agentUniverse 0.0.17.dev4__tar.gz → 0.0.17.dev6__tar.gz

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: agentUniverse
-Version: 0.0.17.dev4
+Version: 0.0.17.dev6
 Summary: agentUniverse is a framework for developing applications powered by multi-agent base on large language model.
 Author: AntGroup
 Author-email: jerry.zzw@antgroup.com
@@ -34,6 +34,7 @@ Requires-Dist: langchain-anthropic (>=0.1.13,<0.2.0)
 Requires-Dist: langchain-community (==0.0.38)
 Requires-Dist: langchain-core (==0.1.52)
 Requires-Dist: loguru (==0.7.2)
+Requires-Dist: mcp (>=1.9.0,<1.10.0)
 Requires-Dist: myst-parser (>=2.0.0,<3.0.0)
 Requires-Dist: networkx (>=3.3,<4.0)
 Requires-Dist: numpy (>=1.26.0,<2.0.0)
@@ -41,6 +42,7 @@ Requires-Dist: ollama (>=0.2.1,<0.3.0)
 Requires-Dist: openai (==1.13.3)
 Requires-Dist: openpyxl (>=3.1.5,<4.0.0)
 Requires-Dist: opentelemetry-exporter-otlp-proto-grpc (>=1.25.0,<2.0.0)
+Requires-Dist: opentracing (>=2.4.0,<3.0.0)
 Requires-Dist: pandas (>=2.2.2,<3.0.0)
 Requires-Dist: pillow (>=10.4.0,<11.0.0)
 Requires-Dist: primp (>=0.6.5,<0.7.0)

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/arxiv_tool.py

@@ -34,7 +34,7 @@ class ArxivTool(Tool):
     sch_engine: Optional[Any] = None
     MAX_QUERY_LENGTH: int = Field(default=300, description="查询字符串最大长度")
 
-    def execute(self, tool_input: ToolInput):
+    def execute(self, input: str, mode: str):
         try:
             import arxiv
         except ImportError:
@@ -43,11 +43,10 @@ class ArxivTool(Tool):
         if self.sch_engine is None:
             self.sch_engine = arxiv.Client()
 
-        mode = tool_input.get_data('mode')
         if mode not in [m.value for m in SearchMode]:
             raise ValueError(f"Invalid mode: {mode}. Must be one of {[m.value for m in SearchMode]}")
 
-        query = tool_input.get_data("input")
+        query = input
         return (self.find_papers_by_str(query) if mode == SearchMode.SEARCH.value
                 else self.retrieve_full_paper_text(query))
         

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/bing_search_tool.py

@@ -25,10 +25,10 @@ class BingSearchTool(Tool):
     bing_subscription_key: Optional[str] = Field(default_factory=lambda: get_from_env("BING_SUBSCRIPTION_KEY"))
     bing_search_url: Optional[str] = Field(default='https://api.bing.microsoft.com/v7.0/search')
 
-    def execute(self, tool_input: ToolInput):
+    def execute(self, input: str):
         if self.bing_subscription_key is None:
-            return MockSearchTool().execute(tool_input)
-        query = tool_input.get_data("input")
+            return MockSearchTool().execute(input)
+        query = input
         # get top5 results from Bing search.
         search = BingSearchAPIWrapper(bing_subscription_key=self.bing_subscription_key, k=5,
                                       bing_search_url=self.bing_search_url)

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/command_status_tool.py

@@ -12,9 +12,7 @@ from agentuniverse.agent.action.tool.common_tool.run_command_tool import get_com
 
 
 class CommandStatusTool(Tool):
-    def execute(self, tool_input: ToolInput) -> str:
-        thread_id = tool_input.get_data("thread_id")
-
+    def execute(self, thread_id: int) -> str:
         if isinstance(thread_id, str) and thread_id.isdigit():
             thread_id = int(thread_id)
 

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/google_search_tool.py

