fix: actually fix the fix of tool filter (#224)

Author: chr-hertel

src/Chain/ToolBox/ChainProcessor.php

@@ -43,8 +43,9 @@ public function processInput(Input $input): void
         }
 
         $options = $input->getOptions();
-        if (isset($options['tools'])) {
-            $toolMap = array_filter($toolMap, fn (string $tool) => in_array($tool, $options['tools'], true), ARRAY_FILTER_USE_KEY);
+        // only filter tool map if list of strings is provided as option
+        if (isset($options['tools']) && is_array($options['tools']) && is_string($options['tools'][0])) {
+            $toolMap = array_values(array_filter($toolMap, fn (Metadata $tool) => in_array($tool->name, $options['tools'], true)));
         }
 
         $options['tools'] = $toolMap;

tests/Chain/ToolBox/ChainProcessorTest.php

@@ -6,6 +6,7 @@
 
 use PhpLlm\LlmChain\Chain\Input;
 use PhpLlm\LlmChain\Chain\ToolBox\ChainProcessor;
+use PhpLlm\LlmChain\Chain\ToolBox\Metadata;
 use PhpLlm\LlmChain\Chain\ToolBox\ToolBoxInterface;
 use PhpLlm\LlmChain\Exception\MissingModelSupport;
 use PhpLlm\LlmChain\Model\LanguageModel;
@@ -42,7 +43,9 @@ public function processInputWithoutRegisteredToolsWillResultInNoOptionChange():
     public function processInputWithRegisteredToolsWillResultInOptionChange(): void
     {
         $toolBox = $this->createStub(ToolBoxInterface::class);
-        $toolBox->method('getMap')->willReturn(['tool1' => 'tool1', 'tool2' => 'tool2']);
+        $tool1 = new Metadata('ClassTool1', 'tool1', 'description1', 'method1', null);
+        $tool2 = new Metadata('ClassTool2', 'tool2', 'description2', 'method2', null);
+        $toolBox->method('getMap')->willReturn([$tool1, $tool2]);
 
         $llm = $this->createMock(LanguageModel::class);
         $llm->method('supportsToolCalling')->willReturn(true);
@@ -52,14 +55,16 @@ public function processInputWithRegisteredToolsWillResultInOptionChange(): void
 
         $chainProcessor->processInput($input);
 
-        self::assertSame(['tools' => ['tool1' => 'tool1', 'tool2' => 'tool2']], $input->getOptions());
+        self::assertSame(['tools' => [$tool1, $tool2]], $input->getOptions());
     }
 
     #[Test]
     public function processInputWithRegisteredToolsButToolOverride(): void
     {
         $toolBox = $this->createStub(ToolBoxInterface::class);
-        $toolBox->method('getMap')->willReturn(['tool1' => 'tool1-metadata', 'tool2' => 'tool2-metadata']);
+        $tool1 = new Metadata('ClassTool1', 'tool1', 'description1', 'method1', null);
+        $tool2 = new Metadata('ClassTool2', 'tool2', 'description2', 'method2', null);
+        $toolBox->method('getMap')->willReturn([$tool1, $tool2]);
 
         $llm = $this->createMock(LanguageModel::class);
         $llm->method('supportsToolCalling')->willReturn(true);
@@ -69,7 +74,7 @@ public function processInputWithRegisteredToolsButToolOverride(): void
 
         $chainProcessor->processInput($input);
 
-        self::assertSame(['tools' => ['tool2' => 'tool2-metadata']], $input->getOptions());
+        self::assertSame(['tools' => [$tool2]], $input->getOptions());
     }
 
     #[Test]