mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
838a7fd61d
* Replace Role and FinishReason classes with NewType + Literal
- Remove EnumLike metaclass from _types.py
- Replace Role class with NewType('Role', str) + RoleLiteral
- Replace FinishReason class with NewType('FinishReason', str) + FinishReasonLiteral
- Update all usages across codebase to use string literals
- Remove .value access patterns (direct string comparison now works)
- Add backward compatibility for legacy dict serialization format
- Update tests to reflect new string-based types
Addresses #3591, #3615
* Simplify ChatResponse and AgentResponse type hints (#3592)
- Remove overloads from ChatResponse.__init__
- Remove text parameter from ChatResponse.__init__
- Remove | dict[str, Any] from finish_reason and usage_details params
- Remove **kwargs from AgentResponse.__init__
- Both now accept ChatMessage | Sequence[ChatMessage] | None for messages
- Update docstrings and examples to reflect changes
- Fix tests that were using removed kwargs
- Fix Role type hint usage in ag-ui utils
* Remove text parameter from ChatResponseUpdate and AgentResponseUpdate (#3597)
- Remove text parameter from ChatResponseUpdate.__init__
- Remove text parameter from AgentResponseUpdate.__init__
- Remove **kwargs from both update classes
- Simplify contents parameter type to Sequence[Content] | None
- Update all usages to use contents=[Content.from_text(...)] pattern
- Fix imports in test files
- Update docstrings and examples
* Rename from_chat_response_updates to from_updates (#3593)
- ChatResponse.from_chat_response_updates → ChatResponse.from_updates
- ChatResponse.from_chat_response_generator → ChatResponse.from_update_generator
- AgentResponse.from_agent_run_response_updates → AgentResponse.from_updates
* Remove try_parse_value method from ChatResponse and AgentResponse (#3595)
- Remove try_parse_value method from ChatResponse
- Remove try_parse_value method from AgentResponse
- Remove try_parse_value calls from from_updates and from_update_generator methods
- Update samples to use try/except with response.value instead
- Update tests to use response.value pattern
- Users should now use response.value with try/except for safe parsing
* Add agent_id to AgentResponse and clarify author_name documentation (#3596)
- Add agent_id parameter to AgentResponse class
- Document that author_name is on ChatMessage objects, not responses
- Update ChatResponse docstring with author_name note
- Update AgentResponse docstring with author_name note
* Simplify ChatMessage.__init__ signature (#3618)
- Make contents a positional argument accepting Sequence[Content | str]
- Auto-convert strings in contents to TextContent
- Remove overloads, keep text kwarg for backward compatibility with serialization
- Update _parse_content_list to handle string items
- Update all usages across codebase to use new format: ChatMessage("role", ["text"])
* Allow Content as input on run and get_response
- Update prepare_messages and normalize_messages to accept Content
- Update type signatures in _agents.py and _clients.py
- Add tests for Content input handling
* Fix ChatMessage usage across packages and samples
Update all remaining ChatMessage(role=..., text=...) to use new
ChatMessage('role', ['text']) signature.
* Fix Role string usage and response format parsing
- Fix redis provider: remove .value access on string literals
- Fix durabletask ensure_response_format: set _response_format before accessing .value
* Fix ollama .value and ai_model_id issues, handle None in content list
- Fix ollama _chat_client: remove .value on string literals
- Fix ollama _chat_client: rename ai_model_id to model_id
- Fix _parse_content_list: skip None values gracefully
* Fix A2AAgent type signature to include Content
* Fix Role/FinishReason NewType dict annotations and improve test coverage to 95%
* Fix mypy errors for Role/FinishReason NewType usage
* Fix Role.TOOL and Role.ASSISTANT usage in _orchestrator_helpers.py
* Fix Role NewType usage in durabletask _models.py
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 (
|
|
ChatMessage,
|
|
ChatOptions,
|
|
Content,
|
|
FunctionTool,
|
|
)
|
|
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 = [ChatMessage("user", [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 = [
|
|
ChatMessage("user", [Content.from_text(text="how's weather?")]),
|
|
ChatMessage(
|
|
role="assistant",
|
|
contents=[
|
|
Content.from_function_call(call_id="call-1", name="get_weather", arguments='{"location": "SEA"}')
|
|
],
|
|
),
|
|
ChatMessage(
|
|
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}
|