tool parameters

Author: ilvalerione

src/Tools/Tool.php

@@ -22,17 +22,12 @@
 use function method_exists;
 
 /**
- * @method static static make(?string $name = null, ?string $description = null, array $properties = [], array $annotations = [])
+ * @method static static make(?string $name = null, ?string $description = null, array $properties = [], array $parameters = [], array $annotations = [])
  */
 class Tool implements ToolInterface
 {
     use StaticConstructor;
 
-    /**
-     * @var ToolPropertyInterface[]
-     */
-    protected array $properties = [];
-
     /**
      * @var null|callable
      */
@@ -64,18 +59,16 @@ class Tool implements ToolInterface
      * Tool constructor.
      *
      * @param ToolPropertyInterface[] $properties
+     * @params array<int, mixed>|null $parameters
      * @params array<int, mixed>|null $annotations
      */
     public function __construct(
         protected string $name,
         protected ?string $description = null,
-        array $properties = [],
+        protected array $properties = [],
         protected array $parameters = [],
         protected array $annotations = []
     ) {
-        if ($properties !== []) {
-            $this->properties = $properties;
-        }
     }
 
     public function getName(): string
@@ -144,6 +137,12 @@ public function getAnnotations(): array
         return $this->annotations;
     }
 
+    public function setParameters(array $parameters): self
+    {
+        $this->parameters = $parameters;
+        return $this;
+    }
+
     public function getParameters(): array
     {
         return $this->parameters;

tests/Stubs/Tools/TestToolClassWithoutParentConstructor.php

@@ -8,8 +8,6 @@
 use NeuronAI\Tests\Stubs\StructuredOutput\Color;
 use NeuronAI\Tests\Stubs\Tools\TestToolClassOnlyParentConstructor;
 use NeuronAI\Tests\Stubs\Tools\TestToolClassOnlyParentConstructorFluent;
-use NeuronAI\Tests\Stubs\Tools\TestToolClassWithoutParentConstructor;
-use NeuronAI\Tests\Stubs\Tools\TestToolClassWithoutParentConstructorMixed;
 use NeuronAI\Tests\Stubs\Tools\TestToolClassWithParentConstructor;
 use NeuronAI\Tests\Stubs\Tools\TestToolClassWithParentConstructorMixed;
 use NeuronAI\Tools\ArrayProperty;
@@ -21,8 +19,6 @@
 use PHPUnit\Framework\TestCase;
 use Error;
 
-use function count;
-
 class ToolTest extends TestCase
 {
     public function test_tool_instance(): void
@@ -415,28 +411,10 @@ public function test_tool_named_parameters(): void
         );
     }
 
-    public function test_properties_declaration_on_method_and_constructor_without_parent_constructor(): void
-    {
-        $tool = new TestToolClassWithoutParentConstructorMixed('test');
-        $this->assertEquals(1, count($tool->getProperties()));
-        $this->assertEquals('test_tool', $tool->getName());
-        $this->assertEquals('test tool', $tool->getDescription());
-        $this->assertEquals('test', $tool->getKey());
-    }
-
-    public function test_properties_declaration_on_method_without_parent_constructor(): void
-    {
-        $tool = new TestToolClassWithoutParentConstructor('test');
-        $this->assertEquals(2, count($tool->getProperties()));
-        $this->assertEquals('test_tool', $tool->getName());
-        $this->assertEquals('test tool', $tool->getDescription());
-        $this->assertEquals('test', $tool->getKey());
-    }
-
     public function test_properties_declaration_on_method_and_constructor_with_parent_constructor(): void
     {
         $tool = new TestToolClassWithParentConstructorMixed('test');
-        $this->assertEquals(1, count($tool->getProperties()));
+        $this->assertCount(1, $tool->getProperties());
         $this->assertEquals('test_tool', $tool->getName());
         $this->assertEquals('test tool', $tool->getDescription());
         $this->assertEquals('test', $tool->getKey());
@@ -445,7 +423,7 @@ public function test_properties_declaration_on_method_and_constructor_with_paren
     public function test_properties_declaration_on_method_with_parent_constructor(): void
     {
         $tool = new TestToolClassWithParentConstructor('test');
-        $this->assertEquals(1, count($tool->getProperties()));
+        $this->assertCount(1, $tool->getProperties());
         $this->assertEquals('test_tool', $tool->getName());
         $this->assertEquals('test tool', $tool->getDescription());
         $this->assertEquals('test', $tool->getKey());
@@ -454,7 +432,7 @@ public function test_properties_declaration_on_method_with_parent_constructor():
     public function test_properties_declaration_on_constructor_with_parent_constructor(): void
     {
         $tool = new TestToolClassOnlyParentConstructor('test');
-        $this->assertEquals(2, count($tool->getProperties()));
+        $this->assertCount(2, $tool->getProperties());
         $this->assertEquals('test_tool', $tool->getName());
         $this->assertEquals('test tool', $tool->getDescription());
         $this->assertEquals('test', $tool->getKey());
@@ -463,7 +441,7 @@ public function test_properties_declaration_on_constructor_with_parent_construct
     public function test_properties_declaration_on_constructor_with_parent_constructor_fluent(): void
     {
         $tool = new TestToolClassOnlyParentConstructorFluent('test');
-        $this->assertEquals(2, count($tool->getProperties()));
+        $this->assertCount(2, $tool->getProperties());
         $this->assertEquals('test_tool', $tool->getName());
         $this->assertEquals('test tool', $tool->getDescription());
         $this->assertEquals('test', $tool->getKey());
@@ -493,6 +471,9 @@ public function test_parameters(): void
             parameters: ['foo' => 'bar'],
         );
         $this->assertEquals(['foo' => 'bar'], $tool->getParameters());
+
+        $tool->setParameters(['foo' => 'baz']);
+        $this->assertEquals(['foo' => 'baz'], $tool->getParameters());
     }
 
     public function test_callback_precedence(): void