add a timeout parameter to the mcp.

Author: JDOxygen

examples/llms/demo_disable_system_prompt.py

@@ -0,0 +1,27 @@
+import asyncio
+import os
+
+from oxygent import MAS, oxy
+
+oxy_space = [
+    oxy.HttpLLM(
+        name="default_llm",
+        api_key=os.getenv("CHATRHINO_750B_API_KEY"),
+        base_url=os.getenv("CHATRHINO_750B_BASE_URL"),
+        model_name=os.getenv("CHATRHINO_750B_MODEL_NAME"),
+        is_disable_system_prompt=True,  # 适配少部分不支持system prompt的模型
+    ),
+    oxy.ChatAgent(
+        name="master_agent",
+        llm_model="default_llm",
+    ),
+]
+
+
+async def main():
+    async with MAS(oxy_space=oxy_space) as mas:
+        await mas.start_web_service(first_query="hello")
+
+
+if __name__ == "__main__":
+    asyncio.run(main())

oxygent/oxy/agents/local_agent.py

@@ -172,14 +172,9 @@ async def init(self):
             self.llm_model
         ].is_multimodal_supported
         if self.is_multimodal_supported:
-            self.input_schema = {
-                "properties": {
-                    "query": {
-                        "description": "The image path and the query to ask about the images, for example: ![file 1](image1.png) ![file 2](image2.png) What are file 1 and file 2, respectively?"
-                    }
-                },
-                "required": ["query"],
-            }
+            self.input_schema["properties"]["query"]["description"] = (
+                "The image path and the query to ask about the images, for example: ![file 1](image1.png) ![file 2](image2.png) What are file 1 and file 2, respectively?"
+            )
 
         await super().init()
         if self.intent_understanding_agent:

oxygent/oxy/llms/base_llm.py

@@ -79,8 +79,21 @@ class BaseLLM(Oxy):
         default=2 * 1024 * 1024,
         description="Maximum non-media file size (bytes) for base64 embedding.",
     )
+    is_disable_system_prompt: bool = Field(default=False)
 
     async def _get_messages(self, oxy_request: OxyRequest):
+        # merge system prompt
+        if (
+            self.is_disable_system_prompt
+            and oxy_request.arguments["messages"][0].get("role") == "system"
+        ):
+            oxy_request.arguments["messages"][1]["content"] = (
+                oxy_request.arguments["messages"][0]["content"]
+                + "\nUser Input: "
+                + oxy_request.arguments["messages"][1]["content"]
+            )
+            oxy_request.arguments["messages"] = oxy_request.arguments["messages"][1:]
+
         # Preprocess messages for multimoding input
         if not self.is_multimodal_supported:
             return oxy_request.arguments["messages"]

oxygent/oxy/mcp_tools/sse_mcp_client.py

@@ -42,7 +42,11 @@ async def init(self, is_fetch_tools=True) -> None:
             if not self.is_dynamic_headers and self.is_keep_alive:
                 # header
                 sse_transport = await self._exit_stack.enter_async_context(
-                    sse_client(build_url(self.sse_url), headers=self.headers)
+                    sse_client(
+                        build_url(self.sse_url),
+                        headers=self.headers,
+                        timeout=self.timeout,
+                    )
                 )
                 read, write = sse_transport
                 self._session = await self._exit_stack.enter_async_context(
@@ -64,7 +68,7 @@ async def init(self, is_fetch_tools=True) -> None:
                     await self.list_tools()
             else:
                 async with sse_client(
-                    build_url(self.sse_url), headers=self.headers
+                    build_url(self.sse_url), headers=self.headers, timeout=self.timeout
                 ) as streams:
                     async with ClientSession(*streams) as session:
                         await session.initialize()
@@ -76,7 +80,9 @@ async def init(self, is_fetch_tools=True) -> None:
             raise Exception(f"Server {self.name} error")
 
     async def call_tool(self, tool_name, arguments, headers=None):
-        async with sse_client(build_url(self.sse_url), headers=headers, timeout=self.timeout) as streams:
+        async with sse_client(
+            build_url(self.sse_url), headers=headers, timeout=self.timeout
+        ) as streams:
             async with ClientSession(*streams) as session:
                 await session.initialize()
                 return await session.call_tool(tool_name, arguments)

oxygent/oxy/mcp_tools/streamable_mcp_client.py

@@ -27,7 +27,9 @@ async def init(self, is_fetch_tools=True) -> None:
             if not self.is_dynamic_headers and self.is_keep_alive:
                 self._http_transport = await self._exit_stack.enter_async_context(
                     streamablehttp_client(
-                        build_url(self.server_url), headers=self.headers
+                        build_url(self.server_url),
+                        headers=self.headers,
+                        timeout=self.timeout,
                     )
                 )
                 read, write, _ = self._http_transport
@@ -47,12 +49,10 @@ async def init(self, is_fetch_tools=True) -> None:
                     await self.list_tools()
             else:
                 async with streamablehttp_client(
-                    build_url(self.server_url), headers=self.headers
-                ) as (
-                    read,
-                    write,
-                    _,
-                ):
+                    build_url(self.server_url),
+                    headers=self.headers,
+                    timeout=self.timeout,
+                ) as (read, write, _):
                     async with ClientSession(read, write) as session:
                         await session.initialize()
                         tools_response = await session.list_tools()
@@ -64,12 +64,8 @@ async def init(self, is_fetch_tools=True) -> None:
 
     async def call_tool(self, tool_name, arguments, headers=None):
         async with streamablehttp_client(
-            build_url(self.server_url), headers=headers
-        ) as (
-            read,
-            write,
-            _,
-        ):
+            build_url(self.server_url), headers=headers, timeout=self.timeout
+        ) as (read, write, _):
             async with ClientSession(read, write) as session:
                 await session.initialize()
                 return await session.call_tool(tool_name, arguments)

oxygent/preset_tools/__init__.py

@@ -13,7 +13,6 @@
     "system_tools",
     "shell_tools",
     "python_tools",
-    "baidu_search_tools",
     "image_gen_tools",
 ]