TASK: Move thread processing to assistant record

sitegeist · Feb 2, 2024 · f93eb21 · f93eb21
1 parent b559188
commit f93eb21
Show file tree

Hide file tree

Showing 4 changed files with 48 additions and 41 deletions.
diff --git a/Classes/Controller/AssistantModuleController.php b/Classes/Controller/AssistantModuleController.php
@@ -106,7 +106,7 @@ public function addThreadMessageAction(string $threadId, string $assistantId, st
         try {
             $assistant->continueThread($threadId, $message, $withAdditionalInstructions);
             $this->view->assignMultiple([
-                'messages' => $this->fetchMessages($threadId),
+                'messages' => $assistant->readThread($threadId),
                 'threadId' => $threadId,
                 'assistantId' => $assistantId,
                 'metadata' => $assistant->getCollectedMetadata()
@@ -127,30 +127,12 @@ public function addThreadMessageAction(string $threadId, string $assistantId, st
 
     public function showThreadAction(string $threadId, string $assistantId): void
     {
+        $assistant = $this->assistantDepartment->findAssistantById($assistantId);
+
         $this->view->assignMultiple([
-            'messages' => $this->fetchMessages($threadId),
+            'messages' => $assistant->readThread($threadId),
             'threadId' => $threadId,
             'assistantId' => $assistantId,
         ]);
     }
-
-    /**
-     * @return array<MessageRecord>
-     */
-    private function fetchMessages(string $threadId): array
-    {
-        $threadMessageResponses = $this->client->threads()->messages()->list($threadId)->data;
-
-        $threadMessageResponsesFiltered =  array_filter(
-            $threadMessageResponses,
-            fn(ThreadMessageResponse $threadMessageResponse) => ($threadMessageResponse->metadata['role'] ?? null) !== 'system'
-        );
-
-        return array_reverse(
-            array_map(
-                fn(ThreadMessageResponse $threadMessageResponse) => MessageRecord::fromThreadMessageResponse($threadMessageResponse),
-                $threadMessageResponsesFiltered
-            ),
-        );
-    }
 }
diff --git a/Classes/Controller/ChatController.php b/Classes/Controller/ChatController.php
@@ -34,33 +34,26 @@ public function startAction(string $assistantId, string $message): void
         $threadId = $assistant->startThread();
         $assistant->continueThread($threadId, $message, true);
 
-        $messageResponse = $this->client->threads()->messages()->list($threadId)->data;
-        /** @var ?ThreadMessageResponse $lastMessage */
-        $lastMessage = reset($messageResponse);
+        $messageResponses = $assistant->readThread($threadId);
+        $lastMessageKey = array_key_last($messageResponses);
+        $lastMessage = $messageResponses[$lastMessageKey];
 
         $this->view->assign('value', [
             'bot' => true,
-            'message' => $lastMessage?->content ?: '',
+            'message' => $lastMessage->toApiArray(),
             'threadId' => $threadId,
             'metadata' => $assistant->getCollectedMetadata()
         ]);
     }
 
-    public function historyAction(string $threadId): void
+    public function historyAction(string $assistantId, string $threadId): void
     {
-        $data = $this->client->threads()->messages()->list($threadId)->data;
-
-        $messages = array_reverse(array_map(
-            fn (ThreadMessageResponse $threadMessageResponse) => MessageRecord::fromThreadMessageResponse($threadMessageResponse),
-            $data
-        ));
+        $assistant = $this->assistantDepartment->findAssistantById($assistantId);
+        $messages = $assistant->readThread($threadId);
 
         $this->view->assign('value', [
             'messages' => array_map(
-                fn (MessageRecord $message): array => [
-                    'bot' => $message->role !== 'user',
-                    'message' => $message->content,
-                ],
+                fn (MessageRecord $message): array => $message->toApiArray(),
                 $messages
             ),
         ]);
@@ -71,13 +64,13 @@ public function postAction(string $assistantId, string $threadId, string $messag
         $assistant = $this->assistantDepartment->findAssistantById($assistantId);
         $assistant->continueThread($threadId, $message);
 
-        $messageResponse = $this->client->threads()->messages()->list($threadId)->data;
-        /** @var ?ThreadMessageResponse $lastMessage */
-        $lastMessage = reset($messageResponse);
+        $messageResponses = $assistant->readThread($threadId);
+        $lastMessageKey = array_key_last($messageResponses);
+        $lastMessage = $messageResponses[$lastMessageKey];
 
         $this->view->assign('value', [
             'bot' => true,
-            'message' => $lastMessage?->content ?: '',
+            'message' => $lastMessage->toApiArray(),
             'metadata' => $assistant->getCollectedMetadata()
         ]);
     }

diff --git a/Classes/Domain/Assistant.php b/Classes/Domain/Assistant.php
@@ -6,6 +6,7 @@
 
 use OpenAI\Contracts\ClientContract as OpenAiClientContract;
 use Neos\Flow\Annotations as Flow;
+use OpenAI\Responses\Threads\Messages\ThreadMessageResponse;
 use OpenAI\Responses\Threads\Runs\ThreadRunResponseRequiredActionFunctionToolCall;
 use OpenAI\Responses\Threads\Runs\ThreadRunResponseRequiredActionSubmitToolOutputs;
 use Psr\Log\LoggerInterface;
@@ -66,6 +67,26 @@ public function continueThread(string $threadId, string $message, bool $withAddi
         $this->completeRun($threadId, $runResponse->id);
     }
 
+    /**
+     * @return array<MessageRecord>
+     */
+    public function readThread(string $threadId): array
+    {
+        $threadMessageResponses = $this->client->threads()->messages()->list($threadId)->data;
+
+        $threadMessageResponsesFiltered =  array_filter(
+            $threadMessageResponses,
+            fn(ThreadMessageResponse $threadMessageResponse) => ($threadMessageResponse->metadata['role'] ?? null) !== 'system'
+        );
+
+        return array_reverse(
+            array_map(
+                fn(ThreadMessageResponse $threadMessageResponse) => MessageRecord::fromThreadMessageResponse($threadMessageResponse),
+                $threadMessageResponsesFiltered
+            )
+        );
+    }
+
     private function completeRun(string $threadId, string $runId): void
     {
         $threadRunResponse = $this->client->threads()->runs()->retrieve($threadId, $runId);

diff --git a/Classes/Domain/MessageRecord.php b/Classes/Domain/MessageRecord.php
@@ -34,4 +34,15 @@ public static function fromThreadMessageResponse(ThreadMessageResponse $response
             $response->metadata
         );
     }
+
+    /**
+     * @return array{bot:boolean, messsage: string}
+     */
+    public function toApiArray(): array
+    {
+        return [
+            'bot' => $this->role !== 'user',
+            'message' => $this->content,
+        ];
+    }
 }