Merge pull request #11 from sitegeist/task/externamRunInstructions

TASK: Allow to pass `additionalInstructions` with the start and post endpoints
sitegeist · Mar 7, 2024 · 3dc806c · 3dc806c
2 parents 60c967d + a1eafdb
commit 3dc806c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Classes/Controller/ChatController.php b/Classes/Controller/ChatController.php
@@ -33,12 +33,12 @@ public function injectMetaDataCache(VariableFrontend $metaDataCache): void
         $this->metaDataCache = $metaDataCache;
     }
 
-    public function startAction(string $organizationId, string $assistantId, string $message): string
+    public function startAction(string $organizationId, string $assistantId, string $message, ?string $additionalInstructions = null): string
     {
         $organization = $this->organizationRepository->findById($organizationId);
         $assistant = $organization->assistantDepartment->findAssistantById($assistantId);
         $threadId = $assistant->startThread();
-        $assistant->continueThread($threadId, $message);
+        $assistant->continueThread($threadId, $message, $additionalInstructions);
 
         $messageResponses = $assistant->readThread($threadId);
         $lastMessageKey = array_key_last($messageResponses);
@@ -88,11 +88,11 @@ function (MessageRecord $message) use ($cachedMetadata, $assistantId, $threadId)
         );
     }
 
-    public function postAction(string $organizationId, string $assistantId, string $threadId, string $message): string
+    public function postAction(string $organizationId, string $assistantId, string $threadId, string $message, ?string $additionalInstructions = null): string
     {
         $organization = $this->organizationRepository->findById($organizationId);
         $assistant = $organization->assistantDepartment->findAssistantById($assistantId);
-        $assistant->continueThread($threadId, $message);
+        $assistant->continueThread($threadId, $message, $additionalInstructions);
 
         $messageResponses = $assistant->readThread($threadId);
         $lastMessageKey = array_key_last($messageResponses);

diff --git a/Classes/Domain/Assistant.php b/Classes/Domain/Assistant.php
@@ -51,7 +51,7 @@ public function startThread(): string
         return $threadResponse->id;
     }
 
-    public function continueThread(string $threadId, string $message): void
+    public function continueThread(string $threadId, string $message, ?string $additionalInstructions = null): void
     {
         $this->client->threads()->messages()->create(
             $threadId,
@@ -65,7 +65,7 @@ public function continueThread(string $threadId, string $message): void
             $threadId,
             array_filter([
                 'assistant_id' => $this->id,
-                'additional_instructions' => $this->instructions->getContent()
+                'additional_instructions' => $this->instructions->getContent() . ($additionalInstructions ? " \n" . $additionalInstructions : '')
             ])
         );
         $this->completeRun($threadId, $runResponse->id);