mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
0521f5bed8
* [BREAKING] Rename ChatAgent -> Agent, ChatMessage -> Message, ChatClientProtocol -> SupportsChatGetResponse Simplify the public API by removing redundant 'Chat' prefix from core types: - ChatAgent -> Agent - RawChatAgent -> RawAgent - ChatMessage -> Message - ChatClientProtocol -> SupportsChatGetResponse Also renamed internal WorkflowMessage (was Message in _runner_context) to avoid collision. No backward compatibility aliases - this is a clean breaking change. * [BREAKING] Rename Agent chat_client parameter to client * Fix rebase issues: WorkflowMessage references and broken markdown links * Fix formatting and lint issues from code quality checks * Fix import ordering in workflow sample files * fixed rebase * Fix test failures: use WorkflowMessage and A2AMessage after ChatMessage→Message rename - Replace Message(data=..., source_id=...) with WorkflowMessage(...) in workflow tests - Fix isinstance check in A2A agent to use A2AMessage instead of Message - Fix import in test_workflow_observability.py (Message→WorkflowMessage) * Fix lint, fmt, and sample errors after ChatMessage→Message rename - Auto-fix 70+ ruff lint issues across samples (ChatMessage→Message refs) - Fix HostedVectorStoreContent→Content.from_hosted_vector_store in file search sample - Fix _normalize_messages→normalize_messages in custom agent sample - Fix context.terminate→raise MiddlewareTermination in middleware samples - Fix with_update_hook→with_transform_hook in override middleware sample - Add TOptions_co import back to custom_chat_client sample - Add noqa for FastAPI File() default in chatkit sample - Fix B023 loop variable capture in weather agent sample * fix: update Agent constructor calls from chat_client to client in declaration-only tool tests * fix: add register_cleanup to devui lazy-loading proxy and type stub * fixed tests and updated new pieces * fix agui typevar * fix merge errors * fix merge conflicts * fiux merge * Remove unused links --------- Co-authored-by: Evan Mattson <evan.mattson@microsoft.com>
135 lines
4.2 KiB
Python
135 lines
4.2 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 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 = BedrockSettings()
|
|
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}
|