phoenix-oss/llama-stack-mirror
0
0
Fork 1
mirror of https://github.com/meta-llama/llama-stack.git synced 2025-12-23 02:09:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove all usages of builtin tools in agents

Browse source
This commit is contained in:
Dinesh Yeduguru 2024-12-20 17:30:36 -08:00
parent f90e9c2003
commit dcdf9da6ef
17 changed files with 89 additions and 1200 deletions
Download patch file Download diff file Expand all files Collapse all files

26
llama_stack/providers/tests/agents/fixtures.py
View file

@ -4,6 +4,7 @@
# This source code is licensed under the terms described in the LICENSE file in
# the root directory of this source tree.
import os
import tempfile
import pytest
@ -68,7 +69,14 @@ def tool_runtime_memory() -> ProviderFixture:
provider_id="memory-runtime",
provider_type="inline::memory-runtime",
config={},
)
),
Provider(
provider_id="brave-search",
provider_type="inline::brave-search",
config={
"api_key": os.environ["BRAVE_SEARCH_API_KEY"],
},
),
],
)
@ -131,6 +139,20 @@ async def agents_stack(request, inference_model, safety_shield):
)
)
tool_groups = [
ToolGroupInput(
tool_group_id="brave_search_group",
tool_group=UserDefinedToolGroupDef(
tools=[
ToolDef(
name="brave_search",
description="brave_search",
parameters=[],
metadata={},
),
],
),
provider_id="brave-search",
),
ToolGroupInput(
tool_group_id="memory_group",
tool_group=UserDefinedToolGroupDef(
@ -163,7 +185,7 @@ async def agents_stack(request, inference_model, safety_shield):
],
),
provider_id="memory-runtime",
)
),
]
test_stack = await construct_stack_for_test(

34
llama_stack/providers/tests/agents/test_agents.py
View file

@ -50,7 +50,8 @@ def common_params(inference_model):
sampling_params=SamplingParams(temperature=0.7, top_p=0.95),
input_shields=[],
output_shields=[],
tools=[],
available_tools=[],
preprocessing_tools=[],
max_infer_iters=5,
)
@ -91,7 +92,7 @@ async def create_agent_turn_with_search_tool(
agents_stack: Dict[str, object],
search_query_messages: List[object],
common_params: Dict[str, str],
search_tool_definition: SearchToolDefinition,
tool_name: str,
) -> None:
"""
Create an agent turn with a search tool.
@ -107,7 +108,7 @@ async def create_agent_turn_with_search_tool(
agent_config = AgentConfig(
**{
**common_params,
"tools": [search_tool_definition],
"available_tools": [tool_name],
}
)
@ -254,7 +255,6 @@ class TestAgents:
agent_config = AgentConfig(
**{
**common_params,
"tools": [],
"preprocessing_tools": ["memory"],
"tool_choice": ToolChoice.auto,
}
@ -295,29 +295,11 @@ class TestAgents:
if "BRAVE_SEARCH_API_KEY" not in os.environ:
pytest.skip("BRAVE_SEARCH_API_KEY not set, skipping test")
search_tool_definition = SearchToolDefinition(
type=AgentTool.brave_search.value,
api_key=os.environ["BRAVE_SEARCH_API_KEY"],
engine=SearchEngineType.brave,
)
await create_agent_turn_with_search_tool(
agents_stack, search_query_messages, common_params, search_tool_definition
)
@pytest.mark.asyncio
async def test_create_agent_turn_with_tavily_search(
self, agents_stack, search_query_messages, common_params
):
if "TAVILY_SEARCH_API_KEY" not in os.environ:
pytest.skip("TAVILY_SEARCH_API_KEY not set, skipping test")
search_tool_definition = SearchToolDefinition(
type=AgentTool.brave_search.value, # place holder only
api_key=os.environ["TAVILY_SEARCH_API_KEY"],
engine=SearchEngineType.tavily,
)
await create_agent_turn_with_search_tool(
agents_stack, search_query_messages, common_params, search_tool_definition
agents_stack,
search_query_messages,
common_params,
"brave_search",
)