forked from phoenix-oss/llama-stack-mirror
# What does this PR do? - as title, cleaning up `import *`'s - upgrade tests to make them more robust to bad model outputs - remove import *'s in llama_stack/apis/* (skip __init__ modules) <img width="465" alt="image" src="https://github.com/user-attachments/assets/d8339c13-3b40-4ba5-9c53-0d2329726ee2" /> - run `sh run_openapi_generator.sh`, no types gets affected ## Test Plan ### Providers Tests **agents** ``` pytest -v -s llama_stack/providers/tests/agents/test_agents.py -m "together" --safety-shield meta-llama/Llama-Guard-3-8B --inference-model meta-llama/Llama-3.1-405B-Instruct-FP8 ``` **inference** ```bash # meta-reference torchrun $CONDA_PREFIX/bin/pytest -v -s -k "meta_reference" --inference-model="meta-llama/Llama-3.1-8B-Instruct" ./llama_stack/providers/tests/inference/test_text_inference.py torchrun $CONDA_PREFIX/bin/pytest -v -s -k "meta_reference" --inference-model="meta-llama/Llama-3.2-11B-Vision-Instruct" ./llama_stack/providers/tests/inference/test_vision_inference.py # together pytest -v -s -k "together" --inference-model="meta-llama/Llama-3.1-8B-Instruct" ./llama_stack/providers/tests/inference/test_text_inference.py pytest -v -s -k "together" --inference-model="meta-llama/Llama-3.2-11B-Vision-Instruct" ./llama_stack/providers/tests/inference/test_vision_inference.py pytest ./llama_stack/providers/tests/inference/test_prompt_adapter.py ``` **safety** ``` pytest -v -s llama_stack/providers/tests/safety/test_safety.py -m together --safety-shield meta-llama/Llama-Guard-3-8B ``` **memory** ``` pytest -v -s llama_stack/providers/tests/memory/test_memory.py -m "sentence_transformers" --env EMBEDDING_DIMENSION=384 ``` **scoring** ``` pytest -v -s -m llm_as_judge_scoring_together_inference llama_stack/providers/tests/scoring/test_scoring.py --judge-model meta-llama/Llama-3.2-3B-Instruct pytest -v -s -m basic_scoring_together_inference llama_stack/providers/tests/scoring/test_scoring.py pytest -v -s -m braintrust_scoring_together_inference llama_stack/providers/tests/scoring/test_scoring.py ``` **datasetio** ``` pytest -v -s -m localfs llama_stack/providers/tests/datasetio/test_datasetio.py pytest -v -s -m huggingface llama_stack/providers/tests/datasetio/test_datasetio.py ``` **eval** ``` pytest -v -s -m meta_reference_eval_together_inference llama_stack/providers/tests/eval/test_eval.py pytest -v -s -m meta_reference_eval_together_inference_huggingface_datasetio llama_stack/providers/tests/eval/test_eval.py ``` ### Client-SDK Tests ``` LLAMA_STACK_BASE_URL=http://localhost:5000 pytest -v ./tests/client-sdk ``` ### llama-stack-apps ``` PORT=5000 LOCALHOST=localhost python -m examples.agents.hello $LOCALHOST $PORT python -m examples.agents.inflation $LOCALHOST $PORT python -m examples.agents.podcast_transcript $LOCALHOST $PORT python -m examples.agents.rag_as_attachments $LOCALHOST $PORT python -m examples.agents.rag_with_memory_bank $LOCALHOST $PORT python -m examples.safety.llama_guard_demo_mm $LOCALHOST $PORT python -m examples.agents.e2e_loop_with_custom_tools $LOCALHOST $PORT # Vision model python -m examples.interior_design_assistant.app python -m examples.agent_store.app $LOCALHOST $PORT ``` ### CLI ``` which llama llama model prompt-format -m Llama3.2-11B-Vision-Instruct llama model list llama stack list-apis llama stack list-providers inference llama stack build --template ollama --image-type conda ``` ### Distributions Tests **ollama** ``` llama stack build --template ollama --image-type conda ollama run llama3.2:1b-instruct-fp16 llama stack run ./llama_stack/templates/ollama/run.yaml --env INFERENCE_MODEL=meta-llama/Llama-3.2-1B-Instruct ``` **fireworks** ``` llama stack build --template fireworks --image-type conda llama stack run ./llama_stack/templates/fireworks/run.yaml ``` **together** ``` llama stack build --template together --image-type conda llama stack run ./llama_stack/templates/together/run.yaml ``` **tgi** ``` llama stack run ./llama_stack/templates/tgi/run.yaml --env TGI_URL=http://0.0.0.0:5009 --env INFERENCE_MODEL=meta-llama/Llama-3.1-8B-Instruct ``` ## Sources Please link relevant resources if necessary. ## Before submitting - [ ] This PR fixes a typo or improves the docs (you can dismiss the other checks if that's the case). - [ ] Ran pre-commit to handle lint / formatting issues. - [ ] Read the [contributor guideline](https://github.com/meta-llama/llama-stack/blob/main/CONTRIBUTING.md), Pull Request section? - [ ] Updated relevant documentation. - [ ] Wrote necessary unit or integration tests.
218 lines
7.2 KiB
Python
218 lines
7.2 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 os
|
|
|
|
import pytest
|
|
import pytest_asyncio
|
|
from llama_stack.apis.inference import Model
|
|
from llama_stack.apis.memory_banks import VectorMemoryBank
|
|
|
|
from llama_stack.distribution.store.registry import (
|
|
CachedDiskDistributionRegistry,
|
|
DiskDistributionRegistry,
|
|
)
|
|
from llama_stack.providers.utils.kvstore import kvstore_impl, SqliteKVStoreConfig
|
|
|
|
|
|
@pytest.fixture
|
|
def config():
|
|
config = SqliteKVStoreConfig(db_path="/tmp/test_registry.db")
|
|
if os.path.exists(config.db_path):
|
|
os.remove(config.db_path)
|
|
return config
|
|
|
|
|
|
@pytest_asyncio.fixture
|
|
async def registry(config):
|
|
registry = DiskDistributionRegistry(await kvstore_impl(config))
|
|
await registry.initialize()
|
|
return registry
|
|
|
|
|
|
@pytest_asyncio.fixture
|
|
async def cached_registry(config):
|
|
registry = CachedDiskDistributionRegistry(await kvstore_impl(config))
|
|
await registry.initialize()
|
|
return registry
|
|
|
|
|
|
@pytest.fixture
|
|
def sample_bank():
|
|
return VectorMemoryBank(
|
|
identifier="test_bank",
|
|
embedding_model="all-MiniLM-L6-v2",
|
|
chunk_size_in_tokens=512,
|
|
overlap_size_in_tokens=64,
|
|
provider_resource_id="test_bank",
|
|
provider_id="test-provider",
|
|
)
|
|
|
|
|
|
@pytest.fixture
|
|
def sample_model():
|
|
return Model(
|
|
identifier="test_model",
|
|
provider_resource_id="test_model",
|
|
provider_id="test-provider",
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_registry_initialization(registry):
|
|
# Test empty registry
|
|
results = await registry.get("nonexistent", "nonexistent")
|
|
assert len(results) == 0
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_basic_registration(registry, sample_bank, sample_model):
|
|
print(f"Registering {sample_bank}")
|
|
await registry.register(sample_bank)
|
|
print(f"Registering {sample_model}")
|
|
await registry.register(sample_model)
|
|
print("Getting bank")
|
|
results = await registry.get("memory_bank", "test_bank")
|
|
assert len(results) == 1
|
|
result_bank = results[0]
|
|
assert result_bank.identifier == sample_bank.identifier
|
|
assert result_bank.embedding_model == sample_bank.embedding_model
|
|
assert result_bank.chunk_size_in_tokens == sample_bank.chunk_size_in_tokens
|
|
assert result_bank.overlap_size_in_tokens == sample_bank.overlap_size_in_tokens
|
|
assert result_bank.provider_id == sample_bank.provider_id
|
|
|
|
results = await registry.get("model", "test_model")
|
|
assert len(results) == 1
|
|
result_model = results[0]
|
|
assert result_model.identifier == sample_model.identifier
|
|
assert result_model.provider_id == sample_model.provider_id
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_cached_registry_initialization(config, sample_bank, sample_model):
|
|
# First populate the disk registry
|
|
disk_registry = DiskDistributionRegistry(await kvstore_impl(config))
|
|
await disk_registry.initialize()
|
|
await disk_registry.register(sample_bank)
|
|
await disk_registry.register(sample_model)
|
|
|
|
# Test cached version loads from disk
|
|
cached_registry = CachedDiskDistributionRegistry(await kvstore_impl(config))
|
|
await cached_registry.initialize()
|
|
|
|
results = await cached_registry.get("memory_bank", "test_bank")
|
|
assert len(results) == 1
|
|
result_bank = results[0]
|
|
assert result_bank.identifier == sample_bank.identifier
|
|
assert result_bank.embedding_model == sample_bank.embedding_model
|
|
assert result_bank.chunk_size_in_tokens == sample_bank.chunk_size_in_tokens
|
|
assert result_bank.overlap_size_in_tokens == sample_bank.overlap_size_in_tokens
|
|
assert result_bank.provider_id == sample_bank.provider_id
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_cached_registry_updates(config):
|
|
cached_registry = CachedDiskDistributionRegistry(await kvstore_impl(config))
|
|
await cached_registry.initialize()
|
|
|
|
new_bank = VectorMemoryBank(
|
|
identifier="test_bank_2",
|
|
embedding_model="all-MiniLM-L6-v2",
|
|
chunk_size_in_tokens=256,
|
|
overlap_size_in_tokens=32,
|
|
provider_resource_id="test_bank_2",
|
|
provider_id="baz",
|
|
)
|
|
await cached_registry.register(new_bank)
|
|
|
|
# Verify in cache
|
|
results = await cached_registry.get("memory_bank", "test_bank_2")
|
|
assert len(results) == 1
|
|
result_bank = results[0]
|
|
assert result_bank.identifier == new_bank.identifier
|
|
assert result_bank.provider_id == new_bank.provider_id
|
|
|
|
# Verify persisted to disk
|
|
new_registry = DiskDistributionRegistry(await kvstore_impl(config))
|
|
await new_registry.initialize()
|
|
results = await new_registry.get("memory_bank", "test_bank_2")
|
|
assert len(results) == 1
|
|
result_bank = results[0]
|
|
assert result_bank.identifier == new_bank.identifier
|
|
assert result_bank.provider_id == new_bank.provider_id
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_duplicate_provider_registration(config):
|
|
cached_registry = CachedDiskDistributionRegistry(await kvstore_impl(config))
|
|
await cached_registry.initialize()
|
|
|
|
original_bank = VectorMemoryBank(
|
|
identifier="test_bank_2",
|
|
embedding_model="all-MiniLM-L6-v2",
|
|
chunk_size_in_tokens=256,
|
|
overlap_size_in_tokens=32,
|
|
provider_resource_id="test_bank_2",
|
|
provider_id="baz",
|
|
)
|
|
await cached_registry.register(original_bank)
|
|
|
|
duplicate_bank = VectorMemoryBank(
|
|
identifier="test_bank_2",
|
|
embedding_model="different-model",
|
|
chunk_size_in_tokens=128,
|
|
overlap_size_in_tokens=16,
|
|
provider_resource_id="test_bank_2",
|
|
provider_id="baz", # Same provider_id
|
|
)
|
|
await cached_registry.register(duplicate_bank)
|
|
|
|
results = await cached_registry.get("memory_bank", "test_bank_2")
|
|
assert len(results) == 1 # Still only one result
|
|
assert (
|
|
results[0].embedding_model == original_bank.embedding_model
|
|
) # Original values preserved
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_get_all_objects(config):
|
|
cached_registry = CachedDiskDistributionRegistry(await kvstore_impl(config))
|
|
await cached_registry.initialize()
|
|
|
|
# Create multiple test banks
|
|
test_banks = [
|
|
VectorMemoryBank(
|
|
identifier=f"test_bank_{i}",
|
|
embedding_model="all-MiniLM-L6-v2",
|
|
chunk_size_in_tokens=256,
|
|
overlap_size_in_tokens=32,
|
|
provider_resource_id=f"test_bank_{i}",
|
|
provider_id=f"provider_{i}",
|
|
)
|
|
for i in range(3)
|
|
]
|
|
|
|
# Register all banks
|
|
for bank in test_banks:
|
|
await cached_registry.register(bank)
|
|
|
|
# Test get_all retrieval
|
|
all_results = await cached_registry.get_all()
|
|
assert len(all_results) == 3
|
|
|
|
# Verify each bank was stored correctly
|
|
for original_bank in test_banks:
|
|
matching_banks = [
|
|
b for b in all_results if b.identifier == original_bank.identifier
|
|
]
|
|
assert len(matching_banks) == 1
|
|
stored_bank = matching_banks[0]
|
|
assert stored_bank.embedding_model == original_bank.embedding_model
|
|
assert stored_bank.provider_id == original_bank.provider_id
|
|
assert stored_bank.chunk_size_in_tokens == original_bank.chunk_size_in_tokens
|
|
assert (
|
|
stored_bank.overlap_size_in_tokens == original_bank.overlap_size_in_tokens
|
|
)
|