mirror of
https://github.com/microsoft/agent-framework.git
synced 2026-06-16 21:04:09 +08:00
3dc59c83b5
* WIP * big update to new ResponseStream model * fixed tests and typing * fixed tests and typing * fixed tools typevar import * fix * mypy fix * mypy fixes and some cleanup * fix missing quoted names * and client * fix imports agui * fix anthropic override * fix agui * fix ag ui * fix import * fix anthropic types * fix mypy * refactoring * updated typing * fix 3.11 * fixes * redid layering of chat clients and agents * redid layering of chat clients and agents * Fix lint, type, and test issues after rebase - Add @overload decorators to AgentProtocol.run() for type compatibility - Add missing docstring params (middleware, function_invocation_configuration) - Fix TODO format (TD002) by adding author tags - Fix broken observability tests from upstream: - Replace non-existent use_instrumentation with direct instantiation - Replace non-existent use_agent_instrumentation with AgentTelemetryLayer mixin - Fix get_streaming_response to use get_response(stream=True) - Add AgentInitializationError import - Update streaming exception tests to match actual behavior * Fix AgentExecutionException import error in test_agents.py - Replace non-existent AgentExecutionException with AgentRunException * Fix test import and asyncio deprecation issues - Add 'tests' to pythonpath in ag-ui pyproject.toml for utils_test_ag_ui import - Replace deprecated asyncio.get_event_loop().run_until_complete with asyncio.run * Fix azure-ai test failures - Update _prepare_options patching to use correct class path - Fix test_to_azure_ai_agent_tools_web_search_missing_connection to clear env vars * Convert ag-ui utils_test_ag_ui.py to conftest.py - Move test utilities to conftest.py for proper pytest discovery - Update all test imports to use conftest instead of utils_test_ag_ui - Remove old utils_test_ag_ui.py file - Revert pythonpath change in pyproject.toml * fix: use relative imports for ag-ui test utilities * fix agui * Rename Bare*Client to Raw*Client and BaseChatClient - Renamed BareChatClient to BaseChatClient (abstract base class) - Renamed BareOpenAIChatClient to RawOpenAIChatClient - Renamed BareOpenAIResponsesClient to RawOpenAIResponsesClient - Renamed BareAzureAIClient to RawAzureAIClient - Added warning docstrings to Raw* classes about layer ordering - Updated README in samples/getting_started/agents/custom with layer docs - Added test for span ordering with function calling * Fix layer ordering: FunctionInvocationLayer before ChatTelemetryLayer This ensures each inner LLM call gets its own telemetry span, resulting in the correct span sequence: chat -> execute_tool -> chat Updated all production clients and test mocks to use correct ordering: - ChatMiddlewareLayer (first) - FunctionInvocationLayer (second) - ChatTelemetryLayer (third) - BaseChatClient/Raw...Client (fourth) * Remove run_stream usage * Fix conversation_id propagation * Python: Add BaseAgent implementation for Claude Agent SDK (#3509) * Added ClaudeAgent implementation * Updated streaming logic * Small updates * Small update * Fixes * Small fix * Naming improvements * Updated imports * Addressed comments * Updated package versions * Update Claude agent connector layering * fix test and plugin * Store function middleware in invocation layer * Fix telemetry streaming and ag-ui tests * Remove legacy ag-ui tests folder * updates * Remove terminate flag from FunctionInvocationContext, use MiddlewareTermination instead - Remove terminate attribute from FunctionInvocationContext - Add result attribute to MiddlewareTermination to carry function results - FunctionMiddlewarePipeline.execute() now lets MiddlewareTermination propagate - _auto_invoke_function captures context.result in exception before re-raising - _try_execute_function_calls catches MiddlewareTermination and sets should_terminate - Fix handoff middleware to append to chat_client.function_middleware directly - Update tests to use raise MiddlewareTermination instead of context.terminate - Add middleware flow documentation in samples/concepts/tools/README.md - Fix ag-ui to use FunctionMiddlewarePipeline instead of removed create_function_middleware_pipeline * fix: remove references to removed terminate flag in purview tests, add type ignore * fix: move _test_utils.py from package to test folder * fix: call get_final_response() to trigger context provider notification in streaming test * fix: correct broken links in tools README * docs: clarify default middleware behavior in summary table * fix: ensure inner stream result hooks are called when using map()/from_awaitable() * Fix mypy type errors * Address PR review comments on observability.py - Remove TODO comment about unconsumed streams, add explanatory note instead - Remove redundant _close_span cleanup hook (already called in _finalize_stream) - Clarify behavior: cleanup hooks run after stream iteration, if stream is not consumed the span remains open until garbage collected * Remove gen_ai.client.operation.duration from span attributes Duration is a metrics-only attribute per OpenTelemetry semantic conventions. It should be recorded to the histogram but not set as a span attribute. * Remove duration from _get_response_attributes, pass directly to _capture_response Duration is a metrics-only attribute. It's now passed directly to _capture_response instead of being included in the attributes dict that gets set on the span. * Remove redundant _close_span cleanup hook in AgentTelemetryLayer _finalize_stream already calls _close_span() in its finally block, so adding it as a separate cleanup hook is redundant. * Use weakref.finalize to close span when stream is garbage collected If a user creates a streaming response but never consumes it, the cleanup hooks won't run. Now we register a weak reference finalizer that will close the span when the stream object is garbage collected, ensuring spans don't leak in this scenario. * Fix _get_finalizers_from_stream to use _result_hooks attribute Renamed function to _get_result_hooks_from_stream and fixed it to look for the _result_hooks attribute which is the correct name in ResponseStream class. * Add missing asyncio import in test_request_info_mixin.py * Fix leftover merge conflict marker in image_generation sample * Update integration tests * Fix integration tests: increase max_iterations from 1 to 2 Tests with tool_choice options require at least 2 iterations: 1. First iteration to get function call and execute the tool 2. Second iteration to get the final text response With max_iterations=1, streaming tests would return early with only the function call/result but no final text content. * Fix duplicate function call error in conversation-based APIs When using conversation_id (for Responses/Assistants APIs), the server already has the function call message from the previous response. We should only send the new function result message, not all messages including the function call which would cause a duplicate ID error. Fix: When conversation_id is set, only send the last message (the tool result) instead of all response.messages. * Add regression test for conversation_id propagation between tool iterations Port test from PR #3664 with updates for new streaming API pattern. Tests that conversation_id is properly updated in options dict during function invocation loop iterations. * Fix tool_choice=required to return after tool execution When tool_choice is 'required', the user's intent is to force exactly one tool call. After the tool executes, return immediately with the function call and result - don't continue to call the model again. This fixes integration tests that were failing with empty text responses because with tool_choice=required, the model would keep returning function calls instead of text. Also adds regression tests for: - conversation_id propagation between tool iterations (from PR #3664) - tool_choice=required returns after tool execution * Document tool_choice behavior in tools README - Add table explaining tool_choice values (auto, none, required) - Explain why tool_choice=required returns immediately after tool execution - Add code example showing the difference between required and auto - Update flow diagram to show the early return path for tool_choice=required * Fix tool_choice=None behavior - don't default to 'auto' Remove the hardcoded default of 'auto' for tool_choice in ChatAgent init. When tool_choice is not specified (None), it will now not be sent to the API, allowing the API's default behavior to be used. Users who want tool_choice='auto' can still explicitly set it either in default_options or at runtime. Fixes #3585 * Fix tool_choice=none should not remove tools In OpenAI Assistants client, tools were not being sent when tool_choice='none'. This was incorrect - tool_choice='none' means the model won't call tools, but tools should still be available in the request (they may be used later in the conversation). Fixes #3585 * Add test for tool_choice=none preserving tools Adds a regression test to ensure that when tool_choice='none' is set but tools are provided, the tools are still sent to the API. This verifies the fix for #3585. * Fix tool_choice=none should not remove tools in all clients Apply the same fix to OpenAI Responses client and Azure AI client: - OpenAI Responses: Remove else block that popped tool_choice/parallel_tool_calls - Azure AI: Remove tool_choice != 'none' check when adding tools When tool_choice='none', the model won't call tools, but tools should still be sent to the API so they're available for future turns. Also update README to clarify tool_choice=required supports multiple tools. Fixes #3585 * Keep tool_choice even when tools is None Move tool_choice processing outside of the 'if tools' block in OpenAI Responses client so tool_choice is sent to the API even when no tools are provided. * Update test to match new parallel_tool_calls behavior Changed test_prepare_options_removes_parallel_tool_calls_when_no_tools to test_prepare_options_preserves_parallel_tool_calls_when_no_tools to reflect that parallel_tool_calls is now preserved even when no tools are present, consistent with the tool_choice behavior. * Fix ChatMessage API and Role enum usage after rebase - Update ChatMessage instantiation to use keyword args (role=, text=, contents=) - Fix Role enum comparisons to use .value for string comparison - Add created_at to AgentResponse in error handling - Fix AgentResponse.from_updates -> from_agent_run_response_updates - Fix DurableAgentStateMessage.from_chat_message to convert Role enum to string - Add Role import where needed * Fix additional ChatMessage API and method name changes - Fix ChatMessage usage in workflow files (use text= instead of contents= for strings) - Fix AgentResponse.from_updates -> from_agent_run_response_updates in workflow files - Fix test files for ChatMessage and Role enum usage * Fix remaining ChatMessage API usage in test files * Fix more ChatMessage and Role API changes in source and test files - Fix ChatMessage in _magentic.py replan method - Fix Role enum comparison in test assertions - Fix remaining test files with old ChatMessage syntax * Fix ChatMessage and Role API changes across packages - Add Role import where missing - Fix ChatMessage signature: positional args to keyword args (role=, text=, contents=) - Fix Role enum comparisons: .role.value instead of .role string - Fix FinishReason enum usage in ag-ui event converters - Rename AgentResponse.from_updates to from_agent_run_response_updates in ag-ui Fixes API compatibility after Types API Review improvements merge * Fix ChatMessage and Role API changes in github_copilot tests * Fix ChatMessage and Role API changes in redis and github_copilot packages - Fix redis provider: Role enum comparison using .value - Fix redis tests: ChatMessage signature and Role comparisons - Fix github_copilot tests: ChatMessage signature and Role comparisons - Update docstring examples in redis chat message store * Fix ChatMessage and Role API changes in devui package - Fix executor: ChatMessage signature change - Fix conversations: Role enum to string conversion in two places - Fix tests: ChatMessage signatures and Role comparisons * Fix ChatMessage and Role API changes in a2a and lab packages - Fix a2a tests: Role comparisons and ChatMessage signatures - Fix lab tau2 source: Role enum comparison in flip_messages, log_messages, sliding_window - Fix lab tau2 tests: ChatMessage signatures and Role comparisons * Remove duplicate test files from ag-ui/tests (tests are in ag_ui_tests) * Fix ChatMessage and Role API changes across packages After rebasing on upstream/main which merged PR #3647 (Types API Review improvements), fix all packages to use the new API: - ChatMessage: Use keyword args (role=, text=, contents=) instead of positional args - Role: Compare using .value attribute since it's now an enum Packages fixed: - ag-ui: Fixed Role value extraction bugs in _message_adapters.py - anthropic: Fixed ChatMessage and Role comparisons in tests - azure-ai: Fixed Role comparison in _client.py - azure-ai-search: Fixed ChatMessage and Role in source/tests - bedrock: Fixed ChatMessage signatures in tests - chatkit: Fixed ChatMessage and Role in source/tests - copilotstudio: Fixed ChatMessage and Role in tests - declarative: Fixed ChatMessage in _executors_agents.py - mem0: Fixed ChatMessage and Role in source/tests - purview: Fixed ChatMessage in source/tests * Fix mypy errors for ChatMessage and Role API changes - durabletask: Use str() fallback in role value extraction - core: Fix ChatMessage in _orchestrator_helpers.py to use keyword args - core: Add type ignore for _conversation_state.py contents deserialization - ag-ui: Fix type ignore comments (call-overload instead of arg-type) - azure-ai-search: Fix get_role_value type hint to accept Any - lab: Move get_role_value to module level with Any type hint * Improve CI test timeout configuration - Increase job timeout from 10 to 15 minutes - Reduce per-test timeout to 60s (was 900s/300s) - Add --timeout_method thread for better timeout handling - Add --timeout-verbose to see which tests are slow - Reduce retries from 3 to 2 and delay from 10s to 5s This ensures individual test timeouts are shorter than the job timeout, providing better visibility when tests hang. With 60s timeout and 2 retries, worst case per test is ~180s. * Fix ChatMessage API usage in docstrings and source - Fix ChatMessage positional args in docstrings: _serialization.py, _threads.py, _middleware.py - Fix ChatMessage in tau2 runner.py - Fix role comparison in _orchestrator_helpers.py to use .value - Fix role comparison in _group_chat.py docstring example - Fix role assertions in test_durable_entities.py to use .value * Revert tool_choice/parallel_tool_calls changes - must be removed when no tools OpenAI API requires tool_choice and parallel_tool_calls to only be present when tools are specified. Restored the logic that removes these options when there are no tools. - Restored check in _chat_client.py to remove tool_choice and parallel_tool_calls when no tools present - Restored same logic in _responses_client.py - Reverted test to expect the correct behavior * fixed issue in tests * fix: resolve merge conflict markers in ag-ui tests * fix: restructure ag-ui tests and fix Role/FinishReason to use string types * fix: streaming function invocation and middleware termination - Refactor streaming function invocation to use get_final_response() on inner streams - Fix MiddlewareTermination to accept result parameter for passing results - Fix _AutoHandoffMiddleware to use MiddlewareTermination instead of context.terminate - Fix AgentMiddlewareLayer.run() to properly forward function/chat middleware - Remove duplicate middleware registration in AgentMiddlewareLayer.__init__ - Fix exception handling in _auto_invoke_function to properly capture termination - Fix mypy errors in core package - Update tests to use stream=True parameter for unified run API * fix all tests command * Refactor integration tests to use pytest fixtures - Merge testutils.py into conftest.py for azurefunctions integration tests - Merge dt_testutils.py into conftest.py for durabletask integration tests - Convert all integration tests to use fixtures instead of direct imports (fixes ModuleNotFoundError with --import-mode=importlib) - Add sample_helper fixture for azurefunctions tests - Add agent_client_factory and orchestration_helper fixtures for durabletask - Integration tests now skip with descriptive messages when services unavailable - Restructure devui tests into tests/devui/ with proper conftest.py - Add test organization guidelines to CODING_STANDARD.md - Remove __init__.py from test directories per pytest best practices * Fix pytest_collection_modifyitems to only skip integration tests The hook was skipping all tests in the test session, not just integration tests. Now it only skips items in the integration_tests directory. * Fix mem0 tests failing on Python 3.13 Use patch.object on the imported module instead of @patch with string path to ensure the mock takes effect regardless of import timing. * fix mem0 * another attempt for mem0 * fix for mem0 * fix mem0 * Increase worker initialization wait time in durabletask tests Increase from 2 to 8 seconds to allow time for: - Python startup and module imports - Azure OpenAI client creation - Agent registration with DTS worker - Worker connection to DTS This helps prevent test failures in CI where the first tests may run before the worker is fully ready to process requests. * Fix streaming test to use ResponseStream with finalizer The _consume_stream method now expects a ResponseStream that can provide a final AgentResponse via get_final_response(). Update the test to use ResponseStream with AgentResponse.from_updates as the finalizer. * Fix MockToolCallingAgent to use new ResponseStream API and update samples * small updates to run_stream to run * fix sub workflow * temp fix for az func test --------- Co-authored-by: Dmytro Struk <13853051+dmytrostruk@users.noreply.github.com>
687 lines
25 KiB
Python
687 lines
25 KiB
Python
# Copyright (c) Microsoft. All rights reserved.
|
|
|
|
"""Tests for _run.py helper functions and FlowState."""
|
|
|
|
from ag_ui.core import (
|
|
TextMessageEndEvent,
|
|
TextMessageStartEvent,
|
|
)
|
|
from agent_framework import ChatMessage, Content
|
|
|
|
from agent_framework_ag_ui._run import (
|
|
FlowState,
|
|
_build_safe_metadata,
|
|
_create_state_context_message,
|
|
_emit_content,
|
|
_emit_tool_result,
|
|
_has_only_tool_calls,
|
|
_inject_state_context,
|
|
_should_suppress_intermediate_snapshot,
|
|
)
|
|
|
|
|
|
class TestBuildSafeMetadata:
|
|
"""Tests for _build_safe_metadata function."""
|
|
|
|
def test_none_metadata(self):
|
|
"""Returns empty dict for None."""
|
|
result = _build_safe_metadata(None)
|
|
assert result == {}
|
|
|
|
def test_empty_metadata(self):
|
|
"""Returns empty dict for empty dict."""
|
|
result = _build_safe_metadata({})
|
|
assert result == {}
|
|
|
|
def test_short_string_values(self):
|
|
"""Preserves short string values."""
|
|
metadata = {"key1": "short", "key2": "value"}
|
|
result = _build_safe_metadata(metadata)
|
|
assert result == metadata
|
|
|
|
def test_truncates_long_strings(self):
|
|
"""Truncates strings over 512 chars."""
|
|
long_value = "x" * 1000
|
|
metadata = {"key": long_value}
|
|
result = _build_safe_metadata(metadata)
|
|
assert len(result["key"]) == 512
|
|
|
|
def test_serializes_non_strings(self):
|
|
"""Serializes non-string values to JSON."""
|
|
metadata = {"count": 42, "items": [1, 2, 3]}
|
|
result = _build_safe_metadata(metadata)
|
|
assert result["count"] == "42"
|
|
assert result["items"] == "[1, 2, 3]"
|
|
|
|
def test_truncates_serialized_values(self):
|
|
"""Truncates serialized values over 512 chars."""
|
|
long_list = list(range(200))
|
|
metadata = {"data": long_list}
|
|
result = _build_safe_metadata(metadata)
|
|
assert len(result["data"]) == 512
|
|
|
|
|
|
class TestHasOnlyToolCalls:
|
|
"""Tests for _has_only_tool_calls function."""
|
|
|
|
def test_only_tool_calls(self):
|
|
"""Returns True when only function_call content."""
|
|
contents = [
|
|
Content.from_function_call(call_id="call_1", name="tool1", arguments="{}"),
|
|
]
|
|
assert _has_only_tool_calls(contents) is True
|
|
|
|
def test_tool_call_with_text(self):
|
|
"""Returns False when both tool call and text."""
|
|
contents = [
|
|
Content.from_text("Some text"),
|
|
Content.from_function_call(call_id="call_1", name="tool1", arguments="{}"),
|
|
]
|
|
assert _has_only_tool_calls(contents) is False
|
|
|
|
def test_only_text(self):
|
|
"""Returns False when only text."""
|
|
contents = [Content.from_text("Just text")]
|
|
assert _has_only_tool_calls(contents) is False
|
|
|
|
def test_empty_contents(self):
|
|
"""Returns False for empty contents."""
|
|
assert _has_only_tool_calls([]) is False
|
|
|
|
def test_tool_call_with_empty_text(self):
|
|
"""Returns True when text content has empty text."""
|
|
contents = [
|
|
Content.from_text(""),
|
|
Content.from_function_call(call_id="call_1", name="tool1", arguments="{}"),
|
|
]
|
|
assert _has_only_tool_calls(contents) is True
|
|
|
|
|
|
class TestShouldSuppressIntermediateSnapshot:
|
|
"""Tests for _should_suppress_intermediate_snapshot function."""
|
|
|
|
def test_no_tool_name(self):
|
|
"""Returns False when no tool name."""
|
|
result = _should_suppress_intermediate_snapshot(
|
|
None, {"key": {"tool": "write_doc", "tool_argument": "content"}}, False
|
|
)
|
|
assert result is False
|
|
|
|
def test_no_config(self):
|
|
"""Returns False when no config."""
|
|
result = _should_suppress_intermediate_snapshot("write_doc", None, False)
|
|
assert result is False
|
|
|
|
def test_confirmation_required(self):
|
|
"""Returns False when confirmation is required."""
|
|
config = {"key": {"tool": "write_doc", "tool_argument": "content"}}
|
|
result = _should_suppress_intermediate_snapshot("write_doc", config, True)
|
|
assert result is False
|
|
|
|
def test_tool_not_in_config(self):
|
|
"""Returns False when tool not in config."""
|
|
config = {"key": {"tool": "other_tool", "tool_argument": "content"}}
|
|
result = _should_suppress_intermediate_snapshot("write_doc", config, False)
|
|
assert result is False
|
|
|
|
def test_suppresses_predictive_tool(self):
|
|
"""Returns True for predictive tool without confirmation."""
|
|
config = {"document": {"tool": "write_doc", "tool_argument": "content"}}
|
|
result = _should_suppress_intermediate_snapshot("write_doc", config, False)
|
|
assert result is True
|
|
|
|
|
|
class TestFlowState:
|
|
"""Tests for FlowState dataclass."""
|
|
|
|
def test_default_values(self):
|
|
"""Tests default initialization."""
|
|
flow = FlowState()
|
|
assert flow.message_id is None
|
|
assert flow.tool_call_id is None
|
|
assert flow.tool_call_name is None
|
|
assert flow.waiting_for_approval is False
|
|
assert flow.current_state == {}
|
|
assert flow.accumulated_text == ""
|
|
assert flow.pending_tool_calls == []
|
|
assert flow.tool_calls_by_id == {}
|
|
assert flow.tool_results == []
|
|
assert flow.tool_calls_ended == set()
|
|
|
|
def test_get_tool_name(self):
|
|
"""Tests get_tool_name method."""
|
|
flow = FlowState()
|
|
flow.tool_calls_by_id = {"call_123": {"function": {"name": "get_weather", "arguments": "{}"}}}
|
|
|
|
assert flow.get_tool_name("call_123") == "get_weather"
|
|
assert flow.get_tool_name("nonexistent") is None
|
|
assert flow.get_tool_name(None) is None
|
|
|
|
def test_get_tool_name_empty_name(self):
|
|
"""Tests get_tool_name with empty name."""
|
|
flow = FlowState()
|
|
flow.tool_calls_by_id = {"call_123": {"function": {"name": "", "arguments": "{}"}}}
|
|
|
|
assert flow.get_tool_name("call_123") is None
|
|
|
|
def test_get_pending_without_end(self):
|
|
"""Tests get_pending_without_end method."""
|
|
flow = FlowState()
|
|
flow.pending_tool_calls = [
|
|
{"id": "call_1", "function": {"name": "tool1"}},
|
|
{"id": "call_2", "function": {"name": "tool2"}},
|
|
{"id": "call_3", "function": {"name": "tool3"}},
|
|
]
|
|
flow.tool_calls_ended = {"call_1", "call_3"}
|
|
|
|
result = flow.get_pending_without_end()
|
|
assert len(result) == 1
|
|
assert result[0]["id"] == "call_2"
|
|
|
|
|
|
class TestCreateStateContextMessage:
|
|
"""Tests for _create_state_context_message function."""
|
|
|
|
def test_no_state(self):
|
|
"""Returns None when no state."""
|
|
result = _create_state_context_message({}, {"properties": {}})
|
|
assert result is None
|
|
|
|
def test_no_schema(self):
|
|
"""Returns None when no schema."""
|
|
result = _create_state_context_message({"key": "value"}, {})
|
|
assert result is None
|
|
|
|
def test_creates_message(self):
|
|
"""Creates state context message."""
|
|
|
|
state = {"document": "Hello world"}
|
|
schema = {"properties": {"document": {"type": "string"}}}
|
|
|
|
result = _create_state_context_message(state, schema)
|
|
|
|
assert result is not None
|
|
assert result.role == "system"
|
|
assert len(result.contents) == 1
|
|
assert "Hello world" in result.contents[0].text
|
|
assert "Current state" in result.contents[0].text
|
|
|
|
|
|
class TestInjectStateContext:
|
|
"""Tests for _inject_state_context function."""
|
|
|
|
def test_no_state_message(self):
|
|
"""Returns original messages when no state context needed."""
|
|
messages = [ChatMessage(role="user", contents=[Content.from_text("Hello")])]
|
|
result = _inject_state_context(messages, {}, {})
|
|
assert result == messages
|
|
|
|
def test_empty_messages(self):
|
|
"""Returns empty list for empty messages."""
|
|
result = _inject_state_context([], {"key": "value"}, {"properties": {}})
|
|
assert result == []
|
|
|
|
def test_last_message_not_user(self):
|
|
"""Returns original messages when last message is not from user."""
|
|
messages = [
|
|
ChatMessage(role="user", contents=[Content.from_text("Hello")]),
|
|
ChatMessage(role="assistant", contents=[Content.from_text("Hi")]),
|
|
]
|
|
state = {"key": "value"}
|
|
schema = {"properties": {"key": {"type": "string"}}}
|
|
|
|
result = _inject_state_context(messages, state, schema)
|
|
assert result == messages
|
|
|
|
def test_injects_before_last_user_message(self):
|
|
"""Injects state context before last user message."""
|
|
|
|
messages = [
|
|
ChatMessage(role="system", contents=[Content.from_text("You are helpful")]),
|
|
ChatMessage(role="user", contents=[Content.from_text("Hello")]),
|
|
]
|
|
state = {"document": "content"}
|
|
schema = {"properties": {"document": {"type": "string"}}}
|
|
|
|
result = _inject_state_context(messages, state, schema)
|
|
|
|
assert len(result) == 3
|
|
# System message first
|
|
assert result[0].role == "system"
|
|
assert "helpful" in result[0].contents[0].text
|
|
# State context second
|
|
assert result[1].role == "system"
|
|
assert "Current state" in result[1].contents[0].text
|
|
# User message last
|
|
assert result[2].role == "user"
|
|
assert "Hello" in result[2].contents[0].text
|
|
|
|
|
|
# Additional tests for _run.py functions
|
|
|
|
|
|
def test_emit_text_basic():
|
|
"""Test _emit_text emits correct events."""
|
|
from agent_framework_ag_ui._run import _emit_text
|
|
|
|
flow = FlowState()
|
|
content = Content.from_text("Hello world")
|
|
|
|
events = _emit_text(content, flow)
|
|
|
|
assert len(events) == 2 # TextMessageStartEvent + TextMessageContentEvent
|
|
assert flow.message_id is not None
|
|
assert flow.accumulated_text == "Hello world"
|
|
|
|
|
|
def test_emit_text_skip_empty():
|
|
"""Test _emit_text skips empty text."""
|
|
from agent_framework_ag_ui._run import _emit_text
|
|
|
|
flow = FlowState()
|
|
content = Content.from_text("")
|
|
|
|
events = _emit_text(content, flow)
|
|
|
|
assert len(events) == 0
|
|
|
|
|
|
def test_emit_text_continues_existing_message():
|
|
"""Test _emit_text continues existing message."""
|
|
from agent_framework_ag_ui._run import _emit_text
|
|
|
|
flow = FlowState()
|
|
flow.message_id = "existing-id"
|
|
content = Content.from_text("more text")
|
|
|
|
events = _emit_text(content, flow)
|
|
|
|
assert len(events) == 1 # Only TextMessageContentEvent, no new start
|
|
assert flow.message_id == "existing-id"
|
|
|
|
|
|
def test_emit_text_skips_when_waiting_for_approval():
|
|
"""Test _emit_text skips when waiting for approval."""
|
|
from agent_framework_ag_ui._run import _emit_text
|
|
|
|
flow = FlowState()
|
|
flow.waiting_for_approval = True
|
|
content = Content.from_text("should skip")
|
|
|
|
events = _emit_text(content, flow)
|
|
|
|
assert len(events) == 0
|
|
|
|
|
|
def test_emit_text_skips_when_skip_text_flag():
|
|
"""Test _emit_text skips with skip_text flag."""
|
|
from agent_framework_ag_ui._run import _emit_text
|
|
|
|
flow = FlowState()
|
|
content = Content.from_text("should skip")
|
|
|
|
events = _emit_text(content, flow, skip_text=True)
|
|
|
|
assert len(events) == 0
|
|
|
|
|
|
def test_emit_tool_call_basic():
|
|
"""Test _emit_tool_call emits correct events."""
|
|
from agent_framework_ag_ui._run import _emit_tool_call
|
|
|
|
flow = FlowState()
|
|
content = Content.from_function_call(
|
|
call_id="call_123",
|
|
name="get_weather",
|
|
arguments='{"city": "NYC"}',
|
|
)
|
|
|
|
events = _emit_tool_call(content, flow)
|
|
|
|
assert len(events) >= 1 # At least ToolCallStartEvent
|
|
assert flow.tool_call_id == "call_123"
|
|
assert flow.tool_call_name == "get_weather"
|
|
|
|
|
|
def test_emit_tool_call_generates_id():
|
|
"""Test _emit_tool_call generates ID when not provided."""
|
|
from agent_framework_ag_ui._run import _emit_tool_call
|
|
|
|
flow = FlowState()
|
|
# Create content without call_id
|
|
content = Content(type="function_call", name="test_tool", arguments="{}")
|
|
|
|
events = _emit_tool_call(content, flow)
|
|
|
|
assert len(events) >= 1
|
|
assert flow.tool_call_id is not None # ID should be generated
|
|
|
|
|
|
def test_emit_tool_result_closes_open_message():
|
|
"""Test _emit_tool_result emits TextMessageEndEvent for open text message.
|
|
|
|
This is a regression test for where TEXT_MESSAGE_END was not
|
|
emitted when using MCP tools because the message_id was reset without
|
|
closing the message first.
|
|
"""
|
|
flow = FlowState()
|
|
# Simulate an open text message (e.g., from Feature #4 tool-only detection)
|
|
flow.message_id = "open-msg-123"
|
|
flow.tool_call_id = "call_456"
|
|
|
|
content = Content.from_function_result(call_id="call_456", result="tool result")
|
|
|
|
events = _emit_tool_result(content, flow, predictive_handler=None)
|
|
|
|
# Should have: ToolCallEndEvent, ToolCallResultEvent, TextMessageEndEvent
|
|
assert len(events) == 3
|
|
|
|
# Verify TextMessageEndEvent is emitted for the open message
|
|
text_end_events = [e for e in events if isinstance(e, TextMessageEndEvent)]
|
|
assert len(text_end_events) == 1
|
|
assert text_end_events[0].message_id == "open-msg-123"
|
|
|
|
# Verify message_id is reset after
|
|
assert flow.message_id is None
|
|
|
|
|
|
def test_emit_tool_result_no_open_message():
|
|
"""Test _emit_tool_result works when there's no open text message."""
|
|
flow = FlowState()
|
|
# No open message
|
|
flow.message_id = None
|
|
flow.tool_call_id = "call_456"
|
|
|
|
content = Content.from_function_result(call_id="call_456", result="tool result")
|
|
|
|
events = _emit_tool_result(content, flow, predictive_handler=None)
|
|
|
|
# Should have: ToolCallEndEvent, ToolCallResultEvent (no TextMessageEndEvent)
|
|
text_end_events = [e for e in events if isinstance(e, TextMessageEndEvent)]
|
|
assert len(text_end_events) == 0
|
|
|
|
|
|
def test_extract_approved_state_updates_no_handler():
|
|
"""Test _extract_approved_state_updates returns empty with no handler."""
|
|
from agent_framework_ag_ui._run import _extract_approved_state_updates
|
|
|
|
messages = [ChatMessage(role="user", contents=[Content.from_text("Hello")])]
|
|
result = _extract_approved_state_updates(messages, None)
|
|
assert result == {}
|
|
|
|
|
|
def test_extract_approved_state_updates_no_approval():
|
|
"""Test _extract_approved_state_updates returns empty when no approval content."""
|
|
from agent_framework_ag_ui._orchestration._predictive_state import PredictiveStateHandler
|
|
from agent_framework_ag_ui._run import _extract_approved_state_updates
|
|
|
|
handler = PredictiveStateHandler(predict_state_config={"doc": {"tool": "write", "tool_argument": "content"}})
|
|
messages = [ChatMessage(role="user", contents=[Content.from_text("Hello")])]
|
|
result = _extract_approved_state_updates(messages, handler)
|
|
assert result == {}
|
|
|
|
|
|
class TestBuildMessagesSnapshot:
|
|
"""Tests for _build_messages_snapshot function."""
|
|
|
|
def test_tool_calls_and_text_are_separate_messages(self):
|
|
"""Test that tool calls and text content are emitted as separate messages.
|
|
|
|
This is a regression test for issue #3619 where tool calls and content
|
|
were incorrectly merged into a single assistant message.
|
|
"""
|
|
from agent_framework_ag_ui._run import FlowState, _build_messages_snapshot
|
|
|
|
flow = FlowState()
|
|
flow.message_id = "msg-123"
|
|
flow.pending_tool_calls = [
|
|
{"id": "call_1", "function": {"name": "get_weather", "arguments": '{"city": "NYC"}'}},
|
|
]
|
|
flow.accumulated_text = "Here is the weather information."
|
|
flow.tool_results = [{"id": "result-1", "role": "tool", "content": '{"temp": 72}', "toolCallId": "call_1"}]
|
|
|
|
result = _build_messages_snapshot(flow, [])
|
|
|
|
# Should have 3 messages: tool call msg, tool result, text content msg
|
|
assert len(result.messages) == 3
|
|
|
|
# First message: assistant with tool calls only (no content)
|
|
assistant_tool_msg = result.messages[0]
|
|
assert assistant_tool_msg.role == "assistant"
|
|
assert assistant_tool_msg.tool_calls is not None
|
|
assert len(assistant_tool_msg.tool_calls) == 1
|
|
assert assistant_tool_msg.content is None
|
|
|
|
# Second message: tool result
|
|
tool_result_msg = result.messages[1]
|
|
assert tool_result_msg.role == "tool"
|
|
|
|
# Third message: assistant with content only (no tool calls)
|
|
assistant_text_msg = result.messages[2]
|
|
assert assistant_text_msg.role == "assistant"
|
|
assert assistant_text_msg.content == "Here is the weather information."
|
|
assert assistant_text_msg.tool_calls is None
|
|
|
|
# The text message should have a different ID than the tool call message
|
|
assert assistant_text_msg.id != assistant_tool_msg.id
|
|
|
|
def test_only_tool_calls_no_text(self):
|
|
"""Test snapshot with only tool calls and no accumulated text."""
|
|
from agent_framework_ag_ui._run import FlowState, _build_messages_snapshot
|
|
|
|
flow = FlowState()
|
|
flow.message_id = "msg-123"
|
|
flow.pending_tool_calls = [
|
|
{"id": "call_1", "function": {"name": "get_weather", "arguments": "{}"}},
|
|
]
|
|
flow.accumulated_text = ""
|
|
flow.tool_results = []
|
|
|
|
result = _build_messages_snapshot(flow, [])
|
|
|
|
# Should have 1 message: tool call msg only
|
|
assert len(result.messages) == 1
|
|
assert result.messages[0].role == "assistant"
|
|
assert result.messages[0].tool_calls is not None
|
|
assert result.messages[0].content is None
|
|
|
|
def test_only_text_no_tool_calls(self):
|
|
"""Test snapshot with only text and no tool calls."""
|
|
from agent_framework_ag_ui._run import FlowState, _build_messages_snapshot
|
|
|
|
flow = FlowState()
|
|
flow.message_id = "msg-123"
|
|
flow.pending_tool_calls = []
|
|
flow.accumulated_text = "Hello world"
|
|
flow.tool_results = []
|
|
|
|
result = _build_messages_snapshot(flow, [])
|
|
|
|
# Should have 1 message: text content msg only
|
|
assert len(result.messages) == 1
|
|
assert result.messages[0].role == "assistant"
|
|
assert result.messages[0].content == "Hello world"
|
|
assert result.messages[0].tool_calls is None
|
|
# Should use the existing message_id
|
|
assert result.messages[0].id == "msg-123"
|
|
|
|
def test_preserves_snapshot_messages(self):
|
|
"""Test that existing snapshot messages are preserved."""
|
|
from agent_framework_ag_ui._run import FlowState, _build_messages_snapshot
|
|
|
|
flow = FlowState()
|
|
flow.pending_tool_calls = []
|
|
flow.accumulated_text = ""
|
|
|
|
existing_messages = [
|
|
{"id": "user-1", "role": "user", "content": "Hello"},
|
|
{"id": "assist-1", "role": "assistant", "content": "Hi there"},
|
|
]
|
|
|
|
result = _build_messages_snapshot(flow, existing_messages)
|
|
|
|
assert len(result.messages) == 2
|
|
assert result.messages[0].id == "user-1"
|
|
assert result.messages[1].id == "assist-1"
|
|
|
|
|
|
def test_malformed_json_in_confirm_args_skips_confirmation():
|
|
"""Test that malformed JSON in tool arguments skips confirm_changes flow.
|
|
|
|
This is a regression test to ensure that when tool arguments contain malformed
|
|
JSON, the code skips the confirmation flow entirely rather than crashing or
|
|
showing incomplete data to the user.
|
|
"""
|
|
import json
|
|
|
|
# Simulate the parsing logic - malformed JSON should trigger skip
|
|
malformed_arguments = "{ invalid json }"
|
|
tool_call = {"function": {"name": "write_doc", "arguments": malformed_arguments}}
|
|
|
|
# This is what the code should do - detect parsing failure and skip
|
|
should_skip_confirmation = False
|
|
try:
|
|
json.loads(tool_call.get("function", {}).get("arguments", "{}"))
|
|
except json.JSONDecodeError:
|
|
should_skip_confirmation = True
|
|
|
|
# Should skip confirmation when JSON is malformed
|
|
assert should_skip_confirmation is True
|
|
|
|
# Valid JSON should proceed with confirmation
|
|
valid_arguments = '{"content": "hello"}'
|
|
tool_call_valid = {"function": {"name": "write_doc", "arguments": valid_arguments}}
|
|
should_skip_confirmation = False
|
|
try:
|
|
function_arguments = json.loads(tool_call_valid.get("function", {}).get("arguments", "{}"))
|
|
except json.JSONDecodeError:
|
|
should_skip_confirmation = True
|
|
|
|
assert should_skip_confirmation is False
|
|
assert function_arguments == {"content": "hello"}
|
|
|
|
|
|
class TestTextMessageEventBalancing:
|
|
"""Tests for proper TEXT_MESSAGE_START/END event balancing.
|
|
|
|
These tests verify that the streaming flow produces balanced pairs of
|
|
TextMessageStartEvent and TextMessageEndEvent, especially when tool
|
|
execution is involved.
|
|
"""
|
|
|
|
def test_tool_only_flow_produces_balanced_events(self):
|
|
"""Test that a tool-only response produces balanced TEXT_MESSAGE events.
|
|
|
|
This simulates the scenario where the LLM immediately calls a tool
|
|
without any initial text, then returns text after the tool result.
|
|
"""
|
|
flow = FlowState()
|
|
all_events: list = []
|
|
|
|
# Step 1: LLM outputs function_call only (no text)
|
|
func_call_content = Content.from_function_call(
|
|
call_id="call_weather",
|
|
name="get_weather",
|
|
arguments='{"city": "Seattle"}',
|
|
)
|
|
|
|
# Feature #4 check: this should trigger TextMessageStartEvent
|
|
contents = [func_call_content]
|
|
if not flow.message_id and _has_only_tool_calls(contents):
|
|
flow.message_id = "tool-msg-1"
|
|
all_events.append(TextMessageStartEvent(message_id=flow.message_id, role="assistant"))
|
|
|
|
# Emit tool call events
|
|
all_events.extend(_emit_content(func_call_content, flow))
|
|
|
|
# Step 2: Tool executes and returns result
|
|
func_result_content = Content.from_function_result(
|
|
call_id="call_weather",
|
|
result='{"temp": 55, "conditions": "rainy"}',
|
|
)
|
|
|
|
# This should close the text message
|
|
all_events.extend(_emit_tool_result(func_result_content, flow))
|
|
|
|
# Verify message_id was reset
|
|
assert flow.message_id is None, "message_id should be reset after tool result"
|
|
|
|
# Step 3: LLM outputs text response
|
|
text_content = Content.from_text("The weather in Seattle is 55°F and rainy.")
|
|
|
|
# Since message_id is None, _emit_text should create a new one
|
|
for event in _emit_content(text_content, flow):
|
|
all_events.append(event)
|
|
|
|
# Step 4: End of stream - emit final TextMessageEndEvent
|
|
if flow.message_id:
|
|
all_events.append(TextMessageEndEvent(message_id=flow.message_id))
|
|
|
|
# Verify event counts
|
|
start_events = [e for e in all_events if isinstance(e, TextMessageStartEvent)]
|
|
end_events = [e for e in all_events if isinstance(e, TextMessageEndEvent)]
|
|
|
|
# Should have 2 TextMessageStartEvent and 2 TextMessageEndEvent
|
|
assert len(start_events) == 2, f"Expected 2 start events, got {len(start_events)}"
|
|
assert len(end_events) == 2, f"Expected 2 end events, got {len(end_events)}"
|
|
|
|
# Verify order: first message should start and end before second starts
|
|
# Find indices
|
|
start_indices = [i for i, e in enumerate(all_events) if isinstance(e, TextMessageStartEvent)]
|
|
end_indices = [i for i, e in enumerate(all_events) if isinstance(e, TextMessageEndEvent)]
|
|
|
|
# First end should come before second start
|
|
assert end_indices[0] < start_indices[1], (
|
|
f"First TextMessageEndEvent (index {end_indices[0]}) should come "
|
|
f"before second TextMessageStartEvent (index {start_indices[1]})"
|
|
)
|
|
|
|
def test_text_then_tool_flow(self):
|
|
"""Test flow where LLM outputs text first, then calls a tool.
|
|
|
|
This simulates: "Let me check the weather..." -> tool call -> tool result -> "The weather is..."
|
|
"""
|
|
flow = FlowState()
|
|
all_events: list = []
|
|
|
|
# Step 1: LLM outputs text first
|
|
text1 = Content.from_text("Let me check the weather for you.")
|
|
all_events.extend(_emit_content(text1, flow))
|
|
|
|
# Verify message_id is set
|
|
assert flow.message_id is not None, "message_id should be set after text"
|
|
first_msg_id = flow.message_id
|
|
|
|
# Step 2: LLM outputs function_call
|
|
func_call = Content.from_function_call(
|
|
call_id="call_1",
|
|
name="get_weather",
|
|
arguments="{}",
|
|
)
|
|
all_events.extend(_emit_content(func_call, flow))
|
|
|
|
# Step 3: Tool result comes back
|
|
func_result = Content.from_function_result(call_id="call_1", result="sunny")
|
|
all_events.extend(_emit_tool_result(func_result, flow))
|
|
|
|
# Verify message_id was reset and first message was closed
|
|
assert flow.message_id is None
|
|
end_events_so_far = [e for e in all_events if isinstance(e, TextMessageEndEvent)]
|
|
assert len(end_events_so_far) == 1
|
|
assert end_events_so_far[0].message_id == first_msg_id
|
|
|
|
# Step 4: LLM outputs follow-up text
|
|
text2 = Content.from_text("The weather is sunny!")
|
|
all_events.extend(_emit_content(text2, flow))
|
|
|
|
# Step 5: End of stream
|
|
if flow.message_id:
|
|
all_events.append(TextMessageEndEvent(message_id=flow.message_id))
|
|
|
|
# Verify balance
|
|
start_events = [e for e in all_events if isinstance(e, TextMessageStartEvent)]
|
|
end_events = [e for e in all_events if isinstance(e, TextMessageEndEvent)]
|
|
|
|
assert len(start_events) == 2
|
|
assert len(end_events) == 2
|