phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-08-06 10:42:39 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

support non value for test config

Browse source
This commit is contained in:
Sixian Yi 2025-01-15 13:45:55 -08:00
parent 26d9804efd
commit 11b2fdd3d8
4 changed files with 15 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
llama_stack/providers/tests/agents/conftest.py
View file

@ -92,7 +92,7 @@ def pytest_generate_tests(metafunc):
config_override_safety_shield, config_override_safety_shield,
custom_provider_fixtures, custom_provider_fixtures,
) = (None, None, None) ) = (None, None, None)
if test_config is not None: if test_config is not None and test_config.agent is not None:
config_override_inference_models = test_config.agent.fixtures.inference_models config_override_inference_models = test_config.agent.fixtures.inference_models
config_override_safety_shield = test_config.agent.fixtures.safety_shield config_override_safety_shield = test_config.agent.fixtures.safety_shield
custom_provider_fixtures = get_provider_fixtures_from_config( custom_provider_fixtures = get_provider_fixtures_from_config(

2
llama_stack/providers/tests/conftest.py
View file

@ -189,6 +189,8 @@ def pytest_collection_modifyitems(session, config, items):
required_tests = defaultdict(set) required_tests = defaultdict(set)
test_configs = [test_config.inference, test_config.memory, test_config.agent] test_configs = [test_config.inference, test_config.memory, test_config.agent]
for test_config in test_configs: for test_config in test_configs:
if test_config is None:
continue
for test in test_config.tests: for test in test_config.tests:
arr = test.split("::") arr = test.split("::")
if len(arr) != 2: if len(arr) != 2:

10
llama_stack/providers/tests/memory/conftest.py
View file

@ -72,11 +72,15 @@ def pytest_generate_tests(metafunc):
test_config = try_load_config_file_cached(metafunc.config.getoption("config")) test_config = try_load_config_file_cached(metafunc.config.getoption("config"))
provider_fixtures_config = ( provider_fixtures_config = (
test_config.memory.fixtures.provider_fixtures test_config.memory.fixtures.provider_fixtures
if test_config is not None if test_config is not None and test_config.memory is not None
else None else None
) )
custom_fixtures = get_provider_fixtures_from_config( custom_fixtures = (
provider_fixtures_config, DEFAULT_PROVIDER_COMBINATIONS get_provider_fixtures_from_config(
provider_fixtures_config, DEFAULT_PROVIDER_COMBINATIONS
)
if provider_fixtures_config is not None
else None
) )
if "embedding_model" in metafunc.fixturenames: if "embedding_model" in metafunc.fixturenames:
model = metafunc.config.getoption("--embedding-model") model = metafunc.config.getoption("--embedding-model")

10
llama_stack/providers/tests/test_config_helper.py
View file

@ -18,10 +18,10 @@ class APITestConfig(BaseModel):
class Fixtures(BaseModel): class Fixtures(BaseModel):
# provider fixtures can be either a mark or a dictionary of api -> providers # provider fixtures can be either a mark or a dictionary of api -> providers
provider_fixtures: List[Dict[str, str]] provider_fixtures: List[Dict[str, str]] = Field(default_factory=list)
inference_models: List[str] = Field(default_factory=list) inference_models: List[str] = Field(default_factory=list)
safety_shield: Optional[str] safety_shield: Optional[str] = Field(default_factory=None)
embedding_model: Optional[str] embedding_model: Optional[str] = Field(default_factory=None)
fixtures: Fixtures fixtures: Fixtures
tests: List[str] = Field(default_factory=list) tests: List[str] = Field(default_factory=list)
@ -32,8 +32,8 @@ class APITestConfig(BaseModel):
class TestConfig(BaseModel): class TestConfig(BaseModel):
inference: APITestConfig inference: APITestConfig
agent: APITestConfig agent: Optional[APITestConfig] = Field(default=None)
memory: APITestConfig memory: Optional[APITestConfig] = Field(default=None)
CONFIG_CACHE = None CONFIG_CACHE = None