mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-12-12 20:12:33 +00:00
feat(stores)!: use backend storage references instead of configs
This commit is contained in:
parent
b3099d40e2
commit
ea9664874d
47 changed files with 893 additions and 696 deletions
63
tests/integration/test_persistence_integration.py
Normal file
63
tests/integration/test_persistence_integration.py
Normal file
|
|
@ -0,0 +1,63 @@
|
|||
# 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 yaml
|
||||
|
||||
from llama_stack.core.datatypes import StackRunConfig
|
||||
from llama_stack.core.storage.datatypes import (
|
||||
PostgresSqlStoreConfig,
|
||||
SqliteKVStoreConfig,
|
||||
SqliteSqlStoreConfig,
|
||||
)
|
||||
|
||||
|
||||
def test_starter_distribution_config_loads_and_resolves():
|
||||
"""Integration: Actual starter config should parse and have correct storage structure."""
|
||||
with open("llama_stack/distributions/starter/run.yaml") as f:
|
||||
config_dict = yaml.safe_load(f)
|
||||
|
||||
config = StackRunConfig(**config_dict)
|
||||
|
||||
# Config should have storage with default backend
|
||||
assert config.storage is not None
|
||||
assert "default" in config.storage.backends
|
||||
assert isinstance(config.storage.backends["default"], SqliteSqlStoreConfig)
|
||||
|
||||
# Stores should reference the default backend
|
||||
assert config.storage.metadata is not None
|
||||
assert config.storage.metadata.backend == "default"
|
||||
assert config.storage.metadata.namespace is not None
|
||||
|
||||
assert config.storage.inference is not None
|
||||
assert config.storage.inference.backend == "default"
|
||||
assert config.storage.inference.table_name is not None
|
||||
assert config.storage.inference.max_write_queue_size > 0
|
||||
assert config.storage.inference.num_writers > 0
|
||||
|
||||
|
||||
def test_postgres_demo_distribution_config_loads():
|
||||
"""Integration: Postgres demo should use Postgres backend for all stores."""
|
||||
with open("llama_stack/distributions/postgres-demo/run.yaml") as f:
|
||||
config_dict = yaml.safe_load(f)
|
||||
|
||||
config = StackRunConfig(**config_dict)
|
||||
|
||||
# Should have postgres backend
|
||||
assert config.storage is not None
|
||||
assert "default" in config.storage.backends
|
||||
assert isinstance(config.storage.backends["default"], PostgresSqlStoreConfig)
|
||||
|
||||
# Both stores use same postgres backend
|
||||
assert config.storage.metadata is not None
|
||||
assert config.storage.metadata.backend == "default"
|
||||
|
||||
assert config.storage.inference is not None
|
||||
assert config.storage.inference.backend == "default"
|
||||
|
||||
# Backend config should be Postgres
|
||||
postgres_backend = config.storage.backends["default"]
|
||||
assert isinstance(postgres_backend, PostgresSqlStoreConfig)
|
||||
assert postgres_backend.host == "${env.POSTGRES_HOST:=localhost}"
|
||||
82
tests/unit/core/test_persistence_config.py
Normal file
82
tests/unit/core/test_persistence_config.py
Normal file
|
|
@ -0,0 +1,82 @@
|
|||
# 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)
|
||||
Loading…
Add table
Add a link
Reference in a new issue