slowly moving in tools

Modules/LlmDriver/app/BaseClient.php

@@ -120,7 +120,10 @@ public function chat(array $messages): CompletionResponse
 
         $data = fake()->sentences(3, true);
 
-        return new CompletionResponse($data);
+        return CompletionResponse::from([
+            'content' => $data,
+            'stop_reason' => 'stop',
+        ]);
     }
 
     public function completion(string $prompt): CompletionResponse
@@ -135,7 +138,10 @@ public function completion(string $prompt): CompletionResponse
         Voluptate irure cillum dolor anim officia reprehenderit dolor. Eiusmod veniam nostrud consectetur incididunt proident id. Anim adipisicing pariatur amet duis Lorem sunt veniam veniam est. Deserunt ea aliquip cillum pariatur consectetur. Dolor in reprehenderit adipisicing consectetur cupidatat ad cupidatat reprehenderit. Nostrud mollit voluptate aliqua anim pariatur excepteur eiusmod velit quis exercitation tempor quis excepteur.
 EOD;
 
-        return new CompletionResponse($data);
+        return CompletionResponse::from([
+            'content' => $data,
+            'stop_reason' => 'stop',
+        ]);
     }
 
     protected function getConfig(string $driver): array

Modules/LlmDriver/app/ClaudeClient.php

@@ -11,6 +11,7 @@
 use Laravel\Pennant\Feature;
 use LlmLaraHub\LlmDriver\Functions\FunctionDto;
 use LlmLaraHub\LlmDriver\Requests\MessageInDto;
+use LlmLaraHub\LlmDriver\Responses\ClaudeCompletionResponse;
 use LlmLaraHub\LlmDriver\Responses\CompletionResponse;
 use LlmLaraHub\LlmDriver\Responses\EmbeddingsResponseDto;
 
@@ -37,25 +38,16 @@ public function chat(array $messages): CompletionResponse
 
         Log::info('LlmDriver::Claude::chat');
 
-        /**
-         * I need to iterate over each item
-         * then if there are two rows with role assistant I need to insert
-         * in between a user row with some copy to make it work like "And the user search results had"
-         * using the Laravel Collection library
-         */
         $messages = $this->remapMessages($messages);
 
         $payload = [
             'model' => $model,
-            'system' => 'Return a markdown response.',
             'max_tokens' => $maxTokens,
             'messages' => $messages,
         ];
 
         $payload = $this->modifyPayload($payload);
 
-        put_fixture('claude_payload_chat.json', $payload);
-
         $results = $this->getClient()->post('/messages', $payload);
 
         if (! $results->ok()) {
@@ -69,15 +61,7 @@ public function chat(array $messages): CompletionResponse
             throw new \Exception('Claude API Error Chat');
         }
 
-        [$data, $tool_used, $stop_reason] = $this->getContentAndToolTypeFromResults($results);
-
-        return CompletionResponse::from([
-            'content' => $data,
-            'tool_used' => $tool_used,
-            'stop_reason' => $stop_reason,
-            'input_tokens' => data_get($results, 'usage.input_tokens', null),
-            'output_tokens' => data_get($results, 'usage.output_tokens', null),
-        ]);
+        return ClaudeCompletionResponse::from($results->json());
     }
 
     public function completion(string $prompt): CompletionResponse

Modules/LlmDriver/app/GroqClient.php

@@ -28,15 +28,13 @@ public function embedData(string $data): EmbeddingsResponseDto
     public function chat(array $messages): CompletionResponse
     {
         $model = $this->getConfig('groq')['models']['completion_model'];
-        $maxTokens = $this->getConfig('groq')['max_tokens'];
 
         Log::info('LlmDriver::Groq::chat');
 
         $messages = $this->remapMessages($messages);
 
         $results = $this->getClient()->post('/chat/completions', [
             'model' => $model,
-            'max_tokens' => $maxTokens,
             'messages' => $this->messagesToArray($messages),
         ]);
 

Modules/LlmDriver/app/OllamaClient.php

@@ -113,7 +113,10 @@ public function chat(array $messages): CompletionResponse
             throw new \Exception('Ollama API Error');
         }
 
-        return new CompletionResponse($response->json()['message']['content']);
+        return CompletionResponse::from([
+            'content' => $response->json()['message']['content'],
+            'stop_reason' => 'stop',
+        ]);
     }
 
     /**
@@ -186,9 +189,15 @@ public function completion(string $prompt): CompletionResponse
             'stream' => false,
         ]);
 
+        /**
+         * @see https://github.com/ollama/ollama/blob/main/docs/api.md#generate-a-chat-completion
+         */
         $results = $response->json()['response'];
 
-        return new CompletionResponse($results);
+        return CompletionResponse::from([
+            'content' => $results,
+            'stop_reason' => 'stop',
+        ]);
     }
 
     protected function getClient()

Modules/LlmDriver/app/Responses/ClaudeCompletionResponse.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace LlmLaraHub\LlmDriver\Responses;
+
+use Spatie\LaravelData\Attributes\MapInputName;
+use Spatie\LaravelData\Attributes\WithCastable;
+use Spatie\LaravelData\Optional;
+
+class ClaudeCompletionResponse extends CompletionResponse
+{
+    public function __construct(
+        #[WithCastable(ClaudeContentCaster::class)]
+        public mixed $content,
+        public string|Optional $stop_reason,
+        public ?string $tool_used = '',
+        /** @var array<ToolDto> */
+        #[WithCastable(ClaudeToolCaster::class)]
+        #[MapInputName('content')]
+        public array $tool_calls = [],
+        #[MapInputName('usage.input_tokens')]
+        public ?int $input_tokens = null,
+        #[MapInputName('usage.output_tokens')]
+        public ?int $output_tokens = null,
+        public ?string $model = null,
+    ) {
+    }
+}

