[AIBundle] Wire & configure services explicitly

valtzu · valtzu · commit d673f985fea9 · 2025-07-20T00:38:53.000+03:00
diff --git a/src/ai-bundle/config/options.php b/src/ai-bundle/config/options.php
@@ -11,6 +11,7 @@
 
 namespace Symfony\Component\Config\Definition\Configurator;
 
+use Codewithkyrian\ChromaDB\Client as ChromaDBClient;
 use Symfony\AI\Platform\PlatformInterface;
 use Symfony\AI\Store\StoreInterface;
 
@@ -154,6 +155,7 @@
                         ->useAttributeAsKey('name')
                         ->arrayPrototype()
                             ->children()
+                                ->scalarNode('client_service')->cannotBeEmpty()->defaultValue(ChromaDBClient::class)->end()
                                 ->scalarNode('collection')->isRequired()->end()
                             ->end()
                         ->end()
diff --git a/src/ai-bundle/config/services.php b/src/ai-bundle/config/services.php
@@ -19,65 +19,89 @@
 use Symfony\AI\Agent\Toolbox\ToolboxInterface;
 use Symfony\AI\Agent\Toolbox\ToolCallArgumentResolver;
 use Symfony\AI\Agent\Toolbox\ToolFactory\ReflectionToolFactory;
-use Symfony\AI\Agent\Toolbox\ToolFactoryInterface;
 use Symfony\AI\Agent\Toolbox\ToolResultConverter;
 use Symfony\AI\AIBundle\Profiler\DataCollector;
 use Symfony\AI\AIBundle\Profiler\TraceableToolbox;
 use Symfony\AI\AIBundle\Security\EventListener\IsGrantedToolAttributeListener;
+use Symfony\AI\Platform\Contract;
+use Symfony\AI\Platform\Contract\JsonSchema\Factory;
 
 return static function (ContainerConfigurator $container): void {
     $container->services()
-        ->defaults()
-            ->autowire()
-
+        ->set('ai.platform.contract', Contract::class)
+            ->factory([Contract::class, 'create'])
         // structured output
-        ->set(ResponseFormatFactory::class)
-            ->alias(ResponseFormatFactoryInterface::class, ResponseFormatFactory::class)
-        ->set(StructureOutputProcessor::class)
+        ->set('ai.response_format_factory', ResponseFormatFactory::class)
+            ->args([
+                '$schemaFactory' => service('ai.json_schema_factory'),
+            ])
+        ->set('ai.json_schema_factory', Factory::class)
+        ->alias(ResponseFormatFactoryInterface::class, 'ai.response_format_factory')
+        ->set('ai.agent.structured_output_processor', StructureOutputProcessor::class)
+            ->args([
+                '$responseFormatFactory' => service('ai.response_format_factory'),
+                '$serializer' => service('serializer'),
+            ])
             ->tag('ai.agent.input_processor')
             ->tag('ai.agent.output_processor')
 
         // tools
-        ->set('ai.toolbox.abstract')
-            ->class(Toolbox::class)
-            ->autowire()
+        ->set('ai.toolbox.abstract', Toolbox::class)
             ->abstract()
             ->args([
-                '$toolFactory' => service(ToolFactoryInterface::class),
+                '$toolFactory' => service('ai.tool_factory'),
                 '$tools' => abstract_arg('Collection of tools'),
             ])
-        ->set(Toolbox::class)
+        ->set('ai.toolbox', Toolbox::class)
             ->parent('ai.toolbox.abstract')
             ->args([
                 '$tools' => tagged_iterator('ai.tool'),
             ])
-            ->alias(ToolboxInterface::class, Toolbox::class)
-        ->set(ReflectionToolFactory::class)
-            ->alias(ToolFactoryInterface::class, ReflectionToolFactory::class)
-        ->set(ToolResultConverter::class)
-        ->set(ToolCallArgumentResolver::class)
-        ->set('ai.tool.agent_processor.abstract')
-            ->class(ToolProcessor::class)
+        ->alias(ToolboxInterface::class, 'ai.toolbox')
+        ->set('ai.tool_factory', ReflectionToolFactory::class)
+        ->set('ai.tool_result_converter', ToolResultConverter::class)
+            ->args([
+                '$serializer' => service('serializer'),
+            ])
+        ->set('ai.tool_call_argument_resolver', ToolCallArgumentResolver::class)
+            ->args([
+                '$denormalizer' => service('serializer'),
+            ])
+        ->set('ai.tool.agent_processor.abstract', ToolProcessor::class)
             ->abstract()
             ->args([
                 '$toolbox' => abstract_arg('Toolbox'),
             ])
-        ->set(ToolProcessor::class)
+        ->set('ai.tool.agent_processor', ToolProcessor::class)
             ->parent('ai.tool.agent_processor.abstract')
             ->tag('ai.agent.input_processor')
             ->tag('ai.agent.output_processor')
             ->args([
-                '$toolbox' => service(ToolboxInterface::class),
+                '$toolbox' => service('ai.toolbox'),
+                '$resultConverter' => service('ai.tool_result_converter'),
                 '$eventDispatcher' => service('event_dispatcher')->nullOnInvalid(),
+                '$keepToolMessages' => false,
             ])
         ->set('ai.security.is_granted_attribute_listener', IsGrantedToolAttributeListener::class)
+            ->args([
+                '$authChecker' => service('security.authorization_checker'),
+                '$expressionLanguage' => service('expression_language')->nullOnInvalid(),
+            ])
             ->tag('kernel.event_listener')
 
         // profiler
-        ->set(DataCollector::class)
+        ->set('ai.data_collector', DataCollector::class)
+            ->args([
+                '$platforms' => tagged_iterator('ai.traceable_platform'),
+                '$defaultToolBox' => service('ai.toolbox'),
+                '$toolboxes' => tagged_iterator('ai.traceable_toolbox'),
+            ])
             ->tag('data_collector')
-        ->set(TraceableToolbox::class)
-            ->decorate(ToolboxInterface::class)
+        ->set('ai.traceable_toolbox', TraceableToolbox::class)
+            ->decorate('ai.toolbox')
+            ->args([
+                '$toolbox' => service('.inner'),
+            ])
             ->tag('ai.traceable_toolbox')
     ;
 };