@@ -24,14 +24,12 @@ class GoogleSearchTool(Tool):
 
     serper_api_key: Optional[str] = Field(default_factory=lambda: get_from_env("SERPER_API_KEY"))
 
-    def execute(self, tool_input: ToolInput):
-        input = tool_input.get_data("input")
+    def execute(self, input: str):
         # get top10 results from Google search.
         search = GoogleSerperAPIWrapper(serper_api_key=self.serper_api_key, k=10, gl="us", hl="en", type="search")
         return search.run(query=input)
 
-    async def async_execute(self, tool_input: ToolInput):
-        input = tool_input.get_data("input")
+    async def async_execute(self, input: str):
         # get top10 results from Google search.
         search = GoogleSerperAPIWrapper(serper_api_key=self.serper_api_key, k=10, gl="us", hl="en", type="search")
         return await search.arun(query=input)

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/jina_ai_tool.py

@@ -35,24 +35,31 @@ class JinaAITool(Tool):
     max_read_content_length: int = Field(10000, description="Maximum content length in characters")
     remove_image: bool = Field(True, description="Remove image from content")
     headers: Dict[str, str] = None
-    def execute(self, tool_input: ToolInput):
-        if tool_input.get_data("input") is None:
+    def execute(self,
+                input: str = None,
+                mode: str = None,
+                timeout: int = None,
+                api_key: str = None,
+                max_read_content_length: int = None,
+                remove_image: bool = None,
+                headers: Dict[str, str] = None
+                ):
+        if not input:
             return None
-        input = tool_input.get_data("input")
         
         # Update optional configurations
-        if tool_input.get_data("mode") is not None:
-            self.mode = tool_input.get_data("mode")
-        if tool_input.get_data("timeout") is not None:
-            self.timeout = tool_input.get_data("timeout")
-        if tool_input.get_data("api_key") is not None:
-            self.api_key = tool_input.get_data("api_key")
-        if tool_input.get_data("max_read_content_length") is not None:
-            self.max_read_content_length = tool_input.get_data("max_read_content_length")
-        if tool_input.get_data("remove_image") is not None:
-            self.remove_image = tool_input.get_data("remove_image")
-        if tool_input.get_data("headers") is not None:
-            self.headers = tool_input.get_data("headers")
+        if mode:
+            self.mode = mode
+        if timeout:
+            self.timeout = timeout
+        if api_key:
+            self.api_key = api_key
+        if max_read_content_length:
+            self.max_read_content_length = max_read_content_length
+        if remove_image is not None:
+            self.remove_image = remove_image
+        if headers:
+            self.headers = headers
 
         # print(f"mode: {self.mode}, max_read_content_length: {self.max_read_content_length}, headers: {self.headers}")
 

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/langchain_tool.py

@@ -18,14 +18,10 @@ class LangChainTool(Tool):
     description: Optional[str] = ""
     tool: Optional[BaseTool] = None
 
-    def execute(self, tool_input: ToolInput):
-        input = tool_input.get_data("input")
-        callbacks = tool_input.get_data("callbacks", None)
+    def execute(self, input: str, callbacks):
         return self.tool.run(input, callbacks=callbacks)
 
-    async def async_execute(self, **kwargs):
-        input = kwargs.get("input")
-        callbacks = kwargs.get("callbacks", None)
+    async def async_execute(self, input: str, callbacks):
         return await self.tool.arun(input, callbacks=callbacks)
 
     def initialize_by_component_configer(self, component_configer: ToolConfiger) -> 'Tool':

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/mock_search_tool.py

@@ -13,8 +13,7 @@ class MockSearchTool(Tool):
     """The demo google search mock tool.
     """
 
-    def execute(self, tool_input: ToolInput):
-        input = tool_input.get_data("input")
+    def execute(self, input: str):
         # get top10 results from mock search.
         res = self.mock_api_res()
         return res

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/python_repl.py

