agentscope-runtime 0.1.2__tar.gz → 0.1.4__tar.gz

{agentscope_runtime-0.1.2/src/agentscope_runtime.egg-info → agentscope_runtime-0.1.4}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.4
 Name: agentscope-runtime
-Version: 0.1.2
+Version: 0.1.4
 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
 License-File: LICENSE
-Requires-Dist: mcp<1.10.0,>=1.8.0
+Requires-Dist: mcp>=1.13
 Requires-Dist: fastapi>=0.104.0
 Requires-Dist: uvicorn[standard]>=0.24.0
 Requires-Dist: openai
@@ -30,11 +30,11 @@ Requires-Dist: dotenv>=0.9.9; extra == "sandbox"
 Requires-Dist: kubernetes>=33.1.0; extra == "sandbox"
 Requires-Dist: shortuuid>=1.0.13; extra == "sandbox"
 Provides-Extra: agentscope
-Requires-Dist: agentscope==1.0.0; extra == "agentscope"
+Requires-Dist: agentscope>=1.0.1; extra == "agentscope"
 Provides-Extra: langgraph
 Requires-Dist: langgraph>=0.5.3; extra == "langgraph"
 Provides-Extra: agno
-Requires-Dist: agno>=1.7.5; extra == "agno"
+Requires-Dist: agno<2.0.0,>=1.7.5; extra == "agno"
 Provides-Extra: a2a
 Requires-Dist: a2a-sdk>=0.3.0; extra == "a2a"
 Provides-Extra: autogen
@@ -45,6 +45,17 @@ Requires-Dist: langchain>=0.3.25; extra == "langchain-rag"
 Requires-Dist: pymilvus>=2.6.0; extra == "langchain-rag"
 Requires-Dist: langchain-community>=0.3.27; extra == "langchain-rag"
 Requires-Dist: langchain-milvus>=0.2.1; extra == "langchain-rag"
+Requires-Dist: bs4>=0.0.2; extra == "langchain-rag"
+Provides-Extra: llamaindex-rag
+Requires-Dist: llama-index>=0.13.4; extra == "llamaindex-rag"
+Requires-Dist: pymilvus>=2.6.0; extra == "llamaindex-rag"
+Requires-Dist: llama-index-vector-stores-milvus>=0.9.1; extra == "llamaindex-rag"
+Requires-Dist: llama-index-readers-web>=0.5.1; extra == "llamaindex-rag"
+Requires-Dist: llama-index-embeddings-langchain>=0.4.0; extra == "llamaindex-rag"
+Requires-Dist: langchain-community>=0.3.27; extra == "llamaindex-rag"
+Requires-Dist: bs4>=0.0.2; extra == "llamaindex-rag"
+Provides-Extra: memory-ext
+Requires-Dist: reme-ai==0.1.9; python_full_version >= "3.12" and extra == "memory-ext"
 Dynamic: license-file
 
 <div align="center">