diff --git a/src/ai-bundle/src/AIBundle.php b/src/ai-bundle/src/AIBundle.php
@@ -16,14 +16,12 @@
 use Symfony\AI\Agent\InputProcessor\SystemPromptInputProcessor;
 use Symfony\AI\Agent\InputProcessorInterface;
 use Symfony\AI\Agent\OutputProcessorInterface;
-use Symfony\AI\Agent\StructuredOutput\AgentProcessor as StructureOutputProcessor;
 use Symfony\AI\Agent\Toolbox\AgentProcessor as ToolProcessor;
 use Symfony\AI\Agent\Toolbox\Attribute\AsTool;
 use Symfony\AI\Agent\Toolbox\FaultTolerantToolbox;
 use Symfony\AI\Agent\Toolbox\Tool\Agent as AgentTool;
 use Symfony\AI\Agent\Toolbox\ToolFactory\ChainFactory;
 use Symfony\AI\Agent\Toolbox\ToolFactory\MemoryToolFactory;
-use Symfony\AI\Agent\Toolbox\ToolFactory\ReflectionToolFactory;
 use Symfony\AI\AIBundle\Exception\InvalidArgumentException;
 use Symfony\AI\AIBundle\Profiler\DataCollector;
 use Symfony\AI\AIBundle\Profiler\TraceablePlatform;
@@ -52,6 +50,7 @@
 use Symfony\Component\Config\Definition\Configurator\DefinitionConfigurator;
 use Symfony\Component\DependencyInjection\ChildDefinition;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Symfony\Component\DependencyInjection\Definition;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
 use Symfony\Component\DependencyInjection\Reference;
