Fix mypy errors; still need to verify the sample

Author: TaoChenOSU

python/samples/getting_started_with_agents/multi_agent_orchestration/step2b_sequential_streaming_agent_response_callback.py

@@ -5,7 +5,7 @@
 from semantic_kernel.agents import Agent, ChatCompletionAgent, SequentialOrchestration
 from semantic_kernel.agents.runtime import InProcessRuntime
 from semantic_kernel.connectors.ai.open_ai import AzureChatCompletion
-from semantic_kernel.contents.streaming_chat_message_content import StreamingChatMessageContent
+from semantic_kernel.contents import StreamingChatMessageContent
 
 """
 The following sample demonstrates how to create a sequential orchestration for

python/samples/getting_started_with_agents/multi_agent_orchestration/step4b_handoff_streaming_agent_response_callback.py

@@ -132,7 +132,9 @@ def get_agents() -> tuple[list[Agent], OrchestrationHandoffs]:
 is_new_message = True
 
 
-def streaming_agent_response_callback(message: StreamingChatMessageContent, is_final: bool) -> None:
+def streaming_agent_response_callback(
+    message: StreamingChatMessageContent | ChatMessageContent, is_final: bool
+) -> None:
     """Observer function to print the messages from the agents.
 
     Please note that this function is called whenever the agent generates a response,
