Refactor GenerateCalendarJob to implement retry logic.

Added retry mechanisms for OpenAI and Mistral responses with improved error handling and logging. Extracted logic for single and multiple events into dedicated private methods.
hrsa · Feb 1, 2025 · 6c17ee7 · 6c17ee7
1 parent 2e7e185
commit 6c17ee7
Showing 1 changed file with 105 additions and 53 deletions.
diff --git a/app/Jobs/GenerateCalendarJob.php b/app/Jobs/GenerateCalendarJob.php
@@ -36,6 +36,9 @@ class GenerateCalendarJob implements ShouldQueue
 
     public function __construct(public icsEvent $icsEvent) {}
 
+    /**
+     * @throws Exception
+     */
     public function handle(): void
     {
         $user = $this->icsEvent->user;
@@ -55,26 +58,90 @@ public function handle(): void
             ['role' => 'user', 'content' => $this->icsEvent->prompt],
         ];
 
-        try {
-            $result = $this->generateOpenAIResponse();
-        } catch (Exception $exception) {
-            Log::alert("OpenAI error generating IcsEvent #{$this->icsEvent->id}: {$exception->getMessage()}");
-        }
+        $maxRetries = 4;
+        $attempts = 0;
 
-        if (!$result instanceof CreateResponse) {
+        while ($attempts < $maxRetries) {
             try {
-                $result = $this->generateMistralResponse();
-            } catch (Exception $e) {
-                $this->icsEvent->update(['error' => "I'm sorry, my servers are having hiccups. Please try again in 30-60 minutes!"]);
-                Log::alert("Mistral error generating IcsEvent #{$this->icsEvent->id}: {$e->getMessage()}");
-                IcsEventProcessed::dispatch($this->icsEvent);
-                $this->notifyUserError($this->icsEvent->user);
-                $this->fail("{$e->getCode()} : {$e->getMessage()}");
+                $result = $this->generateOpenAIResponse();
+
+                if ($this->isErrorJson($result)) {
+                    $attempts++;
+                    Log::warning("OpenAI Retry #{$attempts} for IcsEvent #{$this->icsEvent->id}. Reason: {$result->choices[0]->message->content}");
+
+                    continue;
+                }
+
+                break;
+            } catch (Exception $exception) {
+                Log::alert("OpenAI error generating IcsEvent #{$this->icsEvent->id}: {$exception->getMessage()}");
+                break;
+            }
+        }
+
+        if (!isset($result)) {
+            $attempts = 0; // Reset retry counter for Mistral
+
+            while ($attempts < $maxRetries) {
+                try {
+                    $result = $this->generateMistralResponse();
 
-                return;
+                    if ($this->isErrorJson($result)) {
+                        $attempts++;
+                        Log::warning("Mistral Retry #{$attempts} for IcsEvent #{$this->icsEvent->id}. Reason: " . json_encode($result));
+
+                        continue;
+                    }
+
+                    break;
+                } catch (Exception $e) {
+                    Log::alert("Mistral error generating IcsEvent #{$this->icsEvent->id}: {$e->getMessage()}");
+                    break;
+                }
             }
         }
 
+        if (!isset($result) || $this->isErrorJson($result)) {
+            if (isset($result) && $this->isErrorJson($result)) {
+                $errorContent = json_decode($result->choices[0]->message->content, true)['error'] ?? 'Unexpected error';
+                $this->icsEvent->update(['error' => $errorContent]);
+            } else {
+                $this->icsEvent->update(['error' => "I'm sorry, my servers are having hiccups. Please try again in 30-60 minutes!"]);
+            }
+
+            Log::alert("Max retries reached for IcsEvent #{$this->icsEvent->id}");
+            IcsEventProcessed::dispatch($this->icsEvent);
+            $this->notifyUserError($this->icsEvent->user);
+            $this->fail("Max retries reached for IcsEvent #{$this->icsEvent->id}");
+
+            return;
+        }
+
+        $this->processResponse($result, $user);
+    }
+
+    private function isErrorJson(mixed $result): bool
+    {
+        if (!$result) {
+            return false;
+        }
+
+        $content = $result->choices[0]->message->content ?? null;
+
+        if ($content) {
+            $decoded = json_decode($content, true);
+
+            return array_key_exists('error', $decoded) && isset($decoded['error']);
+        }
+
+        return false;
+    }
+
+    /**
+     * @throws Exception
+     */
+    private function processResponse(mixed $result, User $user): void
+    {
         $jsonIcs = $result->choices[0]->message->content;
 
         if (!$jsonIcs) {
@@ -93,48 +160,33 @@ public function handle(): void
 
         $decodedReply = json_decode($jsonIcs, true);
 
-        if (array_key_exists('error', $decodedReply) && isset($decodedReply['error'])) {
-            $this->icsEvent->update(['error' => $decodedReply['error']]);
-            $user->increment('failed_requests');
-
-            if ($user->failed_requests >= $user->credits) {
-                $user->decrement('credits');
-            }
-
-            $this->notifyUserError($user);
-            IcsEventProcessed::dispatch($this->icsEvent);
-
-            return;
+        if (isset($decodedReply['events'])) {
+            $this->handleEvents($decodedReply, $user);
+        } elseif (isset($decodedReply['event'])) {
+            $this->handleEvent($decodedReply, $user);
         }
+    }
 
-        if (array_key_exists('events', $decodedReply) && isset($decodedReply['events'])) {
-            try {
-                $events = IcsEventsArray::from($decodedReply);
-                $this->generateAndSaveIcs(event: null, events: $events, user: $user);
-            } catch (Exception $e) {
-                Log::error("Ics {$this->icsEvent->id} error: {$e->getMessage()}", $decodedReply);
-                $this->icsEvent->update(['error' => "I'm sorry, my servers are having hiccups. Please try again in 30-60 minutes!"]);
-                Log::alert("Total failure for IcsEvent #{$this->icsEvent->id}");
-                IcsEventProcessed::dispatch($this->icsEvent);
-                $this->fail("Total failure for IcsEvent #{$this->icsEvent->id}");
-
-                return;
-            }
-        } else {
-            try {
-                $event = IcsEventData::from($decodedReply);
-                $this->generateAndSaveIcs(event: $event, events: null, user: $user);
-            } catch (Exception $e) {
-                Log::error("Ics {$this->icsEvent->id} error: {$e->getMessage()}", $decodedReply);
-                $this->icsEvent->update(['error' => "I'm sorry, my servers are having hiccups. Please try again in 30-60 minutes!"]);
-                Log::alert("Total failure for IcsEvent #{$this->icsEvent->id}");
-                IcsEventProcessed::dispatch($this->icsEvent);
-                $this->notifyUserError($this->icsEvent->user);
-                $this->fail("Total failure for IcsEvent #{$this->icsEvent->id}");
+    /**
+     * Handle the case where multiple events are returned
+     *
+     * @throws Exception
+     */
+    private function handleEvents(array $decodedReply, User $user): void
+    {
+        $events = IcsEventsArray::from($decodedReply);
+        $this->generateAndSaveIcs(event: null, events: $events, user: $user);
+    }
 
-                return;
-            }
-        }
+    /**
+     * Handle the case where a single event is returned
+     *
+     * @throws Exception
+     */
+    private function handleEvent(array $decodedReply, User $user): void
+    {
+        $event = IcsEventData::from($decodedReply);
+        $this->generateAndSaveIcs(event: $event, events: null, user: $user);
     }
 
     private function generateOpenAIResponse(): CreateResponse