@@ -24,8 +24,7 @@ class PythonREPLTool(Tool):
     """
     client: PythonREPL = Field(default_factory=lambda: PythonREPL())
 
-    def execute(self, tool_input: ToolInput):
-        input = tool_input.get_data("input")
+    def execute(self, input: str):
         """Demonstrates the execute method of the Tool class."""
         pattern = re.compile(r"```python(.*?)``", re.DOTALL)
         matches = pattern.findall(input)

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/request_tool.py

@@ -28,8 +28,8 @@ class RequestTool(Tool):
         """Strips quotes from the url."""
         return url.strip("\"'")
 
-    def execute(self, tool_input: ToolInput):
-        input_params: str = tool_input.get_data('input')
+    def execute(self, input: str):
+        input_params: str = input
         if self.json_parser:
             try:
                 parse_data = parse_json_markdown(input_params)

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/run_command_tool.py

@@ -75,10 +75,7 @@ class RunCommandTool(Tool):
     Tool for executing shell commands either synchronously or asynchronously.
     """
 
-    def execute(self, tool_input: ToolInput) -> str:
-        command = tool_input.get_data("command")
-        cwd = tool_input.get_data("cwd", os.getcwd())
-        blocking = tool_input.get_data("blocking", True)
+    def execute(self, command: str, cwd: str, blocking: bool = True) -> str:
         return self._run_command(command, cwd, blocking)
 
     def _run_command(self, command: str, cwd: str, blocking: bool = True) -> str:

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/search_api_tool.py

@@ -44,15 +44,14 @@ class SearchAPITool(Tool):
             self.search_api_wrapper = SearchApiAPIWrapper(searchapi_api_key=self.search_api_key, engine=self.engine)
         return self.search_api_wrapper
 
-    def execute(self, tool_input: ToolInput):
+    def execute(self, input: str, **kwargs):
         self._load_api_wapper()
         search_params = {}
         for k, v in self.search_params.items():
-            if k in tool_input.to_dict():
-                search_params[k] = tool_input.get_data(k)
+            if k in kwargs:
+                search_params[k] = kwargs.get(k)
                 continue
             search_params[k] = v
-        input = tool_input.get_data("input")
         if self.search_type == "json":
             return self.search_api_wrapper.results(query=input, **search_params)
         return self.search_api_wrapper.run(query=input, **search_params)

agentuniverse-0.0.17.dev6/agentuniverse/agent/action/tool/common_tool/simple_math_tool.py

@@ -0,0 +1,58 @@
+# !/usr/bin/env python3
+# -*- coding:utf-8 -*-
+
+# @Time    :
+# @Author  :
+# @Email   :
+# @FileName: simple_math_tool.py
+
+
+from agentuniverse.agent.action.tool.tool import Tool, ToolInput
+
+
+class AddTool(Tool):
+    def execute(self, input: str):
+        a, b = input.split(',')
+        result = float(a) + float(b)
+        return result
+
+    async def async_execute(self, input: str):
+        a, b = input.split(',')
+        result = float(a) + float(b)
+        return result
+
+
+class SubtractTool(Tool):
+    def execute(self, input: str):
+        a, b = input.split(',')
+        result = float(a) - float(b)
+        return result
+
+    async def async_execute(self, input: str):
+        a, b = input.split(',')
+        result = float(a) - float(b)
+        return result
+
+
+class MultiplyTool(Tool):
+    def execute(self, input: str):
+        a, b = input.split(',')
+        result = float(a) * float(b)
+        return result
+
+    async def async_execute(self, input: str):
+        a, b = input.split(',')
+        result = float(a) * float(b)
+        return result
+
+
+class DivideTool(Tool):
+    def execute(self, input: str):
+        a, b = input.split(',')
+        result = float(a) / float(b)
+        return result
+
+    async def async_execute(self, input: str):
+        a, b = input.split(',')
+        result = float(a) / float(b)
+        return result

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/sql_langchain_tool.py