Modules/LlmDriver/app/Responses/ClaudeContentCaster.php

@@ -0,0 +1,33 @@
+<?php
+
+namespace LlmLaraHub\LlmDriver\Responses;
+
+use Spatie\LaravelData\Casts\Cast;
+use Spatie\LaravelData\Casts\Castable;
+use Spatie\LaravelData\Support\Creation\CreationContext;
+use Spatie\LaravelData\Support\DataProperty;
+
+class ClaudeContentCaster implements Castable
+{
+    public function __construct(public array $content)
+    {
+
+    }
+
+    public static function dataCastUsing(...$arguments): Cast
+    {
+        return new class implements Cast
+        {
+            public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): mixed
+            {
+                $results = collect($value)->filter(
+                    function ($item) {
+                        return $item['type'] === 'text';
+                    }
+                )->first();
+
+                return data_get($results, 'text');
+            }
+        };
+    }
+}

Modules/LlmDriver/app/Responses/ClaudeToolCaster.php

@@ -0,0 +1,43 @@
+<?php
+
+namespace LlmLaraHub\LlmDriver\Responses;
+
+use Spatie\LaravelData\Casts\Cast;
+use Spatie\LaravelData\Casts\Castable;
+use Spatie\LaravelData\Support\Creation\CreationContext;
+use Spatie\LaravelData\Support\DataProperty;
+
+class ClaudeToolCaster implements Castable
+{
+    public function __construct(public array $tools)
+    {
+
+    }
+
+    public static function dataCastUsing(...$arguments): Cast
+    {
+        return new class implements Cast
+        {
+            public function cast(DataProperty $property, mixed $value, array $properties, CreationContext $context): mixed
+            {
+                $results = collect($value)->filter(
+                    function ($item) {
+                        return $item['type'] === 'tool_use';
+                    }
+                )->toArray();
+
+                foreach ($results as $index => $result) {
+                    $results[$index] = ToolDto::from(
+                        [
+                            'name' => $result['name'],
+                            'arguments' => $result['input'],
+                            'id' => $result['id'],
+                        ]
+                    );
+                }
+
+                return $results;
+            }
+        };
+    }
+}

Modules/LlmDriver/app/Responses/CompletionResponse.php

@@ -2,14 +2,19 @@
 
 namespace LlmLaraHub\LlmDriver\Responses;
 
+use Spatie\LaravelData\Optional;
+
 class CompletionResponse extends \Spatie\LaravelData\Data
 {
     public function __construct(
-        public string $content,
-        public string $stop_reason = 'end_turn',
-        public ?string $tool_used = null,
+        public mixed $content,
+        public string|Optional $stop_reason,
+        public ?string $tool_used = '',
+        /** @var array<ToolDto> */
+        public array $tool_calls = [],
         public ?int $input_tokens = null,
         public ?int $output_tokens = null,
+        public ?string $model = null,
     ) {
     }
 }

Modules/LlmDriver/app/Responses/ToolDto.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace LlmLaraHub\LlmDriver\Responses;
+
+use Spatie\LaravelData\Data;
+use Spatie\LaravelData\Optional;
+
+class ToolDto extends Data
+{
+    public function __construct(
+        public string $name,
+        public array $arguments,
+        public string|Optional $id = '',
+    ) {
+    }
+}

Modules/LlmDriver/tests/Feature/MockClientTest.php

@@ -47,9 +47,7 @@ public function test_completion(): void
         $client = new MockClient();
 
         $results = $client->completion('test');
-
         $this->assertInstanceOf(CompletionResponse::class, $results);
-
     }
 
     public function test_Chat(): void

tests/Api/ClientsTest.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace Tests\Api;
+
+use App\Domains\Messages\RoleEnum;
+use App\Models\Setting;
+use App\Models\Source;
+use Illuminate\Support\Arr;
+use Illuminate\Support\Facades\Http;
+use LlmLaraHub\LlmDriver\LlmDriverFacade;
+use App\Domains\EmailParser\MailDto;
+use LlmLaraHub\LlmDriver\Requests\MessageInDto;
+use Tests\TestCase;
+
+class ClientsTest extends TestCase
+{
+
+
+    public function test_clients() {
+        $this->markTestSkipped('@TODO will setup the tokens shortly');
+        $prompt = <<<PROMPT
+What do you know about Laravel
+PROMPT;
+
+        $messages = [];
+        $messages[] = MessageInDto::from([
+            "role" => RoleEnum::User->value,
+            "content" => $prompt
+        ]);
+        $results = LlmDriverFacade::driver("groq")->chat($messages);
+        $this->assertNotNull($results->content);
+        $results = LlmDriverFacade::driver("openai")->chat($messages);
+        $this->assertNotNull($results->content);
+        $results = LlmDriverFacade::driver("claude")->chat($messages);
+        $this->assertNotNull($results->content);
+
+    }
+}