fix up the stan

LlmLaraHub · Mar 30, 2024 · 87bb67c · 87bb67c
1 parent 0ccbe50
commit 87bb67c
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 58 deletions.
diff --git a/app/LlmDriver/Functions/FunctionContract.php b/app/LlmDriver/Functions/FunctionContract.php
@@ -1,29 +1,44 @@
-<?php 
+<?php
 
 namespace App\LlmDriver\Functions;
 
 abstract class FunctionContract
 {
     protected string $name;
+
+    protected string $dscription;
+
+    /**
+     * @param  array<string, mixed>  $data
+     * @return array<string, mixed>
+     */
+    abstract public function handle(array $data): array;
 
-    public function getName(): string
+    public function getFunction(): FunctionDto
     {
-        return $this->name;
-    }
+        return FunctionDto::from(
+            [
+                'name' => $this->getName(),
+                'description' => $this->getDescription(),
+                'parameters' => $this->getParameters(),
+            ]
+        );
 
-    public function getFunction() : FunctionDto {
-        return new FunctionDto($this->name, $this->getParameters());
-
     }
 
+    protected function getName(): string
+    {
+        return $this->name;
+    }
 
-    abstract public function getParameters(): array;
 
+    protected function getParameters(): array {
+        return [];
+    }
 
 
-    /**
-     * @param array<string, mixed> $data
-     * @return array<string, mixed>
-     */
-    abstract public function handle(array $data): array;
-}
+    protected function getDescription(): string
+    {
+        return $this->name;
+    }
+}
diff --git a/app/LlmDriver/Functions/FunctionDto.php b/app/LlmDriver/Functions/FunctionDto.php
@@ -2,8 +2,6 @@
 
 namespace App\LlmDriver\Functions;
 
-use Spatie\LaravelData\Attributes\WithCastable;
-
 class FunctionDto extends \Spatie\LaravelData\Data
 {
     public function __construct(

diff --git a/app/LlmDriver/Functions/ParameterCaster.php b/app/LlmDriver/Functions/ParameterCaster.php
diff --git a/app/LlmDriver/Functions/ParameterDto.php b/app/LlmDriver/Functions/ParameterDto.php
@@ -2,16 +2,14 @@
 
 namespace App\LlmDriver\Functions;
 
-use Spatie\LaravelData\Attributes\WithCastable;
-
 class ParameterDto extends \Spatie\LaravelData\Data
 {
     public function __construct(
         public string $name,
         public string $description,
-        public string $type = "string",
+        public string $type = 'string',
         public array $enum = [],
-        public string $default = "",
+        public string $default = '',
         public bool $required = false,
     ) {
     }

diff --git a/app/LlmDriver/Functions/ParametersDto.php b/app/LlmDriver/Functions/ParametersDto.php
@@ -2,19 +2,14 @@
 
 namespace App\LlmDriver\Functions;
 
-use Spatie\LaravelData\Attributes\WithCastable;
-
 class ParametersDto extends \Spatie\LaravelData\Data
 {
-
     /**
-     * 
-     * @param string $type 
-     * @param ParameterDto[] $parameters 
-     * @return void 
+     * @param  ParameterDto[]  $parameters
+     * @return void
      */
     public function __construct(
-        public string $type = "object",
+        public string $type = 'object',
         public array $parameters = [],
     ) {
     }

diff --git a/tests/Feature/FunctionDtoTest.php b/tests/Feature/FunctionDtoTest.php
@@ -5,8 +5,6 @@
 use App\LlmDriver\Functions\FunctionDto;
 use App\LlmDriver\Functions\ParameterDto;
 use App\LlmDriver\Functions\ParametersDto;
-use Illuminate\Foundation\Testing\RefreshDatabase;
-use Illuminate\Foundation\Testing\WithFaker;
 use Tests\TestCase;
 
 class FunctionDtoTest extends TestCase
@@ -39,12 +37,11 @@ public function test_dto(): void
                             'default' => 'bar',
                             'required' => true,
                         ],
-                        ],
+                    ],
                 ],
             ]
         );
 
-
         $this->assertNotNull($dto->name);
         $this->assertNotNull($dto->description);
         $this->assertInstanceOf(ParametersDto::class, $dto->parameters);
@@ -57,7 +54,7 @@ public function test_dto(): void
         $this->assertEquals([], $parameterOne->enum);
         $this->assertEquals('', $parameterOne->default);
         $this->assertFalse($parameterOne->required);
-        
+
         $parameterTwo = $dto->parameters->parameters[1];
         $this->assertInstanceOf(ParameterDto::class, $parameterTwo);
         $this->assertEquals('test2', $parameterTwo->name);