Deepseek privider

Author: ilvalerione

src/Agent.php

@@ -110,7 +110,9 @@ public function chat(Message|array $messages): Message
                 $this->notify('tool-called', new ToolCalled($tool));
             }
 
-            $response = $this->chat($toolCallResult);
+            $response = $this->chat([
+                $response, $toolCallResult
+            ]);
         }
 
         $this->notify('message-saving', new MessageSaving($response));

src/Chat/Messages/Message.php

@@ -13,11 +13,11 @@ class Message implements \JsonSerializable
     protected array $meta = [];
 
     public function __construct(
-        protected ?string $role = null,
+        protected string $role,
         protected array|string|int|float|null $content = null
     ) {}
 
-    public function getRole(): ?string
+    public function getRole(): string
     {
         return $this->role;
     }

src/Chat/Messages/ToolCallResultMessage.php

@@ -2,11 +2,11 @@
 
 namespace NeuronAI\Chat\Messages;
 
-class ToolCallResultMessage extends Message
+class ToolCallResultMessage extends UserMessage
 {
     public function __construct(protected array $tools)
     {
-        parent::__construct();
+        parent::__construct(null);
     }
 
     public function getTools(): array

src/Providers/Anthropic/MessageMapper.php

@@ -4,6 +4,7 @@
 
 use NeuronAI\Chat\Messages\Message;
 use NeuronAI\Chat\Messages\ToolCallMessage;
+use NeuronAI\Chat\Messages\ToolCallResultMessage;
 use NeuronAI\Tools\ToolInterface;
 
 class MessageMapper
@@ -23,10 +24,10 @@ public function __construct(protected array $messages) {}
     public function map(): array
     {
         foreach ($this->messages as $message) {
-            $this->mapping[] = $message->jsonSerialize();
-
-            if ($message instanceof ToolCallMessage) {
+            if ($message instanceof ToolCallResultMessage) {
                 $this->addToolsResult($message->getTools());
+            } else {
+                $this->mapping[] = $message->jsonSerialize();
             }
         }
 

src/Providers/OpenAI/MessageMapper.php

@@ -23,10 +23,10 @@ public function __construct(protected array $messages) {}
     public function map(): array
     {
         foreach ($this->messages as $message) {
-            $this->mapping[] = $message->jsonSerialize();
-
             if ($message instanceof ToolCallResultMessage) {
                 $this->addToolsResult($message->getTools());
+            } else {
+                $this->mapping[] = $message->jsonSerialize();
             }
         }
 
@@ -37,7 +37,7 @@ public function addToolsResult(array $tools): void
     {
         foreach ($tools as $tool) {
             $this->mapping[] = [
-                'role' => 'tool',
+                'role' => Message::ROLE_TOOL,
                 'tool_call_id' => $tool->getCallId(),
                 'content' => $tool->getResult()
             ];