@@ -391,3 +402,46 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 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-8-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rayrayraykk"><img src="https://avatars.githubusercontent.com/u/39145382?v=4?s=100" width="100px;" alt="Weirui Kuang"/><br /><sub><b>Weirui Kuang</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=rayrayraykk" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/pulls?q=is%3Apr+reviewed-by%3Arayrayraykk" title="Reviewed Pull Requests">👀</a> <a href="#maintenance-rayrayraykk" title="Maintenance">🚧</a> <a href="#projectManagement-rayrayraykk" title="Project Management">📆</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.bruceluo.net/"><img src="https://avatars.githubusercontent.com/u/7297307?v=4?s=100" width="100px;" alt="Bruce Luo"/><br /><sub><b>Bruce Luo</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=zhilingluo" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/pulls?q=is%3Apr+reviewed-by%3Azhilingluo" title="Reviewed Pull Requests">👀</a> <a href="#example-zhilingluo" title="Examples">💡</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zzhangpurdue"><img src="https://avatars.githubusercontent.com/u/5746653?v=4?s=100" width="100px;" alt="Zhicheng Zhang"/><br /><sub><b>Zhicheng Zhang</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=zzhangpurdue" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/pulls?q=is%3Apr+reviewed-by%3Azzhangpurdue" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=zzhangpurdue" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ericczq"><img src="https://avatars.githubusercontent.com/u/116273607?v=4?s=100" width="100px;" alt="ericczq"/><br /><sub><b>ericczq</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=ericczq" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=ericczq" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/qbc2016"><img src="https://avatars.githubusercontent.com/u/22984042?v=4?s=100" width="100px;" alt="qbc"/><br /><sub><b>qbc</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/pulls?q=is%3Apr+reviewed-by%3Aqbc2016" title="Reviewed Pull Requests">👀</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rankesterc"><img src="https://avatars.githubusercontent.com/u/114560457?v=4?s=100" width="100px;" alt="Ran Chen"/><br /><sub><b>Ran Chen</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=rankesterc" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jinliyl"><img src="https://avatars.githubusercontent.com/u/6469360?v=4?s=100" width="100px;" alt="jinliyl"/><br /><sub><b>jinliyl</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=jinliyl" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=jinliyl" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Osier-Yi"><img src="https://avatars.githubusercontent.com/u/8287381?v=4?s=100" width="100px;" alt="Osier-Yi"/><br /><sub><b>Osier-Yi</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=Osier-Yi" title="Code">💻</a></td>
+    </tr>
+  </tbody>
+  <tfoot>
+    <tr>
+      <td align="center" size="13px" colspan="7">
+        <img src="https://raw.githubusercontent.com/all-contributors/all-contributors-cli/1b8533af435da9854653492b1327a23a4dbd0a10/assets/logo-small.svg">
+          <a href="https://all-contributors.js.org/docs/en/bot/usage">Add your contributions</a>
+        </img>
+      </td>
+    </tr>
+  </tfoot>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

agentscope_runtime-0.1.2/PKG-INFO → agentscope_runtime-0.1.4/README.md

@@ -1,52 +1,3 @@
-Metadata-Version: 2.4
-Name: agentscope-runtime
-Version: 0.1.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
-License-File: LICENSE
-Requires-Dist: mcp<1.10.0,>=1.8.0
-Requires-Dist: fastapi>=0.104.0
-Requires-Dist: uvicorn[standard]>=0.24.0
-Requires-Dist: openai
-Requires-Dist: pydantic>=2.11.7
-Requires-Dist: requests>=2.32.4
-Provides-Extra: dev
-Requires-Dist: pytest>=8.3.5; extra == "dev"
-Requires-Dist: pytest-asyncio>=0.23.0; extra == "dev"
-Requires-Dist: pre-commit>=4.2.0; extra == "dev"
-Requires-Dist: jupyter-book>=1.0.4.post1; extra == "dev"
-Requires-Dist: furo>=2025.7.19; extra == "dev"
-Requires-Dist: pytest-cov>=6.2.1; extra == "dev"
-Requires-Dist: fakeredis>=2.31.0; extra == "dev"
-Requires-Dist: sphinx-autoapi>=3.6.0; extra == "dev"
-Provides-Extra: sandbox
-Requires-Dist: docker>=7.1.0; extra == "sandbox"
-Requires-Dist: steel-sdk>=0.1.0; extra == "sandbox"
-Requires-Dist: redis>=6.0.0b2; extra == "sandbox"
-Requires-Dist: oss2>=2.19.1; extra == "sandbox"
-Requires-Dist: pydantic-settings>=2.9.1; extra == "sandbox"
-Requires-Dist: dotenv>=0.9.9; extra == "sandbox"
-Requires-Dist: kubernetes>=33.1.0; extra == "sandbox"
-Requires-Dist: shortuuid>=1.0.13; extra == "sandbox"
-Provides-Extra: agentscope
-Requires-Dist: agentscope==1.0.0; extra == "agentscope"
-Provides-Extra: langgraph
-Requires-Dist: langgraph>=0.5.3; extra == "langgraph"
-Provides-Extra: agno
-Requires-Dist: agno>=1.7.5; extra == "agno"
-Provides-Extra: a2a
-Requires-Dist: a2a-sdk>=0.3.0; extra == "a2a"
-Provides-Extra: autogen
-Requires-Dist: autogen-agentchat>=0.7.4; extra == "autogen"
-Requires-Dist: autogen-ext[openai]>=0.7.4; extra == "autogen"
-Provides-Extra: langchain-rag
-Requires-Dist: langchain>=0.3.25; extra == "langchain-rag"
-Requires-Dist: pymilvus>=2.6.0; extra == "langchain-rag"
-Requires-Dist: langchain-community>=0.3.27; extra == "langchain-rag"
-Requires-Dist: langchain-milvus>=0.2.1; extra == "langchain-rag"
-Dynamic: license-file
-
 <div align="center">
 
 # AgentScope Runtime
