Merge pull request #21 from bootstrapguru/dev

Renaming Fixes with Dexor

Author: vijaythecoder

app/Commands/DroidCommand.php renamed to app/Commands/DexorCommand.php

@@ -62,4 +62,4 @@ public function createDtoFromResponse(Response $response): MessageData
         $data = $response->json();
         return MessageData::from($data['message'] ?? []);
     }
-}
+}

app/Integrations/Ollama/Requests/ChatRequest.php

@@ -3,6 +3,7 @@
 namespace App\Integrations\OpenAI\Requests;
 
 use App\Data\MessageData;
+use App\Data\ToolCallData;
 use App\Models\Thread;
 use Saloon\Contracts\Body\HasBody;
 use Saloon\Enums\Method;
@@ -51,7 +52,16 @@ private function formatMessages($assistant): array
     public function createDtoFromResponse(Response $response): MessageData
     {
         $data = $response->json();
-        $choice = $data['choices'][0] ?? [];
-        return MessageData::from($choice['message'] ?? []);
+        $message = $data['choices'][0]['message'] ?? [];
+        $tools = collect([]);
+        if (isset($message['tool_calls'])) {
+            foreach ($message['tool_calls'] as $toolCall) {
+                $tools->push(ToolCallData::from($toolCall));
+            }
+
+            $message['tool_calls'] = $tools;
+        }
+
+        return MessageData::from($message ?? []);
     }
-}
+}

app/Integrations/OpenAI/Requests/ChatRequest.php

@@ -26,9 +26,4 @@ public function thread()
     {
         return $this->belongsTo(Thread::class);
     }
-
-    public function tool()
-    {
-        return $this->belongsTo(Tool::class);
-    }
 }