Skip to content

[AI Bundle] Improvements on lazy / proxy usages #955

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 24, 2025
+93 −51
Merged

[AI Bundle] Improvements on lazy / proxy usages #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ai-bundle/config/options.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@
->treatNullLike(['enabled' => true])
->beforeNormalization()
->ifArray()
->then(function (array $v) {
->then(function (array $v): array {
return [
'enabled' => $v['enabled'] ?? true,
'services' => $v['services'] ?? $v,
Expand Down Expand Up @@ -564,7 +564,7 @@
->stringNode('table')->isRequired()->cannotBeEmpty()->end()
->end()
->validate()
->ifTrue(static fn ($v) => !isset($v['dsn']) && !isset($v['http_client']))
->ifTrue(static fn ($v): bool => !isset($v['dsn']) && !isset($v['http_client']))
->thenInvalid('Either "dsn" or "http_client" must be configured.')
->end()
->end()
Expand Down Expand Up @@ -819,11 +819,11 @@
->stringNode('dbal_connection')->cannotBeEmpty()->end()
->end()
->validate()
->ifTrue(static fn ($v) => !isset($v['dsn']) && !isset($v['dbal_connection']))
->ifTrue(static fn (array $v): bool => !isset($v['dsn']) && !isset($v['dbal_connection']))
->thenInvalid('Either "dsn" or "dbal_connection" must be configured.')
->end()
->validate()
->ifTrue(static fn ($v) => isset($v['dsn'], $v['dbal_connection']))
->ifTrue(static fn (array $v): bool => isset($v['dsn'], $v['dbal_connection']))
->thenInvalid('Either "dsn" or "dbal_connection" can be configured, but not both.')
->end()
->end()
Expand Down
131 changes: 85 additions & 46 deletions src/ai-bundle/src/AiBundle.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,7 @@ private function processAgentConfig(string $name, array $config, ContainerBuilde
* @param array<string, mixed> $stores
* @param array<string, mixed> $setupStoresOptions
*/
private function processStoreConfig(string $type, array $stores, ContainerBuilder $container, &$setupStoresOptions): void
private function processStoreConfig(string $type, array $stores, ContainerBuilder $container, array &$setupStoresOptions): void
{
if ('azure_search' === $type) {
foreach ($stores as $name => $store) {
Expand All @@ -947,8 +947,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(AzureSearchStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand All @@ -961,6 +963,7 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde
$arguments = [
new Reference($store['service']),
new Definition(DistanceCalculator::class),
$store['cache_key'] ?? $name,
];

if (\array_key_exists('strategy', $store) && null !== $store['strategy']) {
Expand All @@ -974,13 +977,11 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde
$arguments[1] = new Reference('ai.store.distance_calculator.'.$name);
}

$arguments[2] = \array_key_exists('cache_key', $store) && null !== $store['cache_key']
? $store['cache_key']
: $name;

$definition = new Definition(CacheStore::class);
$definition
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
Expand All @@ -993,10 +994,12 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde
foreach ($stores as $name => $store) {
$definition = new Definition(ChromaDbStore::class);
$definition
->setLazy(true)
->setArguments([
new Reference($store['client']),
$store['collection'],
])
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
Expand All @@ -1019,11 +1022,13 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(ClickHouseStore::class);
$definition
->setLazy(true)
->setArguments([
$httpClient,
$store['database'],
$store['table'],
])
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store')
;

Expand Down Expand Up @@ -1056,8 +1061,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(CloudflareStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand Down Expand Up @@ -1095,7 +1102,9 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(ManticoreStore::class);
$definition
->setLazy(true)
->addTag('ai.store')
->addTag('proxy', ['interface' => StoreInterface::class])
->setArguments($arguments);

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
Expand All @@ -1116,8 +1125,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde
$definition = new Definition(MariaDbStore::class);
$definition->setFactory([MariaDbStore::class, 'fromDbal']);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$serviceId = 'ai.store.'.$type.'.'.$name;
$container->setDefinition($serviceId, $definition);
Expand Down Expand Up @@ -1155,8 +1166,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(MeilisearchStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand All @@ -1166,7 +1179,9 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

if ('memory' === $type) {
foreach ($stores as $name => $store) {
$arguments = [];
$arguments = [
new Definition(DistanceCalculator::class),
];

if (\array_key_exists('strategy', $store) && null !== $store['strategy']) {
if (!$container->hasDefinition('ai.store.distance_calculator.'.$name)) {
Expand All @@ -1181,8 +1196,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(InMemoryStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand Down Expand Up @@ -1214,8 +1231,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(MilvusStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand All @@ -1242,8 +1261,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(MongoDbStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand Down Expand Up @@ -1281,8 +1302,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(Neo4jStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand All @@ -1307,8 +1330,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(PineconeStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand Down Expand Up @@ -1339,8 +1364,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(QdrantStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand All @@ -1359,14 +1386,15 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(RedisStore::class);
$definition
->addTag('ai.store')
->setLazy(true)
->setArguments([
$redisClient,
$store['index_name'],
$store['key_prefix'],
$store['distance'],
])
;
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
}
Expand Down Expand Up @@ -1405,8 +1433,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(SurrealDbStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand All @@ -1433,8 +1463,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(TypesenseStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand All @@ -1444,17 +1476,17 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

if ('weaviate' === $type) {
foreach ($stores as $name => $store) {
$arguments = [
new Reference('http_client'),
$store['endpoint'],
$store['api_key'],
$store['collection'],
];

$definition = new Definition(WeaviateStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments([
new Reference('http_client'),
$store['endpoint'],
$store['api_key'],
$store['collection'],
])
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand Down Expand Up @@ -1495,8 +1527,10 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde
}

$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.'.$type.'.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
Expand Down Expand Up @@ -1530,11 +1564,14 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde

$definition = new Definition(SupabaseStore::class);
$definition
->addTag('ai.store')
->setArguments($arguments);
->setLazy(true)
->setArguments($arguments)
->addTag('proxy', ['interface' => StoreInterface::class])
->addTag('ai.store');

$container->setDefinition('ai.store.supabase.'.$name, $definition);
$container->registerAliasForArgument('ai.store.'.$name, StoreInterface::class, (new Target($name.'Store'))->getParsedName());
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $name);
$container->registerAliasForArgument('ai.store.'.$type.'.'.$name, StoreInterface::class, $type.'_'.$name);
}
}
}
Expand Down Expand Up @@ -1750,10 +1787,12 @@ private function processChatConfig(string $name, array $configuration, Container
{
$definition = new Definition(Chat::class);
$definition
->setLazy(true)
->setArguments([
new Reference($configuration['agent']),
new Reference($configuration['message_store']),
])
->addTag('proxy', ['interface' => ChatInterface::class])
->addTag('ai.chat');

$container->setDefinition('ai.chat.'.$name, $definition);
Expand Down
5 changes: 4 additions & 1 deletion src/ai-bundle/tests/DependencyInjection/AiBundleTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
use Symfony\AI\Platform\Bridge\Ollama\OllamaApiCatalog;
use Symfony\AI\Platform\Capability;
use Symfony\AI\Platform\Model;
use Symfony\AI\Store\Bridge\Local\DistanceCalculator;
use Symfony\AI\Store\Document\Filter\TextContainsFilter;
use Symfony\AI\Store\Document\Loader\InMemoryLoader;
use Symfony\AI\Store\Document\Transformer\TextTrimTransformer;
Expand Down Expand Up @@ -483,7 +484,9 @@ public function testInMemoryStoreWithoutCustomStrategyCanBeConfigured()
$this->assertTrue($container->hasDefinition('ai.store.memory.my_memory_store_with_custom_strategy'));

$definition = $container->getDefinition('ai.store.memory.my_memory_store_with_custom_strategy');
$this->assertCount(0, $definition->getArguments());
$this->assertCount(1, $definition->getArguments());
$this->assertInstanceOf(Definition::class, $definition->getArgument(0));
$this->assertSame(DistanceCalculator::class, $definition->getArgument(0)->getClass());
}

public function testInMemoryStoreWithCustomStrategyCanBeConfigured()
Expand Down