fix ollama stream

Author: ilvalerione

src/Providers/HandleSetClient.php src/Providers/HandleClient.phpsrc/Providers/HandleSetClient.php renamed to src/Providers/HandleClient.php

@@ -4,12 +4,11 @@
 
 use GuzzleHttp\Client;
 
-trait HandleSetClient
+trait HandleClient
 {
-    public function setClient(Client $client): static
+    public function setClient(Client $client): AIProviderInterface
     {
         $this->client = $client;
-
         return $this;
     }
 }

src/Providers/Ollama/HandleChat.php

@@ -21,13 +21,10 @@ public function chat(array $messages): Message
         $json = [
             'stream' => false,
             'model' => $this->model,
+            'temperature' => $this->temperature,
             'messages' => $mapper->map(),
         ];
 
-        if ($this->temperature) {
-            $json['temperature'] = $this->temperature;
-        }
-
         if (! empty($this->tools)) {
             $json['tools'] = $this->generateToolsPayload();
         }

src/Providers/Ollama/HandleStream.php

@@ -16,12 +16,12 @@ public function stream(array|string $messages, callable $executeToolsCallback):
 
         $mapper = new MessageMapper($messages);
 
-        $json = \array_filter([
+        $json = [
             'stream' => true,
             'model' => $this->model,
             'temperature' => $this->temperature,
             'messages' => $mapper->map(),
-        ]);
+        ];
 
         if (!empty($this->tools)) {
             $json['tools'] = $this->generateToolsPayload();
@@ -31,9 +31,6 @@ public function stream(array|string $messages, callable $executeToolsCallback):
             'chat', compact('json')
         )->getBody();
 
