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

address feedback

Browse source
This commit is contained in:
Dinesh Yeduguru 2025-01-08 18:24:35 -08:00
parent e08b7f4432
commit a7a55748ca
8 changed files with 21 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

25
llama_stack/providers/inline/agents/meta_reference/agent_instance.py
View file

@ -78,6 +78,7 @@ def make_random_string(length: int = 8):
TOOLS_ATTACHMENT_KEY_REGEX = re.compile(r"__tools_attachment__=(\{.*?\})")
MEMORY_QUERY_TOOL = "query_memory"
WEB_SEARCH_TOOL = "web_search"
MEMORY_GROUP = "builtin::memory"
class ChatAgent(ShieldRunnerMixin):
@ -741,16 +742,24 @@ class ChatAgent(ShieldRunnerMixin):
continue
tools = await self.tool_groups_api.list_tools(tool_group_id=toolgroup_name)
for tool_def in tools:
if tool_def.built_in_type:
if tool_def_map.get(tool_def.built_in_type, None):
raise ValueError(
f"Tool {tool_def.built_in_type} already exists"
)
if (
toolgroup_name.startswith("builtin")
and toolgroup_name != MEMORY_GROUP
):
tool_name = tool_def.identifier
built_in_type = BuiltinTool.brave_search
if tool_name == "web_search":
built_in_type = BuiltinTool.brave_search
else:
built_in_type = BuiltinTool(tool_name)
tool_def_map[tool_def.built_in_type] = ToolDefinition(
tool_name=tool_def.built_in_type
if tool_def_map.get(built_in_type, None):
raise ValueError(f"Tool {built_in_type} already exists")
tool_def_map[built_in_type] = ToolDefinition(
tool_name=built_in_type
)
tool_to_group[tool_def.built_in_type] = tool_def.toolgroup_id
tool_to_group[built_in_type] = tool_def.toolgroup_id
continue
if tool_def_map.get(tool_def.identifier, None):

5
llama_stack/providers/inline/agents/meta_reference/tests/test_chat_agent.py
View file

@ -198,7 +198,7 @@ class MockToolGroupsAPI:
toolgroup_id=MEMORY_TOOLGROUP,
tool_host=ToolHost.client,
description="Mock tool",
provider_id="mock_provider",
provider_id="builtin::memory",
parameters=[],
)
]
@ -208,10 +208,9 @@ class MockToolGroupsAPI:
identifier="code_interpreter",
provider_resource_id="code_interpreter",
toolgroup_id=CODE_INTERPRETER_TOOLGROUP,
built_in_type=BuiltinTool.code_interpreter,
tool_host=ToolHost.client,
description="Mock tool",
provider_id="mock_provider",
provider_id="builtin::code_interpreter",
parameters=[],
)
]