Refactor ModelCatalog to injectable service with platform-specific catalogs

- Remove ->value from Capability enum references to use enum instances directly
- Convert ModelCatalog to injectable service that can be extended with user models
- Remove AbstractModelCatalog and implement ModelCatalogInterface directly
- Add platform-specific ModelCatalog services (ai.model_catalog.openai)
- Add all GPT and Embeddings models to OpenAI ModelCatalog with proper capabilities
- Inject ModelCatalog into OpenAI PlatformFactory with fallback support
- Add comprehensive test coverage for OpenAI ModelCatalog
- Create example demonstrating custom model addition with audio transcription
- Move model catalog configuration from compiler pass to bundle initialization
- Remove getCapabilities method and pass name+capabilities to model constructor
- Add fallback for all capabilities when none provided in configuration
- Ensure default empty model catalogs exist for all platforms

Author: OskarStark

MODELS_CONFIG_EXAMPLE.yaml

@@ -0,0 +1,54 @@
+<?php
+
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+use Symfony\AI\Platform\Bridge\OpenAi\Gpt;
+use Symfony\AI\Platform\Bridge\OpenAi\ModelCatalog;
+use Symfony\AI\Platform\Bridge\OpenAi\PlatformFactory;
+use Symfony\AI\Platform\Capability;
+use Symfony\AI\Platform\Message\Content\Audio;
+use Symfony\AI\Platform\Message\Message;
+use Symfony\AI\Platform\Message\MessageBag;
+
+require_once dirname(__DIR__).'/bootstrap.php';
+
+$modelCatalog = new ModelCatalog([
+    'gpt-4o-mini-transcribe' => [
+        'class' => Gpt::class,
+        'capabilities' => [
+            Capability::INPUT_AUDIO,
+            Capability::INPUT_TEXT,
+            Capability::OUTPUT_TEXT,
+        ],
+    ],
+]);
+
+// Create platform with the custom model catalog
+$platform = PlatformFactory::create(
+    env('OPENAI_API_KEY'),
+    http_client(),
+    catalog: $modelCatalog
+);
+
+// Use the transcription model
+$transcribeModel = $modelCatalog->getModel('gpt-4o-mini-transcribe');
+
+$messages = new MessageBag(
+    Message::ofUser(
+        'Please transcribe this audio file.',
+        Audio::fromFile(dirname(__DIR__, 2).'/fixtures/audio.mp3'),
+    ),
+);
+
+$result = $platform->invoke($transcribeModel, $messages, [
+    'max_tokens' => 300,
+]);
+
+echo $result->getResult()->getContent()."\n\n";

examples/openai/additional-model.php

@@ -168,7 +168,7 @@
                     ->end()
                 ->end()
             ->end()
-            ->arrayNode('models')
+            ->arrayNode('model')
                 ->useAttributeAsKey('platform')
                 ->arrayPrototype()
                     ->useAttributeAsKey('model_name')

src/ai-bundle/config/options.php

@@ -41,8 +41,6 @@
 use Symfony\AI\Platform\Contract;
 use Symfony\AI\Platform\Contract\JsonSchema\DescriptionParser;
 use Symfony\AI\Platform\Contract\JsonSchema\Factory as SchemaFactory;
-use Symfony\AI\Platform\ModelCatalog;
-use Symfony\AI\Platform\ModelCatalogInterface;
 use Symfony\AI\Store\Command\DropStoreCommand;
 use Symfony\AI\Store\Command\IndexCommand;
 use Symfony\AI\Store\Command\SetupStoreCommand;
@@ -176,12 +174,5 @@
                 tagged_locator('ai.indexer', 'name'),
             ])
             ->tag('console.command')
-
-        // model catalog
-        ->set('ai.model_catalog', ModelCatalog::class)
-            ->args([
-                [], // models array will be set by compiler pass
-            ])
-        ->alias(ModelCatalogInterface::class, 'ai.model_catalog')
     ;
 };

src/ai-bundle/config/services.php

@@ -27,7 +27,6 @@
 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\AiBundle\DependencyInjection\ModelCatalogCompilerPass;
 use Symfony\AI\AiBundle\DependencyInjection\ProcessorCompilerPass;
 use Symfony\AI\AiBundle\Exception\InvalidArgumentException;
 use Symfony\AI\AiBundle\Profiler\TraceablePlatform;
@@ -48,7 +47,9 @@
 use Symfony\AI\Platform\Bridge\VertexAi\PlatformFactory as VertexAiPlatformFactory;
 use Symfony\AI\Platform\Bridge\Voyage\PlatformFactory as VoyagePlatformFactory;
 use Symfony\AI\Platform\Exception\RuntimeException;