@@ -143,24 +145,26 @@ def streaming_agent_response_callback(message: StreamingChatMessageContent, is_f
     complete message.
 
     Args:
-        message (StreamingChatMessageContent): The streaming message content from the agent.
+        message (StreamingChatMessageContent | ChatMessageContent): The message content from the agent.
         is_final (bool): Indicates if this is the final part of the message.
     """
-    global is_new_message
-    if is_new_message:
+    if isinstance(message, StreamingChatMessageContent):
+        global is_new_message
+        if is_new_message:
+            print(f"{message.name}: ", end="", flush=True)
+            is_new_message = False
+        print(message.content, end="", flush=True)
+
+        if is_final:
+            print()
+            is_new_message = True
+    else:
         print(f"{message.name}: ", end="", flush=True)
-        is_new_message = False
-    print(message.content, end="", flush=True)
-
-    for item in message.items:
-        if isinstance(item, FunctionCallContent):
-            print(f"Calling '{item.name}' with arguments '{item.arguments}'", end="", flush=True)
-        if isinstance(item, FunctionResultContent):
-            print(f"Result from '{item.name}' is '{item.result}'", end="", flush=True)
-
-    if is_final:
-        print()
-        is_new_message = True
+        for item in message.items:
+            if isinstance(item, FunctionCallContent):
+                print(f"Calling '{item.name}' with arguments '{item.arguments}'")
+            if isinstance(item, FunctionResultContent):
+                print(f"Result from '{item.name}' is '{item.result}'")
 
 
 def human_response_function() -> ChatMessageContent:

python/semantic_kernel/agents/orchestration/agent_actor_base.py

@@ -44,7 +44,9 @@ def __init__(
         agent: Agent,
         internal_topic_type: str,
         agent_response_callback: Callable[[DefaultTypeAlias], Awaitable[None] | None] | None = None,
-        streaming_agent_response_callback: Callable[[StreamingChatMessageContent, bool], Awaitable[None] | None]
+        streaming_agent_response_callback: Callable[
+            [StreamingChatMessageContent | ChatMessageContent, bool], Awaitable[None] | None
+        ]
         | None = None,
     ) -> None:
         """Initialize the agent container.
@@ -82,20 +84,21 @@ async def _call_agent_response_callback(self, message: DefaultTypeAlias) -> None
 
     async def _call_streaming_agent_response_callback(
         self,
-        message_chunk: StreamingChatMessageContent,
+        message: StreamingChatMessageContent | ChatMessageContent,
         is_final: bool,
     ) -> None:
         """Call the streaming_agent_response_callback function if it is set.
 
         Args:
-            message_chunk (StreamingChatMessageContent): The message chunk.
-            is_final (bool): Whether this is the final chunk of the response.
+            message (StreamingChatMessageContent | ChatMessageContent): The message. Can be either a full message
+                or a chunk of a streaming message.
+            is_final (bool): Whether this is the final chunk of the response (if it's a streaming chunk).
         """
         if self._streaming_agent_response_callback:
             if inspect.iscoroutinefunction(self._streaming_agent_response_callback):
-                await self._streaming_agent_response_callback(message_chunk, is_final)
+                await self._streaming_agent_response_callback(message, is_final)
             else:
-                self._streaming_agent_response_callback(message_chunk, is_final)
+                self._streaming_agent_response_callback(message, is_final)
 
     async def _invoke_agent(self, additional_messages: DefaultTypeAlias | None = None, **kwargs) -> ChatMessageContent:
         """Invoke the agent with the current chat history or thread and optionally additional messages.
@@ -112,11 +115,11 @@ async def _invoke_agent(self, additional_messages: DefaultTypeAlias | None = Non
         messages = self._create_messages(additional_messages)
 
         async for response_item in self._agent.invoke_stream(
-            messages=messages,
+            messages,  # type: ignore[arg-type]
             thread=self._agent_thread,
             on_intermediate_message=self._handle_intermediate_message,
             **kwargs,
-        ):  # type: ignore[arg-type]
+        ):
             # Buffer message chunks and stream them with correct is_final flag.
             streaming_message_buffer.append(response_item.message)
             if len(streaming_message_buffer) > 1:

python/semantic_kernel/agents/orchestration/concurrent.py

@@ -57,7 +57,9 @@ def __init__(
         internal_topic_type: str,
         collection_agent_type: str,
         agent_response_callback: Callable[[DefaultTypeAlias], Awaitable[None] | None] | None = None,
-        streaming_agent_response_callback: Callable[[StreamingChatMessageContent, bool], Awaitable[None] | None]
+        streaming_agent_response_callback: Callable[
+            [StreamingChatMessageContent | ChatMessageContent, bool], Awaitable[None] | None
+        ]
         | None = None,
     ) -> None:
         """Initialize the agent actor.

python/semantic_kernel/agents/orchestration/group_chat.py

@@ -384,7 +384,9 @@ def __init__(
         input_transform: Callable[[TIn], Awaitable[DefaultTypeAlias] | DefaultTypeAlias] | None = None,
         output_transform: Callable[[DefaultTypeAlias], Awaitable[TOut] | TOut] | None = None,
         agent_response_callback: Callable[[DefaultTypeAlias], Awaitable[None] | None] | None = None,
-        streaming_agent_response_callback: Callable[[StreamingChatMessageContent, bool], Awaitable[None] | None]
+        streaming_agent_response_callback: Callable[
+            [StreamingChatMessageContent | ChatMessageContent, bool], Awaitable[None] | None
+        ]
         | None = None,
     ) -> None:
         """Initialize the group chat orchestration.

python/semantic_kernel/agents/orchestration/handoffs.py

@@ -163,7 +163,9 @@ def __init__(
         handoff_connections: AgentHandoffs,
         result_callback: Callable[[DefaultTypeAlias], Awaitable[None]] | None = None,
         agent_response_callback: Callable[[DefaultTypeAlias], Awaitable[None] | None] | None = None,
-        streaming_agent_response_callback: Callable[[StreamingChatMessageContent, bool], Awaitable[None] | None]
+        streaming_agent_response_callback: Callable[
+            [StreamingChatMessageContent | ChatMessageContent, bool], Awaitable[None] | None
+        ]
         | None = None,
         human_response_function: Callable[[], Awaitable[ChatMessageContent] | ChatMessageContent] | None = None,
     ) -> None:
@@ -342,11 +344,11 @@ async def _invoke_agent_with_potentially_no_response(
         messages = self._create_messages(additional_messages)
 
         async for response_item in self._agent.invoke_stream(
-            messages=messages,
+            messages,  # type: ignore[arg-type]
             thread=self._agent_thread,
             on_intermediate_message=self._handle_intermediate_message,
             **kwargs,
-        ):  # type: ignore[arg-type]
+        ):
             # Buffer message chunks and stream them with correct is_final flag.
             streaming_message_buffer.append(response_item.message)
             if len(streaming_message_buffer) > 1:
@@ -386,7 +388,9 @@ def __init__(
         input_transform: Callable[[TIn], Awaitable[DefaultTypeAlias] | DefaultTypeAlias] | None = None,
         output_transform: Callable[[DefaultTypeAlias], Awaitable[TOut] | TOut] | None = None,
         agent_response_callback: Callable[[DefaultTypeAlias], Awaitable[None] | None] | None = None,
-        streaming_agent_response_callback: Callable[[StreamingChatMessageContent, bool], Awaitable[None] | None]
+        streaming_agent_response_callback: Callable[
+            [StreamingChatMessageContent | ChatMessageContent, bool], Awaitable[None] | None
+        ]
         | None = None,
         human_response_function: Callable[[], Awaitable[ChatMessageContent] | ChatMessageContent] | None = None,
     ) -> None:

python/semantic_kernel/agents/orchestration/magentic.py

@@ -727,7 +727,9 @@ def __init__(
         input_transform: Callable[[TIn], Awaitable[DefaultTypeAlias] | DefaultTypeAlias] | None = None,
         output_transform: Callable[[DefaultTypeAlias], Awaitable[TOut] | TOut] | None = None,
         agent_response_callback: Callable[[DefaultTypeAlias], Awaitable[None] | None] | None = None,
-        streaming_agent_response_callback: Callable[[StreamingChatMessageContent, bool], Awaitable[None] | None]
+        streaming_agent_response_callback: Callable[
+            [StreamingChatMessageContent | ChatMessageContent, bool], Awaitable[None] | None
+        ]
         | None = None,
     ) -> None:
         """Initialize the Magentic One orchestration.

python/semantic_kernel/agents/orchestration/orchestration_base.py

@@ -95,7 +95,9 @@ def __init__(
         input_transform: Callable[[TIn], Awaitable[DefaultTypeAlias] | DefaultTypeAlias] | None = None,
         output_transform: Callable[[DefaultTypeAlias], Awaitable[TOut] | TOut] | None = None,
         agent_response_callback: Callable[[DefaultTypeAlias], Awaitable[None] | None] | None = None,
-        streaming_agent_response_callback: Callable[[StreamingChatMessageContent, bool], Awaitable[None] | None]
+        streaming_agent_response_callback: Callable[
+            [StreamingChatMessageContent | ChatMessageContent, bool], Awaitable[None] | None
+        ]
         | None = None,
     ) -> None:
         """Initialize the orchestration base.

python/semantic_kernel/agents/orchestration/sequential.py

@@ -49,7 +49,9 @@ def __init__(
         internal_topic_type: str,
         next_agent_type: str,
         agent_response_callback: Callable[[DefaultTypeAlias], Awaitable[None] | None] | None = None,
-        streaming_agent_response_callback: Callable[[StreamingChatMessageContent, bool], Awaitable[None] | None]
+        streaming_agent_response_callback: Callable[
+            [StreamingChatMessageContent | ChatMessageContent, bool], Awaitable[None] | None
+        ]
         | None = None,
     ) -> None:
         """Initialize the agent actor."""