feature #1063 [Store] Split Local bridge into Cache and Memory bridges (OskarStark)

OskarStark · OskarStark · commit 265537637591 · 2025-12-07T17:59:26.000+01:00
This PR was squashed before being merged into the main branch. Discussion ---------- [Store] Split Local bridge into Cache and Memory bridges | Q | A | ------------- | --- | Bug fix? | no | New feature? | yes | Docs? | no | Issues | -- | License | MIT Commits ------- 1866e94 [Store] Split Local bridge into Cache and Memory bridges
diff --git a/examples/commands/stores.php b/examples/commands/stores.php
@@ -14,9 +14,9 @@
 use Doctrine\DBAL\DriverManager;
 use Doctrine\DBAL\Tools\DsnParser;
 use MongoDB\Client as MongoDbClient;
+use Symfony\AI\Store\Bridge\Cache\Store as CacheStore;
 use Symfony\AI\Store\Bridge\ClickHouse\Store as ClickHouseStore;
-use Symfony\AI\Store\Bridge\Local\CacheStore;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Bridge\ManticoreSearch\Store as ManticoreSearchStore;
 use Symfony\AI\Store\Bridge\MariaDb\Store as MariaDbStore;
 use Symfony\AI\Store\Bridge\Meilisearch\Store as MeilisearchStore;
diff --git a/examples/indexer/index-file-loader.php b/examples/indexer/index-file-loader.php
@@ -10,7 +10,7 @@
  */
 
 use Symfony\AI\Platform\Bridge\OpenAi\PlatformFactory;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Document\Loader\TextFileLoader;
 use Symfony\AI\Store\Document\Transformer\TextReplaceTransformer;
 use Symfony\AI\Store\Document\Transformer\TextSplitTransformer;
diff --git a/examples/indexer/index-inmemory-loader.php b/examples/indexer/index-inmemory-loader.php
@@ -10,7 +10,7 @@
  */
 
 use Symfony\AI\Platform\Bridge\OpenAi\PlatformFactory;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Document\Loader\InMemoryLoader;
 use Symfony\AI\Store\Document\Metadata;
 use Symfony\AI\Store\Document\TextDocument;
diff --git a/examples/indexer/index-rss-loader.php b/examples/indexer/index-rss-loader.php
@@ -10,7 +10,7 @@
  */
 
 use Symfony\AI\Platform\Bridge\OpenAi\PlatformFactory;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Document\Loader\RssFeedLoader;
 use Symfony\AI\Store\Document\Transformer\TextSplitTransformer;
 use Symfony\AI\Store\Document\Vectorizer;
diff --git a/examples/indexer/index-with-filters.php b/examples/indexer/index-with-filters.php
@@ -10,7 +10,7 @@
  */
 
 use Symfony\AI\Platform\Bridge\OpenAi\PlatformFactory;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Document\Filter\TextContainsFilter;
 use Symfony\AI\Store\Document\Loader\InMemoryLoader;
 use Symfony\AI\Store\Document\Metadata;
diff --git a/examples/ollama/indexer.php b/examples/ollama/indexer.php
@@ -10,7 +10,7 @@
  */
 
 use Symfony\AI\Platform\Bridge\Ollama\PlatformFactory;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Document\Loader\TextFileLoader;
 use Symfony\AI\Store\Document\Transformer\TextReplaceTransformer;
 use Symfony\AI\Store\Document\Transformer\TextSplitTransformer;
diff --git a/examples/ollama/rag.php b/examples/ollama/rag.php
@@ -17,7 +17,7 @@
 use Symfony\AI\Platform\Bridge\Ollama\PlatformFactory;
 use Symfony\AI\Platform\Message\Message;
 use Symfony\AI\Platform\Message\MessageBag;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Document\Loader\InMemoryLoader;
 use Symfony\AI\Store\Document\Metadata;
 use Symfony\AI\Store\Document\TextDocument;
diff --git a/examples/rag/cache.php b/examples/rag/cache.php
@@ -17,7 +17,7 @@
 use Symfony\AI\Platform\Bridge\OpenAi\PlatformFactory;
 use Symfony\AI\Platform\Message\Message;
 use Symfony\AI\Platform\Message\MessageBag;
-use Symfony\AI\Store\Bridge\Local\CacheStore;
+use Symfony\AI\Store\Bridge\Cache\Store as CacheStore;
 use Symfony\AI\Store\Document\Loader\InMemoryLoader;
 use Symfony\AI\Store\Document\Metadata;
 use Symfony\AI\Store\Document\TextDocument;
