mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
Eduard van Valkenburg
8ed50009c6
* Centralize tool result parsing in FunctionTool.invoke() - Add parse_result static method to FunctionTool that converts raw function return values to strings at invocation time - Add result_parser parameter to FunctionTool and @tool decorator for custom parsing - Remove prepare_function_call_results from all 9 consumer files and from the public API - Update MCPTool to parse MCP types directly to strings via _parse_tool_result_from_mcp and _parse_prompt_result_from_mcp - Change MCPTool parse_tool_results/parse_prompt_results type from Literal[True] | Callable | None to Callable | None - Remove ReturnT type parameter from FunctionTool (now single generic ArgsT since invoke() always returns str) - Update all subclass signatures and docstrings Fixes #1147 * Fix test_mcp_tool_call_tool_with_meta_integration for string results The test was still accessing result[0].additional_properties but invoke() now returns a string, not a list of Content objects. * Fix SIM108 lint: use binary operator for output assignment * Fix bedrock: use FunctionTool.parse_result instead of str() fallback str(result) turns None into literal 'None' and dicts into Python reprs with single quotes, breaking JSON parsing. Use the shared parse_result which handles None as '' and serializes via json.dumps. * updated lock * updates from feedback
136 lines
4.3 KiB
Python
136 lines
4.3 KiB
Python
# Copyright (c) Microsoft. All rights reserved.
|
|
|
|
from __future__ import annotations
|
|
|
|
from unittest.mock import MagicMock
|
|
|
|
import pytest
|
|
from agent_framework import (
|
|
ChatOptions,
|
|
Content,
|
|
FunctionTool,
|
|
Message,
|
|
)
|
|
from agent_framework._settings import load_settings
|
|
from pydantic import BaseModel
|
|
|
|
from agent_framework_bedrock._chat_client import BedrockChatClient, BedrockSettings
|
|
|
|
|
|
class _WeatherArgs(BaseModel):
|
|
location: str
|
|
|
|
|
|
def _build_client() -> BedrockChatClient:
|
|
fake_runtime = MagicMock()
|
|
fake_runtime.converse.return_value = {}
|
|
return BedrockChatClient(model_id="test-model", client=fake_runtime)
|
|
|
|
|
|
def _dummy_weather(location: str) -> str: # pragma: no cover - helper
|
|
return f"Weather in {location}"
|
|
|
|
|
|
def test_settings_load_from_environment(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
monkeypatch.setenv("BEDROCK_REGION", "us-west-2")
|
|
monkeypatch.setenv("BEDROCK_CHAT_MODEL_ID", "anthropic.claude-v2")
|
|
settings = load_settings(BedrockSettings, env_prefix="BEDROCK_")
|
|
assert settings["region"] == "us-west-2"
|
|
assert settings["chat_model_id"] == "anthropic.claude-v2"
|
|
|
|
|
|
def test_build_request_includes_tool_config() -> None:
|
|
client = _build_client()
|
|
|
|
tool = FunctionTool(name="get_weather", description="desc", func=_dummy_weather, input_model=_WeatherArgs)
|
|
options = {
|
|
"tools": [tool],
|
|
"tool_choice": {"mode": "required", "required_function_name": "get_weather"},
|
|
}
|
|
messages = [Message(role="user", contents=[Content.from_text(text="hi")])]
|
|
|
|
request = client._prepare_options(messages, options)
|
|
|
|
assert request["toolConfig"]["tools"][0]["toolSpec"]["name"] == "get_weather"
|
|
assert request["toolConfig"]["toolChoice"] == {"tool": {"name": "get_weather"}}
|
|
|
|
|
|
def test_build_request_serializes_tool_history() -> None:
|
|
client = _build_client()
|
|
options: ChatOptions = {}
|
|
messages = [
|
|
Message(role="user", contents=[Content.from_text(text="how's weather?")]),
|
|
Message(
|
|
role="assistant",
|
|
contents=[
|
|
Content.from_function_call(call_id="call-1", name="get_weather", arguments='{"location": "SEA"}')
|
|
],
|
|
),
|
|
Message(
|
|
role="tool",
|
|
contents=[Content.from_function_result(call_id="call-1", result='{"answer": "72F"}')],
|
|
),
|
|
]
|
|
|
|
request = client._prepare_options(messages, options)
|
|
assistant_block = request["messages"][1]["content"][0]["toolUse"]
|
|
result_block = request["messages"][2]["content"][0]["toolResult"]
|
|
|
|
assert assistant_block["name"] == "get_weather"
|
|
assert assistant_block["input"] == {"location": "SEA"}
|
|
assert result_block["toolUseId"] == "call-1"
|
|
assert result_block["content"][0]["json"] == {"answer": "72F"}
|
|
|
|
|
|
def test_process_response_parses_tool_use_and_result() -> None:
|
|
client = _build_client()
|
|
response = {
|
|
"modelId": "model",
|
|
"output": {
|
|
"message": {
|
|
"id": "msg-1",
|
|
"content": [
|
|
{"toolUse": {"toolUseId": "call-1", "name": "get_weather", "input": {"location": "NYC"}}},
|
|
{"text": "Calling tool"},
|
|
],
|
|
},
|
|
"completionReason": "tool_use",
|
|
},
|
|
}
|
|
|
|
chat_response = client._process_converse_response(response)
|
|
contents = chat_response.messages[0].contents
|
|
|
|
assert contents[0].type == "function_call"
|
|
assert contents[0].name == "get_weather"
|
|
assert contents[1].type == "text"
|
|
assert chat_response.finish_reason == client._map_finish_reason("tool_use")
|
|
|
|
|
|
def test_process_response_parses_tool_result() -> None:
|
|
client = _build_client()
|
|
response = {
|
|
"modelId": "model",
|
|
"output": {
|
|
"message": {
|
|
"id": "msg-2",
|
|
"content": [
|
|
{
|
|
"toolResult": {
|
|
"toolUseId": "call-1",
|
|
"status": "success",
|
|
"content": [{"json": {"answer": 42}}],
|
|
}
|
|
}
|
|
],
|
|
},
|
|
"completionReason": "end_turn",
|
|
},
|
|
}
|
|
|
|
chat_response = client._process_converse_response(response)
|
|
contents = chat_response.messages[0].contents
|
|
|
|
assert contents[0].type == "function_result"
|
|
assert contents[0].result == {"answer": 42}
|