Merge pull request #20 from bootstrapguru/dexor-rename-fixes

Bug Fixes with Dexor Renaming

README.md

@@ -1,19 +1,19 @@
-# 🤖 Dexor
+# 🤖 Dexor (Previously droid.dev)
 
 Welcome to **Dexor**, your trusty companion for automating and streamlining your development tasks. Dexor is here to help you stay productive by automating repetitive tasks, identifying and fixing bugs, writing comprehensive test cases, and maintaining a consistent codebase. Checkout the [documentation](https://docs.dexors.dev/) to get started! 
 
 Checkout the youtube video [here](https://youtu.be/oLmbafcHCKg)
 
 <p align="center">
-  <a href="https://packagist.org/packages/bootstrapguru/dexor"><img src="https://img.shields.io/packagist/dt/bootstrapguru/dexor.svg" alt="Total Downloads" /></a>
-  <a href="https://packagist.org/packages/bootstrapguru/dexor"><img src="https://img.shields.io/packagist/v/bootstrapguru/dexor.svg?label=stable" alt="Latest Stable Version" /></a>
-  <a href="https://packagist.org/packages/bootstrapguru/dexor"><img src="https://img.shields.io/packagist/l/bootstrapguru/dexor.svg" alt="License" /></a>
+  <a href="https://packagist.org/packages/bootstrapguru/droid"><img src="https://img.shields.io/packagist/dt/bootstrapguru/droid.svg" alt="Total Downloads" /></a>
+  <a href="https://packagist.org/packages/bootstrapguru/droid"><img src="https://img.shields.io/packagist/v/bootstrapguru/droid.svg?label=stable" alt="Latest Stable Version" /></a>
+  <a href="https://packagist.org/packages/bootstrapguru/droid"><img src="https://img.shields.io/packagist/l/bootstrapguru/droid.svg" alt="License" /></a>
 </p>
-<img src="https://raw.githubusercontent.com/bootstrapguru/dexor.dev/main/resources/images/dexor.webp">
+<img src="https://raw.githubusercontent.com/bootstrapguru/dexor.dev/main/resources/images/droid.webp">
 
 ## Documentation
 
-For full documentation, getting started guides, and advanced usage, please visit [docs.dexors.dev](https://docs.dexors.dev/).
+For full documentation, getting started guides, and advanced usage, please visit [docs.dexors.dev](https://docs.dexor.dev/).
 
 ## License
 

app/Integrations/Ollama/Requests/ChatRequest.php

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

app/Integrations/OpenAI/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/Models/Message.php

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