Merge branch 'main' into feature-python-foundry-agents

python/packages/core/tests/core/test_tools.py

@@ -63,6 +63,26 @@ def test_ai_function_decorator_without_args():
     assert test_tool(1, 2) == 3
 
 
+def test_ai_function_without_args():
+    """Test the ai_function decorator."""
+
+    @ai_function
+    def test_tool() -> int:
+        """A simple function that adds two numbers."""
+        return 1 + 2
+
+    assert isinstance(test_tool, ToolProtocol)
+    assert isinstance(test_tool, AIFunction)
+    assert test_tool.name == "test_tool"
+    assert test_tool.description == "A simple function that adds two numbers."
+    assert test_tool.parameters() == {
+        "properties": {},
+        "title": "test_tool_input",
+        "type": "object",
+    }
+    assert test_tool() == 3
+
+
 async def test_ai_function_decorator_with_async():
     """Test the ai_function decorator with an async function."""
 

python/packages/core/tests/openai/test_openai_chat_client.py

@@ -689,12 +689,15 @@ def test_function_result_exception_handling(openai_unit_test_env: dict[str, str]
     # Test with exception (no result)
     test_exception = ValueError("Test error message")
     message_with_exception = ChatMessage(
-        role="tool", contents=[FunctionResultContent(call_id="call-123", exception=test_exception)]
+        role="tool",
+        contents=[
+            FunctionResultContent(call_id="call-123", result="Error: Function failed.", exception=test_exception)
+        ],
     )
 
     openai_messages = client._openai_chat_message_parser(message_with_exception)
     assert len(openai_messages) == 1
-    assert openai_messages[0]["content"] == "Error: Test error message"
+    assert openai_messages[0]["content"] == "Error: Function failed."
     assert openai_messages[0]["tool_call_id"] == "call-123"
 
 

python/packages/core/tests/workflow/test_handoff.py

@@ -3,6 +3,7 @@
 from collections.abc import AsyncIterable, AsyncIterator
 from dataclasses import dataclass
 from typing import Any, cast
+from unittest.mock import MagicMock
 
 import pytest
 
@@ -10,6 +11,7 @@ from agent_framework import (
     AgentRunResponse,
     AgentRunResponseUpdate,
     BaseAgent,
+    ChatAgent,
     ChatMessage,
     FunctionCallContent,
     HandoffBuilder,
@@ -20,6 +22,8 @@ from agent_framework import (
     WorkflowEvent,
     WorkflowOutputEvent,
 )
+from agent_framework._mcp import MCPTool
+from agent_framework._workflows._handoff import _clone_chat_agent
 
 
 @dataclass
@@ -368,3 +372,32 @@ async def test_handoff_async_termination_condition() -> None:
     user_messages = [msg for msg in final_conv_list if msg.role == Role.USER]
     assert len(user_messages) == 2
     assert termination_call_count > 0
+
+
+async def test_clone_chat_agent_preserves_mcp_tools() -> None:
+    """Test that _clone_chat_agent preserves MCP tools when cloning an agent."""
+    mock_chat_client = MagicMock()
+
+    mock_mcp_tool = MagicMock(spec=MCPTool)
+    mock_mcp_tool.name = "test_mcp_tool"
+
+    def sample_function() -> str:
+        return "test"
+
+    original_agent = ChatAgent(
+        chat_client=mock_chat_client,
+        name="TestAgent",
+        instructions="Test instructions",
+        tools=[mock_mcp_tool, sample_function],
+    )
+
+    assert hasattr(original_agent, "_local_mcp_tools")
+    assert len(original_agent._local_mcp_tools) == 1
+    assert original_agent._local_mcp_tools[0] == mock_mcp_tool
+
+    cloned_agent = _clone_chat_agent(original_agent)
+
+    assert hasattr(cloned_agent, "_local_mcp_tools")
+    assert len(cloned_agent._local_mcp_tools) == 1
+    assert cloned_agent._local_mcp_tools[0] == mock_mcp_tool
+    assert len(cloned_agent.chat_options.tools) == 1