agentscope-runtime 1.0.1__tar.gz → 1.0.2__tar.gz

{agentscope_runtime-1.0.1/src/agentscope_runtime.egg-info → agentscope_runtime-1.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: agentscope-runtime
-Version: 1.0.1
+Version: 1.0.2
 Summary: A production-ready runtime framework for agent applications, providing secure sandboxed execution environments and scalable deployment solutions with multi-framework support.
 Requires-Python: >=3.10
 Description-Content-Type: text/markdown
@@ -26,6 +26,8 @@ Requires-Dist: psutil
 Requires-Dist: dashscope>=1.25.0
 Requires-Dist: jsonref
 Requires-Dist: asgiref
+Requires-Dist: click>=8.0.0
+Requires-Dist: rich>=13.0.0
 Provides-Extra: dev
 Requires-Dist: pytest>=8.3.5; extra == "dev"
 Requires-Dist: pytest-asyncio>=0.23.0; extra == "dev"
@@ -37,9 +39,11 @@ Requires-Dist: fakeredis>=2.31.0; extra == "dev"
 Requires-Dist: sphinx-autoapi>=3.6.0; extra == "dev"
 Requires-Dist: pytest-mock>=3.15.1; extra == "dev"
 Requires-Dist: sphinxcontrib-mermaid>=1.2.3; extra == "dev"
-Requires-Dist: langgraph>=0.4.0; extra == "dev"
-Requires-Dist: autogen-agentchat>=0.7.0; extra == "dev"
 Provides-Extra: ext
+Requires-Dist: langchain>=1.1.3; extra == "ext"
+Requires-Dist: langchain_openai>=1.0.1; extra == "ext"
+Requires-Dist: langgraph>=1.0.4; extra == "ext"
+Requires-Dist: autogen-agentchat>=0.7.0; extra == "ext"
 Requires-Dist: reme-ai>=0.2.0.2; extra == "ext"
 Requires-Dist: mem0ai>=0.1.117; extra == "ext"
 Requires-Dist: alibabacloud-agentrun20250910>=2.0.1; extra == "ext"
@@ -61,6 +65,7 @@ Requires-Dist: setuptools>=40.8.0; extra == "ext"
 Requires-Dist: wheel; extra == "ext"
 Requires-Dist: alibabacloud-credentials; extra == "ext"
 Requires-Dist: PyYAML; extra == "ext"
+Requires-Dist: agno>=2.3.8; extra == "ext"
 Dynamic: license-file
 
 <div align="center">
@@ -71,6 +76,7 @@ Dynamic: license-file
 [![PyPI](https://img.shields.io/pypi/v/agentscope-runtime?label=PyPI&color=brightgreen&logo=python)](https://pypi.org/project/agentscope-runtime/)
 [![Downloads](https://static.pepy.tech/badge/agentscope-runtime)](https://pepy.tech/project/agentscope-runtime)
 [![Python Version](https://img.shields.io/badge/python-3.10%2B-blue.svg?logo=python&label=Python)](https://python.org)
+[![Last Commit](https://img.shields.io/github/last-commit/agentscope-ai/agentscope-runtime)](https://github.com/agentscope-ai/agentscope-runtime)
 [![License](https://img.shields.io/badge/license-Apache%202.0-red.svg?logo=apache&label=License)](LICENSE)
 [![Code Style](https://img.shields.io/badge/code%20style-black-black.svg?logo=python&label=CodeStyle)](https://github.com/psf/black)
 [![GitHub Stars](https://img.shields.io/github/stars/agentscope-ai/agentscope-runtime?style=flat&logo=github&color=yellow&label=Stars)](https://github.com/agentscope-ai/agentscope-runtime/stargazers)
@@ -114,7 +120,15 @@ Dynamic: license-file
 
 > [!NOTE]
 >
-> **About Framework-Agnostic**: Currently, AgentScope Runtime supports the **AgentScope** framework. We plan to extend compatibility to more agent development frameworks in the future.
+> **About Framework-Agnostic**: Currently, AgentScope Runtime supports the **AgentScope** framework. We plan to extend compatibility to more agent development frameworks in the future. This table shows the current version’s adapter support for different frameworks. The level of support for each functionality varies across frameworks:
+>
+> | Framework/Feature                                            | Message/Event | Tool | Service |
+> | ------------------------------------------------------------ | ------------- | ---- | ------- |
+> | AgentScope                                                   | ✅             | ✅    | ✅       |
+> | [LangGraph](https://runtime.agentscope.io/en/langgraph_guidelines.html) | ✅             | 🚧    | 🚧       |
+> | AutoGen                                                      | 🚧             | ✅    | 🚧       |
+> | Microsoft Agent Framework                                    | 🚧             | 🚧    | 🚧       |
+> | [Agno](https://runtime.agentscope.io/en/agno_guidelines.html) | ✅             | ✅    | 🚧       |
 
 ---
 
@@ -124,7 +138,7 @@ Welcome to join our community on
 
 | [Discord](https://discord.gg/eYMpfnkG8h)                     | DingTalk                                                     |
 | ------------------------------------------------------------ | ------------------------------------------------------------ |
-| <img src="https://gw.alicdn.com/imgextra/i1/O1CN01hhD1mu1Dd3BWVUvxN_!!6000000000238-2-tps-400-400.png" width="100" height="100"> | <img src="https://img.alicdn.com/imgextra/i1/O1CN01LxzZha1thpIN2cc2E_!!6000000005934-2-tps-497-477.png" width="100" height="100"> |
+| <img src="https://gw.alicdn.com/imgextra/i1/O1CN01hhD1mu1Dd3BWVUvxN_!!6000000000238-2-tps-400-400.png" width="100" height="100"> | <img src="https://img.alicdn.com/imgextra/i4/O1CN014mhqFq1ZlgNuYjxrz_!!6000000003235-2-tps-400-400.png" width="100" height="100"> |
 
 ---
 
@@ -389,6 +403,8 @@ with FilesystemSandbox() as box:
 
 Provides a **sandboxed Android emulator environment** that allows executing various mobile operations, such as tapping, swiping, inputting text, and taking screenshots.
 
+<img src="https://img.alicdn.com/imgextra/i4/O1CN01yPnBC21vOi45fLy7V_!!6000000006163-2-tps-544-865.png" alt="Mobile Sandbox" height="500">
+
 ##### Prerequisites
 
 - **Linux Host**:
@@ -410,7 +426,7 @@ with MobileSandbox() as box:
     # By default, pulls 'agentscope/runtime-sandbox-mobile:latest' from DockerHub
     print(box.list_tools()) # List all available tools
     print(box.mobile_get_screen_resolution()) # Get the screen resolution
-    print(box.mobile_tap(x=500, y=1000)) # Tap at coordinate (500, 1000)
+    print(box.mobile_tap([500, 1000])) # Tap at coordinate (500, 1000)
     print(box.mobile_input_text("Hello from AgentScope!")) # Input text
     print(box.mobile_key_event(3)) # Sends a HOME key event (KeyCode: 3)
     screenshot_result = box.mobile_get_screenshot() # Get the current screenshot
@@ -636,7 +652,7 @@ limitations under the License.
 
 ## Contributors ✨
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-25-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-26-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/emoji-key/)):
@@ -678,6 +694,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/e
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/XiuShenAl"><img src="https://avatars.githubusercontent.com/u/242360128?v=4?s=100" width="100px;" alt="XiuShenAl"/><br /><sub><b>XiuShenAl</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=XiuShenAl" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=XiuShenAl" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/k-farruh"><img src="https://avatars.githubusercontent.com/u/33511681?v=4?s=100" width="100px;" alt="Farruh Kushnazarov"/><br /><sub><b>Farruh Kushnazarov</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=k-farruh" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/fengxsong"><img src="https://avatars.githubusercontent.com/u/7008971?v=4?s=100" width="100px;" alt="fengxsong"/><br /><sub><b>fengxsong</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/issues?q=author%3Afengxsong" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://m4n5ter.github.io"><img src="https://avatars.githubusercontent.com/u/68144809?v=4?s=100" width="100px;" alt="Wang"/><br /><sub><b>Wang</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=M4n5ter" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/issues?q=author%3AM4n5ter" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
   <tfoot>

{agentscope_runtime-1.0.1 → agentscope_runtime-1.0.2}/README.md

@@ -6,6 +6,7 @@
 [![PyPI](https://img.shields.io/pypi/v/agentscope-runtime?label=PyPI&color=brightgreen&logo=python)](https://pypi.org/project/agentscope-runtime/)
 [![Downloads](https://static.pepy.tech/badge/agentscope-runtime)](https://pepy.tech/project/agentscope-runtime)
 [![Python Version](https://img.shields.io/badge/python-3.10%2B-blue.svg?logo=python&label=Python)](https://python.org)
+[![Last Commit](https://img.shields.io/github/last-commit/agentscope-ai/agentscope-runtime)](https://github.com/agentscope-ai/agentscope-runtime)
 [![License](https://img.shields.io/badge/license-Apache%202.0-red.svg?logo=apache&label=License)](LICENSE)
 [![Code Style](https://img.shields.io/badge/code%20style-black-black.svg?logo=python&label=CodeStyle)](https://github.com/psf/black)
 [![GitHub Stars](https://img.shields.io/github/stars/agentscope-ai/agentscope-runtime?style=flat&logo=github&color=yellow&label=Stars)](https://github.com/agentscope-ai/agentscope-runtime/stargazers)
@@ -49,7 +50,15 @@
 
 > [!NOTE]
 >
-> **About Framework-Agnostic**: Currently, AgentScope Runtime supports the **AgentScope** framework. We plan to extend compatibility to more agent development frameworks in the future.
+> **About Framework-Agnostic**: Currently, AgentScope Runtime supports the **AgentScope** framework. We plan to extend compatibility to more agent development frameworks in the future. This table shows the current version’s adapter support for different frameworks. The level of support for each functionality varies across frameworks:
+>
+> | Framework/Feature                                            | Message/Event | Tool | Service |
+> | ------------------------------------------------------------ | ------------- | ---- | ------- |
+> | AgentScope                                                   | ✅             | ✅    | ✅       |
+> | [LangGraph](https://runtime.agentscope.io/en/langgraph_guidelines.html) | ✅             | 🚧    | 🚧       |
+> | AutoGen                                                      | 🚧             | ✅    | 🚧       |
+> | Microsoft Agent Framework                                    | 🚧             | 🚧    | 🚧       |
+> | [Agno](https://runtime.agentscope.io/en/agno_guidelines.html) | ✅             | ✅    | 🚧       |
 
 ---
 
@@ -59,7 +68,7 @@ Welcome to join our community on
 
 | [Discord](https://discord.gg/eYMpfnkG8h)                     | DingTalk                                                     |
 | ------------------------------------------------------------ | ------------------------------------------------------------ |
-| <img src="https://gw.alicdn.com/imgextra/i1/O1CN01hhD1mu1Dd3BWVUvxN_!!6000000000238-2-tps-400-400.png" width="100" height="100"> | <img src="https://img.alicdn.com/imgextra/i1/O1CN01LxzZha1thpIN2cc2E_!!6000000005934-2-tps-497-477.png" width="100" height="100"> |
+| <img src="https://gw.alicdn.com/imgextra/i1/O1CN01hhD1mu1Dd3BWVUvxN_!!6000000000238-2-tps-400-400.png" width="100" height="100"> | <img src="https://img.alicdn.com/imgextra/i4/O1CN014mhqFq1ZlgNuYjxrz_!!6000000003235-2-tps-400-400.png" width="100" height="100"> |
 
 ---
 
@@ -324,6 +333,8 @@ with FilesystemSandbox() as box:
 
 Provides a **sandboxed Android emulator environment** that allows executing various mobile operations, such as tapping, swiping, inputting text, and taking screenshots.
 
+<img src="https://img.alicdn.com/imgextra/i4/O1CN01yPnBC21vOi45fLy7V_!!6000000006163-2-tps-544-865.png" alt="Mobile Sandbox" height="500">
+
 ##### Prerequisites
 
 - **Linux Host**:
@@ -345,7 +356,7 @@ with MobileSandbox() as box:
     # By default, pulls 'agentscope/runtime-sandbox-mobile:latest' from DockerHub
     print(box.list_tools()) # List all available tools
     print(box.mobile_get_screen_resolution()) # Get the screen resolution
-    print(box.mobile_tap(x=500, y=1000)) # Tap at coordinate (500, 1000)
+    print(box.mobile_tap([500, 1000])) # Tap at coordinate (500, 1000)
     print(box.mobile_input_text("Hello from AgentScope!")) # Input text
     print(box.mobile_key_event(3)) # Sends a HOME key event (KeyCode: 3)
     screenshot_result = box.mobile_get_screenshot() # Get the current screenshot
@@ -571,7 +582,7 @@ limitations under the License.
 
 ## Contributors ✨
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-25-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-26-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 
 Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/emoji-key/)):
@@ -613,6 +624,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/e
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/XiuShenAl"><img src="https://avatars.githubusercontent.com/u/242360128?v=4?s=100" width="100px;" alt="XiuShenAl"/><br /><sub><b>XiuShenAl</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=XiuShenAl" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=XiuShenAl" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/k-farruh"><img src="https://avatars.githubusercontent.com/u/33511681?v=4?s=100" width="100px;" alt="Farruh Kushnazarov"/><br /><sub><b>Farruh Kushnazarov</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=k-farruh" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/fengxsong"><img src="https://avatars.githubusercontent.com/u/7008971?v=4?s=100" width="100px;" alt="fengxsong"/><br /><sub><b>fengxsong</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/issues?q=author%3Afengxsong" title="Bug reports">🐛</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://m4n5ter.github.io"><img src="https://avatars.githubusercontent.com/u/68144809?v=4?s=100" width="100px;" alt="Wang"/><br /><sub><b>Wang</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=M4n5ter" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/issues?q=author%3AM4n5ter" title="Bug reports">🐛</a></td>
     </tr>
   </tbody>
   <tfoot>

{agentscope_runtime-1.0.1 → agentscope_runtime-1.0.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "agentscope-runtime"
-version = "1.0.1"
+version = "1.0.2"
 description = "A production-ready runtime framework for agent applications, providing secure sandboxed execution environments and scalable deployment solutions with multi-framework support."
 readme = "README.md"
 requires-python = ">=3.10"
@@ -26,6 +26,8 @@ dependencies = [
     "dashscope>=1.25.0",
     "jsonref",
     "asgiref",
+    "click>=8.0.0",
+    "rich>=13.0.0",
 ]
 
 [tool.setuptools]
@@ -40,6 +42,7 @@ requires = ["setuptools>=42", "wheel"]
 build-backend = "setuptools.build_meta"
 
 [project.scripts]
+agentscope = "agentscope_runtime.cli.cli:main"
 runtime-sandbox-mcp = "agentscope_runtime.sandbox.mcp_server:main"
 runtime-sandbox-server = "agentscope_runtime.sandbox.manager.server.app:main"
 runtime-sandbox-builder = "agentscope_runtime.sandbox.build:main"
@@ -58,11 +61,13 @@ dev = [
     "sphinx-autoapi>=3.6.0",
     "pytest-mock>=3.15.1",
     "sphinxcontrib-mermaid>=1.2.3",
-    "langgraph>=0.4.0",
-    "autogen-agentchat>=0.7.0",
 ]
 
 ext = [
+    "langchain>=1.1.3",
+    "langchain_openai>=1.0.1",
+    "langgraph>=1.0.4",
+    "autogen-agentchat>=0.7.0",
     "reme-ai>=0.2.0.2",
     "mem0ai>=0.1.117",
     "alibabacloud-agentrun20250910>=2.0.1",
@@ -84,4 +89,9 @@ ext = [
     "wheel",
     "alibabacloud-credentials",
     "PyYAML",
+    "agno>=2.3.8",
 ]
+
+[tool.pytest.ini_options]
+asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"

{agentscope_runtime-1.0.1 → agentscope_runtime-1.0.2}/src/agentscope_runtime/adapters/agentscope/message.py

@@ -374,9 +374,10 @@ def message_to_agentscope_msg(
 
         if message.type in (
             MessageType.PLUGIN_CALL,
+            MessageType.MCP_TOOL_CALL,
             MessageType.FUNCTION_CALL,
         ):
-            # convert PLUGIN_CALL, FUNCTION_CALL to ToolUseBlock
+            # convert CALL to ToolUseBlock
             tool_args = None
             for cnt in reversed(message.content):
                 if hasattr(cnt, "data"):
@@ -398,10 +399,10 @@ def message_to_agentscope_msg(
             ]
         elif message.type in (
             MessageType.PLUGIN_CALL_OUTPUT,
+            MessageType.MCP_TOOL_CALL_OUTPUT,
             MessageType.FUNCTION_CALL_OUTPUT,
         ):
-            # convert PLUGIN_CALL_OUTPUT, FUNCTION_CALL_OUTPUT to
-            # ToolResultBlock
+            # convert CALL_OUTPUT to ToolResultBlock
             out = None
             raw_output = ""
             for cnt in reversed(message.content):
@@ -425,6 +426,22 @@ def message_to_agentscope_msg(
 
             if isinstance(blk, list):
                 if not all(is_valid_block(item) for item in blk):
+                    try:
+                        # Try to convert MCP content list to blocks
+                        call_tool_result = {
+                            "content": blk,
+                            "structuredContent": None,
+                            "isError": False,
+                        }
+                        blk = MCPClientBase._convert_mcp_content_to_as_blocks(
+                            CallToolResult.model_validate(
+                                call_tool_result,
+                            ).content,
+                        )
+                    except Exception:
+                        blk = raw_output
+            elif isinstance(blk, dict):
+                if not is_valid_block(blk):
                     try:
                         # Try to convert to MCP CallToolResult then to blocks
                         blk = CallToolResult.model_validate(blk)
@@ -433,9 +450,6 @@ def message_to_agentscope_msg(
                         )
                     except Exception:
                         blk = raw_output
-            elif isinstance(blk, dict):
-                if not is_valid_block(blk):
-                    blk = raw_output
             else:
                 blk = raw_output
 
@@ -459,6 +473,7 @@ def message_to_agentscope_msg(
                 "text": (TextBlock, "text"),
                 "image": (ImageBlock, "image_url"),
                 "audio": (AudioBlock, "data"),
+                "data": (TextBlock, "data"),
                 # "video": (VideoBlock, "video_url", True),
                 # TODO: support video
             }
@@ -533,7 +548,17 @@ def message_to_agentscope_msg(
                                 block_cls(type=cnt_type, source=base64_source),
                             )
                 else:
-                    msg_content.append(block_cls(type=cnt_type, text=value))
+                    # text & data
+                    if isinstance(value, str):
+                        msg_content.append(
+                            TextBlock(type="text", text=value),
+                        )
+                    else:
+                        try:
+                            json_str = json.dumps(value, ensure_ascii=False)
+                        except Exception:
+                            json_str = str(value)
+                        msg_content.append(TextBlock(text=json_str))
 
             result["content"] = msg_content
         _msg = Msg(**result)

{agentscope_runtime-1.0.1 → agentscope_runtime-1.0.2}/src/agentscope_runtime/adapters/agentscope/stream.py

@@ -3,13 +3,15 @@
 import copy
 import json
 
-from typing import AsyncIterator, Tuple, List
+from typing import AsyncIterator, Tuple, List, Union
 from urllib.parse import urlparse
 
+from agentscope import setup_logger
 from agentscope.message import Msg
 
 from ...engine.schemas.agent_schemas import (
     Message,
+    Content,
     TextContent,
     ImageContent,
     AudioContent,
@@ -21,6 +23,8 @@ from ...engine.schemas.agent_schemas import (
     MessageType,
 )
 
+setup_logger("ERROR")
+
 
 def _update_obj_attrs(obj, **attrs):
     for key, value in attrs.items():
@@ -31,7 +35,7 @@ def _update_obj_attrs(obj, **attrs):
 
 async def adapt_agentscope_message_stream(
     source_stream: AsyncIterator[Tuple[Msg, bool]],
-) -> AsyncIterator[Message]:
+) -> AsyncIterator[Union[Message, Content]]:
     # Initialize variables to avoid uncaught errors
     msg_id = None
     last_content = ""
@@ -48,6 +52,7 @@ async def adapt_agentscope_message_stream(
     should_start_message = True
     should_start_reasoning_message = True
     tool_use_messages_dict = {}
+    tool_result_messages_dict = {}
     index = None
 
     # Run agent
@@ -262,95 +267,69 @@ async def adapt_agentscope_message_stream(
                             fc_cls = FunctionCall
                             fc_kwargs = {}
 
-                        if last:
-                            plugin_call_message = tool_use_messages_dict.get(
-                                call_id,
-                            )
-
-                            if plugin_call_message is None:
-                                # Only one tool use message yields, we fake
-                                #  Build a new tool call message
-                                plugin_call_message = Message(
-                                    type=msg_type,
-                                    role="assistant",
-                                )
-
-                                data_delta_content = DataContent(
-                                    index=0,
-                                    data=fc_cls(
-                                        call_id=element.get("id"),
-                                        name=element.get("name"),
-                                        arguments="",
-                                        **fc_kwargs,
-                                    ).model_dump(),
-                                    delta=False,
-                                )
-
-                                plugin_call_message = _update_obj_attrs(
-                                    plugin_call_message,
-                                    metadata=metadata,
-                                    usage=usage,
-                                )
-                                yield plugin_call_message.in_progress()
-                                yield data_delta_content.in_progress()
+                        plugin_call_message = tool_use_messages_dict.get(
+                            call_id,
+                        )
 
-                            json_str = json.dumps(
-                                element.get("input"),
-                                ensure_ascii=False,
+                        if plugin_call_message is None:
+                            # Create a new message
+                            plugin_call_message = Message(
+                                type=msg_type,
+                                role="assistant",
                             )
                             data_delta_content = DataContent(
-                                index=None,  # Will be set by `add_content`
+                                index=0,
                                 data=fc_cls(
-                                    call_id=element.get("id"),
+                                    call_id=element["id"],
                                     name=element.get("name"),
-                                    arguments=json_str,
+                                    arguments="",
                                     **fc_kwargs,
                                 ).model_dump(),
                                 delta=False,
                             )
-                            plugin_call_message.add_content(
-                                new_content=data_delta_content,
-                            )
-                            yield data_delta_content.completed()
                             plugin_call_message = _update_obj_attrs(
                                 plugin_call_message,
                                 metadata=metadata,
                                 usage=usage,
                             )
-                            yield plugin_call_message.completed()
-                            index = None
-                        else:
-                            if call_id in tool_use_messages_dict:
-                                pass
-                            else:
-                                # Build a new tool call message
-                                plugin_call_message = Message(
-                                    type=msg_type,
-                                    role="assistant",
-                                )
-
-                                data_delta_content = DataContent(
-                                    index=0,
-                                    data=fc_cls(
-                                        call_id=element.get("id"),
-                                        name=element.get("name"),
-                                        arguments="",
-                                        **fc_kwargs,
-                                    ).model_dump(),
-                                    delta=False,
-                                )
+                            yield plugin_call_message.in_progress()
+                            data_delta_content.msg_id = plugin_call_message.id
+                            yield data_delta_content.in_progress()
+                            tool_use_messages_dict[
+                                call_id
+                            ] = plugin_call_message
+
+                        # Update arguments
+                        json_str = json.dumps(
+                            element.get("input"),
+                            ensure_ascii=False,
+                        )
+                        data_delta_content = DataContent(
+                            index=None if last else 0,
+                            data=fc_cls(
+                                call_id=element["id"],
+                                name=element.get("name"),
+                                arguments=json_str,
+                                **fc_kwargs,
+                            ).model_dump(),
+                            delta=False,
+                        )
 
-                                plugin_call_message = _update_obj_attrs(
-                                    plugin_call_message,
-                                    metadata=metadata,
-                                    usage=usage,
-                                )
-                                yield plugin_call_message.in_progress()
-                                yield data_delta_content.in_progress()
+                        plugin_call_message = _update_obj_attrs(
+                            plugin_call_message,
+                            metadata=metadata,
+                            usage=usage,
+                        )
 
-                                tool_use_messages_dict[
-                                    call_id
-                                ] = plugin_call_message
+                        if last:
+                            plugin_call_message.add_content(
+                                new_content=data_delta_content,
+                            )
+                            yield data_delta_content.completed()
+                            yield plugin_call_message.completed()
+                        else:
+                            data_delta_content.msg_id = plugin_call_message.id
+                            yield data_delta_content.in_progress()
 
                     elif element.get("type") == "tool_result":  # Tool result
                         call_id = element.get("id")
@@ -372,35 +351,86 @@ async def adapt_agentscope_message_stream(
                                 msg_type = MessageType.MCP_TOOL_CALL_OUTPUT
                                 fc_cls = McpCallOutput
 
-                        json_str = json.dumps(
-                            element.get("output"),
-                            ensure_ascii=False,
+                        plugin_output_message = tool_result_messages_dict.get(
+                            call_id,
                         )
+
+                        if plugin_output_message is None:
+                            # Create a new message
+                            plugin_output_message = Message(
+                                type=msg_type,
+                                role="tool",
+                            )
+                            data_delta_content = DataContent(
+                                index=0,
+                                data=fc_cls(
+                                    call_id=element.get("id"),
+                                    name=element.get("name"),
+                                    output="",
+                                ).model_dump(),
+                                delta=False,
+                            )
+                            plugin_output_message = _update_obj_attrs(
+                                plugin_output_message,
+                                metadata=metadata,
+                                usage=usage,
+                            )
+                            yield plugin_output_message.in_progress()
+                            data_delta_content.msg_id = (
+                                plugin_output_message.id
+                            )
+                            yield data_delta_content.in_progress()
+                            tool_result_messages_dict[
+                                call_id
+                            ] = plugin_output_message
+
+                        # Update output
+                        try:
+                            json_str = json.dumps(
+                                element.get("output"),
+                                ensure_ascii=False,
+                            )
+                        except Exception:
+                            # For non-JSON outputs, we just use the string
+                            # representation
+                            json_str = str(element.get("output"))
+
                         data_delta_content = DataContent(
-                            index=index,
+                            index=None if last else 0,
                             data=fc_cls(
                                 call_id=element.get("id"),
                                 name=element.get("name"),
                                 output=json_str,
                             ).model_dump(),
+                            delta=False,
                         )
-                        plugin_output_message = Message(
-                            type=msg_type,
-                            role="tool",
-                            content=[data_delta_content],
-                        )
+
                         plugin_output_message = _update_obj_attrs(
                             plugin_output_message,
                             metadata=metadata,
                             usage=usage,
                         )
-                        yield plugin_output_message.completed()
-                        message = Message(
-                            type=MessageType.MESSAGE,
-                            role="assistant",
-                        )
-                        should_start_message = True
-                        index = None
+
+                        if last:
+                            plugin_output_message.add_content(
+                                new_content=data_delta_content,
+                            )
+                            yield data_delta_content.completed()
+                            yield plugin_output_message.completed()
+
+                            message = Message(
+                                type=MessageType.MESSAGE,
+                                role="assistant",
+                            )
+                            should_start_message = True
+                            index = None
+
+                        else:
+                            data_delta_content.msg_id = (
+                                plugin_output_message.id
+                            )
+                            yield data_delta_content.in_progress()
+
                     else:
                         # TODO: handle image/audio/video block
                         if should_start_message:

agentscope_runtime-1.0.2/src/agentscope_runtime/adapters/agno/message.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+from typing import Union, List
+
+from agentscope.formatter import OpenAIChatFormatter
+
+from ...engine.schemas.agent_schemas import Message
+from ..agentscope.message import message_to_agentscope_msg
+
+
+async def message_to_agno_message(
+    messages: Union[Message, List[Message]],
+) -> Union[dict, List[dict]]:
+    """
+    Convert AgentScope runtime Message(s) to Agno Message(s).
+
+    Args:
+        messages: A single AgentScope runtime Message or list of Messages.
+
+    Returns:
+        A single AgnoMessage object or a list of AgnoMessage objects.
+    """
+
+    as_msgs = message_to_agentscope_msg(messages)
+    raw_list = isinstance(as_msgs, list)
+    as_msgs = as_msgs if raw_list else [as_msgs]
+
+    formatter = OpenAIChatFormatter()
+    agno_message = await formatter.format(as_msgs)
+
+    return agno_message if raw_list else agno_message[0]