Merge pull request #1200 from max-svistunov/lcore-1260-fix-vector-store-dedup

LCORE-1260 Deduplicate vector_store entries when modifying BYOK RAG config

Author: are-ces

src/llama_stack_configuration.py

@@ -179,9 +179,15 @@ def construct_vector_stores_section(
         if "vector_stores" in ls_config["registered_resources"]:
             output = ls_config["registered_resources"]["vector_stores"].copy()
 
-    # append new vector_stores entries
+    # append new vector_stores entries, skipping duplicates
+    existing_store_ids = {vs.get("vector_store_id") for vs in output}
+    added = 0
     for brag in byok_rag:
         vector_db_id = brag.get("vector_db_id", "")
+        if vector_db_id in existing_store_ids:
+            continue
+        existing_store_ids.add(vector_db_id)
+        added += 1
         output.append(
             {
                 "vector_store_id": vector_db_id,
@@ -192,7 +198,7 @@ def construct_vector_stores_section(
         )
     logger.info(
         "Added %s items into registered_resources.vector_stores, total items %s",
-        len(byok_rag),
+        added,
         len(output),
     )
     return output

tests/unit/test_llama_stack_configuration.py

@@ -78,6 +78,47 @@ def test_construct_vector_stores_section_merge() -> None:
     assert len(output) == 2
 
 
+def test_construct_vector_stores_section_skips_duplicate_from_existing() -> None:
+    """Test skips BYOK entry when vector_store_id already exists in config."""
+    ls_config = {
+        "registered_resources": {
+            "vector_stores": [
+                {"vector_store_id": "store1", "provider_id": "original_provider"},
+            ]
+        }
+    }
+    byok_rag = [
+        {
+            "vector_db_id": "store1",
+            "embedding_model": "test-model",
+            "embedding_dimension": 512,
+        },
+    ]
+    output = construct_vector_stores_section(ls_config, byok_rag)
+    assert len(output) == 1
+    assert output[0]["provider_id"] == "original_provider"
+
+
+def test_construct_vector_stores_section_skips_duplicate_within_byok() -> None:
+    """Test skips duplicate vector_db_id entries within the BYOK RAG list."""
+    ls_config: dict[str, Any] = {}
+    byok_rag = [
+        {
+            "vector_db_id": "store1",
+            "embedding_model": "model-a",
+            "embedding_dimension": 512,
+        },
+        {
+            "vector_db_id": "store1",
+            "embedding_model": "model-b",
+            "embedding_dimension": 768,
+        },
+    ]
+    output = construct_vector_stores_section(ls_config, byok_rag)
+    assert len(output) == 1
+    assert output[0]["embedding_model"] == "model-a"
+
+
 # =============================================================================
 # Test construct_vector_io_providers_section
 # =============================================================================