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
214 lines
8.7 KiB
Python
214 lines
8.7 KiB
Python
# Copyright (c) Microsoft. All rights reserved.
|
|
|
|
"""Unit tests for DurableAIAgent shim and DurableAgentProvider.
|
|
|
|
Focuses on critical message normalization, delegation, and protocol compliance.
|
|
Run with: pytest tests/test_shim.py -v
|
|
"""
|
|
|
|
from typing import Any
|
|
from unittest.mock import Mock
|
|
|
|
import pytest
|
|
from agent_framework import AgentProtocol, ChatMessage
|
|
from pydantic import BaseModel
|
|
|
|
from agent_framework_durabletask import DurableAgentThread
|
|
from agent_framework_durabletask._executors import DurableAgentExecutor
|
|
from agent_framework_durabletask._models import RunRequest
|
|
from agent_framework_durabletask._shim import DurableAgentProvider, DurableAIAgent
|
|
|
|
|
|
class ResponseFormatModel(BaseModel):
|
|
"""Test Pydantic model for response format testing."""
|
|
|
|
result: str
|
|
|
|
|
|
@pytest.fixture
|
|
def mock_executor() -> Mock:
|
|
"""Create a mock executor for testing."""
|
|
mock = Mock(spec=DurableAgentExecutor)
|
|
mock.run_durable_agent = Mock(return_value=None)
|
|
mock.get_new_thread = Mock(return_value=DurableAgentThread())
|
|
|
|
# Mock get_run_request to create actual RunRequest objects
|
|
def create_run_request(
|
|
message: str,
|
|
options: dict[str, Any] | None = None,
|
|
) -> RunRequest:
|
|
import uuid
|
|
|
|
opts = dict(options) if options else {}
|
|
response_format = opts.pop("response_format", None)
|
|
enable_tool_calls = opts.pop("enable_tool_calls", True)
|
|
wait_for_response = opts.pop("wait_for_response", True)
|
|
return RunRequest(
|
|
message=message,
|
|
correlation_id=str(uuid.uuid4()),
|
|
response_format=response_format,
|
|
enable_tool_calls=enable_tool_calls,
|
|
wait_for_response=wait_for_response,
|
|
options=opts,
|
|
)
|
|
|
|
mock.get_run_request = Mock(side_effect=create_run_request)
|
|
return mock
|
|
|
|
|
|
@pytest.fixture
|
|
def test_agent(mock_executor: Mock) -> DurableAIAgent[Any]:
|
|
"""Create a test agent with mock executor."""
|
|
return DurableAIAgent(mock_executor, "test_agent")
|
|
|
|
|
|
class TestDurableAIAgentMessageNormalization:
|
|
"""Test that DurableAIAgent properly normalizes various message input types."""
|
|
|
|
def test_run_accepts_string_message(self, test_agent: DurableAIAgent[Any], mock_executor: Mock) -> None:
|
|
"""Verify run accepts and normalizes string messages."""
|
|
test_agent.run("Hello, world!")
|
|
|
|
mock_executor.run_durable_agent.assert_called_once()
|
|
# Verify agent_name and run_request were passed correctly as kwargs
|
|
_, kwargs = mock_executor.run_durable_agent.call_args
|
|
assert kwargs["agent_name"] == "test_agent"
|
|
assert kwargs["run_request"].message == "Hello, world!"
|
|
|
|
def test_run_accepts_chat_message(self, test_agent: DurableAIAgent[Any], mock_executor: Mock) -> None:
|
|
"""Verify run accepts and normalizes ChatMessage objects."""
|
|
chat_msg = ChatMessage("user", ["Test message"])
|
|
test_agent.run(chat_msg)
|
|
|
|
mock_executor.run_durable_agent.assert_called_once()
|
|
_, kwargs = mock_executor.run_durable_agent.call_args
|
|
assert kwargs["run_request"].message == "Test message"
|
|
|
|
def test_run_accepts_list_of_strings(self, test_agent: DurableAIAgent[Any], mock_executor: Mock) -> None:
|
|
"""Verify run accepts and joins list of strings."""
|
|
test_agent.run(["First message", "Second message"])
|
|
|
|
mock_executor.run_durable_agent.assert_called_once()
|
|
_, kwargs = mock_executor.run_durable_agent.call_args
|
|
assert kwargs["run_request"].message == "First message\nSecond message"
|
|
|
|
def test_run_accepts_list_of_chat_messages(self, test_agent: DurableAIAgent[Any], mock_executor: Mock) -> None:
|
|
"""Verify run accepts and joins list of ChatMessage objects."""
|
|
messages = [
|
|
ChatMessage("user", ["Message 1"]),
|
|
ChatMessage("assistant", ["Message 2"]),
|
|
]
|
|
test_agent.run(messages)
|
|
|
|
mock_executor.run_durable_agent.assert_called_once()
|
|
_, kwargs = mock_executor.run_durable_agent.call_args
|
|
assert kwargs["run_request"].message == "Message 1\nMessage 2"
|
|
|
|
def test_run_handles_none_message(self, test_agent: DurableAIAgent[Any], mock_executor: Mock) -> None:
|
|
"""Verify run handles None message gracefully."""
|
|
test_agent.run(None)
|
|
|
|
mock_executor.run_durable_agent.assert_called_once()
|
|
_, kwargs = mock_executor.run_durable_agent.call_args
|
|
assert kwargs["run_request"].message == ""
|
|
|
|
def test_run_handles_empty_list(self, test_agent: DurableAIAgent[Any], mock_executor: Mock) -> None:
|
|
"""Verify run handles empty list gracefully."""
|
|
test_agent.run([])
|
|
|
|
mock_executor.run_durable_agent.assert_called_once()
|
|
_, kwargs = mock_executor.run_durable_agent.call_args
|
|
assert kwargs["run_request"].message == ""
|
|
|
|
|
|
class TestDurableAIAgentParameterFlow:
|
|
"""Test that parameters flow correctly through the shim to executor."""
|
|
|
|
def test_run_forwards_thread_parameter(self, test_agent: DurableAIAgent[Any], mock_executor: Mock) -> None:
|
|
"""Verify run forwards thread parameter to executor."""
|
|
thread = DurableAgentThread(service_thread_id="test-thread")
|
|
test_agent.run("message", thread=thread)
|
|
|
|
mock_executor.run_durable_agent.assert_called_once()
|
|
_, kwargs = mock_executor.run_durable_agent.call_args
|
|
assert kwargs["thread"] == thread
|
|
|
|
def test_run_forwards_response_format(self, test_agent: DurableAIAgent[Any], mock_executor: Mock) -> None:
|
|
"""Verify run forwards response_format parameter to executor."""
|
|
test_agent.run("message", options={"response_format": ResponseFormatModel})
|
|
|
|
mock_executor.run_durable_agent.assert_called_once()
|
|
_, kwargs = mock_executor.run_durable_agent.call_args
|
|
assert kwargs["run_request"].response_format == ResponseFormatModel
|
|
|
|
|
|
class TestDurableAIAgentProtocolCompliance:
|
|
"""Test that DurableAIAgent implements AgentProtocol correctly."""
|
|
|
|
def test_agent_implements_protocol(self, test_agent: DurableAIAgent[Any]) -> None:
|
|
"""Verify DurableAIAgent implements AgentProtocol."""
|
|
assert isinstance(test_agent, AgentProtocol)
|
|
|
|
def test_agent_has_required_properties(self, test_agent: DurableAIAgent[Any]) -> None:
|
|
"""Verify DurableAIAgent has all required AgentProtocol properties."""
|
|
assert hasattr(test_agent, "id")
|
|
assert hasattr(test_agent, "name")
|
|
assert hasattr(test_agent, "display_name")
|
|
assert hasattr(test_agent, "description")
|
|
|
|
def test_agent_id_defaults_to_name(self, mock_executor: Mock) -> None:
|
|
"""Verify agent id defaults to name when not provided."""
|
|
agent: DurableAIAgent[Any] = DurableAIAgent(mock_executor, "my_agent")
|
|
|
|
assert agent.id == "my_agent"
|
|
assert agent.name == "my_agent"
|
|
|
|
def test_agent_id_can_be_customized(self, mock_executor: Mock) -> None:
|
|
"""Verify agent id can be set independently from name."""
|
|
agent: DurableAIAgent[Any] = DurableAIAgent(mock_executor, "my_agent", agent_id="custom-id")
|
|
|
|
assert agent.id == "custom-id"
|
|
assert agent.name == "my_agent"
|
|
|
|
|
|
class TestDurableAIAgentThreadManagement:
|
|
"""Test thread creation and management."""
|
|
|
|
def test_get_new_thread_delegates_to_executor(self, test_agent: DurableAIAgent[Any], mock_executor: Mock) -> None:
|
|
"""Verify get_new_thread delegates to executor."""
|
|
mock_thread = DurableAgentThread()
|
|
mock_executor.get_new_thread.return_value = mock_thread
|
|
|
|
thread = test_agent.get_new_thread()
|
|
|
|
mock_executor.get_new_thread.assert_called_once_with("test_agent")
|
|
assert thread == mock_thread
|
|
|
|
def test_get_new_thread_forwards_kwargs(self, test_agent: DurableAIAgent[Any], mock_executor: Mock) -> None:
|
|
"""Verify get_new_thread forwards kwargs to executor."""
|
|
mock_thread = DurableAgentThread(service_thread_id="thread-123")
|
|
mock_executor.get_new_thread.return_value = mock_thread
|
|
|
|
test_agent.get_new_thread(service_thread_id="thread-123")
|
|
|
|
mock_executor.get_new_thread.assert_called_once()
|
|
_, kwargs = mock_executor.get_new_thread.call_args
|
|
assert kwargs["service_thread_id"] == "thread-123"
|
|
|
|
|
|
class TestDurableAgentProviderInterface:
|
|
"""Test that DurableAgentProvider defines the correct interface."""
|
|
|
|
def test_provider_cannot_be_instantiated(self) -> None:
|
|
"""Verify DurableAgentProvider is abstract and cannot be instantiated."""
|
|
with pytest.raises(TypeError):
|
|
DurableAgentProvider() # type: ignore[abstract]
|
|
|
|
def test_provider_defines_get_agent_method(self) -> None:
|
|
"""Verify DurableAgentProvider defines get_agent abstract method."""
|
|
assert hasattr(DurableAgentProvider, "get_agent")
|
|
|
|
|
|
if __name__ == "__main__":
|
|
pytest.main([__file__, "-v", "--tb=short"])
|