diff --git a/examples/rag/in-memory.php b/examples/rag/in-memory.php
@@ -17,7 +17,7 @@
 use Symfony\AI\Platform\Bridge\OpenAi\PlatformFactory;
 use Symfony\AI\Platform\Message\Message;
 use Symfony\AI\Platform\Message\MessageBag;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Document\Loader\InMemoryLoader;
 use Symfony\AI\Store\Document\Metadata;
 use Symfony\AI\Store\Document\TextDocument;
diff --git a/examples/retriever/basic.php b/examples/retriever/basic.php
@@ -10,7 +10,7 @@
  */
 
 use Symfony\AI\Platform\Bridge\OpenAi\PlatformFactory;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Document\Loader\TextFileLoader;
 use Symfony\AI\Store\Document\Transformer\TextSplitTransformer;
 use Symfony\AI\Store\Document\Vectorizer;
diff --git a/examples/retriever/movies.php b/examples/retriever/movies.php
@@ -11,7 +11,7 @@
 
 use Symfony\AI\Fixtures\Movies;
 use Symfony\AI\Platform\Bridge\OpenAi\PlatformFactory;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Document\Loader\InMemoryLoader;
 use Symfony\AI\Store\Document\Metadata;
 use Symfony\AI\Store\Document\TextDocument;
diff --git a/src/ai-bundle/src/AiBundle.php b/src/ai-bundle/src/AiBundle.php
@@ -40,6 +40,7 @@
 use Symfony\AI\Chat\Bridge\Doctrine\DoctrineDbalMessageStore;
 use Symfony\AI\Chat\Bridge\HttpFoundation\SessionStore;
 use Symfony\AI\Chat\Bridge\Local\CacheStore as CacheMessageStore;
+use Symfony\AI\Chat\Bridge\Local\InMemoryStore as InMemoryMessageStore;
 use Symfony\AI\Chat\Bridge\Meilisearch\MessageStore as MeilisearchMessageStore;
 use Symfony\AI\Chat\Bridge\MongoDb\MessageStore as MongoDbMessageStore;
 use Symfony\AI\Chat\Bridge\Pogocache\MessageStore as PogocacheMessageStore;
@@ -79,11 +80,11 @@
 use Symfony\AI\Platform\PlatformInterface;
 use Symfony\AI\Platform\ResultConverterInterface;
 use Symfony\AI\Store\Bridge\AzureSearch\SearchStore as AzureSearchStore;
+use Symfony\AI\Store\Bridge\Cache\Store as CacheStore;
 use Symfony\AI\Store\Bridge\ChromaDb\Store as ChromaDbStore;
 use Symfony\AI\Store\Bridge\ClickHouse\Store as ClickHouseStore;
 use Symfony\AI\Store\Bridge\Cloudflare\Store as CloudflareStore;
-use Symfony\AI\Store\Bridge\Local\CacheStore as LocalCacheStore;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore as LocalInMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Bridge\ManticoreSearch\Store as ManticoreSearchStore;
 use Symfony\AI\Store\Bridge\MariaDb\Store as MariaDbStore;
 use Symfony\AI\Store\Bridge\Meilisearch\Store as MeilisearchStore;
@@ -1015,7 +1016,7 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde
                     $distanceCalculatorDefinition->setArgument(0, DistanceStrategy::from($store['strategy']));
                 }
 
