Updated message return format

Author: eldadfux

src/Agents/Adapter.php

@@ -22,11 +22,11 @@ abstract public function getName(): string;
      * Send a message to the AI model
      *
      * @param  Conversation  $conversation The conversation instance containing messages and tracking tokens
-     * @return array<Message> Response from the AI model
+     * @return Message Response from the AI model
      *
      * @throws \Exception
      */
-    abstract public function send(Conversation $conversation): array;
+    abstract public function send(Conversation $conversation): Message;
 
     /**
      * Get available models for this adapter

src/Agents/Adapters/Anthropic.php

@@ -78,11 +78,11 @@ public function __construct(
      * Send a message to the Anthropic API
      *
      * @param  Conversation  $conversation
-     * @return array<Message>
+     * @return Message
      *
      * @throws \Exception
      */
-    public function send(Conversation $conversation): array
+    public function send(Conversation $conversation): Message
     {
         if ($this->getAgent() === null) {
             throw new \Exception('Agent not set');
@@ -107,7 +107,7 @@ public function send(Conversation $conversation): array
             $instructions[] = "# " . $name . "\n\n" . $content;
         }
 
-        $collectedMessages = [];
+        $content = '';
         $response = $client->fetch(
             'https://api.anthropic.com/v1/messages',
             Client::METHOD_POST,
@@ -121,19 +121,18 @@ public function send(Conversation $conversation): array
                 'stream' => true,
             ],
             [],
-            function ($chunk) use ($conversation, &$collectedMessages) {
-                $messages = $this->process($chunk, $conversation, $conversation->getListener());
-                if ($messages) {
-                    $collectedMessages = array_merge($collectedMessages, $messages);
-                }
+            function ($chunk) use ($conversation, &$content) {
+                $content .= $this->process($chunk, $conversation, $conversation->getListener());
             }
         );
 
         if ($response->getStatusCode() >= 400) {
             throw new \Exception('Anthropic API error ('.$response->getStatusCode().'): '.$response->getBody());
         }
 
-        return $collectedMessages;
+        $message = new Text($content);
+
+        return $message;
     }
 
     /**
@@ -142,17 +141,18 @@ function ($chunk) use ($conversation, &$collectedMessages) {
      * @param  \Utopia\Fetch\Chunk  $chunk
      * @param  Conversation  $conversation
      * @param  callable|null  $listener
-     * @return array<Message>
+     * @return string
      *
      * @throws \Exception
      */
-    protected function process(Chunk $chunk, Conversation $conversation, ?callable $listener): array
+    protected function process(Chunk $chunk, Conversation $conversation, ?callable $listener): string
     {
-        $messages = [];
+        $block = '';
         $data = $chunk->getData();
         $lines = explode("\n", $data);
 
         foreach ($lines as $line) {
+
             if (empty(trim($line))) {
                 continue;
             }
@@ -194,17 +194,14 @@ protected function process(Chunk $chunk, Conversation $conversation, ?callable $
                     }
 
                     $deltaType = $json['delta']['type'];
-                    $message = null;
 
                     if ($deltaType === 'text_delta' && isset($json['delta']['text']) && is_string($json['delta']['text'])) {
-                        $message = new Text($json['delta']['text']);
+                        $block = $json['delta']['text'];
                     }
 
-                    if ($message !== null) {
-                        $conversation->message(new Assistant('anthropic'), $message);
-                        $messages[] = $message;
+                    if (!empty($block)) {
                         if ($listener !== null) {
-                            $listener($message);
+                            $listener($block);
                         }
                     }
                     break;
@@ -226,7 +223,6 @@ protected function process(Chunk $chunk, Conversation $conversation, ?callable $
                     break;
 
                 case 'message_stop':
-                    // End of message
                     break;
 
                 case 'error':
@@ -235,7 +231,7 @@ protected function process(Chunk $chunk, Conversation $conversation, ?callable $
             }
         }
 
-        return $messages;
+        return $block;
     }
 
     /**

src/Agents/Adapters/OpenAI.php

@@ -71,11 +71,11 @@ public function __construct(
      * Send a message to the OpenAI API
      *
      * @param  Conversation  $conversation
-     * @return array<Message> Response from the AI model
+     * @return Message Response from the AI model
      *
      * @throws \Exception
      */
-    public function send(Conversation $conversation): array
+    public function send(Conversation $conversation): Message
     {
         // TODO: Implement OpenAI API call
         // Example implementation structure:

src/Agents/Conversation.php

@@ -79,19 +79,17 @@ public function message(Role $from, Message $message): self
     /**
      * Send the conversation to the agent and get response
      *
-     * @return array<Message>
+     * @return Message
      *
      * @throws \Exception
      */
-    public function send(): array
+    public function send(): Message
     {
-        $messages = $this->agent->getAdapter()->send($this);
+        $message = $this->agent->getAdapter()->send($this);
         $from = new Assistant($this->agent->getAdapter()->getModel(), 'Assistant');
-        foreach ($messages as $message) {
-            $this->message($from, $message);
-        }
+        $this->message($from, $message);
 
-        return $messages;
+        return $message;
     }
 
     /**