refactor: remove resolver interface for now (#375)

Author: chr-hertel

src/Toolbox/ToolCallArgumentResolver.php

@@ -21,14 +21,17 @@
 /**
  * @author Valtteri R <[email protected]>
  */
-final readonly class ToolCallArgumentResolver implements ToolCallArgumentResolverInterface
+final readonly class ToolCallArgumentResolver
 {
     public function __construct(
         private DenormalizerInterface $denormalizer = new Serializer([new DateTimeNormalizer(), new ObjectNormalizer()]),
     ) {
     }
 
-    public function resolveArguments(object $tool, Tool $metadata, ToolCall $toolCall): array
+    /**
+     * @return array<string, mixed>
+     */
+    public function resolveArguments(Tool $metadata, ToolCall $toolCall): array
     {
         $method = new \ReflectionMethod($metadata->reference->class, $metadata->reference->method);
 

src/Toolbox/Toolbox.php

@@ -46,8 +46,8 @@ final class Toolbox implements ToolboxInterface
     public function __construct(
         private readonly ToolFactoryInterface $toolFactory,
         iterable $tools,
+        private readonly ToolCallArgumentResolver $argumentResolver = new ToolCallArgumentResolver(),
         private readonly LoggerInterface $logger = new NullLogger(),
-        private readonly ToolCallArgumentResolverInterface $argumentResolver = new ToolCallArgumentResolver(),
         private readonly ?EventDispatcherInterface $eventDispatcher = null,
     ) {
         $this->tools = $tools instanceof \Traversable ? iterator_to_array($tools) : $tools;
@@ -82,7 +82,7 @@ public function execute(ToolCall $toolCall): mixed
         try {
             $this->logger->debug(\sprintf('Executing tool "%s".', $toolCall->name), $toolCall->arguments);
 
-            $arguments = $this->argumentResolver->resolveArguments($tool, $metadata, $toolCall);
+            $arguments = $this->argumentResolver->resolveArguments($metadata, $toolCall);
             $this->eventDispatcher?->dispatch(new ToolCallArgumentsResolved($tool, $metadata, $arguments));
 
             $result = $tool->{$metadata->reference->method}(...$arguments);

tests/Toolbox/ToolCallArgumentResolverTest.php

@@ -33,19 +33,17 @@ public function resolveArguments(): void
     {
         $resolver = new ToolCallArgumentResolver();
 
-        $tool = new ToolDate();
         $metadata = new Tool(new ExecutionReference(ToolDate::class, '__invoke'), 'tool_date', 'test');
         $toolCall = new ToolCall('invocation', 'tool_date', ['date' => '2025-06-29']);
 
-        self::assertEquals(['date' => new \DateTimeImmutable('2025-06-29')], $resolver->resolveArguments($tool, $metadata, $toolCall));
+        self::assertEquals(['date' => new \DateTimeImmutable('2025-06-29')], $resolver->resolveArguments($metadata, $toolCall));
     }
 
     #[Test]
     public function resolveScalarArrayArguments(): void
     {
         $resolver = new ToolCallArgumentResolver();
 
-        $tool = new ToolArray();
         $metadata = new Tool(new ExecutionReference(ToolArray::class, '__invoke'), 'tool_array', 'A tool with array parameters');
         $toolCall = new ToolCall('tool_id_1234', 'tool_array', [
             'urls' => ['https://symfony.com', 'https://php.net'],
@@ -57,6 +55,6 @@ public function resolveScalarArrayArguments(): void
             'ids' => [1, 2, 3],
         ];
 
-        self::assertSame($expected, $resolver->resolveArguments($tool, $metadata, $toolCall));
+        self::assertSame($expected, $resolver->resolveArguments($metadata, $toolCall));
     }
 }