mirror of
https://github.com/meta-llama/llama-stack.git
synced 2025-10-04 20:14:13 +00:00
ef0736527d
This is a sweeping change to clean up some gunk around our "Tool" definitions. First, we had two types `Tool` and `ToolDef`. The first of these was a "Resource" type for the registry but we had stopped registering tools inside the Registry long back (and only registered ToolGroups.) The latter was for specifying tools for the Agents API. This PR removes the former and adds an optional `toolgroup_id` field to the latter. Secondly, as pointed out by @bbrowning in https://github.com/llamastack/llama-stack/pull/3003#issuecomment-3245270132, we were doing a lossy conversion from a full JSON schema from the MCP tool specification into our ToolDefinition to send it to the model. There is no necessity to do this -- we ourselves aren't doing any execution at all but merely passing it to the chat completions API which supports this. By doing this (and by doing it poorly), we encountered limitations like not supporting array items, or not resolving $refs, etc. To fix this, we replaced the `parameters` field by `{ input_schema, output_schema }` which can be full blown JSON schemas. Finally, there were some types in our llama-related chat format conversion which needed some cleanup. We are taking this opportunity to clean those up. This PR is a substantial breaking change to the API. However, given our window for introducing breaking changes, this suits us just fine. I will be landing a concurrent `llama-stack-client` change as well since API shapes are changing.
69 lines
2.1 KiB
Python
69 lines
2.1 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 json
|
|
import os
|
|
|
|
import pytest
|
|
|
|
|
|
@pytest.fixture
|
|
def sample_search_query():
|
|
return "What are the latest developments in quantum computing?"
|
|
|
|
|
|
@pytest.fixture
|
|
def sample_wolfram_alpha_query():
|
|
return "What is the square root of 16?"
|
|
|
|
|
|
def test_web_search_tool(llama_stack_client, sample_search_query):
|
|
"""Test the web search tool functionality."""
|
|
if "TAVILY_SEARCH_API_KEY" not in os.environ:
|
|
pytest.skip("TAVILY_SEARCH_API_KEY not set, skipping test")
|
|
|
|
tools = llama_stack_client.tool_runtime.list_tools()
|
|
assert any(tool.name == "web_search" for tool in tools)
|
|
|
|
response = llama_stack_client.tool_runtime.invoke_tool(
|
|
tool_name="web_search", kwargs={"query": sample_search_query}
|
|
)
|
|
# Verify the response
|
|
assert response.content is not None
|
|
assert len(response.content) > 0
|
|
assert isinstance(response.content, str)
|
|
|
|
content = json.loads(response.content)
|
|
assert "query" in content
|
|
assert "top_k" in content
|
|
assert len(content["top_k"]) > 0
|
|
|
|
first = content["top_k"][0]
|
|
assert "title" in first
|
|
assert "url" in first
|
|
|
|
|
|
def test_wolfram_alpha_tool(llama_stack_client, sample_wolfram_alpha_query):
|
|
"""Test the wolfram alpha tool functionality."""
|
|
if "WOLFRAM_ALPHA_API_KEY" not in os.environ:
|
|
pytest.skip("WOLFRAM_ALPHA_API_KEY not set, skipping test")
|
|
|
|
tools = llama_stack_client.tool_runtime.list_tools()
|
|
assert any(tool.name == "wolfram_alpha" for tool in tools)
|
|
response = llama_stack_client.tool_runtime.invoke_tool(
|
|
tool_name="wolfram_alpha", kwargs={"query": sample_wolfram_alpha_query}
|
|
)
|
|
|
|
assert response.content is not None
|
|
assert len(response.content) > 0
|
|
assert isinstance(response.content, str)
|
|
|
|
content = json.loads(response.content)
|
|
result = content["queryresult"]
|
|
assert "success" in result
|
|
assert result["success"]
|
|
assert "pods" in result
|
|
assert len(result["pods"]) > 0
|