agent/agent-framework
1
0
Fork 0
mirror of https://github.com/microsoft/agent-framework.git synced 2026-06-16 21:04:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Python: [BREAKING] Simplify API: ChatAgent -> Agent, ChatMessage -> Message (#3747)

Browse Source 
* [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>
This commit is contained in:
Eduard van Valkenburg
2026-02-11 00:04:32 +01:00
committed by GitHub
Unverified
parent a4c9e43afb
commit 0521f5bed8
418 changed files with 5385 additions and 5389 deletions
Download Patch File Download Diff File Expand all files Collapse all files
python/packages/devui/tests/devui/conftest.py
+44 -44
View File
@@ -17,16 +17,16 @@ from typing import Any, Generic
import pytest
import pytest_asyncio
from agent_framework import (
Agent,
AgentResponse,
AgentResponseUpdate,
AgentThread,
BaseAgent,
BaseChatClient,
ChatAgent,
ChatMessage,
ChatResponse,
ChatResponseUpdate,
Content,
Message,
ResponseStream,
)
from agent_framework._clients import OptionsCoT
@@ -67,17 +67,17 @@ class MockChatClient:
async def get_response(
self,
messages: str | ChatMessage | list[str] | list[ChatMessage],
messages: str | Message | list[str] | list[Message],
**kwargs: Any,
) -> ChatResponse:
self.call_count += 1
if self.responses:
return self.responses.pop(0)
return ChatResponse(messages=ChatMessage("assistant", ["test response"]))
return ChatResponse(messages=Message("assistant", ["test response"]))
async def get_streaming_response(
self,
messages: str | ChatMessage | list[str] | list[ChatMessage],
messages: str | Message | list[str] | list[Message],
**kwargs: Any,
) -> AsyncIterable[ChatResponseUpdate]:
self.call_count += 1
@@ -101,13 +101,13 @@ class MockBaseChatClient(BaseChatClient[OptionsCoT], Generic[OptionsCoT]):
self.run_responses: list[ChatResponse] = []
self.streaming_responses: list[list[ChatResponseUpdate]] = []
self.call_count: int = 0
self.received_messages: list[list[ChatMessage]] = []
self.received_messages: list[list[Message]] = []
@override
def _inner_get_response(
self,
*,
messages: Sequence[ChatMessage],
messages: Sequence[Message],
stream: bool,
options: Mapping[str, Any],
**kwargs: Any,
@@ -120,11 +120,11 @@ class MockBaseChatClient(BaseChatClient[OptionsCoT], Generic[OptionsCoT]):
self.received_messages.append(list(messages))
if self.run_responses:
return self.run_responses.pop(0)
return ChatResponse(messages=ChatMessage("assistant", ["Mock response from ChatAgent"]))
return ChatResponse(messages=Message("assistant", ["Mock response from Agent"]))
return _get()
async def _stream_impl(self, messages: Sequence[ChatMessage]) -> AsyncIterable[ChatResponseUpdate]:
async def _stream_impl(self, messages: Sequence[Message]) -> AsyncIterable[ChatResponseUpdate]:
self.call_count += 1
self.received_messages.append(list(messages))
if self.streaming_responses:
@@ -135,7 +135,7 @@ class MockBaseChatClient(BaseChatClient[OptionsCoT], Generic[OptionsCoT]):
yield ChatResponseUpdate(contents=[Content.from_text(text="Mock ")], role="assistant")
yield ChatResponseUpdate(contents=[Content.from_text(text="streaming ")], role="assistant")
yield ChatResponseUpdate(contents=[Content.from_text(text="response ")], role="assistant")
yield ChatResponseUpdate(contents=[Content.from_text(text="from ChatAgent")], role="assistant")
yield ChatResponseUpdate(contents=[Content.from_text(text="from Agent")], role="assistant")
# =============================================================================
@@ -159,7 +159,7 @@ class MockAgent(BaseAgent):
def run(
self,
messages: str | ChatMessage | list[str] | list[ChatMessage] | None = None,
messages: str | Message | list[str] | list[Message] | None = None,
*,
stream: bool = False,
thread: AgentThread | None = None,
@@ -172,17 +172,17 @@ class MockAgent(BaseAgent):
async def _run(
self,
messages: str | ChatMessage | list[str] | list[ChatMessage] | None = None,
messages: str | Message | list[str] | list[Message] | None = None,
*,
thread: AgentThread | None = None,
**kwargs: Any,
) -> AgentResponse:
self.call_count += 1
return AgentResponse(messages=[ChatMessage("assistant", [Content.from_text(text=self.response_text)])])
return AgentResponse(messages=[Message("assistant", [Content.from_text(text=self.response_text)])])
def _run_stream(
self,
messages: str | ChatMessage | list[str] | list[ChatMessage] | None = None,
messages: str | Message | list[str] | list[Message] | None = None,
*,
thread: AgentThread | None = None,
**kwargs: Any,
@@ -205,7 +205,7 @@ class MockToolCallingAgent(BaseAgent):
def run(
self,
messages: str | ChatMessage | list[str] | list[ChatMessage] | None = None,
messages: str | Message | list[str] | list[Message] | None = None,
*,
stream: bool = False,
thread: AgentThread | None = None,
@@ -218,16 +218,16 @@ class MockToolCallingAgent(BaseAgent):
async def _run(
self,
messages: str | ChatMessage | list[str] | list[ChatMessage] | None = None,
messages: str | Message | list[str] | list[Message] | None = None,
*,
thread: AgentThread | None = None,
**kwargs: Any,
) -> AgentResponse:
return AgentResponse(messages=[ChatMessage("assistant", ["done"])])
return AgentResponse(messages=[Message("assistant", ["done"])])
def _run_stream(
self,
messages: str | ChatMessage | list[str] | list[ChatMessage] | None = None,
messages: str | Message | list[str] | list[Message] | None = None,
*,
thread: AgentThread | None = None,
**kwargs: Any,
@@ -275,7 +275,7 @@ class MockToolCallingAgent(BaseAgent):
def _create_agent_run_response(text: str = "Test response") -> AgentResponse:
"""Create an AgentResponse with the given text."""
return AgentResponse(messages=[ChatMessage("assistant", [Content.from_text(text=text)])])
return AgentResponse(messages=[Message("assistant", [Content.from_text(text=text)])])
def _create_agent_executor_response(
@@ -289,8 +289,8 @@ def _create_agent_executor_response(
executor_id=executor_id,
agent_response=agent_response,
full_conversation=[
ChatMessage("user", [Content.from_text(text="User input")]),
ChatMessage("assistant", [Content.from_text(text=response_text)]),
Message("user", [Content.from_text(text="User input")]),
Message("assistant", [Content.from_text(text=response_text)]),
],
)
@@ -318,7 +318,7 @@ def create_executor_completed_event(
This creates the exact data structure that caused the serialization bug:
WorkflowEvent.data contains AgentExecutorResponse which contains
AgentResponse and ChatMessage objects (SerializationMixin, not Pydantic).
AgentResponse and Message objects (SerializationMixin, not Pydantic).
"""
data = _create_agent_executor_response(executor_id) if with_agent_response else {"simple": "dict"}
return WorkflowEvent.executor_completed(executor_id=executor_id, data=data)
@@ -390,7 +390,7 @@ def executor_completed_event() -> WorkflowEvent[Any]:
This creates the exact data structure that caused the serialization bug:
executor_completed event (type='executor_completed').data contains AgentExecutorResponse which contains
AgentResponse and ChatMessage objects (SerializationMixin, not Pydantic).
AgentResponse and Message objects (SerializationMixin, not Pydantic).
"""
data = _create_agent_executor_response("test_executor")
return WorkflowEvent.executor_completed(executor_id="test_executor", data=data)
@@ -425,10 +425,10 @@ def test_entities_dir() -> str:
@pytest_asyncio.fixture
async def executor_with_real_agent() -> tuple[AgentFrameworkExecutor, str, MockBaseChatClient]:
"""Create an executor with a REAL ChatAgent using mock chat client.
"""Create an executor with a REAL Agent using mock chat client.
This tests the full execution pipeline:
- Real ChatAgent class
- Real Agent class
- Real message handling and normalization
- Real middleware pipeline
- Only the LLM call is mocked
@@ -440,12 +440,12 @@ async def executor_with_real_agent() -> tuple[AgentFrameworkExecutor, str, MockB
mapper = MessageMapper()
executor = AgentFrameworkExecutor(discovery, mapper)
# Create a REAL ChatAgent with mock client
agent = ChatAgent(
# Create a REAL Agent with mock client
agent = Agent(
id="test_chat_agent",
name="Test Chat Agent",
description="A real ChatAgent for testing execution flow",
chat_client=mock_client,
description="A real Agent for testing execution flow",
client=mock_client,
system_message="You are a helpful test assistant.",
)
@@ -469,22 +469,22 @@ async def sequential_workflow() -> tuple[AgentFrameworkExecutor, str, MockBaseCh
"""
mock_client = MockBaseChatClient()
mock_client.run_responses = [
ChatResponse(messages=ChatMessage("assistant", ["Here's the draft content about the topic."])),
ChatResponse(messages=ChatMessage("assistant", ["Review: Content is clear and well-structured."])),
ChatResponse(messages=Message("assistant", ["Here's the draft content about the topic."])),
ChatResponse(messages=Message("assistant", ["Review: Content is clear and well-structured."])),
]
writer = ChatAgent(
writer = Agent(
id="writer",
name="Writer",
description="Content writer agent",
chat_client=mock_client,
client=mock_client,
system_message="You are a content writer. Create clear, engaging content.",
)
reviewer = ChatAgent(
reviewer = Agent(
id="reviewer",
name="Reviewer",
description="Content reviewer agent",
chat_client=mock_client,
client=mock_client,
system_message="You are a reviewer. Provide constructive feedback.",
)
@@ -513,30 +513,30 @@ async def concurrent_workflow() -> tuple[AgentFrameworkExecutor, str, MockBaseCh
"""
mock_client = MockBaseChatClient()
mock_client.run_responses = [
ChatResponse(messages=ChatMessage("assistant", ["Research findings: Key data points identified."])),
ChatResponse(messages=ChatMessage("assistant", ["Analysis: Trends indicate positive growth."])),
ChatResponse(messages=ChatMessage("assistant", ["Summary: Overall outlook is favorable."])),
ChatResponse(messages=Message("assistant", ["Research findings: Key data points identified."])),
ChatResponse(messages=Message("assistant", ["Analysis: Trends indicate positive growth."])),
ChatResponse(messages=Message("assistant", ["Summary: Overall outlook is favorable."])),
]
researcher = ChatAgent(
researcher = Agent(
id="researcher",
name="Researcher",
description="Research agent",
chat_client=mock_client,
client=mock_client,
system_message="You are a researcher. Find key data and insights.",
)
analyst = ChatAgent(
analyst = Agent(
id="analyst",
name="Analyst",
description="Analysis agent",
chat_client=mock_client,
client=mock_client,
system_message="You are an analyst. Identify trends and patterns.",
)
summarizer = ChatAgent(
summarizer = Agent(
id="summarizer",
name="Summarizer",
description="Summary agent",
chat_client=mock_client,
client=mock_client,
system_message="You are a summarizer. Provide concise summaries.",
)
python/packages/devui/tests/devui/test_cleanup_hooks.py
+6 -6
View File
@@ -7,7 +7,7 @@ import tempfile
from pathlib import Path
import pytest
from agent_framework import AgentResponse, ChatMessage, Content
from agent_framework import AgentResponse, Content, Message
from agent_framework_devui import register_cleanup
from agent_framework_devui._discovery import EntityDiscovery
@@ -39,12 +39,12 @@ class MockAgent:
async def _stream():
yield AgentResponse(
messages=[ChatMessage(role="assistant", contents=[Content.from_text(text="Test response")])],
messages=[Message(role="assistant", contents=[Content.from_text(text="Test response")])],
)
return _stream()
return AgentResponse(
messages=[ChatMessage(role="assistant", contents=[Content.from_text(text="Test response")])],
messages=[Message(role="assistant", contents=[Content.from_text(text="Test response")])],
)
@@ -267,7 +267,7 @@ async def test_cleanup_with_file_based_discovery():
# Write agent module with cleanup registration
agent_file = agent_dir / "__init__.py"
agent_file.write_text("""
from agent_framework import AgentResponse, ChatMessage, Role, Content
from agent_framework import AgentResponse, Message, Role, Content
from agent_framework_devui import register_cleanup
class MockCredential:
@@ -289,12 +289,12 @@ class TestAgent:
if stream:
async def _stream():
yield AgentResponse(
messages=[ChatMessage(role="assistant", content=[Content.from_text(text="Test")])],
messages=[Message(role="assistant", content=[Content.from_text(text="Test")])],
inner_messages=[],
)
return _stream()
return AgentResponse(
messages=[ChatMessage(role="assistant", content=[Content.from_text(text="Test")])],
messages=[Message(role="assistant", content=[Content.from_text(text="Test")])],
inner_messages=[],
)
python/packages/devui/tests/devui/test_conversations.py
+7 -7
View File
@@ -199,7 +199,7 @@ async def test_list_items_pagination():
@pytest.mark.asyncio
async def test_list_items_converts_function_calls():
"""Test that list_items properly converts function calls to ResponseFunctionToolCallItem."""
from agent_framework import ChatMessage, ChatMessageStore
from agent_framework import ChatMessageStore, Message
store = InMemoryConversationStore()
@@ -216,8 +216,8 @@ async def test_list_items_converts_function_calls():
# Simulate messages from agent execution with function calls
messages = [
ChatMessage(role="user", contents=[{"type": "text", "text": "What's the weather in SF?"}]),
ChatMessage(
Message(role="user", contents=[{"type": "text", "text": "What's the weather in SF?"}]),
Message(
role="assistant",
contents=[
{
@@ -228,7 +228,7 @@ async def test_list_items_converts_function_calls():
}
],
),
ChatMessage(
Message(
role="tool",
contents=[
{
@@ -238,7 +238,7 @@ async def test_list_items_converts_function_calls():
}
],
),
ChatMessage(role="assistant", contents=[{"type": "text", "text": "The weather is sunny, 65°F"}]),
Message(role="assistant", contents=[{"type": "text", "text": "The weather is sunny, 65°F"}]),
]
# Add messages to thread
@@ -284,7 +284,7 @@ async def test_list_items_converts_function_calls():
@pytest.mark.asyncio
async def test_list_items_handles_images_and_files():
"""Test that list_items properly converts data content (images/files) to OpenAI types."""
from agent_framework import ChatMessage, ChatMessageStore
from agent_framework import ChatMessageStore, Message
store = InMemoryConversationStore()
@@ -300,7 +300,7 @@ async def test_list_items_handles_images_and_files():
# Simulate message with image and file
messages = [
ChatMessage(
Message(
role="user",
contents=[
{"type": "text", "text": "Check this image and PDF"},
python/packages/devui/tests/devui/test_discovery.py
+4 -4
View File
@@ -74,7 +74,7 @@ async def test_discovery_accepts_agents_with_only_run():
init_file = agent_dir / "__init__.py"
init_file.write_text("""
from agent_framework import AgentResponse, AgentThread, ChatMessage, Role, Content
from agent_framework import AgentResponse, AgentThread, Message, Role, Content
class NonStreamingAgent:
id = "non_streaming"
@@ -83,7 +83,7 @@ class NonStreamingAgent:
async def run(self, messages=None, *, thread=None, **kwargs):
return AgentResponse(
messages=[ChatMessage(
messages=[Message(
role="assistant",
contents=[Content.from_text(text="response")]
)],
@@ -188,14 +188,14 @@ workflow = WorkflowBuilder(start_executor=executor).build()
agent_dir = temp_path / "my_agent"
agent_dir.mkdir()
(agent_dir / "agent.py").write_text("""
from agent_framework import AgentResponse, AgentThread, ChatMessage, Role, TextContent
from agent_framework import AgentResponse, AgentThread, Message, Role, TextContent
class TestAgent:
name = "Test Agent"
async def run(self, messages=None, *, thread=None, **kwargs):
return AgentResponse(
messages=[ChatMessage(role="assistant", contents=[Content.from_text(text="test")])],
messages=[Message(role="assistant", contents=[Content.from_text(text="test")])],
response_id="test"
)
python/packages/devui/tests/devui/test_execution.py
+15 -15
View File
@@ -4,7 +4,7 @@
Tests include:
- Entity discovery and info retrieval
- Agent execution (sync and streaming) using real ChatAgent with mock LLM
- Agent execution (sync and streaming) using real Agent with mock LLM
- Workflow execution using real WorkflowBuilder with FunctionExecutor
- Edge cases like non-streaming agents
"""
@@ -15,7 +15,7 @@ from pathlib import Path
from typing import Any
import pytest
from agent_framework import AgentExecutor, ChatAgent, FunctionExecutor, WorkflowBuilder
from agent_framework import Agent, AgentExecutor, FunctionExecutor, WorkflowBuilder
# Import mock classes from conftest for direct use in some tests
from conftest import MockBaseChatClient
@@ -77,15 +77,15 @@ async def test_executor_get_entity_info(executor):
# =============================================================================
# Agent Execution Tests (using real ChatAgent with mock LLM)
# Agent Execution Tests (using real Agent with mock LLM)
# =============================================================================
async def test_agent_sync_execution(executor_with_real_agent):
"""Test synchronous agent execution with REAL ChatAgent (mock LLM).
"""Test synchronous agent execution with REAL Agent (mock LLM).
This tests the full execution pipeline without needing an API key:
- Real ChatAgent class with middleware
- Real Agent class with middleware
- Real message normalization
- Mock chat client for LLM calls
"""
@@ -130,7 +130,7 @@ async def test_agent_sync_execution_respects_model_field(executor_with_real_agen
async def test_chat_client_receives_correct_messages(executor_with_real_agent):
"""Verify the mock chat client receives properly formatted messages.
This tests that the REAL ChatAgent properly:
This tests that the REAL Agent properly:
- Normalizes input messages
- Formats messages for the chat client
"""
@@ -297,18 +297,18 @@ async def test_full_pipeline_workflow_events_are_json_serializable():
This is particularly important for workflows with AgentExecutor because:
- AgentExecutor produces executor_completed event (type='executor_completed') with AgentExecutorResponse
- AgentExecutorResponse contains AgentResponse and ChatMessage objects
- AgentExecutorResponse contains AgentResponse and Message objects
- These are SerializationMixin objects, not Pydantic, which caused the original bug
This test ensures the ENTIRE streaming pipeline works end-to-end.
"""
# Create a workflow with AgentExecutor (the problematic case)
mock_client = MockBaseChatClient()
agent = ChatAgent(
agent = Agent(
id="serialization_test_agent",
name="Serialization Test Agent",
description="Agent for testing serialization",
chat_client=mock_client,
client=mock_client,
system_message="You are a test assistant.",
)
@@ -466,15 +466,15 @@ async def test_executor_parse_raw_string_for_string_workflow():
@pytest.mark.asyncio
async def test_executor_parse_converts_to_chat_message_for_sequential_workflow(sequential_workflow):
"""Sequential workflows convert string input to ChatMessage."""
from agent_framework import ChatMessage
"""Sequential workflows convert string input to Message."""
from agent_framework import Message
executor, _entity_id, _mock_client, workflow = sequential_workflow
# Sequential workflows expect ChatMessage, so raw string becomes ChatMessage
# Sequential workflows expect Message, so raw string becomes Message
parsed = executor._parse_raw_workflow_input(workflow, "hello")
assert isinstance(parsed, ChatMessage)
assert isinstance(parsed, Message)
assert parsed.text == "hello"
@@ -538,7 +538,7 @@ def test_extract_workflow_hil_responses_handles_stringified_json():
async def test_executor_handles_streaming_agent():
"""Test executor handles agents with run(stream=True) method."""
from agent_framework import AgentResponse, AgentResponseUpdate, AgentThread, ChatMessage, Content
from agent_framework import AgentResponse, AgentResponseUpdate, AgentThread, Content, Message
class StreamingAgent:
"""Agent with run() method supporting stream parameter."""
@@ -556,7 +556,7 @@ async def test_executor_handles_streaming_agent():
async def _run_impl(self, messages):
return AgentResponse(
messages=[ChatMessage(role="assistant", contents=[Content.from_text(text=f"Processed: {messages}")])],
messages=[Message(role="assistant", contents=[Content.from_text(text=f"Processed: {messages}")])],
response_id="test_123",
)
python/packages/devui/tests/devui/test_mapper.py
+5 -5
View File
@@ -304,7 +304,7 @@ async def test_executor_completed_event_with_agent_response(
This is a REGRESSION TEST for the serialization bug where
WorkflowEvent.data contained AgentExecutorResponse with nested
AgentResponse and ChatMessage objects (SerializationMixin) that
AgentResponse and Message objects (SerializationMixin) that
Pydantic couldn't serialize.
"""
# Create event with realistic nested data - the exact structure that caused the bug
@@ -579,13 +579,13 @@ async def test_workflow_output_event(mapper: MessageMapper, test_request: AgentF
async def test_workflow_output_event_with_list_data(mapper: MessageMapper, test_request: AgentFrameworkRequest) -> None:
"""Test output event (type='output') with list data (common for sequential/concurrent workflows)."""
from agent_framework import ChatMessage
from agent_framework import Message
from agent_framework._workflows._events import WorkflowEvent
# Sequential/Concurrent workflows often output list[ChatMessage]
# Sequential/Concurrent workflows often output list[Message]
messages = [
ChatMessage(role="user", contents=[Content.from_text(text="Hello")]),
ChatMessage(role="assistant", contents=[Content.from_text(text="World")]),
Message(role="user", contents=[Content.from_text(text="Hello")]),
Message(role="assistant", contents=[Content.from_text(text="World")]),
]
event = WorkflowEvent.output(executor_id="complete", data=messages)
events = await mapper.convert_event(event, test_request)
python/packages/devui/tests/devui/test_multimodal_workflow.py
+13 -13
View File
@@ -48,8 +48,8 @@ class TestMultimodalWorkflowInput:
assert executor._is_openai_multimodal_format([{"foo": "bar"}]) is False # no type field
def test_convert_openai_input_to_chat_message_with_image(self):
"""Test that OpenAI format with image is converted to ChatMessage with DataContent."""
from agent_framework import ChatMessage
"""Test that OpenAI format with image is converted to Message with DataContent."""
from agent_framework import Message
discovery = MagicMock(spec=EntityDiscovery)
mapper = MagicMock(spec=MessageMapper)
@@ -67,11 +67,11 @@ class TestMultimodalWorkflowInput:
}
]
# Convert to ChatMessage
# Convert to Message
result = executor._convert_input_to_chat_message(openai_input)
# Verify result is ChatMessage
assert isinstance(result, ChatMessage), f"Expected ChatMessage, got {type(result)}"
# Verify result is Message
assert isinstance(result, Message), f"Expected Message, got {type(result)}"
assert result.role == "user"
# Verify contents
@@ -89,7 +89,7 @@ class TestMultimodalWorkflowInput:
async def test_parse_workflow_input_handles_json_string_with_multimodal(self):
"""Test that _parse_workflow_input correctly handles JSON string with multimodal content."""
from agent_framework import ChatMessage
from agent_framework import Message
discovery = MagicMock(spec=EntityDiscovery)
mapper = MagicMock(spec=MessageMapper)
@@ -114,8 +114,8 @@ class TestMultimodalWorkflowInput:
# Parse the input
result = await executor._parse_workflow_input(mock_workflow, json_string_input)
# Verify result is ChatMessage with multimodal content
assert isinstance(result, ChatMessage), f"Expected ChatMessage, got {type(result)}"
# Verify result is Message with multimodal content
assert isinstance(result, Message), f"Expected Message, got {type(result)}"
assert len(result.contents) == 2
# Verify text content
@@ -129,7 +129,7 @@ class TestMultimodalWorkflowInput:
async def test_parse_workflow_input_still_handles_simple_dict(self):
"""Test that simple dict input still works (backward compatibility)."""
from agent_framework import ChatMessage
from agent_framework import Message
discovery = MagicMock(spec=EntityDiscovery)
mapper = MagicMock(spec=MessageMapper)
@@ -139,14 +139,14 @@ class TestMultimodalWorkflowInput:
simple_input = {"text": "Hello world", "role": "user"}
json_string_input = json.dumps(simple_input)
# Mock workflow with ChatMessage input type
# Mock workflow with Message input type
mock_workflow = MagicMock()
mock_executor = MagicMock()
mock_executor.input_types = [ChatMessage]
mock_executor.input_types = [Message]
mock_workflow.get_start_executor.return_value = mock_executor
# Parse the input
result = await executor._parse_workflow_input(mock_workflow, json_string_input)
# Result should be ChatMessage (from _parse_structured_workflow_input)
assert isinstance(result, ChatMessage), f"Expected ChatMessage, got {type(result)}"
# Result should be Message (from _parse_structured_workflow_input)
assert isinstance(result, Message), f"Expected Message, got {type(result)}"
python/packages/devui/tests/devui/test_schema_generation.py
+4 -4
View File
@@ -67,16 +67,16 @@ def test_dataclass_schema_generation():
def test_chat_message_schema_generation():
"""Test schema generation for ChatMessage (SerializationMixin)."""
"""Test schema generation for Message (SerializationMixin)."""
try:
from agent_framework import ChatMessage
from agent_framework import Message
schema = generate_input_schema(ChatMessage)
schema = generate_input_schema(Message)
assert schema is not None
assert isinstance(schema, dict)
except ImportError:
pytest.skip("ChatMessage not available - agent_framework not installed")
pytest.skip("Message not available - agent_framework not installed")
def test_pydantic_model_schema_generation():
python/packages/devui/tests/devui/test_server.py
+6 -6
View File
@@ -142,7 +142,7 @@ async def test_credential_cleanup() -> None:
"""Test that async credentials are properly closed during server cleanup."""
from unittest.mock import AsyncMock, Mock
from agent_framework import ChatAgent
from agent_framework import Agent
# Create mock credential with async close
mock_credential = AsyncMock()
@@ -155,7 +155,7 @@ async def test_credential_cleanup() -> None:
mock_client.function_invocation_configuration = None
# Create agent with mock client
agent = ChatAgent(name="TestAgent", chat_client=mock_client, instructions="Test agent")
agent = Agent(name="TestAgent", client=mock_client, instructions="Test agent")
# Create DevUI server with agent
server = DevServer()
@@ -175,7 +175,7 @@ async def test_credential_cleanup_error_handling() -> None:
"""Test that credential cleanup errors are handled gracefully."""
from unittest.mock import AsyncMock, Mock
from agent_framework import ChatAgent
from agent_framework import Agent
# Create mock credential that raises error on close
mock_credential = AsyncMock()
@@ -188,7 +188,7 @@ async def test_credential_cleanup_error_handling() -> None:
mock_client.function_invocation_configuration = None
# Create agent with mock client
agent = ChatAgent(name="TestAgent", chat_client=mock_client, instructions="Test agent")
agent = Agent(name="TestAgent", client=mock_client, instructions="Test agent")
# Create DevUI server with agent
server = DevServer()
@@ -207,7 +207,7 @@ async def test_multiple_credential_attributes() -> None:
"""Test that we check all common credential attribute names."""
from unittest.mock import AsyncMock, Mock
from agent_framework import ChatAgent
from agent_framework import Agent
# Create mock credentials
mock_cred1 = Mock()
@@ -223,7 +223,7 @@ async def test_multiple_credential_attributes() -> None:
mock_client.function_invocation_configuration = None
# Create agent with mock client
agent = ChatAgent(name="TestAgent", chat_client=mock_client, instructions="Test agent")
agent = Agent(name="TestAgent", client=mock_client, instructions="Test agent")
# Create DevUI server with agent
server = DevServer()