-        $text = '';
-        $toolCalls = [];
-
         while (! $stream->eof()) {
             if (!$line = $this->parseNextJson($stream)) {
                 continue;
@@ -45,7 +42,6 @@ public function stream(array|string $messages, callable $executeToolsCallback):
 
             // Process regular content
             $content = $line['message']['content']??'';
-            $text .= $content;
 
             yield $content;
         }

src/Providers/Ollama/Ollama.php

@@ -6,15 +6,15 @@
 use NeuronAI\Chat\Messages\Message;
 use NeuronAI\Chat\Messages\ToolCallMessage;
 use NeuronAI\Providers\AIProviderInterface;
-use NeuronAI\Providers\HandleSetClient;
+use NeuronAI\Providers\HandleClient;
 use NeuronAI\Providers\HandleWithTools;
 use NeuronAI\Tools\ToolInterface;
 use NeuronAI\Tools\ToolProperty;
 
 class Ollama implements AIProviderInterface
 {
     use HandleChat;
-    use HandleSetClient;
+    use HandleClient;
     use HandleStream;
     use HandleWithTools;
 

tests/ChatHistoryTest.php

@@ -5,7 +5,6 @@
 use NeuronAI\Chat\History\AbstractChatHistory;
 use NeuronAI\Chat\History\FileChatHistory;
 use NeuronAI\Chat\History\InMemoryChatHistory;
-use NeuronAI\Chat\Messages\Message;
 use NeuronAI\Chat\Messages\Usage;
 use NeuronAI\Chat\Messages\UserMessage;
 use NeuronAI\Exceptions\ChatHistoryException;
@@ -23,20 +22,20 @@ public function setUp(): void
     {
     }
 
-    public function testChatHistoryInstance()
+    public function test_chat_history_instance()
     {
         $history = new InMemoryChatHistory();
         $this->assertInstanceOf(AbstractChatHistory::class, $history);
     }
 
-    public function testChatHistoryAddMessage()
+    public function test_chat_history_add_message()
     {
         $history = new InMemoryChatHistory();
         $history->addMessage(new UserMessage('Hello!'));
         $this->assertCount(1, $history->getMessages());
     }
 
-    public function testChatHistoryTruncate()
+    public function test_chat_history_truncate()
     {
         $message = new UserMessage('Hello!');
         $message->setUsage(new Usage(100, 100));
@@ -46,7 +45,7 @@ public function testChatHistoryTruncate()
         $this->assertCount(1, $history->getMessages());
     }
 
-    public function testChatHistoryClear()
+    public function test_chat_history_clear()
     {
         $history = new InMemoryChatHistory();
         $history->addMessage(new UserMessage('Hello!'));
@@ -58,7 +57,7 @@ public function testChatHistoryClear()
     /**
      * @throws ChatHistoryException
      */
-    public function testFileChatHistory()
+    public function test_file_chat_history()
     {
         $history = new FileChatHistory(__DIR__, 'test');
         $this->assertFileDoesNotExist(__DIR__.DIRECTORY_SEPARATOR.'neuron_test.chat');
@@ -72,7 +71,7 @@ public function testFileChatHistory()
         $this->assertCount(0, $history->getMessages());
     }
 
-    public function testFileChatHistoryInit()
+    public function test_file_chat_history_init()
     {
         $history = new FileChatHistory(__DIR__, 'test');
         $history->addMessage(new UserMessage('Hello!'));

tests/DataLoaderTest.php

@@ -9,15 +9,15 @@
 
 class DataLoaderTest extends TestCase
 {
-    public function testStringDataLoader()
+    public function test_string_data_loader()
     {
         $documents = StringDataLoader::for('test')->getDocuments();
         $this->assertCount(1, $documents);
         $this->assertEquals('test', $documents[0]->content);
         $this->assertEquals(\hash('sha256', 'test'), $documents[0]->hash);
     }
 
-    public function testSplitLongText()
+    public function test_split_long_text()
     {
         $doc = new Document(file_get_contents(__DIR__.'/stubs/long-text.txt'));
 

tests/NeuronAITest.php

@@ -26,7 +26,7 @@ public function setUp(): void
     {
     }
 
-    public function testAgentInstance()
+    public function test_agent_instance()
     {
         $neuron = new Agent();
         $this->assertInstanceOf(AgentInterface::class, $neuron);
@@ -35,7 +35,7 @@ public function testAgentInstance()
         $this->assertInstanceOf(Agent::class, $neuron);
     }
 
-    public function testMessageInstance()
+    public function test_message_instance()
     {
         $tools = [
             new Tool('example', 'example')
@@ -46,7 +46,7 @@ public function testMessageInstance()
         $this->assertInstanceOf(Message::class, new ToolCallMessage('', $tools));
     }
 
-    public function testToolInstance()
+    public function test_tool_instance()
     {
         $tool = new Tool('example', 'example');
         $this->assertInstanceOf(ToolInterface::class, $tool);

tests/OllamaTest.php tests/Providers/OllamaTest.phptests/OllamaTest.php renamed to tests/Providers/OllamaTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace NeuronAI\Tests;
+namespace NeuronAI\Tests\Providers;
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Handler\MockHandler;
@@ -45,6 +45,7 @@ public function test_chat_request(): void
         $expectedResponse = [
             'stream' => false,
             'model' => 'llama3.2',
+            'temperature' => 0,
             'messages' => [
                 [
                     'role' => 'user',

tests/VectorStore/ElasticsearchTest.php

@@ -37,13 +37,13 @@ private function isPortOpen(string $host, int $port, int $timeout = 1): bool
         return false;
     }
 
-    public function testElasticsearchInstance()
+    public function test_elasticsearch_instance()
     {
         $store = new ElasticsearchVectorStore($this->client, 'test');
         $this->assertInstanceOf(VectorStoreInterface::class, $store);
     }
 
-    public function testAddDocumentAndSearch()
+    public function test_add_document_and_search()
     {
         $store = new ElasticsearchVectorStore($this->client, 'test');
 

tests/VectorStore/MemoryVectorStoreTest.php

@@ -17,13 +17,13 @@ protected function setUp(): void
         $this->embedding = json_decode(file_get_contents(__DIR__ . '/../stubs/hello-world.embeddings'), true);
     }
 
-    public function testVectorStoreInstance()
+    public function test_memory_store_instance()
     {
         $store = new MemoryVectorStore();
         $this->assertInstanceOf(VectorStoreInterface::class, $store);
     }
 
-    public function testAddDocumentAndSearch()
+    public function test_add_document_and_search()
     {
         $document = new Document('Hello World!');
         $document->embedding = $this->embedding;