@@ -391,3 +342,46 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 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-8-orange.svg?style=flat-square)](#contributors-)
+<!-- ALL-CONTRIBUTORS-BADGE:END -->
+
+Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):
+
+<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
+<!-- prettier-ignore-start -->
+<!-- markdownlint-disable -->
+<table>
+  <tbody>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rayrayraykk"><img src="https://avatars.githubusercontent.com/u/39145382?v=4?s=100" width="100px;" alt="Weirui Kuang"/><br /><sub><b>Weirui Kuang</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=rayrayraykk" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/pulls?q=is%3Apr+reviewed-by%3Arayrayraykk" title="Reviewed Pull Requests">👀</a> <a href="#maintenance-rayrayraykk" title="Maintenance">🚧</a> <a href="#projectManagement-rayrayraykk" title="Project Management">📆</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="http://www.bruceluo.net/"><img src="https://avatars.githubusercontent.com/u/7297307?v=4?s=100" width="100px;" alt="Bruce Luo"/><br /><sub><b>Bruce Luo</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=zhilingluo" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/pulls?q=is%3Apr+reviewed-by%3Azhilingluo" title="Reviewed Pull Requests">👀</a> <a href="#example-zhilingluo" title="Examples">💡</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/zzhangpurdue"><img src="https://avatars.githubusercontent.com/u/5746653?v=4?s=100" width="100px;" alt="Zhicheng Zhang"/><br /><sub><b>Zhicheng Zhang</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=zzhangpurdue" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/pulls?q=is%3Apr+reviewed-by%3Azzhangpurdue" title="Reviewed Pull Requests">👀</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=zzhangpurdue" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/ericczq"><img src="https://avatars.githubusercontent.com/u/116273607?v=4?s=100" width="100px;" alt="ericczq"/><br /><sub><b>ericczq</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=ericczq" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=ericczq" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/qbc2016"><img src="https://avatars.githubusercontent.com/u/22984042?v=4?s=100" width="100px;" alt="qbc"/><br /><sub><b>qbc</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/pulls?q=is%3Apr+reviewed-by%3Aqbc2016" title="Reviewed Pull Requests">👀</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/rankesterc"><img src="https://avatars.githubusercontent.com/u/114560457?v=4?s=100" width="100px;" alt="Ran Chen"/><br /><sub><b>Ran Chen</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=rankesterc" title="Code">💻</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/jinliyl"><img src="https://avatars.githubusercontent.com/u/6469360?v=4?s=100" width="100px;" alt="jinliyl"/><br /><sub><b>jinliyl</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=jinliyl" title="Code">💻</a> <a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=jinliyl" title="Documentation">📖</a></td>
+    </tr>
+    <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Osier-Yi"><img src="https://avatars.githubusercontent.com/u/8287381?v=4?s=100" width="100px;" alt="Osier-Yi"/><br /><sub><b>Osier-Yi</b></sub></a><br /><a href="https://github.com/agentscope-ai/agentscope-runtime/commits?author=Osier-Yi" title="Code">💻</a></td>
+    </tr>
+  </tbody>
+  <tfoot>
+    <tr>
+      <td align="center" size="13px" colspan="7">
+        <img src="https://raw.githubusercontent.com/all-contributors/all-contributors-cli/1b8533af435da9854653492b1327a23a4dbd0a10/assets/logo-small.svg">
+          <a href="https://all-contributors.js.org/docs/en/bot/usage">Add your contributions</a>
+        </img>
+      </td>
+    </tr>
+  </tfoot>
+</table>
+
+<!-- markdownlint-restore -->
+<!-- prettier-ignore-end -->
+
+<!-- ALL-CONTRIBUTORS-LIST:END -->
+
+This project follows the [all-contributors](https://github.com/all-contributors/all-contributors) specification. Contributions of any kind welcome!

{agentscope_runtime-0.1.2 → agentscope_runtime-0.1.4}/pyproject.toml

@@ -1,11 +1,11 @@
 [project]
 name = "agentscope-runtime"
-version = "0.1.2"
+version = "0.1.4"
 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"
 dependencies = [
-    "mcp>=1.8.0,<1.10.0",
+    "mcp>=1.13",
     "fastapi>=0.104.0",
     "uvicorn[standard]>=0.24.0",
     "openai",
@@ -49,7 +49,7 @@ sandbox = [
 ]
 
 agentscope = [
-    "agentscope==1.0.0",
+    "agentscope>=1.0.1",
 ]
 
 langgraph = [
@@ -57,7 +57,7 @@ langgraph = [
 ]
 
 agno = [
-    "agno>=1.7.5",
+    "agno>=1.7.5,<2.0.0",
 ]
 a2a = [
     "a2a-sdk>=0.3.0",
@@ -72,4 +72,18 @@ langchain_rag=[
     "pymilvus>=2.6.0",
     "langchain-community>=0.3.27",
     "langchain-milvus>=0.2.1",
-]
+    "bs4>=0.0.2",
+]
+
+llamaindex_rag=[
+    "llama-index>=0.13.4",
+    "pymilvus>=2.6.0",
+    "llama-index-vector-stores-milvus>=0.9.1",
+    "llama-index-readers-web>=0.5.1",
+    "llama-index-embeddings-langchain>=0.4.0",
+    "langchain-community>=0.3.27",
+    "bs4>=0.0.2",
+]
+memory-ext = [
+    "reme-ai==0.1.9 ; python_full_version >= '3.12'",
+]

{agentscope_runtime-0.1.2 → agentscope_runtime-0.1.4}/src/agentscope_runtime/engine/agents/agentscope_agent/agent.py

@@ -1,11 +1,14 @@
 # -*- coding: utf-8 -*-
 # pylint:disable=too-many-nested-blocks, too-many-branches, too-many-statements
+# pylint:disable=line-too-long, protected-access
+
 import json
 import threading
 import uuid
 from functools import partial
 from typing import Optional, Type
 
+from agentscope import setup_logger
 from agentscope.agent import ReActAgent
 from agentscope.formatter import (
     FormatterBase,
@@ -15,6 +18,8 @@ from agentscope.formatter import (
     OllamaChatFormatter,
     GeminiChatFormatter,
 )
+from agentscope.memory import InMemoryMemory
+from agentscope.message import Msg, ToolUseBlock, ToolResultBlock
 from agentscope.model import (
     ChatModelBase,
     DashScopeChatModel,
@@ -23,9 +28,6 @@ from agentscope.model import (
     OllamaChatModel,
     GeminiChatModel,
 )
-from agentscope.memory import InMemoryMemory
-from agentscope.message import Msg
-from agentscope import setup_logger
 from agentscope.tool import (
     Toolkit,
     ToolResponse,
@@ -46,7 +48,6 @@ from ...schemas.agent_schemas import (
     FunctionCall,
     FunctionCallOutput,
     MessageType,
-    RunStatus,
 )
 from ...schemas.context import Context
 
@@ -90,12 +91,33 @@ class AgentScopeContextAdapter:
             role_label = "user"
         else:
             role_label = message.role
-
-        return {
+        result = {
             "name": message.role,
             "role": role_label,
-            "content": message.content[0].text if message.content else "",
         }
+        if message.type == MessageType.PLUGIN_CALL:
+            result["content"] = [
+                ToolUseBlock(
+                    type="tool_use",
+                    id=message.content[0].data["call_id"],
+                    name=message.role,
+                    input=json.loads(message.content[0].data["arguments"]),
+                ),
+            ]
+        elif message.type == MessageType.PLUGIN_CALL_OUTPUT:
+            result["content"] = [
+                ToolResultBlock(
+                    type="tool_result",
+                    id=message.content[0].data["call_id"],
+                    name=message.role,
+                    output=message.content[0].data["output"],
+                ),
+            ]
+        else:
+            result["content"] = (
+                message.content[0].text if message.content else ""
+            )
+        return result
 
     async def adapt_new_message(self):
         last_message = self.context.session.messages[-1]
@@ -213,6 +235,7 @@ class AgentScopeAgent(Agent):
             memory=as_context.memory,
             toolkit=as_context.toolkit,
         )
+        self._agent._disable_console_output = True
 
         self._agent.register_instance_hook(
             "pre_print",
@@ -225,6 +248,7 @@ class AgentScopeAgent(Agent):
     async def run(self, context):
         as_context = AgentScopeContextAdapter(context=context, attr=self._attr)
         await as_context.initialize()
+        local_truncate_memory = ""
 
         # We should always build a new agent since the state is manage outside
         # the agent
@@ -245,89 +269,120 @@ class AgentScopeAgent(Agent):
             # Yield new Msg instances as they are logged
             last_content = ""
 
+            message = Message(type=MessageType.MESSAGE, role="assistant")
+            yield message.in_progress()
+            index = None
+
             for msg, msg_len in get_msg_instances(thread_id=thread_id):
                 if msg:
                     content = msg.content
-
                     if isinstance(content, str):
                         last_content = content
                     else:
                         for element in content:
-                            if isinstance(element, str):
-                                content = TextContent(text=element)
-                                message = Message(
-                                    type=MessageType.MESSAGE,
-                                    role="assistant",
-                                    content=[content],
-                                    status=RunStatus.Completed,
+                            if isinstance(element, str) and element:
+                                text_delta_content = TextContent(
+                                    delta=True,
+                                    index=index,
+                                    text=element,
+                                )
+                                text_delta_content = message.add_delta_content(
+                                    new_content=text_delta_content,
                                 )
-                                yield message
+                                index = text_delta_content.index
+                                yield text_delta_content
                             elif isinstance(element, dict):
                                 if element.get("type") == "text":
-                                    content = TextContent(
-                                        text=element.get("text"),
-                                    )
-                                    message = Message(
-                                        type=MessageType.MESSAGE,
-                                        role="assistant",
-                                        status=RunStatus.Completed,
-                                        content=[content],
+                                    text = element.get(
+                                        "text",
+                                        "",
                                     )
-                                    yield message
+                                    if text:
+                                        text_delta_content = TextContent(
+                                            delta=True,
+                                            index=index,
+                                            text=text.removeprefix(
+                                                local_truncate_memory,
+                                            ),
+                                        )
+                                        local_truncate_memory = element.get(
+                                            "text",
+                                            "",
+                                        )
+                                        text_delta_content = (
+                                            message.add_delta_content(
+                                                new_content=text_delta_content,
+                                            )
+                                        )
+                                        index = text_delta_content.index
+                                        yield text_delta_content
+                                        if hasattr(msg, "is_last"):
+                                            yield message.completed()
+                                            message = Message(
+                                                type=MessageType.MESSAGE,
+                                                role="assistant",
+                                            )
+                                            index = None
+
                                 elif element.get("type") == "tool_use":
                                     json_str = json.dumps(element.get("input"))
-                                    data = DataContent(
+                                    data_delta_content = DataContent(
+                                        index=index,
                                         data=FunctionCall(
                                             call_id=element.get("id"),
                                             name=element.get("name"),
                                             arguments=json_str,
                                         ).model_dump(),
                                     )
-                                    message = Message(
+                                    plugin_call_message = Message(
                                         type=MessageType.PLUGIN_CALL,
                                         role="assistant",
-                                        status=RunStatus.Completed,
-                                        content=[data],
+                                        content=[data_delta_content],
                                     )
-                                    yield message
+                                    yield plugin_call_message.completed()
                                 elif element.get("type") == "tool_result":
-                                    data = DataContent(
+                                    data_delta_content = DataContent(
+                                        index=index,
                                         data=FunctionCallOutput(
                                             call_id=element.get("id"),
                                             output=str(element.get("output")),
                                         ).model_dump(),
                                     )
-                                    message = Message(
+                                    plugin_output_message = Message(
                                         type=MessageType.PLUGIN_CALL_OUTPUT,
                                         role="assistant",
-                                        status=RunStatus.Completed,
-                                        content=[data],
+                                        content=[data_delta_content],
                                     )
-                                    yield message
+                                    yield plugin_output_message.completed()
                                 else:
-                                    message = Message(
-                                        type=MessageType.MESSAGE,
-                                        role="assistant",
-                                        status=RunStatus.Completed,
-                                        content=[
-                                            TextContent(text=f"{element}"),
-                                        ],
+                                    text_delta_content = TextContent(
+                                        delta=True,
+                                        index=index,
+                                        text=f"{element}",
                                     )
-                                    yield message
+                                    text_delta_content = (
+                                        message.add_delta_content(
+                                            new_content=text_delta_content,
+                                        )
+                                    )
+                                    index = text_delta_content.index
+                                    yield text_delta_content
 
                 # Break if the thread is dead and no more messages are expected
                 if not thread.is_alive() and msg_len == 0:
                     break
 
             if last_content:
-                content = TextContent(text=last_content)
-                message = Message(
-                    type=MessageType.MESSAGE,
-                    role="assistant",
-                    content=[content],
-                    status=RunStatus.Completed,
+                text_delta_content = TextContent(
+                    delta=True,
+                    index=index,
+                    text=last_content,
+                )
+                text_delta_content = message.add_delta_content(
+                    new_content=text_delta_content,
                 )
-                yield message
+                yield text_delta_content
+                yield message.completed()
 
             # Wait for the function to finish
             thread.join()

{agentscope_runtime-0.1.2 → agentscope_runtime-0.1.4}/src/agentscope_runtime/engine/agents/agentscope_agent/hooks.py

@@ -2,19 +2,20 @@
 """ Hooks for stream output """
 # pylint: disable=unused-argument,too-many-nested-blocks
 import asyncio
+import os
 import time
 import threading
 import logging
 
 from collections import defaultdict
-from typing import Union, Optional, Generator, Any
+from typing import Union, Optional, Generator, Any, List
 
 from agentscope.agent import AgentBase
 from agentscope.message import Msg
 
 _MSG_INSTANCE = defaultdict(list)
 _LOCKS = defaultdict(threading.Lock)
-TIMEOUT = 30
+TIMEOUT = int(os.getenv("AGENTSCOPE_AGENT_TIMEOUT", "30"))
 
 
 def run_async_in_thread(coro):
@@ -83,7 +84,19 @@ def pre_speak_msg_buffer_hook(
     thread_id = threading.current_thread().name
     if thread_id.startswith("pipeline"):
         with _LOCKS[thread_id]:
-            _MSG_INSTANCE[thread_id].append(msg)
+            if kwargs.get("last", True):
+                msg.is_last = True
+                _MSG_INSTANCE[thread_id].append(msg)
+            else:
+                new_blocks = []
+                if isinstance(msg.content, List):
+                    for block in msg.content:
+                        if block.get("type", "") != "tool_use":
+                            new_blocks.append(block)
+                    msg.content = new_blocks
+                if msg.content:
+                    _MSG_INSTANCE[thread_id].append(msg)
+
     return kwargs
 
 

{agentscope_runtime-0.1.2 → agentscope_runtime-0.1.4}/src/agentscope_runtime/engine/helpers/helper.py

@@ -93,6 +93,39 @@ async def simple_call_agent_tool(agent, query):
     return all_result
 
 
+async def simple_call_agent_tool_auto_lifecycle(agent, query):
+    all_result = ""
+    async with Runner(
+        agent=agent,
+        context_manager=create_context_manager(),
+        environment_manager=create_environment_manager(),
+    ) as runner:
+        request = AgentRequest(
+            input=[
+                {
+                    "role": "user",
+                    "content": [
+                        {
+                            "type": "text",
+                            "text": query,
+                        },
+                    ],
+                },
+            ],
+        )
+
+        async for message in runner.stream_query(
+            request=request,
+        ):
+            if (
+                message.object == "message"
+                and MessageType.MESSAGE == message.type
+                and RunStatus.Completed == message.status
+            ):
+                all_result = message.content[0].text
+    return all_result
+
+
 async def simple_call_agent_tool_wo_env(agent, query):
     all_result = ""
     async with create_context_manager() as context_manager: