A programming framework for agentic AI
fix: Update SKChatCompletionAdapter message conversion (#5749)
Leonardo Pinheiro906b09e451d5
diff --git a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.pyindex 718148188..165cc280e 100644--- a/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py+++ b/python/packages/autogen-agentchat/src/autogen_agentchat/agents/_assistant_agent.py@@ -1078,6 +1078,7 @@ class AssistantAgent(BaseChatAgent, Component[AssistantAgentConfig]):content=result_as_str,call_id=tool_call.id,is_error=False,+ name=tool_call.name,),)except Exception as e:@@ -1087,6 +1088,7 @@ class AssistantAgent(BaseChatAgent, Component[AssistantAgentConfig]):content=f"Error: {e}",call_id=tool_call.id,is_error=True,+ name=tool_call.name,),)diff --git a/python/packages/autogen-agentchat/tests/test_assistant_agent.py b/python/packages/autogen-agentchat/tests/test_assistant_agent.pyindex 708e3a4e6..81af21e6f 100644--- a/python/packages/autogen-agentchat/tests/test_assistant_agent.py+++ b/python/packages/autogen-agentchat/tests/test_assistant_agent.py@@ -399,9 +399,9 @@ async def test_run_with_parallel_tools(monkeypatch: pytest.MonkeyPatch) -> None:assert result.messages[2].models_usage.prompt_tokens == 10assert isinstance(result.messages[3], ToolCallExecutionEvent)expected_content = [- FunctionExecutionResult(call_id="1", content="pass", is_error=False),- FunctionExecutionResult(call_id="2", content="pass", is_error=False),- FunctionExecutionResult(call_id="3", content="task3", is_error=False),+ FunctionExecutionResult(call_id="1", content="pass", is_error=False, name="_pass_function"),+ FunctionExecutionResult(call_id="2", content="pass", is_error=False, name="_pass_function"),+ FunctionExecutionResult(call_id="3", content="task3", is_error=False, name="_echo_function"),]for expected in expected_content:assert expected in result.messages[3].content@@ -535,9 +535,9 @@ async def test_run_with_parallel_tools_with_empty_call_ids(monkeypatch: pytest.Massert result.messages[1].models_usage.prompt_tokens == 10assert isinstance(result.messages[2], ToolCallExecutionEvent)expected_content = [- FunctionExecutionResult(call_id="", content="pass", is_error=False),- FunctionExecutionResult(call_id="", content="pass", is_error=False),- FunctionExecutionResult(call_id="", content="task3", is_error=False),+ FunctionExecutionResult(call_id="", content="pass", is_error=False, name="_pass_function"),+ FunctionExecutionResult(call_id="", content="pass", is_error=False, name="_pass_function"),+ FunctionExecutionResult(call_id="", content="task3", is_error=False, name="_echo_function"),]for expected in expected_content:assert expected in result.messages[2].content@@ -1018,8 +1018,8 @@ async def test_model_client_stream_with_tool_calls() -> None:FunctionCall(id="3", name="_echo_function", arguments=r'{"input": "task"}'),]assert message.messages[2].content == [- FunctionExecutionResult(call_id="1", content="pass", is_error=False),- FunctionExecutionResult(call_id="3", content="task", is_error=False),+ FunctionExecutionResult(call_id="1", content="pass", is_error=False, name="_pass_function"),+ FunctionExecutionResult(call_id="3", content="task", is_error=False, name="_echo_function"),]elif isinstance(message, ModelClientStreamingChunkEvent):chunks.append(message.content)diff --git a/python/packages/autogen-agentchat/tests/test_group_chat.py b/python/packages/autogen-agentchat/tests/test_group_chat.pyindex 5c1c5a6aa..d2c5e5b42 100644--- a/python/packages/autogen-agentchat/tests/test_group_chat.py+++ b/python/packages/autogen-agentchat/tests/test_group_chat.py@@ -1172,8 +1172,8 @@ async def test_swarm_with_parallel_tool_calls(monkeypatch: pytest.MonkeyPatch) -),FunctionExecutionResultMessage(content=[- FunctionExecutionResult(content="tool1", call_id="1", is_error=False),- FunctionExecutionResult(content="tool2", call_id="2", is_error=False),+ FunctionExecutionResult(content="tool1", call_id="1", is_error=False, name="tool1"),+ FunctionExecutionResult(content="tool2", call_id="2", is_error=False, name="tool2"),]),]diff --git a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/migration-guide.md b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/migration-guide.mdindex de9991609..25b0fef24 100644--- a/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/migration-guide.md+++ b/python/packages/autogen-core/docs/src/user-guide/agentchat-user-guide/migration-guide.md@@ -770,6 +770,7 @@ def convert_to_v04_message(message: Dict[str, Any]) -> AgentEvent | ChatMessage:call_id=tool_response["tool_call_id"],content=tool_response["content"],is_error=False,+ name=tool_response["name"],))return ToolCallExecutionEvent(source="tools", content=tool_results)diff --git a/python/packages/autogen-core/docs/src/user-guide/core-user-guide/components/tools.ipynb b/python/packages/autogen-core/docs/src/user-guide/core-user-guide/components/tools.ipynbindex 9e56098a4..7f664fc0d 100644--- a/python/packages/autogen-core/docs/src/user-guide/core-user-guide/components/tools.ipynb+++ b/python/packages/autogen-core/docs/src/user-guide/core-user-guide/components/tools.ipynb@@ -239,7 +239,12 @@],"source": ["# Create a function execution result\n",- "exec_result = FunctionExecutionResult(call_id=create_result.content[0].id, content=tool_result_str, is_error=False) # type: ignore\n",+ "exec_result = FunctionExecutionResult(\n",+ " call_id=create_result.content[0].id, # type: ignore\n",+ " content=tool_result_str,\n",+ " is_error=False,\n",+ " name=stock_price_tool.name,\n",+ ")\n","\n","# Make another chat completion with the history and function execution result message.\n","messages = [\n",@@ -353,9 +358,11 @@" try:\n"," arguments = json.loads(call.arguments)\n"," result = await tool.run_json(arguments, cancellation_token)\n",- " return FunctionExecutionResult(call_id=call.id, content=tool.return_value_as_string(result), is_error=False)\n",+ " return FunctionExecutionResult(\n",+ " call_id=call.id, content=tool.return_value_as_string(result), is_error=False, name=tool.name\n",+ " )\n"," except Exception as e:\n",- " return FunctionExecutionResult(call_id=call.id, content=str(e), is_error=True)"+ " return FunctionExecutionResult(call_id=call.id, content=str(e), is_error=True, name=tool.name)"]},{diff --git a/python/packages/autogen-core/docs/src/user-guide/core-user-guide/cookbook/tool-use-with-intervention.ipynb b/python/packages/autogen-core/docs/src/user-guide/core-user-guide/cookbook/tool-use-with-intervention.ipynbindex 2006b2a86..d40408cea 100644--- a/python/packages/autogen-core/docs/src/user-guide/core-user-guide/cookbook/tool-use-with-intervention.ipynb+++ b/python/packages/autogen-core/docs/src/user-guide/core-user-guide/cookbook/tool-use-with-intervention.ipynb@@ -140,7 +140,7 @@" f\"Function call: {message.name}\\nArguments: {message.arguments}\\nDo you want to execute the tool? (y/n): \"\n"," )\n"," if user_input.strip().lower() != \"y\":\n",- " raise ToolException(content=\"User denied tool execution.\", call_id=message.id)\n",+ " raise ToolException(content=\"User denied tool execution.\", call_id=message.id, name=message.name)\n"," return message"]},diff --git a/python/packages/autogen-core/docs/src/user-guide/core-user-guide/design-patterns/handoffs.ipynb b/python/packages/autogen-core/docs/src/user-guide/core-user-guide/design-patterns/handoffs.ipynbindex 3050da509..4adbdc5bd 100644--- a/python/packages/autogen-core/docs/src/user-guide/core-user-guide/design-patterns/handoffs.ipynb+++ b/python/packages/autogen-core/docs/src/user-guide/core-user-guide/design-patterns/handoffs.ipynb@@ -184,7 +184,7 @@" result = await self._tools[call.name].run_json(arguments, ctx.cancellation_token)\n"," result_as_str = self._tools[call.name].return_value_as_string(result)\n"," tool_call_results.append(\n",- " FunctionExecutionResult(call_id=call.id, content=result_as_str, is_error=False)\n",+ " FunctionExecutionResult(call_id=call.id, content=result_as_str, is_error=False, name=call.name)\n"," )\n"," elif call.name in self._delegate_tools:\n"," # Execute the tool to get the delegate agent's topic type.\n",@@ -199,6 +199,7 @@" call_id=call.id,\n"," content=f\"Transferred to {topic_type}. Adopt persona immediately.\",\n"," is_error=False,\n",+ " name=call.name,\n"," )\n"," ]\n"," ),\n",diff --git a/python/packages/autogen-core/src/autogen_core/models/_types.py b/python/packages/autogen-core/src/autogen_core/models/_types.pyindex 39ffcd64a..8a4137c37 100644--- a/python/packages/autogen-core/src/autogen_core/models/_types.py+++ b/python/packages/autogen-core/src/autogen_core/models/_types.py@@ -59,6 +59,9 @@ class FunctionExecutionResult(BaseModel):content: str"""The output of the function call."""+ name: str+ """The name of the function that was called."""+call_id: str"""The ID of the function call. Note this ID may be empty for some models."""diff --git a/python/packages/autogen-core/src/autogen_core/tool_agent/_caller_loop.py b/python/packages/autogen-core/src/autogen_core/tool_agent/_caller_loop.pyindex dbff8e05e..e5d64c3a4 100644--- a/python/packages/autogen-core/src/autogen_core/tool_agent/_caller_loop.py+++ b/python/packages/autogen-core/src/autogen_core/tool_agent/_caller_loop.py@@ -63,7 +63,9 @@ async def tool_agent_caller_loop(function_results.append(result)elif isinstance(result, ToolException):function_results.append(- FunctionExecutionResult(content=f"Error: {result}", call_id=result.call_id, is_error=True)+ FunctionExecutionResult(+ content=f"Error: {result}", call_id=result.call_id, is_error=True, name=result.name+ ))elif isinstance(result, BaseException):raise result # Unexpected exception.diff --git a/python/packages/autogen-core/src/autogen_core/tool_agent/_tool_agent.py b/python/packages/autogen-core/src/autogen_core/tool_agent/_tool_agent.pyindex 2b1979b86..3aca56d6f 100644--- a/python/packages/autogen-core/src/autogen_core/tool_agent/_tool_agent.py+++ b/python/packages/autogen-core/src/autogen_core/tool_agent/_tool_agent.py@@ -19,6 +19,7 @@ __all__ = [class ToolException(BaseException):call_id: strcontent: str+ name: str@dataclass@@ -76,7 +77,9 @@ class ToolAgent(RoutedAgent):"""tool = next((tool for tool in self._tools if tool.name == message.name), None)if tool is None:- raise ToolNotFoundException(call_id=message.id, content=f"Error: Tool not found: {message.name}")+ raise ToolNotFoundException(+ call_id=message.id, content=f"Error: Tool not found: {message.name}", name=message.name+ )else:try:arguments = json.loads(message.arguments)@@ -84,8 +87,8 @@ class ToolAgent(RoutedAgent):result_as_str = tool.return_value_as_string(result)except json.JSONDecodeError as e:raise InvalidToolArgumentsException(- call_id=message.id, content=f"Error: Invalid arguments: {message.arguments}"+ call_id=message.id, content=f"Error: Invalid arguments: {message.arguments}", name=message.name) from eexcept Exception as e:- raise ToolExecutionException(call_id=message.id, content=f"Error: {e}") from e- return FunctionExecutionResult(content=result_as_str, call_id=message.id, is_error=False)+ raise ToolExecutionException(call_id=message.id, content=f"Error: {e}", name=message.name) from e+ return FunctionExecutionResult(content=result_as_str, call_id=message.id, is_error=False, name=message.name)diff --git a/python/packages/autogen-core/tests/test_tool_agent.py b/python/packages/autogen-core/tests/test_tool_agent.pyindex a0c1f9263..5f3664208 100644--- a/python/packages/autogen-core/tests/test_tool_agent.py+++ b/python/packages/autogen-core/tests/test_tool_agent.py@@ -61,7 +61,7 @@ async def test_tool_agent() -> None:result = await runtime.send_message(FunctionCall(id="1", arguments=json.dumps({"input": "pass"}), name="pass"), agent)- assert result == FunctionExecutionResult(call_id="1", content="pass", is_error=False)+ assert result == FunctionExecutionResult(call_id="1", content="pass", is_error=False, name="pass")# Test raise functionwith pytest.raises(ToolExecutionException):diff --git a/python/packages/autogen-ext/src/autogen_ext/agents/openai/_openai_assistant_agent.py b/python/packages/autogen-ext/src/autogen_ext/agents/openai/_openai_assistant_agent.pyindex a74fe8bac..f0ea84500 100644--- a/python/packages/autogen-ext/src/autogen_ext/agents/openai/_openai_assistant_agent.py+++ b/python/packages/autogen-ext/src/autogen_ext/agents/openai/_openai_assistant_agent.py@@ -467,7 +467,9 @@ class OpenAIAssistantAgent(BaseChatAgent):result = f"Error: {e}"is_error = Truetool_outputs.append(- FunctionExecutionResult(content=result, call_id=tool_call.id, is_error=is_error)+ FunctionExecutionResult(+ content=result, call_id=tool_call.id, is_error=is_error, name=tool_call.name+ ))# Add tool result message to inner messagesdiff --git a/python/packages/autogen-ext/src/autogen_ext/models/_utils/normalize_stop_reason.py b/python/packages/autogen-ext/src/autogen_ext/models/_utils/normalize_stop_reason.pynew file mode 100644index 000000000..37e47be8f--- /dev/null+++ b/python/packages/autogen-ext/src/autogen_ext/models/_utils/normalize_stop_reason.py@@ -0,0 +1,22 @@+from typing import Dict++from autogen_core.models import FinishReasons+++def normalize_stop_reason(stop_reason: str | None) -> FinishReasons:+ if stop_reason is None:+ return "unknown"++ # Convert to lower case+ stop_reason = stop_reason.lower()++ KNOWN_STOP_MAPPINGS: Dict[str, FinishReasons] = {+ "stop": "stop",+ "length": "length",+ "content_filter": "content_filter",+ "function_calls": "function_calls",+ "end_turn": "stop",+ "tool_calls": "function_calls",+ }++ return KNOWN_STOP_MAPPINGS.get(stop_reason, "unknown")diff --git a/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.py b/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.pyindex 05a0c949a..a309494ff 100644--- a/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.py+++ b/python/packages/autogen-ext/src/autogen_ext/models/openai/_openai_client.py@@ -37,7 +37,6 @@ from autogen_core.models import (ChatCompletionClient,ChatCompletionTokenLogprob,CreateResult,- FinishReasons,FunctionExecutionResultMessage,LLMMessage,ModelCapabilities, # type: ignore@@ -75,6 +74,7 @@ from openai.types.shared_params import FunctionDefinition, FunctionParametersfrom pydantic import BaseModelfrom typing_extensions import Self, Unpack+from .._utils.normalize_stop_reason import normalize_stop_reasonfrom .._utils.parse_r1_content import parse_r1_contentfrom . import _model_infofrom .config import (@@ -349,25 +349,6 @@ def assert_valid_name(name: str) -> str:return name-def normalize_stop_reason(stop_reason: str | None) -> FinishReasons:- if stop_reason is None:- return "unknown"-- # Convert to lower case- stop_reason = stop_reason.lower()-- KNOWN_STOP_MAPPINGS: Dict[str, FinishReasons] = {- "stop": "stop",- "length": "length",- "content_filter": "content_filter",- "function_calls": "function_calls",- "end_turn": "stop",- "tool_calls": "function_calls",- }-- return KNOWN_STOP_MAPPINGS.get(stop_reason, "unknown")--class BaseOpenAIChatCompletionClient(ChatCompletionClient):def __init__(self,@@ -1214,7 +1195,7 @@ class OpenAIChatCompletionClient(BaseOpenAIChatCompletionClient, Component[OpenAUserMessage(content="I am happy.", source="user"),AssistantMessage(content=response1.content, source="assistant"),FunctionExecutionResultMessage(- content=[FunctionExecutionResult(content="happy", call_id=response1.content[0].id, is_error=False)]+ content=[FunctionExecutionResult(content="happy", call_id=response1.content[0].id, is_error=False, name="sentiment_analysis")]),],)diff --git a/python/packages/autogen-ext/src/autogen_ext/models/semantic_kernel/_sk_chat_completion_adapter.py b/python/packages/autogen-ext/src/autogen_ext/models/semantic_kernel/_sk_chat_completion_adapter.pyindex 62a1d954a..9762c8fd0 100644--- a/python/packages/autogen-ext/src/autogen_ext/models/semantic_kernel/_sk_chat_completion_adapter.py+++ b/python/packages/autogen-ext/src/autogen_ext/models/semantic_kernel/_sk_chat_completion_adapter.py@@ -17,9 +17,13 @@ from autogen_core.tools import BaseTool, Tool, ToolSchemafrom semantic_kernel.connectors.ai.chat_completion_client_base import ChatCompletionClientBasefrom semantic_kernel.connectors.ai.function_choice_behavior import FunctionChoiceBehaviorfrom semantic_kernel.connectors.ai.prompt_execution_settings import PromptExecutionSettings-from semantic_kernel.contents.chat_history import ChatHistory-from semantic_kernel.contents.chat_message_content import ChatMessageContent-from semantic_kernel.contents.function_call_content import FunctionCallContent+from semantic_kernel.contents import (+ ChatHistory,+ ChatMessageContent,+ FinishReason,+ FunctionCallContent,+ FunctionResultContent,+)from semantic_kernel.functions.kernel_plugin import KernelPluginfrom semantic_kernel.kernel import Kernelfrom typing_extensions import AsyncGenerator, Union@@ -265,7 +269,7 @@ class SKChatCompletionAdapter(ChatCompletionClient):validate_model_info(self._model_info)self._total_prompt_tokens = 0self._total_completion_tokens = 0- self._tools_plugin: Optional[KernelPlugin] = None+ self._tools_plugin: KernelPlugin = KernelPlugin(name="autogen_tools")def _convert_to_chat_history(self, messages: Sequence[LLMMessage]) -> ChatHistory:"""Convert Autogen LLMMessages to SK ChatHistory"""@@ -279,19 +283,51 @@ class SKChatCompletionAdapter(ChatCompletionClient):if isinstance(msg.content, str):chat_history.add_user_message(msg.content)else:- # Handle list of str/Image - would need to convert to SK content types+ # Handle list of str/Image - convert to string for nowchat_history.add_user_message(str(msg.content))elif msg.type == "AssistantMessage":- if isinstance(msg.content, str):- chat_history.add_assistant_message(msg.content)+ # Check if it's a function-call style message+ if isinstance(msg.content, list) and all(isinstance(fc, FunctionCall) for fc in msg.content):+ # If there's a 'thought' field, you can add that as plain assistant text+ if msg.thought:+ chat_history.add_assistant_message(msg.thought)++ function_call_contents: list[FunctionCallContent] = []+ for fc in msg.content:+ function_call_contents.append(+ FunctionCallContent(+ id=fc.id,+ name=fc.name,+ plugin_name=self._tools_plugin.name,+ function_name=fc.name,+ arguments=fc.arguments,+ )+ )++ # Mark the assistant's message as tool-calling+ chat_history.add_assistant_message(+ function_call_contents,+ finish_reason=FinishReason.TOOL_CALLS,+ )else:- # Handle function calls - would need to convert to SK function call format- chat_history.add_assistant_message(str(msg.content))+ # Plain assistant text+ chat_history.add_assistant_message(msg.content)elif msg.type == "FunctionExecutionResultMessage":+ # Add each function result as a separate tool message+ tool_results: list[FunctionResultContent] = []for result in msg.content:- chat_history.add_tool_message(result.content)+ tool_results.append(+ FunctionResultContent(+ id=result.call_id,+ plugin_name=self._tools_plugin.name,+ function_name=result.name,+ result=result.content,+ )+ )+ # A single "tool" message with one or more results+ chat_history.add_tool_message(tool_results)return chat_history@@ -323,11 +359,6 @@ class SKChatCompletionAdapter(ChatCompletionClient):def _sync_tools_with_kernel(self, kernel: Kernel, tools: Sequence[Tool | ToolSchema]) -> None:"""Sync tools with kernel by updating the plugin"""- # Create new plugin if none exists- if not self._tools_plugin:- self._tools_plugin = KernelPlugin(name="autogen_tools")- kernel.add_plugin(self._tools_plugin)-# Get current tool names in plugincurrent_tool_names = set(self._tools_plugin.functions.keys())@@ -414,6 +445,7 @@ class SKChatCompletionAdapter(ChatCompletionClient):CreateResult: The result of the chat completion."""kernel = self._get_kernel(extra_create_args)+chat_history = self._convert_to_chat_history(messages)user_settings = self._get_prompt_settings(extra_create_args)settings = self._build_execution_settings(user_settings, tools)diff --git a/python/packages/autogen-ext/tests/models/test_anthropic_model_client.py b/python/packages/autogen-ext/tests/models/test_anthropic_model_client.pyindex cdb53a55b..8e652663d 100644--- a/python/packages/autogen-ext/tests/models/test_anthropic_model_client.py+++ b/python/packages/autogen-ext/tests/models/test_anthropic_model_client.py@@ -143,7 +143,12 @@ async def test_anthropic_tool_calling() -> None:messages.append(FunctionExecutionResultMessage(content=[- FunctionExecutionResult(content="Processed: hello world", call_id=result.content[0].id, is_error=False)+ FunctionExecutionResult(+ content="Processed: hello world",+ call_id=result.content[0].id,+ is_error=False,+ name=result.content[0].name,+ )]))diff --git a/python/packages/autogen-ext/tests/models/test_openai_model_client.py b/python/packages/autogen-ext/tests/models/test_openai_model_client.pyindex c9c237df4..4eea3164c 100644--- a/python/packages/autogen-ext/tests/models/test_openai_model_client.py+++ b/python/packages/autogen-ext/tests/models/test_openai_model_client.py@@ -334,7 +334,9 @@ async def test_openai_chat_completion_client_count_tokens(monkeypatch: pytest.Mo],source="user",),- FunctionExecutionResultMessage(content=[FunctionExecutionResult(content="Hello", call_id="1", is_error=False)]),+ FunctionExecutionResultMessage(+ content=[FunctionExecutionResult(content="Hello", call_id="1", is_error=False, name="tool1")]+ ),]def tool1(test: str, test2: str) -> str:@@ -1230,7 +1232,14 @@ async def _test_model_client_with_function_calling(model_client: OpenAIChatComplmessages.append(AssistantMessage(content=create_result.content, source="assistant"))messages.append(FunctionExecutionResultMessage(- content=[FunctionExecutionResult(content="passed", call_id=create_result.content[0].id, is_error=False)]+ content=[+ FunctionExecutionResult(+ content="passed",+ call_id=create_result.content[0].id,+ is_error=False,+ name=create_result.content[0].name,+ )+ ]))create_result = await model_client.create(messages=messages)@@ -1260,8 +1269,12 @@ async def _test_model_client_with_function_calling(model_client: OpenAIChatComplmessages.append(FunctionExecutionResultMessage(content=[- FunctionExecutionResult(content="passed", call_id=create_result.content[0].id, is_error=False),- FunctionExecutionResult(content="failed", call_id=create_result.content[1].id, is_error=True),+ FunctionExecutionResult(+ content="passed", call_id=create_result.content[0].id, is_error=False, name="pass_tool"+ ),+ FunctionExecutionResult(+ content="failed", call_id=create_result.content[1].id, is_error=True, name="fail_tool"+ ),]))@@ -1380,7 +1393,11 @@ async def test_openai_structured_output_with_tool_calls() -> None:UserMessage(content="I am happy.", source="user"),AssistantMessage(content=response1.content, source="assistant"),FunctionExecutionResultMessage(- content=[FunctionExecutionResult(content="happy", call_id=response1.content[0].id, is_error=False)]+ content=[+ FunctionExecutionResult(+ content="happy", call_id=response1.content[0].id, is_error=False, name=tool.name+ )+ ]),],)@@ -1439,7 +1456,11 @@ async def test_openai_structured_output_with_streaming_tool_calls() -> None:UserMessage(content="I am happy.", source="user"),AssistantMessage(content=create_result1.content, source="assistant"),FunctionExecutionResultMessage(- content=[FunctionExecutionResult(content="happy", call_id=create_result1.content[0].id, is_error=False)]+ content=[+ FunctionExecutionResult(+ content="happy", call_id=create_result1.content[0].id, is_error=False, name=tool.name+ )+ ]),],)diff --git a/python/packages/autogen-ext/tests/models/test_sk_chat_completion_adapter.py b/python/packages/autogen-ext/tests/models/test_sk_chat_completion_adapter.pyindex ce602d8fb..66052259e 100644--- a/python/packages/autogen-ext/tests/models/test_sk_chat_completion_adapter.py+++ b/python/packages/autogen-ext/tests/models/test_sk_chat_completion_adapter.py@@ -3,8 +3,18 @@ from typing import Any, AsyncGeneratorfrom unittest.mock import AsyncMockimport pytest-from autogen_core import CancellationToken-from autogen_core.models import CreateResult, LLMMessage, ModelFamily, ModelInfo, SystemMessage, UserMessage+from autogen_core import CancellationToken, FunctionCall+from autogen_core.models import (+ AssistantMessage,+ CreateResult,+ FunctionExecutionResult,+ FunctionExecutionResultMessage,+ LLMMessage,+ ModelFamily,+ ModelInfo,+ SystemMessage,+ UserMessage,+)from autogen_core.tools import BaseToolfrom autogen_ext.models.semantic_kernel import SKChatCompletionAdapterfrom openai.types.chat.chat_completion_chunk import (@@ -728,3 +738,111 @@ async def test_sk_chat_completion_stream_with_multiple_function_calls() -> None:assert second_call.id == "call_2"assert second_call.name == "anotherPlugin-secondFunction"assert '{"arg2":"another"}' in second_call.arguments+++async def test_sk_chat_completion_with_function_call_and_execution_result_messages() -> None:+ """+ Test that _convert_to_chat_history can properly handle a conversation+ that includes both an assistant function-call message and a function+ execution result message in the same sequence.+ """+ # Mock the SK client to return some placeholder response+ mock_client = AsyncMock(spec=AzureChatCompletion)+ mock_client.get_chat_message_contents = AsyncMock(+ return_value=[+ ChatMessageContent(+ ai_model_id="test-model",+ role=AuthorRole.ASSISTANT,+ items=[TextContent(text="All done!")],+ finish_reason=FinishReason.STOP,+ metadata={"usage": {"prompt_tokens": 10, "completion_tokens": 5}},+ )+ ]+ )++ adapter = SKChatCompletionAdapter(sk_client=mock_client, kernel=Kernel(memory=NullMemory()))++ # Messages include:+ # 1) SystemMessage+ # 2) UserMessage+ # 3) AssistantMessage with a function call+ # 4) FunctionExecutionResultMessage+ # 5) AssistantMessage with plain text++ messages: list[LLMMessage] = [+ SystemMessage(content="You are a helpful assistant."),+ UserMessage(content="What is 3 + 5?", source="user"),+ AssistantMessage(+ content=[+ FunctionCall(+ id="call_1",+ name="calculator",+ arguments='{"a":3,"b":5}',+ )+ ],+ thought="Let me call the calculator function",+ source="assistant",+ ),+ FunctionExecutionResultMessage(+ content=[+ FunctionExecutionResult(+ call_id="call_1",+ name="calculator",+ content="8",+ )+ ]+ ),+ AssistantMessage(content="The answer is 8.", source="assistant"),+ ]++ # Run create (which triggers _convert_to_chat_history internally)+ result = await adapter.create(messages=messages)++ # Verify final CreateResult+ assert isinstance(result.content, str)+ assert "All done!" in result.content+ assert result.finish_reason == "stop"++ # Ensure the underlying client was called with a properly built ChatHistory+ mock_client.get_chat_message_contents.assert_awaited_once()+ chat_history_arg = mock_client.get_chat_message_contents.call_args[0][0] # The ChatHistory passed in++ # Expecting 5 messages in the ChatHistory+ assert len(chat_history_arg) == 6++ # 1) System message+ assert chat_history_arg[0].role == AuthorRole.SYSTEM+ assert chat_history_arg[0].items[0].text == "You are a helpful assistant."++ # 2) User message+ assert chat_history_arg[1].role == AuthorRole.USER+ assert chat_history_arg[1].items[0].text == "What is 3 + 5?"++ # 3) Assistant message with thought+ assert chat_history_arg[2].role == AuthorRole.ASSISTANT+ assert chat_history_arg[2].items[0].text == "Let me call the calculator function"++ # 4) Assistant message with function call+ assert chat_history_arg[3].role == AuthorRole.ASSISTANT+ assert chat_history_arg[3].finish_reason == FinishReason.TOOL_CALLS+ # Should have one FunctionCallContent+ func_call_contents = chat_history_arg[3].items+ assert len(func_call_contents) == 1+ assert func_call_contents[0].id == "call_1"+ assert func_call_contents[0].function_name == "calculator"+ assert func_call_contents[0].arguments == '{"a":3,"b":5}'+ assert func_call_contents[0].plugin_name == "autogen_tools"++ # 5) Function execution result message+ assert chat_history_arg[4].role == AuthorRole.TOOL+ tool_contents = chat_history_arg[4].items+ assert len(tool_contents) == 1+ assert tool_contents[0].id == "call_1"+ assert tool_contents[0].result == "8"+ assert tool_contents[0].function_name == "calculator"+ assert tool_contents[0].plugin_name == "autogen_tools"++ # 6) Assistant message with plain text+ assert chat_history_arg[5].role == AuthorRole.ASSISTANT+ assert chat_history_arg[5].items[0].text == "The answer is 8."