+use Symfony\AI\Platform\Capability;
 use Symfony\AI\Platform\Model;
+use Symfony\AI\Platform\ModelCatalog;
 use Symfony\AI\Platform\ModelClientInterface;
 use Symfony\AI\Platform\Platform;
 use Symfony\AI\Platform\PlatformInterface;
@@ -99,7 +100,6 @@ public function build(ContainerBuilder $container): void
         parent::build($container);
 
         $container->addCompilerPass(new ProcessorCompilerPass());
-        $container->addCompilerPass(new ModelCatalogCompilerPass());
     }
 
     public function configure(DefinitionConfigurator $definition): void // @phpstan-ignore-line generics.notSubtype
@@ -132,12 +132,13 @@ public function loadExtension(array $config, ContainerConfigurator $container, C
             }
         }
 
-        foreach ($config['models'] ?? [] as $platformName => $models) {
-            foreach ($models as $modelName => $model) {
-                $this->processModelConfig($modelName, $model, $platformName, $builder);
-            }
+        foreach ($config['model'] ?? [] as $platformName => $models) {
+            $this->processModelCatalogConfig($platformName, $models, $builder);
         }
 
+        // Ensure default empty model catalogs exist for all platforms
+        $this->ensureDefaultModelCatalogs($builder);
+
         foreach ($config['agent'] as $agentName => $agent) {
             $this->processAgentConfig($agentName, $agent, $builder);
         }
@@ -350,6 +351,7 @@ private function processPlatformConfig(string $type, array $platform, ContainerB
                     new Reference($platform['http_client'], ContainerInterface::NULL_ON_INVALID_REFERENCE),
                     new Reference('ai.platform.contract.openai'),
                     $platform['region'] ?? null,
+                    new Reference('ai.model_catalog.openai', ContainerInterface::NULL_ON_INVALID_REFERENCE),
                 ])
                 ->addTag('ai.platform');
 
@@ -1162,20 +1164,58 @@ private function processIndexerConfig(int|string $name, array $config, Container
     }
 
     /**
-     * @param array<string, mixed> $config
+     * @param array<string, mixed> $models
      */
-    private function processModelConfig(string $modelName, array $config, string $platformName, ContainerBuilder $container): void
+    private function processModelCatalogConfig(string $platformName, array $models, ContainerBuilder $container): void
     {
-        $platformServiceId = 'ai.platform.'.$platformName;
-
-        $modelDefinition = new Definition($config['class']);
-        $modelDefinition->addTag('ai.model.catalog', [
-            'name' => $modelName,
-            'class' => $config['class'],
-            'platform' => $platformServiceId,
-            'capabilities' => $config['capabilities'],
-        ]);
+        $modelDefinitions = [];
+        
+        foreach ($models as $modelName => $modelConfig) {
+            $capabilities = $modelConfig['capabilities'] ?? [];
+            
+            // If no capabilities provided, add all capabilities from Capability enum
+            if (empty($capabilities)) {
+                $capabilityEnums = Capability::cases();
+            } else {
+                // Convert string capabilities to Capability enums
+                if (is_string($capabilities)) {
+                    $capabilities = explode(',', $capabilities);
+                }
+                
+                $capabilityEnums = [];
+                foreach ($capabilities as $capability) {
+                    $capability = trim($capability);
+                    if ($capability !== '') {
+                        $capabilityEnums[] = Capability::from($capability);
+                    }
+                }
+            }
+            
+            $modelDefinitions[$modelName] = [
+                'class' => $modelConfig['class'],
+                'platform' => $platformName,
+                'capabilities' => $capabilityEnums,
+            ];
+        }
+        
+        // Create platform-specific model catalog service
+        $catalogServiceId = 'ai.model_catalog.' . $platformName;
+        $catalogDefinition = new Definition(ModelCatalog::class, [$modelDefinitions]);
+        $container->setDefinition($catalogServiceId, $catalogDefinition);
+    }
 
-        $container->setDefinition('ai.model.catalog.'.$modelName, $modelDefinition);
+    private function ensureDefaultModelCatalogs(ContainerBuilder $container): void
+    {
+        $defaultPlatforms = ['openai', 'anthropic', 'gemini', 'azure', 'mistral', 'ollama', 'perplexity'];
+        
+        foreach ($defaultPlatforms as $platform) {
+            $catalogServiceId = 'ai.model_catalog.' . $platform;
+            
+            // Only create if it doesn't already exist
+            if (!$container->hasDefinition($catalogServiceId)) {
+                $catalogDefinition = new Definition(ModelCatalog::class, [[]]);
+                $container->setDefinition($catalogServiceId, $catalogDefinition);
+            }
+        }
     }
 }