simplified some, walked back some decisions

tests/unit/core/test_persistence_config.py

@@ -1,82 +0,0 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
-# All rights reserved.
-#
-# This source code is licensed under the terms described in the LICENSE file in
-# the root directory of this source tree.
-
-import pytest
-from pydantic import ValidationError
-
-from llama_stack.core.datatypes import (
-    InferenceStoreReference,
-    PersistenceConfig,
-    StoreReference,
-    StoresConfig,
-)
-from llama_stack.providers.utils.kvstore.config import SqliteKVStoreConfig
-from llama_stack.providers.utils.sqlstore.sqlstore import (
-    PostgresSqlStoreConfig,
-    SqliteSqlStoreConfig,
-)
-
-
-def test_backend_reference_validation_catches_missing_backend():
-    """Critical: Catch user typos in backend references before runtime."""
-    with pytest.raises(ValidationError, match="not defined in persistence.backends"):
-        PersistenceConfig(
-            backends={
-                "default": SqliteSqlStoreConfig(db_path="/tmp/store.db"),
-            },
-            stores=StoresConfig(
-                metadata=StoreReference(backend="typo_backend"),  # User typo
-            ),
-        )
-
-
-def test_backend_reference_validation_accepts_valid_config():
-    """Valid config should parse without errors."""
-    config = PersistenceConfig(
-        backends={
-            "default": SqliteSqlStoreConfig(db_path="/tmp/store.db"),
-        },
-        stores=StoresConfig(
-            metadata=StoreReference(backend="default"),
-            inference=InferenceStoreReference(backend="default"),
-        ),
-    )
-    assert config.stores.metadata.backend == "default"
-    assert config.stores.inference.backend == "default"
-
-
-def test_multiple_stores_can_share_same_backend():
-    """Core use case: metadata and inference both use 'default' backend."""
-    config = PersistenceConfig(
-        backends={
-            "default": SqliteSqlStoreConfig(db_path="/tmp/shared.db"),
-        },
-        stores=StoresConfig(
-            metadata=StoreReference(backend="default", namespace="metadata"),
-            inference=InferenceStoreReference(backend="default"),
-            conversations=StoreReference(backend="default"),
-        ),
-    )
-    # All reference the same backend
-    assert config.stores.metadata.backend == "default"
-    assert config.stores.inference.backend == "default"
-    assert config.stores.conversations.backend == "default"
-
-
-def test_mixed_backend_types_allowed():
-    """Should support KVStore and SqlStore backends simultaneously."""
-    config = PersistenceConfig(
-        backends={
-            "kvstore": SqliteKVStoreConfig(db_path="/tmp/kv.db"),
-            "sqlstore": PostgresSqlStoreConfig(user="test", password="test", host="localhost", db="test"),
-        },
-        stores=StoresConfig(
-            metadata=StoreReference(backend="kvstore"),
-            inference=InferenceStoreReference(backend="sqlstore"),
-        ),
-    )
-    assert isinstance(config.backends["kvstore"], SqliteKVStoreConfig)
-    assert isinstance(config.backends["sqlstore"], PostgresSqlStoreConfig)

tests/unit/core/test_storage_references.py

@@ -0,0 +1,77 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the terms described in the LICENSE file in
+# the root directory of this source tree.
+
+"""Unit tests for storage backend/reference validation."""
+
+import pytest
+from pydantic import ValidationError
+
+from llama_stack.core.datatypes import (
+    LLAMA_STACK_RUN_CONFIG_VERSION,
+    StackRunConfig,
+)
+from llama_stack.core.storage.datatypes import (
+    InferenceStoreReference,
+    KVStoreReference,
+    SqliteKVStoreConfig,
+    SqliteSqlStoreConfig,
+    SqlStoreReference,
+    StorageConfig,
+)
+
+
+def _base_run_config(**overrides):
+    storage = overrides.pop(
+        "storage",
+        StorageConfig(
+            backends={
+                "kv_default": SqliteKVStoreConfig(db_path="/tmp/kv.db"),
+                "sql_default": SqliteSqlStoreConfig(db_path="/tmp/sql.db"),
+            }
+        ),
+    )
+    return StackRunConfig(
+        version=LLAMA_STACK_RUN_CONFIG_VERSION,
+        image_name="test-distro",
+        apis=[],
+        providers={},
+        storage=storage,
+        metadata_store=overrides.pop(
+            "metadata_store",
+            KVStoreReference(backend="kv_default", namespace="registry"),
+        ),
+        inference_store=overrides.pop(
+            "inference_store",
+            InferenceStoreReference(backend="sql_default", table_name="inference"),
+        ),
+        conversations_store=overrides.pop(
+            "conversations_store",
+            SqlStoreReference(backend="sql_default", table_name="conversations"),
+        ),
+        **overrides,
+    )
+
+
+def test_references_require_known_backend():
+    with pytest.raises(ValidationError, match="unknown backend 'missing'"):
+        _base_run_config(metadata_store=KVStoreReference(backend="missing", namespace="registry"))
+
+
+def test_references_must_match_backend_family():
+    with pytest.raises(ValidationError, match="kv_.* is required"):
+        _base_run_config(metadata_store=KVStoreReference(backend="sql_default", namespace="registry"))
+
+    with pytest.raises(ValidationError, match="sql_.* is required"):
+        _base_run_config(
+            inference_store=InferenceStoreReference(backend="kv_default", table_name="inference"),
+        )
+
+
+def test_valid_configuration_passes_validation():
+    config = _base_run_config()
+    assert config.metadata_store.backend == "kv_default"
+    assert config.inference_store.backend == "sql_default"
+    assert config.conversations_store.backend == "sql_default"