@@ -17,10 +17,10 @@ class SqlLangchainTool(LangChainTool):
     db_wrapper_name: Optional[str] = ""
     clz: Type[BaseTool] = BaseTool
 
-    def execute(self, tool_input: ToolInput):
+    def execute(self, input: str, callbacks):
         if self.tool is None:
             self.get_sql_database()
-        return super().execute(tool_input)
+        return super().execute(input, callbacks)
 
     def get_sql_database(self):
         db_wrapper = SQLDBWrapperManager().get_instance_obj(self.db_wrapper_name)

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/tavily_tool.py

@@ -57,7 +57,7 @@ class TavilyTool(Tool):
     # 提取模式可选参数
     extract_depth: Literal["basic", "advanced"] = Field(default="advanced", description="提取深度")
 
-    def execute(self, tool_input: ToolInput):
+    def execute(self, input: str | list = None, **kwargs):
         """执行Tavily工具。
         
         Args:
@@ -78,8 +78,8 @@ class TavilyTool(Tool):
         ]
         
         for param in possible_params:
-            if tool_input.get_data(param) is not None:
-                setattr(self, param, tool_input.get_data(param))
+            if kwargs.get(param) is not None:
+                setattr(self, param, kwargs.get(param))
 
         try:
             # 初始化Tavily客户端
@@ -88,7 +88,7 @@ class TavilyTool(Tool):
             # 根据操作模式执行不同的操作
             if self.mode == "extract":
                 # 提取模式
-                urls = tool_input.get_data("input")
+                urls = input
                 if not urls:
                     return {"error": "未提供要提取内容的URL"}
                 
@@ -111,7 +111,7 @@ class TavilyTool(Tool):
                 return result
             else:
                 # 搜索模式
-                query = tool_input.get_data("input")
+                query = input
                 if not query:
                     return {"error": "未提供搜索查询"}
                 

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/view_file_tool.py

@@ -13,11 +13,11 @@ from agentuniverse.agent.action.tool.tool import Tool, ToolInput
 
 
 class ViewFileTool(Tool):
-    def execute(self, tool_input: ToolInput) -> str:
-        file_path = tool_input.get_data("file_path")
-        start_line = tool_input.get_data("start_line", 0)
-        end_line = tool_input.get_data("end_line", None)
-
+    def execute(self,
+                file_path: str,
+                start_line: int = 0,
+                end_line: int = None
+                ) -> str:
         if not file_path or not os.path.isfile(file_path):
             return json.dumps({
                 "error": f"File not found: {file_path}",

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/common_tool/write_file_tool.py

@@ -13,11 +13,10 @@ from agentuniverse.agent.action.tool.tool import Tool, ToolInput
 
 
 class WriteFileTool(Tool):
-    def execute(self, tool_input: ToolInput) -> str:
-        file_path = tool_input.get_data("file_path")
-        content = tool_input.get_data("content", "")
-        append = tool_input.get_data("append", False)
-
+    def execute(self,
+                file_path: str,
+                content: str = '',
+                append: bool = False) -> str:
         directory = os.path.dirname(file_path)
         if directory and not os.path.exists(directory):
             try:

{agentuniverse-0.0.17.dev4 → agentuniverse-0.0.17.dev6}/agentuniverse/agent/action/tool/enum.py

@@ -12,4 +12,5 @@ from enum import Enum
 @enum.unique
 class ToolTypeEnum(Enum):
     API = 'api'
+    MCP = 'mcp'
     FUNC = 'func'

agentuniverse-0.0.17.dev6/agentuniverse/agent/action/tool/mcp_tool.py

@@ -0,0 +1,117 @@
+# !/usr/bin/env python3
+# -*- coding:utf-8 -*-
+import asyncio
+from typing import Any, Optional, Literal, List
+
+from mcp.types import CallToolResult
+
+from agentuniverse.agent.action.tool.tool import Tool, ToolInput
+from agentuniverse.base.config.component_configer.component_configer import \
+    ComponentConfiger
+from agentuniverse.base.config.component_configer.configers.tool_configer import \
+    ToolConfiger
+from agentuniverse.base.context.mcp_session_manager import MCPSessionManager, \
+    MCPTempClient
+from agentuniverse.base.util.async_util import run_async_from_sync
+
+
+# @Time    : 2025/4/14 18:11
+# @Author  : fanen.lhy
+# @Email   : fanen.lhy@antgroup.com
+# @FileName: mcp_tool.py
+
+
+class MCPTool(Tool):
+
+    server_name: str = ''
+    transport: Literal["stdio", "sse", "websocket", "streamable_http"] = "stdio"
+    url: str = ''
+    command: str = ''
+    args: List[str] = []
+    env: Optional[dict] = None
+    connection_kwargs: Optional[dict] = None
+    # You can use origin_tool_name while you want another name for this aU tool
+    origin_tool_name: str = ''
+
+    @property
+    def tool_name(self) -> str:
+        return self.origin_tool_name if self.origin_tool_name else self.name
+
+    def execute(self, **kwargs) -> CallToolResult:
+        session = MCPSessionManager().get_mcp_server_session_sync(
+            server_name=self.server_name,
+            **self.get_mcp_server_connect_args()
+        )
+        result = MCPSessionManager().run_async(session.call_tool, self.tool_name, kwargs)
+        return result
+
+    async def async_execute(self, **kwargs) -> CallToolResult:
+        session = await MCPSessionManager().get_mcp_server_session(
+            server_name=self.server_name,
+            **self.get_mcp_server_connect_args()
+        )
+        result = await session.call_tool(self.tool_name, kwargs)
+        return result
+
+
+    def get_mcp_server_connect_args(self) -> dict:
+        if self.transport == "sse":
+            connect_args = {
+                'transport': self.transport,
+                'url': self.url
+            }
+        elif self.transport == "stdio":
+            return {
+                'transport': self.transport,
+                "command": self.command,
+                "args": self.args,
+                'env': self.env
+            }
+        elif self.transport == "streamable_http":
+            connect_args = {
+                'transport': self.transport,
+                'url': self.url
+            }
+        elif self.transport == "websocket":
+            connect_args = {
+                'transport': self.transport,
+                'url': self.url
+            }
+        else:
+            raise Exception(
+                f'Unsupported mcp server type: {self.transport}')
+        if self.connection_kwargs and isinstance(self.connection_kwargs, dict):
+            connect_args.update(self.connection_kwargs)
+        return connect_args
+
+    def initialize_by_component_configer(self, component_configer: ToolConfiger) -> 'MCPTool':
+        """Initialize the agent model by component configer."""
+        super().initialize_by_component_configer(component_configer)
+        self._initialize_by_component_configer(component_configer)
+        return self
+
+    async def get_tool_info(self):
+        async with MCPTempClient(
+            self.get_mcp_server_connect_args()
+        ) as client:
+            tools_list = await client.session.list_tools()
+        tools = tools_list.tools
+        tool_info = None
+        for _tool in tools:
+            if _tool.name == self.tool_name:
+                tool_info = _tool
+                break
+        if not tool_info:
+            raise Exception(f'No tool named {self.tool_name} in mcp server {self.server_name}')
+        self.input_keys = tool_info.inputSchema['required']
+        self.args_model_schema = tool_info.inputSchema
+        if not self.description:
+            self.description = f'{tool_info.description}\n{str(tool_info.inputSchema)}'
+
+    def _initialize_by_component_configer(self, component_configer: ComponentConfiger) -> 'MCPTool':
+        if not self.server_name:
+            # use an unique name to manage session
+            self.server_name = self.name
+        coro = self.get_tool_info()
+        run_async_from_sync(coro, timeout=10)
+        return self