@@ -158,11 +157,12 @@ private function processPlatformConfig(string $type, array $platform, ContainerB
             $platformId = 'ai.platform.anthropic';
             $definition = (new Definition(Platform::class))
                 ->setFactory(AnthropicPlatformFactory::class.'::create')
-                ->setAutowired(true)
                 ->setLazy(true)
                 ->addTag('proxy', ['interface' => PlatformInterface::class])
                 ->setArguments([
                     '$apiKey' => $platform['api_key'],
+                    '$httpClient' => new Reference('http_client', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                    '$contract' => new Reference('ai.platform.contract'),
                 ])
                 ->addTag('ai.platform');
 
@@ -180,14 +180,15 @@ private function processPlatformConfig(string $type, array $platform, ContainerB
                 $platformId = 'ai.platform.azure.'.$name;
                 $definition = (new Definition(Platform::class))
                     ->setFactory(AzureOpenAIPlatformFactory::class.'::create')
-                    ->setAutowired(true)
                     ->setLazy(true)
                     ->addTag('proxy', ['interface' => PlatformInterface::class])
                     ->setArguments([
                         '$baseUrl' => $config['base_url'],
                         '$deployment' => $config['deployment'],
                         '$apiVersion' => $config['api_version'],
                         '$apiKey' => $config['api_key'],
+                        '$httpClient' => new Reference('http_client', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                        '$contract' => new Reference('ai.platform.contract'),
                     ])
                     ->addTag('ai.platform');
 
@@ -201,10 +202,13 @@ private function processPlatformConfig(string $type, array $platform, ContainerB
             $platformId = 'ai.platform.google';
             $definition = (new Definition(Platform::class))
                 ->setFactory(GooglePlatformFactory::class.'::create')
-                ->setAutowired(true)
                 ->setLazy(true)
                 ->addTag('proxy', ['interface' => PlatformInterface::class])
-                ->setArguments(['$apiKey' => $platform['api_key']])
+                ->setArguments([
+                    '$apiKey' => $platform['api_key'],
+                    '$httpClient' => new Reference('http_client', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                    '$contract' => new Reference('ai.platform.contract'),
+                ])
                 ->addTag('ai.platform');
 
             $container->setDefinition($platformId, $definition);
@@ -216,10 +220,13 @@ private function processPlatformConfig(string $type, array $platform, ContainerB
             $platformId = 'ai.platform.openai';
             $definition = (new Definition(Platform::class))
                 ->setFactory(OpenAIPlatformFactory::class.'::create')
-                ->setAutowired(true)
                 ->setLazy(true)
                 ->addTag('proxy', ['interface' => PlatformInterface::class])
-                ->setArguments(['$apiKey' => $platform['api_key']])
+                ->setArguments([
+                    '$apiKey' => $platform['api_key'],
+                    '$httpClient' => new Reference('http_client', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                    '$contract' => new Reference('ai.platform.contract'),
+                ])
                 ->addTag('ai.platform');
 
             $container->setDefinition($platformId, $definition);
@@ -231,10 +238,13 @@ private function processPlatformConfig(string $type, array $platform, ContainerB
             $platformId = 'ai.platform.openrouter';
             $definition = (new Definition(Platform::class))
                 ->setFactory(OpenRouterPlatformFactory::class.'::create')
-                ->setAutowired(true)
                 ->setLazy(true)
                 ->addTag('proxy', ['interface' => PlatformInterface::class])
-                ->setArguments(['$apiKey' => $platform['api_key']])
+                ->setArguments([
+                    '$apiKey' => $platform['api_key'],
+                    '$httpClient' => new Reference('http_client', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                    '$contract' => new Reference('ai.platform.contract'),
+                ])
                 ->addTag('ai.platform');
 
             $container->setDefinition($platformId, $definition);
@@ -246,10 +256,13 @@ private function processPlatformConfig(string $type, array $platform, ContainerB
             $platformId = 'ai.platform.mistral';
             $definition = (new Definition(Platform::class))
                 ->setFactory(MistralPlatformFactory::class.'::create')
-                ->setAutowired(true)
                 ->setLazy(true)
                 ->addTag('proxy', ['interface' => PlatformInterface::class])
-                ->setArguments(['$apiKey' => $platform['api_key']])
+                ->setArguments([
+                    '$apiKey' => $platform['api_key'],
+                    '$httpClient' => new Reference('http_client', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                    '$contract' => new Reference('ai.platform.contract'),
+                ])
                 ->addTag('ai.platform');
 
             $container->setDefinition($platformId, $definition);
@@ -261,10 +274,13 @@ private function processPlatformConfig(string $type, array $platform, ContainerB
             $platformId = 'symfony_ai.platform.lmstudio';
             $definition = (new Definition(Platform::class))
             ->setFactory(LMStudioPlatformFactory::class.'::create')
-                ->setAutowired(true)
                 ->setLazy(true)
                 ->addTag('proxy', ['interface' => PlatformInterface::class])
-                ->setArguments(['$hostUrl' => $platform['host_url']])
+                ->setArguments([
+                    '$hostUrl' => $platform['host_url'],
+                    '$httpClient' => new Reference('http_client', ContainerInterface::NULL_ON_INVALID_REFERENCE),
+                    '$contract' => new Reference('ai.platform.contract'),
+                ])
                 ->addTag('symfony_ai.platform');
 
             $container->setDefinition($platformId, $definition);
@@ -299,7 +315,6 @@ private function processAgentConfig(string $name, array $config, ContainerBuilde
 
         // AGENT
         $agentDefinition = (new Definition(Agent::class))
-            ->setAutowired(true)
             ->setArgument('$platform', new Reference($config['platform']))
             ->setArgument('$model', new Reference('ai.agent.'.$name.'.model'));
 
@@ -313,7 +328,7 @@ private function processAgentConfig(string $name, array $config, ContainerBuilde
                 $memoryFactoryDefinition = new Definition(MemoryToolFactory::class);
                 $container->setDefinition('ai.toolbox.'.$name.'.memory_factory', $memoryFactoryDefinition);
                 $chainFactoryDefinition = new Definition(ChainFactory::class, [
-                    '$factories' => [new Reference('ai.toolbox.'.$name.'.memory_factory'), new Reference(ReflectionToolFactory::class)],
+                    '$factories' => [new Reference('ai.toolbox.'.$name.'.memory_factory'), new Reference('ai.tool_factory')],
                 ]);
                 $container->setDefinition('ai.toolbox.'.$name.'.chain_factory', $chainFactoryDefinition);
 
@@ -368,8 +383,8 @@ private function processAgentConfig(string $name, array $config, ContainerBuilde
 
         // STRUCTURED OUTPUT
         if ($config['structured_output']) {
-            $inputProcessors[] = new Reference(StructureOutputProcessor::class);
-            $outputProcessors[] = new Reference(StructureOutputProcessor::class);
+            $inputProcessors[] = new Reference('ai.agent.structured_output_processor');
+            $outputProcessors[] = new Reference('ai.agent.structured_output_processor');
         }
 
         // SYSTEM PROMPT
@@ -412,7 +427,6 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde
 
                 $definition = new Definition(AzureSearchStore::class);
                 $definition
-                    ->setAutowired(true)
                     ->addTag('ai.store')
                     ->setArguments($arguments);
 
@@ -424,7 +438,7 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde
             foreach ($stores as $name => $store) {
                 $definition = new Definition(ChromaDBStore::class);
                 $definition
-                    ->setAutowired(true)
+                    ->setArgument('$client', new Reference($store['client_service']))
                     ->setArgument('$collectionName', $store['collection'])
                     ->addTag('ai.store');
 
@@ -450,7 +464,6 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde
 
                 $definition = new Definition(MongoDBStore::class);
                 $definition
-                    ->setAutowired(true)
                     ->addTag('ai.store')
                     ->setArguments($arguments);
 
@@ -474,7 +487,6 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde
 
                 $definition = new Definition(PineconeStore::class);
                 $definition
-                    ->setAutowired(true)
                     ->addTag('ai.store')
                     ->setArguments($arguments);
 
diff --git a/src/ai-bundle/src/Profiler/DataCollector.php b/src/ai-bundle/src/Profiler/DataCollector.php
@@ -15,7 +15,6 @@
 use Symfony\AI\Platform\Model;
 use Symfony\AI\Platform\Tool\Tool;
 use Symfony\Bundle\FrameworkBundle\DataCollector\AbstractDataCollector;
-use Symfony\Component\DependencyInjection\Attribute\TaggedIterator;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 
@@ -42,10 +41,8 @@ final class DataCollector extends AbstractDataCollector
      * @param TraceableToolbox[]  $toolboxes
      */
     public function __construct(
-        #[TaggedIterator('ai.traceable_platform')]
         iterable $platforms,
         private readonly ToolboxInterface $defaultToolBox,
-        #[TaggedIterator('ai.traceable_toolbox')]
         iterable $toolboxes,
     ) {
         $this->platforms = $platforms instanceof \Traversable ? iterator_to_array($platforms) : $platforms;