-                $definition = new Definition(LocalCacheStore::class);
+                $definition = new Definition(CacheStore::class);
                 $definition
                     ->setLazy(true)
                     ->setArguments([
@@ -1205,7 +1206,7 @@ private function processStoreConfig(string $type, array $stores, ContainerBuilde
                     $arguments[0] = new Reference('ai.store.distance_calculator.'.$name);
                 }
 
-                $definition = new Definition(LocalInMemoryStore::class);
+                $definition = new Definition(InMemoryStore::class);
                 $definition
                     ->setLazy(true)
                     ->setArguments($arguments)
@@ -1667,7 +1668,7 @@ private function processMessageStoreConfig(string $type, array $messageStores, C
 
         if ('memory' === $type) {
             foreach ($messageStores as $name => $messageStore) {
-                $definition = new Definition(LocalInMemoryStore::class);
+                $definition = new Definition(InMemoryMessageStore::class);
                 $definition
                     ->setLazy(true)
                     ->setArgument(0, $messageStore['identifier'])
diff --git a/src/ai-bundle/tests/DependencyInjection/AiBundleTest.php b/src/ai-bundle/tests/DependencyInjection/AiBundleTest.php
@@ -33,12 +33,11 @@
 use Symfony\AI\Platform\Model;
 use Symfony\AI\Platform\PlatformInterface;
 use Symfony\AI\Store\Bridge\AzureSearch\SearchStore as AzureStore;
+use Symfony\AI\Store\Bridge\Cache\Store as CacheStore;
 use Symfony\AI\Store\Bridge\ChromaDb\Store as ChromaDbStore;
 use Symfony\AI\Store\Bridge\ClickHouse\Store as ClickhouseStore;
 use Symfony\AI\Store\Bridge\Cloudflare\Store as CloudflareStore;
-use Symfony\AI\Store\Bridge\Local\CacheStore;
-use Symfony\AI\Store\Bridge\Local\CacheStore as LocalCacheStore;
-use Symfony\AI\Store\Bridge\Local\InMemoryStore as LocalInMemoryStore;
+use Symfony\AI\Store\Bridge\InMemory\Store as InMemoryStore;
 use Symfony\AI\Store\Bridge\ManticoreSearch\Store as ManticoreSearchStore;
 use Symfony\AI\Store\Bridge\MariaDb\Store as MariaDbStore;
 use Symfony\AI\Store\Bridge\Meilisearch\Store as MeilisearchStore;
@@ -527,7 +526,7 @@ public function testCacheStoreCanBeConfigured()
         $this->assertTrue($container->hasDefinition('ai.store.distance_calculator.my_cache_store'));
 
         $definition = $container->getDefinition('ai.store.cache.my_cache_store');
-        $this->assertSame(LocalCacheStore::class, $definition->getClass());
+        $this->assertSame(CacheStore::class, $definition->getClass());
 
         $this->assertTrue($definition->isLazy());
         $this->assertCount(3, $definition->getArguments());
@@ -1489,7 +1488,7 @@ 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->assertSame(LocalInMemoryStore::class, $definition->getClass());
+        $this->assertSame(InMemoryStore::class, $definition->getClass());
 
         $this->assertTrue($definition->isLazy());
         $this->assertCount(1, $definition->getArguments());
@@ -1528,7 +1527,7 @@ public function testInMemoryStoreWithCustomStrategyCanBeConfigured()
         $this->assertTrue($container->hasDefinition('ai.store.distance_calculator.my_memory_store_with_custom_strategy'));
 
         $definition = $container->getDefinition('ai.store.memory.my_memory_store_with_custom_strategy');
-        $this->assertSame(LocalInMemoryStore::class, $definition->getClass());
+        $this->assertSame(InMemoryStore::class, $definition->getClass());
 
         $this->assertTrue($definition->isLazy());
         $this->assertCount(1, $definition->getArguments());
diff --git a/src/store/src/Bridge/Cache/Store.php b/src/store/src/Bridge/Cache/Store.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\AI\Store\Bridge\Local;
+namespace Symfony\AI\Store\Bridge\Cache;
 
 use Psr\Cache\CacheItemPoolInterface;
 use Symfony\AI\Platform\Vector\Vector;
@@ -26,15 +26,15 @@
 /**
  * @author Guillaume Loulier <personal@guillaumeloulier.fr>
  */
-final class CacheStore implements ManagedStoreInterface, StoreInterface
+final class Store implements ManagedStoreInterface, StoreInterface
 {
     public function __construct(
         private readonly CacheInterface&CacheItemPoolInterface $cache,
         private readonly DistanceCalculator $distanceCalculator = new DistanceCalculator(),
         private readonly string $cacheKey = '_vectors',
     ) {
         if (!interface_exists(CacheInterface::class)) {
-            throw new RuntimeException('For using the CacheStore as vector store, a symfony/contracts cache implementation is required. Try running "composer require symfony/cache" or another symfony/contracts compatible cache.');
+            throw new RuntimeException('For using the Cache store as vector store, a symfony/contracts cache implementation is required. Try running "composer require symfony/cache" or another symfony/contracts compatible cache.');
         }
     }
 
diff --git a/src/store/src/Bridge/InMemory/Store.php b/src/store/src/Bridge/InMemory/Store.php
@@ -9,7 +9,7 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\AI\Store\Bridge\Local;
+namespace Symfony\AI\Store\Bridge\InMemory;
 
 use Symfony\AI\Platform\Vector\Vector;
 use Symfony\AI\Store\Distance\DistanceCalculator;
@@ -21,7 +21,7 @@
 /**
  * @author Guillaume Loulier <personal@guillaumeloulier.fr>
  */
-class InMemoryStore implements ManagedStoreInterface, StoreInterface
+class Store implements ManagedStoreInterface, StoreInterface
 {
     /**
      * @var VectorDocument[]
diff --git a/src/store/tests/Bridge/Cache/StoreTest.php b/src/store/tests/Bridge/Cache/StoreTest.php
@@ -9,23 +9,23 @@
  * file that was distributed with this source code.
  */
 
-namespace Symfony\AI\Store\Tests\Bridge\Local;
+namespace Symfony\AI\Store\Tests\Bridge\Cache;
 
 use PHPUnit\Framework\TestCase;
 use Symfony\AI\Platform\Vector\Vector;
-use Symfony\AI\Store\Bridge\Local\CacheStore;
+use Symfony\AI\Store\Bridge\Cache\Store;
 use Symfony\AI\Store\Distance\DistanceCalculator;
 use Symfony\AI\Store\Distance\DistanceStrategy;
 use Symfony\AI\Store\Document\Metadata;
 use Symfony\AI\Store\Document\VectorDocument;
 use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Uid\Uuid;
 
-final class CacheStoreTest extends TestCase
+final class StoreTest extends TestCase
 {
     public function testStoreCannotSetup()
     {
-        $store = new CacheStore(new ArrayAdapter());
+        $store = new Store(new ArrayAdapter());
         $store->setup();
 
         $result = iterator_to_array($store->query(new Vector([0.0, 0.1, 0.6])));
@@ -34,7 +34,7 @@ public function testStoreCannotSetup()
 
     public function testStoreCanDrop()
     {
-        $store = new CacheStore(new ArrayAdapter());
+        $store = new Store(new ArrayAdapter());
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([0.1, 0.1, 0.5])),
             new VectorDocument(Uuid::v4(), new Vector([0.7, -0.3, 0.0])),
@@ -52,7 +52,7 @@ public function testStoreCanDrop()
 
     public function testStoreCanSearchUsingCosineDistance()
     {
-        $store = new CacheStore(new ArrayAdapter());
+        $store = new Store(new ArrayAdapter());
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([0.1, 0.1, 0.5])),
             new VectorDocument(Uuid::v4(), new Vector([0.7, -0.3, 0.0])),
@@ -76,7 +76,7 @@ public function testStoreCanSearchUsingCosineDistance()
 
     public function testStoreCanSearchUsingCosineDistanceAndReturnCorrectOrder()
     {
-        $store = new CacheStore(new ArrayAdapter());
+        $store = new Store(new ArrayAdapter());
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([0.1, 0.1, 0.5])),
             new VectorDocument(Uuid::v4(), new Vector([0.7, -0.3, 0.0])),
@@ -96,7 +96,7 @@ public function testStoreCanSearchUsingCosineDistanceAndReturnCorrectOrder()
 
     public function testStoreCanSearchUsingCosineDistanceWithMaxItems()
     {
-        $store = new CacheStore(new ArrayAdapter());
+        $store = new Store(new ArrayAdapter());
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([0.1, 0.1, 0.5])),
             new VectorDocument(Uuid::v4(), new Vector([0.7, -0.3, 0.0])),
@@ -110,7 +110,7 @@ public function testStoreCanSearchUsingCosineDistanceWithMaxItems()
 
     public function testStoreCanSearchUsingAngularDistance()
     {
-        $store = new CacheStore(new ArrayAdapter(), new DistanceCalculator(DistanceStrategy::ANGULAR_DISTANCE));
+        $store = new Store(new ArrayAdapter(), new DistanceCalculator(DistanceStrategy::ANGULAR_DISTANCE));
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([1.0, 2.0, 3.0])),
             new VectorDocument(Uuid::v4(), new Vector([1.0, 5.0, 7.0])),
@@ -124,7 +124,7 @@ public function testStoreCanSearchUsingAngularDistance()
 
     public function testStoreCanSearchUsingEuclideanDistance()
     {
-        $store = new CacheStore(new ArrayAdapter(), new DistanceCalculator(DistanceStrategy::EUCLIDEAN_DISTANCE));
+        $store = new Store(new ArrayAdapter(), new DistanceCalculator(DistanceStrategy::EUCLIDEAN_DISTANCE));
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([1.0, 5.0, 7.0])),
             new VectorDocument(Uuid::v4(), new Vector([1.0, 2.0, 3.0])),
@@ -138,7 +138,7 @@ public function testStoreCanSearchUsingEuclideanDistance()
 
     public function testStoreCanSearchUsingManhattanDistance()
     {
-        $store = new CacheStore(new ArrayAdapter(), new DistanceCalculator(DistanceStrategy::MANHATTAN_DISTANCE));
+        $store = new Store(new ArrayAdapter(), new DistanceCalculator(DistanceStrategy::MANHATTAN_DISTANCE));
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([1.0, 2.0, 3.0])),
             new VectorDocument(Uuid::v4(), new Vector([1.0, 5.0, 7.0])),
@@ -152,7 +152,7 @@ public function testStoreCanSearchUsingManhattanDistance()
 
     public function testStoreCanSearchUsingChebyshevDistance()
     {
-        $store = new CacheStore(new ArrayAdapter(), new DistanceCalculator(DistanceStrategy::CHEBYSHEV_DISTANCE));
+        $store = new Store(new ArrayAdapter(), new DistanceCalculator(DistanceStrategy::CHEBYSHEV_DISTANCE));
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([1.0, 2.0, 3.0])),
             new VectorDocument(Uuid::v4(), new Vector([1.0, 5.0, 7.0])),
@@ -166,7 +166,7 @@ public function testStoreCanSearchUsingChebyshevDistance()
 
     public function testStoreCanSearchWithFilter()
     {
-        $store = new CacheStore(new ArrayAdapter());
+        $store = new Store(new ArrayAdapter());
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([0.1, 0.1, 0.5]), new Metadata(['category' => 'products', 'enabled' => true])),
             new VectorDocument(Uuid::v4(), new Vector([0.7, -0.3, 0.0]), new Metadata(['category' => 'articles', 'enabled' => true])),
@@ -184,7 +184,7 @@ public function testStoreCanSearchWithFilter()
 
     public function testStoreCanSearchWithFilterAndMaxItems()
     {
-        $store = new CacheStore(new ArrayAdapter());
+        $store = new Store(new ArrayAdapter());
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([0.1, 0.1, 0.5]), new Metadata(['category' => 'products'])),
             new VectorDocument(Uuid::v4(), new Vector([0.7, -0.3, 0.0]), new Metadata(['category' => 'articles'])),
@@ -204,7 +204,7 @@ public function testStoreCanSearchWithFilterAndMaxItems()
 
     public function testStoreCanSearchWithComplexFilter()
     {
-        $store = new CacheStore(new ArrayAdapter());
+        $store = new Store(new ArrayAdapter());
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([0.1, 0.1, 0.5]), new Metadata(['price' => 100, 'stock' => 5])),
             new VectorDocument(Uuid::v4(), new Vector([0.7, -0.3, 0.0]), new Metadata(['price' => 200, 'stock' => 0])),
@@ -220,7 +220,7 @@ public function testStoreCanSearchWithComplexFilter()
 
     public function testStoreCanSearchWithNestedMetadataFilter()
     {
-        $store = new CacheStore(new ArrayAdapter());
+        $store = new Store(new ArrayAdapter());
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([0.1, 0.1, 0.5]), new Metadata(['options' => ['size' => 'S', 'color' => 'blue']])),
             new VectorDocument(Uuid::v4(), new Vector([0.7, -0.3, 0.0]), new Metadata(['options' => ['size' => 'M', 'color' => 'blue']])),
@@ -238,7 +238,7 @@ public function testStoreCanSearchWithNestedMetadataFilter()
 
     public function testStoreCanSearchWithInArrayFilter()
     {
-        $store = new CacheStore(new ArrayAdapter());
+        $store = new Store(new ArrayAdapter());
         $store->add(
             new VectorDocument(Uuid::v4(), new Vector([0.1, 0.1, 0.5]), new Metadata(['brand' => 'Nike'])),
             new VectorDocument(Uuid::v4(), new Vector([0.7, -0.3, 0.0]), new Metadata(['brand' => 'Adidas'])),
diff --git a/src/store/tests/Bridge/InMemory/StoreTest.php b/src/store/tests/Bridge/InMemory/StoreTest.php
