mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-08-05 18:22:41 +00:00
fix eval test w/ tools
This commit is contained in:
parent
d0a25dd453
commit
b7e59ba002
2 changed files with 15 additions and 1 deletions
|
@ -15,6 +15,7 @@ from ..inference.fixtures import INFERENCE_FIXTURES
|
||||||
from ..memory.fixtures import MEMORY_FIXTURES
|
from ..memory.fixtures import MEMORY_FIXTURES
|
||||||
from ..safety.fixtures import SAFETY_FIXTURES
|
from ..safety.fixtures import SAFETY_FIXTURES
|
||||||
from ..scoring.fixtures import SCORING_FIXTURES
|
from ..scoring.fixtures import SCORING_FIXTURES
|
||||||
|
from ..tools.fixtures import TOOL_RUNTIME_FIXTURES
|
||||||
from .fixtures import EVAL_FIXTURES
|
from .fixtures import EVAL_FIXTURES
|
||||||
|
|
||||||
DEFAULT_PROVIDER_COMBINATIONS = [
|
DEFAULT_PROVIDER_COMBINATIONS = [
|
||||||
|
@ -27,6 +28,7 @@ DEFAULT_PROVIDER_COMBINATIONS = [
|
||||||
"agents": "meta_reference",
|
"agents": "meta_reference",
|
||||||
"safety": "llama_guard",
|
"safety": "llama_guard",
|
||||||
"memory": "faiss",
|
"memory": "faiss",
|
||||||
|
"tool_runtime": "memory_and_search",
|
||||||
},
|
},
|
||||||
id="meta_reference_eval_fireworks_inference",
|
id="meta_reference_eval_fireworks_inference",
|
||||||
marks=pytest.mark.meta_reference_eval_fireworks_inference,
|
marks=pytest.mark.meta_reference_eval_fireworks_inference,
|
||||||
|
@ -40,6 +42,7 @@ DEFAULT_PROVIDER_COMBINATIONS = [
|
||||||
"agents": "meta_reference",
|
"agents": "meta_reference",
|
||||||
"safety": "llama_guard",
|
"safety": "llama_guard",
|
||||||
"memory": "faiss",
|
"memory": "faiss",
|
||||||
|
"tool_runtime": "memory_and_search",
|
||||||
},
|
},
|
||||||
id="meta_reference_eval_together_inference",
|
id="meta_reference_eval_together_inference",
|
||||||
marks=pytest.mark.meta_reference_eval_together_inference,
|
marks=pytest.mark.meta_reference_eval_together_inference,
|
||||||
|
@ -53,6 +56,7 @@ DEFAULT_PROVIDER_COMBINATIONS = [
|
||||||
"agents": "meta_reference",
|
"agents": "meta_reference",
|
||||||
"safety": "llama_guard",
|
"safety": "llama_guard",
|
||||||
"memory": "faiss",
|
"memory": "faiss",
|
||||||
|
"tool_runtime": "memory_and_search",
|
||||||
},
|
},
|
||||||
id="meta_reference_eval_together_inference_huggingface_datasetio",
|
id="meta_reference_eval_together_inference_huggingface_datasetio",
|
||||||
marks=pytest.mark.meta_reference_eval_together_inference_huggingface_datasetio,
|
marks=pytest.mark.meta_reference_eval_together_inference_huggingface_datasetio,
|
||||||
|
@ -98,6 +102,7 @@ def pytest_generate_tests(metafunc):
|
||||||
"agents": AGENTS_FIXTURES,
|
"agents": AGENTS_FIXTURES,
|
||||||
"safety": SAFETY_FIXTURES,
|
"safety": SAFETY_FIXTURES,
|
||||||
"memory": MEMORY_FIXTURES,
|
"memory": MEMORY_FIXTURES,
|
||||||
|
"tool_runtime": TOOL_RUNTIME_FIXTURES,
|
||||||
}
|
}
|
||||||
combinations = (
|
combinations = (
|
||||||
get_provider_fixture_overrides(metafunc.config, available_fixtures)
|
get_provider_fixture_overrides(metafunc.config, available_fixtures)
|
||||||
|
|
|
@ -35,7 +35,13 @@ EVAL_FIXTURES = ["meta_reference", "remote"]
|
||||||
|
|
||||||
|
|
||||||
@pytest_asyncio.fixture(scope="session")
|
@pytest_asyncio.fixture(scope="session")
|
||||||
async def eval_stack(request, inference_model, judge_model):
|
async def eval_stack(
|
||||||
|
request,
|
||||||
|
inference_model,
|
||||||
|
judge_model,
|
||||||
|
tool_group_input_memory,
|
||||||
|
tool_group_input_tavily_search,
|
||||||
|
):
|
||||||
fixture_dict = request.param
|
fixture_dict = request.param
|
||||||
|
|
||||||
providers = {}
|
providers = {}
|
||||||
|
@ -48,6 +54,7 @@ async def eval_stack(request, inference_model, judge_model):
|
||||||
"agents",
|
"agents",
|
||||||
"safety",
|
"safety",
|
||||||
"memory",
|
"memory",
|
||||||
|
"tool_runtime",
|
||||||
]:
|
]:
|
||||||
fixture = request.getfixturevalue(f"{key}_{fixture_dict[key]}")
|
fixture = request.getfixturevalue(f"{key}_{fixture_dict[key]}")
|
||||||
providers[key] = fixture.providers
|
providers[key] = fixture.providers
|
||||||
|
@ -63,6 +70,7 @@ async def eval_stack(request, inference_model, judge_model):
|
||||||
Api.agents,
|
Api.agents,
|
||||||
Api.safety,
|
Api.safety,
|
||||||
Api.memory,
|
Api.memory,
|
||||||
|
Api.tool_runtime,
|
||||||
],
|
],
|
||||||
providers,
|
providers,
|
||||||
provider_data,
|
provider_data,
|
||||||
|
@ -73,6 +81,7 @@ async def eval_stack(request, inference_model, judge_model):
|
||||||
judge_model,
|
judge_model,
|
||||||
]
|
]
|
||||||
],
|
],
|
||||||
|
tool_groups=[tool_group_input_memory, tool_group_input_tavily_search],
|
||||||
)
|
)
|
||||||
|
|
||||||
return test_stack.impls
|
return test_stack.impls
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue