diff --git a/src/Chain/ToolBox/Metadata.php b/src/Chain/ToolBox/Metadata.php index e118454e..23a40f2a 100644 --- a/src/Chain/ToolBox/Metadata.php +++ b/src/Chain/ToolBox/Metadata.php @@ -15,7 +15,6 @@ * @param JsonSchema|null $parameters */ public function __construct( - public string $className, public string $name, public string $description, public string $method, diff --git a/src/Chain/ToolBox/MetadataFactory/ReflectionFactory.php b/src/Chain/ToolBox/MetadataFactory/ReflectionFactory.php index e50a23b5..6561738d 100644 --- a/src/Chain/ToolBox/MetadataFactory/ReflectionFactory.php +++ b/src/Chain/ToolBox/MetadataFactory/ReflectionFactory.php @@ -45,7 +45,6 @@ private function convertAttribute(string $className, AsTool $attribute): Metadat { try { return new Metadata( - $className, $attribute->name, $attribute->description, $attribute->method, diff --git a/tests/Chain/InputProcessor/SystemPromptInputProcessorTest.php b/tests/Chain/InputProcessor/SystemPromptInputProcessorTest.php index 77b36759..d62e6b27 100644 --- a/tests/Chain/InputProcessor/SystemPromptInputProcessorTest.php +++ b/tests/Chain/InputProcessor/SystemPromptInputProcessorTest.php @@ -15,8 +15,6 @@ use PhpLlm\LlmChain\Model\Message\SystemMessage; use PhpLlm\LlmChain\Model\Message\UserMessage; use PhpLlm\LlmChain\Model\Response\ToolCall; -use PhpLlm\LlmChain\Tests\Fixture\Tool\ToolNoParams; -use PhpLlm\LlmChain\Tests\Fixture\Tool\ToolRequiredParams; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Small; use PHPUnit\Framework\Attributes\Test; @@ -105,9 +103,8 @@ public function includeToolDefinitions(): void public function getMap(): array { return [ - new Metadata(ToolNoParams::class, 'tool_no_params', 'A tool without parameters', '__invoke', null), + new Metadata('tool_no_params', 'A tool without parameters', '__invoke', null), new Metadata( - ToolRequiredParams::class, 'tool_required_params', <<createStub(ToolBoxInterface::class); - $tool1 = new Metadata('ClassTool1', 'tool1', 'description1', 'method1', null); - $tool2 = new Metadata('ClassTool2', 'tool2', 'description2', 'method2', null); + $tool1 = new Metadata('tool1', 'description1', 'method1', null); + $tool2 = new Metadata('tool2', 'description2', 'method2', null); $toolBox->method('getMap')->willReturn([$tool1, $tool2]); $llm = $this->createMock(LanguageModel::class); @@ -62,8 +62,8 @@ public function processInputWithRegisteredToolsWillResultInOptionChange(): void public function processInputWithRegisteredToolsButToolOverride(): void { $toolBox = $this->createStub(ToolBoxInterface::class); - $tool1 = new Metadata('ClassTool1', 'tool1', 'description1', 'method1', null); - $tool2 = new Metadata('ClassTool2', 'tool2', 'description2', 'method2', null); + $tool1 = new Metadata('tool1', 'description1', 'method1', null); + $tool2 = new Metadata('tool2', 'description2', 'method2', null); $toolBox->method('getMap')->willReturn([$tool1, $tool2]); $llm = $this->createMock(LanguageModel::class); diff --git a/tests/Chain/ToolBox/FaultTolerantToolBoxTest.php b/tests/Chain/ToolBox/FaultTolerantToolBoxTest.php index 95681dd4..269b946f 100644 --- a/tests/Chain/ToolBox/FaultTolerantToolBoxTest.php +++ b/tests/Chain/ToolBox/FaultTolerantToolBoxTest.php @@ -10,8 +10,6 @@ use PhpLlm\LlmChain\Chain\ToolBox\Metadata; use PhpLlm\LlmChain\Chain\ToolBox\ToolBoxInterface; use PhpLlm\LlmChain\Model\Response\ToolCall; -use PhpLlm\LlmChain\Tests\Fixture\Tool\ToolNoParams; -use PhpLlm\LlmChain\Tests\Fixture\Tool\ToolRequiredParams; use PHPUnit\Framework\Attributes\CoversClass; use PHPUnit\Framework\Attributes\Test; use PHPUnit\Framework\Attributes\UsesClass; @@ -69,8 +67,8 @@ public function __construct(private readonly \Closure $exceptionFactory) public function getMap(): array { return [ - new Metadata(ToolNoParams::class, 'tool_no_params', 'A tool without parameters', '__invoke', null), - new Metadata(ToolRequiredParams::class, 'tool_required_params', 'A tool with required parameters', 'bar', null), + new Metadata('tool_no_params', 'A tool without parameters', '__invoke', null), + new Metadata('tool_required_params', 'A tool with required parameters', 'bar', null), ]; } diff --git a/tests/Chain/ToolBox/MetadataFactory/ReflectionFactoryTest.php b/tests/Chain/ToolBox/MetadataFactory/ReflectionFactoryTest.php index 93d77ede..480f1ca4 100644 --- a/tests/Chain/ToolBox/MetadataFactory/ReflectionFactoryTest.php +++ b/tests/Chain/ToolBox/MetadataFactory/ReflectionFactoryTest.php @@ -69,7 +69,6 @@ public function getDefinition(): void self::assertToolConfiguration( metadata: $metadatas[0], - className: ToolRequiredParams::class, name: 'tool_required_params', description: 'A tool with required parameters', method: 'bar', @@ -102,7 +101,6 @@ public function getDefinitionWithMultiple(): void self::assertToolConfiguration( metadata: $first, - className: ToolMultiple::class, name: 'tool_hello_world', description: 'Function to say hello', method: 'hello', @@ -121,7 +119,6 @@ className: ToolMultiple::class, self::assertToolConfiguration( metadata: $second, - className: ToolMultiple::class, name: 'tool_required_params', description: 'Function to say a number', method: 'bar', @@ -143,9 +140,8 @@ className: ToolMultiple::class, ); } - private function assertToolConfiguration(Metadata $metadata, string $className, string $name, string $description, string $method, array $parameters): void + private function assertToolConfiguration(Metadata $metadata, string $name, string $description, string $method, array $parameters): void { - self::assertSame($className, $metadata->className); self::assertSame($name, $metadata->name); self::assertSame($description, $metadata->description); self::assertSame($method, $metadata->method);