mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-07-29 07:14:20 +00:00
feat(vector-io): implement global default embedding model configuration (Issue #2729)
- Add VectorStoreConfig with global default_embedding_model and default_embedding_dimension - Support environment variables LLAMA_STACK_DEFAULT_EMBEDDING_MODEL and LLAMA_STACK_DEFAULT_EMBEDDING_DIMENSION - Implement precedence: explicit model > global default > clear error (no fallback) - Update VectorIORouter with _resolve_embedding_model() precedence logic - Remove non-deterministic 'first model in run.yaml' fallback behavior - Add vector_store_config to StackRunConfig and all distribution templates - Include comprehensive unit tests for config loading and router precedence - Update documentation with configuration examples and usage patterns - Fix error messages to include 'Failed to' prefix per coding standards Resolves deterministic vector store creation by eliminating unpredictable fallbacks and providing clear configuration options at the stack level.
This commit is contained in:
parent
3344d8a9e5
commit
603ba5a4e0
7 changed files with 243 additions and 8 deletions
|
@ -688,3 +688,38 @@ shields:
|
|||
provider_shield_id: null
|
||||
...
|
||||
```
|
||||
|
||||
### Global Vector-Store Defaults
|
||||
|
||||
Starting with Llama-Stack v2, you can provide a *stack-level* default embedding model that will be used whenever a new vector-store is created and the caller does **not** specify an `embedding_model` parameter.
|
||||
|
||||
Add a top-level block next to `models:` and `vector_io:` in your build/run YAML:
|
||||
|
||||
```yaml
|
||||
vector_store_config:
|
||||
default_embedding_model: ${env.LLAMA_STACK_DEFAULT_EMBEDDING_MODEL:=all-MiniLM-L6-v2}
|
||||
# optional but recommended
|
||||
default_embedding_dimension: ${env.LLAMA_STACK_DEFAULT_EMBEDDING_DIMENSION:=384}
|
||||
```
|
||||
|
||||
Precedence rules at runtime:
|
||||
|
||||
1. If `embedding_model` is explicitly passed in an API call, that value is used.
|
||||
2. Otherwise the value in `vector_store_config.default_embedding_model` is used.
|
||||
3. If neither is available the server will raise **MissingEmbeddingModelError** at store-creation time so mis-configuration is caught early.
|
||||
|
||||
#### Environment variables
|
||||
|
||||
| Variable | Purpose | Example |
|
||||
|----------|---------|---------|
|
||||
| `LLAMA_STACK_DEFAULT_EMBEDDING_MODEL` | Global default embedding model id | `all-MiniLM-L6-v2` |
|
||||
| `LLAMA_STACK_DEFAULT_EMBEDDING_DIMENSION` | Dimension for embeddings (optional) | `384` |
|
||||
|
||||
If you include the `${env.…}` placeholder in `vector_store_config`, deployments can override the default without editing YAML:
|
||||
|
||||
```bash
|
||||
export LLAMA_STACK_DEFAULT_EMBEDDING_MODEL="sentence-transformers/all-MiniLM-L6-v2"
|
||||
llama stack run --config run.yaml
|
||||
```
|
||||
|
||||
> Tip: If you omit `vector_store_config` entirely you **must** either pass `embedding_model=` on every `create_vector_store` call or set `LLAMA_STACK_DEFAULT_EMBEDDING_MODEL` in the environment, otherwise the server will refuse to create a vector store.
|
||||
|
|
45
llama_stack/apis/common/vector_store_config.py
Normal file
45
llama_stack/apis/common/vector_store_config.py
Normal file
|
@ -0,0 +1,45 @@
|
|||
# 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.
|
||||
|
||||
from __future__ import annotations
|
||||
|
||||
"""Global vector-store configuration shared across the stack.
|
||||
|
||||
This module introduces `VectorStoreConfig`, a small Pydantic model that
|
||||
lives under `StackRunConfig.vector_store_config`. It lets deployers set
|
||||
an explicit default embedding model (and dimension) that the Vector-IO
|
||||
router will inject whenever the caller does not specify one.
|
||||
"""
|
||||
|
||||
import os
|
||||
|
||||
from pydantic import BaseModel, ConfigDict, Field
|
||||
|
||||
__all__ = ["VectorStoreConfig"]
|
||||
|
||||
|
||||
class VectorStoreConfig(BaseModel):
|
||||
"""Stack-level defaults for vector-store creation.
|
||||
|
||||
Attributes
|
||||
----------
|
||||
default_embedding_model
|
||||
The model *id* the stack should use when an embedding model is
|
||||
required but not supplied by the API caller. When *None* the
|
||||
router will raise a :class:`~llama_stack.errors.MissingEmbeddingModelError`.
|
||||
default_embedding_dimension
|
||||
Optional integer hint for vector dimension. Routers/providers
|
||||
may validate that the chosen model emits vectors of this size.
|
||||
"""
|
||||
|
||||
default_embedding_model: str | None = Field(
|
||||
default_factory=lambda: os.getenv("LLAMA_STACK_DEFAULT_EMBEDDING_MODEL")
|
||||
)
|
||||
default_embedding_dimension: int | None = Field(
|
||||
default_factory=lambda: int(os.getenv("LLAMA_STACK_DEFAULT_EMBEDDING_DIMENSION", 0)) or None, ge=1
|
||||
)
|
||||
|
||||
model_config = ConfigDict(frozen=True)
|
|
@ -11,6 +11,7 @@ from typing import Annotated, Any, Literal, Self
|
|||
from pydantic import BaseModel, Field, field_validator, model_validator
|
||||
|
||||
from llama_stack.apis.benchmarks import Benchmark, BenchmarkInput
|
||||
from llama_stack.apis.common.vector_store_config import VectorStoreConfig
|
||||
from llama_stack.apis.datasetio import DatasetIO
|
||||
from llama_stack.apis.datasets import Dataset, DatasetInput
|
||||
from llama_stack.apis.eval import Eval
|
||||
|
@ -391,6 +392,12 @@ Configuration for the persistence store used by the inference API. If not specif
|
|||
a default SQLite store will be used.""",
|
||||
)
|
||||
|
||||
# Global vector-store defaults (embedding model etc.)
|
||||
vector_store_config: VectorStoreConfig = Field(
|
||||
default_factory=VectorStoreConfig,
|
||||
description="Global defaults for vector-store creation (embedding model, dimension, …)",
|
||||
)
|
||||
|
||||
# registry of "resources" in the distribution
|
||||
models: list[ModelInput] = Field(default_factory=list)
|
||||
shields: list[ShieldInput] = Field(default_factory=list)
|
||||
|
|
|
@ -11,6 +11,7 @@ from typing import Any
|
|||
from llama_stack.apis.common.content_types import (
|
||||
InterleavedContent,
|
||||
)
|
||||
from llama_stack.apis.common.vector_store_config import VectorStoreConfig
|
||||
from llama_stack.apis.models import ModelType
|
||||
from llama_stack.apis.vector_io import (
|
||||
Chunk,
|
||||
|
@ -76,6 +77,42 @@ class VectorIORouter(VectorIO):
|
|||
logger.error(f"Error getting embedding models: {e}")
|
||||
return None
|
||||
|
||||
async def _resolve_embedding_model(self, explicit_model: str | None = None) -> tuple[str, int]:
|
||||
"""Apply precedence rules to decide which embedding model to use.
|
||||
|
||||
1. If *explicit_model* is provided, verify dimension (if possible) and use it.
|
||||
2. Else use the global default in ``vector_store_config``.
|
||||
3. Else raise ``MissingEmbeddingModelError``.
|
||||
"""
|
||||
|
||||
# 1. explicit override
|
||||
if explicit_model is not None:
|
||||
# We still need a dimension; try to look it up in routing table
|
||||
all_models = await self.routing_table.get_all_with_type("model")
|
||||
for m in all_models:
|
||||
if getattr(m, "identifier", None) == explicit_model:
|
||||
dim = m.metadata.get("embedding_dimension")
|
||||
if dim is None:
|
||||
raise ValueError(
|
||||
f"Failed to use embedding model {explicit_model}: found but has no embedding_dimension metadata"
|
||||
)
|
||||
return explicit_model, dim
|
||||
# If not found, dimension unknown - defer to caller
|
||||
return explicit_model, None # type: ignore
|
||||
|
||||
# 2. global default
|
||||
cfg = VectorStoreConfig() # picks up env vars automatically
|
||||
if cfg.default_embedding_model is not None:
|
||||
return cfg.default_embedding_model, cfg.default_embedding_dimension or 384
|
||||
|
||||
# 3. error - no default
|
||||
class MissingEmbeddingModelError(RuntimeError):
|
||||
pass
|
||||
|
||||
raise MissingEmbeddingModelError(
|
||||
"Failed to create vector store: No embedding model provided. Set vector_store_config.default_embedding_model or supply one in the API call."
|
||||
)
|
||||
|
||||
async def register_vector_db(
|
||||
self,
|
||||
vector_db_id: str,
|
||||
|
@ -102,7 +139,7 @@ class VectorIORouter(VectorIO):
|
|||
ttl_seconds: int | None = None,
|
||||
) -> None:
|
||||
logger.debug(
|
||||
f"VectorIORouter.insert_chunks: {vector_db_id}, {len(chunks)} chunks, ttl_seconds={ttl_seconds}, chunk_ids={[chunk.metadata['document_id'] for chunk in chunks[:3]]}{' and more...' if len(chunks) > 3 else ''}",
|
||||
f"VectorIORouter.insert_chunks: {vector_db_id}, {len(chunks)} chunks, ttl_seconds={ttl_seconds}, chunk_ids={[chunk.chunk_id for chunk in chunks[:3]]}{' and more...' if len(chunks) > 3 else ''}",
|
||||
)
|
||||
provider = await self.routing_table.get_provider_impl(vector_db_id)
|
||||
return await provider.insert_chunks(vector_db_id, chunks, ttl_seconds)
|
||||
|
@ -131,13 +168,12 @@ class VectorIORouter(VectorIO):
|
|||
) -> VectorStoreObject:
|
||||
logger.debug(f"VectorIORouter.openai_create_vector_store: name={name}, provider_id={provider_id}")
|
||||
|
||||
# If no embedding model is provided, use the first available one
|
||||
if embedding_model is None:
|
||||
embedding_model_info = await self._get_first_embedding_model()
|
||||
if embedding_model_info is None:
|
||||
raise ValueError("No embedding model provided and no embedding models available in the system")
|
||||
embedding_model, embedding_dimension = embedding_model_info
|
||||
logger.info(f"No embedding model specified, using first available: {embedding_model}")
|
||||
# Determine which embedding model to use based on new precedence
|
||||
embedding_model, embedding_dimension = await self._resolve_embedding_model(embedding_model)
|
||||
if embedding_dimension is None:
|
||||
# try to fetch dimension from model metadata as fallback
|
||||
embedding_model_info = await self._get_first_embedding_model() # may still help
|
||||
embedding_dimension = embedding_model_info[1] if embedding_model_info else 384
|
||||
|
||||
vector_db_id = f"vs_{uuid.uuid4()}"
|
||||
registered_vector_db = await self.routing_table.register_vector_db(
|
||||
|
|
|
@ -43,6 +43,9 @@ distribution_spec:
|
|||
provider_type: inline::rag-runtime
|
||||
- provider_id: model-context-protocol
|
||||
provider_type: remote::model-context-protocol
|
||||
vector_store_config:
|
||||
default_embedding_model: ${env.LLAMA_STACK_DEFAULT_EMBEDDING_MODEL:=all-MiniLM-L6-v2}
|
||||
default_embedding_dimension: ${env.LLAMA_STACK_DEFAULT_EMBEDDING_DIMENSION:=384}
|
||||
image_type: conda
|
||||
image_name: watsonx
|
||||
additional_pip_packages:
|
||||
|
|
26
tests/unit/common/test_vector_store_config.py
Normal file
26
tests/unit/common/test_vector_store_config.py
Normal file
|
@ -0,0 +1,26 @@
|
|||
# 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.
|
||||
|
||||
from llama_stack.apis.common.vector_store_config import VectorStoreConfig
|
||||
|
||||
|
||||
def test_defaults():
|
||||
cfg = VectorStoreConfig()
|
||||
assert cfg.default_embedding_model is None
|
||||
assert cfg.default_embedding_dimension is None
|
||||
|
||||
|
||||
def test_env_loading(monkeypatch):
|
||||
monkeypatch.setenv("LLAMA_STACK_DEFAULT_EMBEDDING_MODEL", "test-model")
|
||||
monkeypatch.setenv("LLAMA_STACK_DEFAULT_EMBEDDING_DIMENSION", "123")
|
||||
|
||||
cfg = VectorStoreConfig()
|
||||
assert cfg.default_embedding_model == "test-model"
|
||||
assert cfg.default_embedding_dimension == 123
|
||||
|
||||
# Clean up
|
||||
monkeypatch.delenv("LLAMA_STACK_DEFAULT_EMBEDDING_MODEL", raising=False)
|
||||
monkeypatch.delenv("LLAMA_STACK_DEFAULT_EMBEDDING_DIMENSION", raising=False)
|
83
tests/unit/router/test_embedding_precedence.py
Normal file
83
tests/unit/router/test_embedding_precedence.py
Normal file
|
@ -0,0 +1,83 @@
|
|||
# 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 llama_stack.apis.models import ModelType
|
||||
from llama_stack.distribution.routers.vector_io import VectorIORouter
|
||||
|
||||
|
||||
class _DummyModel:
|
||||
def __init__(self, identifier: str, dim: int):
|
||||
self.identifier = identifier
|
||||
self.model_type = ModelType.embedding
|
||||
self.metadata = {"embedding_dimension": dim}
|
||||
|
||||
|
||||
class _DummyRoutingTable:
|
||||
"""Minimal stub satisfying the methods used by VectorIORouter in tests."""
|
||||
|
||||
def __init__(self):
|
||||
self._models: list[_DummyModel] = [
|
||||
_DummyModel("first-model", 123),
|
||||
_DummyModel("second-model", 512),
|
||||
]
|
||||
|
||||
async def get_all_with_type(self, _type: str):
|
||||
# Only embedding models requested in our tests
|
||||
return self._models
|
||||
|
||||
# The following methods are required by the VectorIORouter signature but
|
||||
# are not used in these unit tests; stub them out.
|
||||
async def register_vector_db(self, *args, **kwargs):
|
||||
raise NotImplementedError
|
||||
|
||||
async def get_provider_impl(self, *args, **kwargs):
|
||||
raise NotImplementedError
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_global_default_used(monkeypatch):
|
||||
"""Router should pick up global default when no explicit model is supplied."""
|
||||
|
||||
monkeypatch.setenv("LLAMA_STACK_DEFAULT_EMBEDDING_MODEL", "env-default-model")
|
||||
monkeypatch.setenv("LLAMA_STACK_DEFAULT_EMBEDDING_DIMENSION", "256")
|
||||
|
||||
router = VectorIORouter(routing_table=_DummyRoutingTable())
|
||||
|
||||
model, dim = await router._resolve_embedding_model(None)
|
||||
assert model == "env-default-model"
|
||||
assert dim == 256
|
||||
|
||||
# Cleanup env vars
|
||||
monkeypatch.delenv("LLAMA_STACK_DEFAULT_EMBEDDING_MODEL", raising=False)
|
||||
monkeypatch.delenv("LLAMA_STACK_DEFAULT_EMBEDDING_DIMENSION", raising=False)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_explicit_override(monkeypatch):
|
||||
"""Explicit model parameter should override global default."""
|
||||
|
||||
monkeypatch.setenv("LLAMA_STACK_DEFAULT_EMBEDDING_MODEL", "env-default-model")
|
||||
|
||||
router = VectorIORouter(routing_table=_DummyRoutingTable())
|
||||
|
||||
model, dim = await router._resolve_embedding_model("first-model")
|
||||
assert model == "first-model"
|
||||
assert dim == 123
|
||||
|
||||
monkeypatch.delenv("LLAMA_STACK_DEFAULT_EMBEDDING_MODEL", raising=False)
|
||||
|
||||
|
||||
@pytest.mark.asyncio
|
||||
async def test_error_when_no_default(monkeypatch):
|
||||
"""Router should raise when neither explicit nor global default is available."""
|
||||
|
||||
router = VectorIORouter(routing_table=_DummyRoutingTable())
|
||||
|
||||
with pytest.raises(RuntimeError):
|
||||
await router._resolve_embedding_model(None)
|
Loading…
Add table
Add a link
Reference in a new issue