mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-10-22 00:13:08 +00:00
2c43285e22
**This PR changes configurations in a backward incompatible way.**
Run configs today repeat full SQLite/Postgres snippets everywhere a
store is needed, which means duplicated credentials, extra connection
pools, and lots of drift between files. This PR introduces named storage
backends so the stack and providers can share a single catalog and
reference those backends by name.
## Key Changes
- Add `storage.backends` to `StackRunConfig`, register each KV/SQL
backend once at startup, and validate that references point to the right
family.
- Move server stores under `storage.stores` with lightweight references
(backend + namespace/table) instead of full configs.
- Update every provider/config/doc to use the new reference style;
docs/codegen now surface the simplified YAML.
## Migration
Before:
```yaml
metadata_store:
type: sqlite
db_path: ~/.llama/distributions/foo/registry.db
inference_store:
type: postgres
host: ${env.POSTGRES_HOST}
port: ${env.POSTGRES_PORT}
db: ${env.POSTGRES_DB}
user: ${env.POSTGRES_USER}
password: ${env.POSTGRES_PASSWORD}
conversations_store:
type: postgres
host: ${env.POSTGRES_HOST}
port: ${env.POSTGRES_PORT}
db: ${env.POSTGRES_DB}
user: ${env.POSTGRES_USER}
password: ${env.POSTGRES_PASSWORD}
```
After:
```yaml
storage:
backends:
kv_default:
type: kv_sqlite
db_path: ~/.llama/distributions/foo/kvstore.db
sql_default:
type: sql_postgres
host: ${env.POSTGRES_HOST}
port: ${env.POSTGRES_PORT}
db: ${env.POSTGRES_DB}
user: ${env.POSTGRES_USER}
password: ${env.POSTGRES_PASSWORD}
stores:
metadata:
backend: kv_default
namespace: registry
inference:
backend: sql_default
table_name: inference_store
max_write_queue_size: 10000
num_writers: 4
conversations:
backend: sql_default
table_name: openai_conversations
```
Provider configs follow the same pattern—for example, a Chroma vector
adapter switches from:
```yaml
providers:
vector_io:
- provider_id: chromadb
provider_type: remote::chromadb
config:
url: ${env.CHROMADB_URL}
kvstore:
type: sqlite
db_path: ~/.llama/distributions/foo/chroma.db
```
to:
```yaml
providers:
vector_io:
- provider_id: chromadb
provider_type: remote::chromadb
config:
url: ${env.CHROMADB_URL}
persistence:
backend: kv_default
namespace: vector_io::chroma_remote
```
Once the backends are declared, everything else just points at them, so
rotating credentials or swapping to Postgres happens in one place and
the stack reuses a single connection pool.
71 lines
2.7 KiB
Python
71 lines
2.7 KiB
Python
# 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 (
|
|
PostgresKVStoreConfig,
|
|
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 named backends and explicit store references
|
|
assert config.storage is not None
|
|
assert "kv_default" in config.storage.backends
|
|
assert "sql_default" in config.storage.backends
|
|
assert isinstance(config.storage.backends["kv_default"], SqliteKVStoreConfig)
|
|
assert isinstance(config.storage.backends["sql_default"], SqliteSqlStoreConfig)
|
|
|
|
stores = config.storage.stores
|
|
assert stores.metadata is not None
|
|
assert stores.metadata.backend == "kv_default"
|
|
assert stores.metadata.namespace == "registry"
|
|
|
|
assert stores.inference is not None
|
|
assert stores.inference.backend == "sql_default"
|
|
assert stores.inference.table_name == "inference_store"
|
|
assert stores.inference.max_write_queue_size > 0
|
|
assert stores.inference.num_writers > 0
|
|
|
|
assert stores.conversations is not None
|
|
assert stores.conversations.backend == "sql_default"
|
|
assert stores.conversations.table_name == "openai_conversations"
|
|
|
|
|
|
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 "kv_default" in config.storage.backends
|
|
assert "sql_default" in config.storage.backends
|
|
postgres_backend = config.storage.backends["sql_default"]
|
|
assert isinstance(postgres_backend, PostgresSqlStoreConfig)
|
|
assert postgres_backend.host == "${env.POSTGRES_HOST:=localhost}"
|
|
|
|
kv_backend = config.storage.backends["kv_default"]
|
|
assert isinstance(kv_backend, PostgresKVStoreConfig)
|
|
|
|
stores = config.storage.stores
|
|
# Stores target the Postgres backends explicitly
|
|
assert stores.metadata is not None
|
|
assert stores.metadata.backend == "kv_default"
|
|
assert stores.inference is not None
|
|
assert stores.inference.backend == "sql_default"
|