update:合并非tts代码

main/xiaozhi-server/core/mcp/manager.py

@@ -1,26 +1,29 @@
 """MCP服务管理器"""
+
+import asyncio
 import os, json
 from typing import Dict, Any, List
 from .MCPClient import MCPClient
-from config.logger import setup_logging
-from core.utils.util import get_project_dir
-from plugins_func.register import register_function, ActionResponse, Action, ToolType
+from plugins_func.register import register_function, ToolType
+from config.config_loader import get_project_dir
 
 TAG = __name__
 
+
 class MCPManager:
     """管理多个MCP服务的集中管理器"""
 
-    def __init__(self,conn) -> None:
+    def __init__(self, conn) -> None:
         """
         初始化MCP管理器
         """
         self.conn = conn
-        self.logger = setup_logging()
-        self.config_path = get_project_dir() + 'data/.mcp_server_settings.json'
+        self.config_path = get_project_dir() + "data/.mcp_server_settings.json"
         if os.path.exists(self.config_path) == False:
             self.config_path = ""
-            self.logger.bind(tag=TAG).warning(f"请检查mcp服务配置文件：data/.mcp_server_settings.json")
+            self.conn.logger.bind(tag=TAG).warning(
+                f"请检查mcp服务配置文件：data/.mcp_server_settings.json"
+            )
         self.client: Dict[str, MCPClient] = {}
         self.tools = []
 
@@ -31,37 +34,47 @@ class MCPManager:
         """
         if len(self.config_path) == 0:
             return {}
-        
+
         try:
-            with open(self.config_path, 'r', encoding='utf-8') as f:
+            with open(self.config_path, "r", encoding="utf-8") as f:
                 config = json.load(f)
-            return config.get('mcpServers', {})
+            return config.get("mcpServers", {})
         except Exception as e:
-            self.logger.bind(tag=TAG).error(f"Error loading MCP config from {self.config_path}: {e}")
+            self.conn.logger.bind(tag=TAG).error(
+                f"Error loading MCP config from {self.config_path}: {e}"
+            )
             return {}
 
     async def initialize_servers(self) -> None:
         """初始化所有MCP服务"""
         config = self.load_config()
         for name, srv_config in config.items():
-            if not srv_config.get("command"):
-                self.logger.bind(tag=TAG).warning(f"Skipping server {name}: command not specified")
+            if not srv_config.get("command") and not srv_config.get("url"):
+                self.conn.logger.bind(tag=TAG).warning(
+                    f"Skipping server {name}: neither command nor url specified"
+                )
                 continue
 
             try:
                 client = MCPClient(srv_config)
                 await client.initialize()
                 self.client[name] = client
-                self.logger.bind(tag=TAG).info(f"Initialized MCP client: {name}")
+                self.conn.logger.bind(tag=TAG).info(f"Initialized MCP client: {name}")
                 client_tools = client.get_available_tools()
                 self.tools.extend(client_tools)
                 for tool in client_tools:
-                    func_name = "mcp_"+tool["function"]["name"]
-                    register_function(func_name, tool, ToolType.MCP_CLIENT)(self.execute_tool)
-                    self.conn.func_handler.function_registry.register_function(func_name)
+                    func_name = "mcp_" + tool["function"]["name"]
+                    register_function(func_name, tool, ToolType.MCP_CLIENT)(
+                        self.execute_tool
+                    )
+                    self.conn.func_handler.function_registry.register_function(
+                        func_name
+                    )
 
             except Exception as e:
-                self.logger.bind(tag=TAG).error(f"Failed to initialize MCP server {name}: {e}")
+                self.conn.logger.bind(tag=TAG).error(
+                    f"Failed to initialize MCP server {name}: {e}"
+                )
         self.conn.func_handler.upload_functions_desc()
 
     def get_all_tools(self) -> List[Dict[str, Any]]:
@@ -79,7 +92,10 @@ class MCPManager:
             bool: 是否是MCP工具
         """
         for tool in self.tools:
-            if tool.get("function") != None and tool["function"].get("name") == tool_name:
+            if (
+                tool.get("function") != None
+                and tool["function"].get("name") == tool_name
+            ):
                 return True
         return False
 
@@ -87,24 +103,29 @@ class MCPManager:
         """执行工具调用
         Args:
             tool_name: 工具名称
-            arguments: 工具参数 
+            arguments: 工具参数
         Returns:
             Any: 工具执行结果
         Raises:
             ValueError: 工具未找到时抛出
         """
-        self.logger.bind(tag=TAG).info(f"Executing tool {tool_name} with arguments: {arguments}")
+        self.conn.logger.bind(tag=TAG).info(
+            f"Executing tool {tool_name} with arguments: {arguments}"
+        )
         for client in self.client.values():
             if client.has_tool(tool_name):
                 return await client.call_tool(tool_name, arguments)
-            
+
         raise ValueError(f"Tool {tool_name} not found in any MCP server")
 
     async def cleanup_all(self) -> None:
-        for name, client in self.client.items():
+        """依次关闭所有 MCPClient，不让异常阻断整体流程。"""
+        for name, client in list(self.client.items()):
             try:
-                await client.cleanup()
-                self.logger.bind(tag=TAG).info(f"Cleaned up MCP client: {name}")
-            except Exception as e:
-                self.logger.bind(tag=TAG).error(f"Error cleaning up MCP client {name}: {e}")
+                await asyncio.wait_for(client.cleanup(), timeout=20)
+                self.conn.logger.bind(tag=TAG).info(f"MCP client closed: {name}")
+            except (asyncio.TimeoutError, Exception) as e:
+                self.conn.logger.bind(tag=TAG).error(
+                    f"Error closing MCP client {name}: {e}"
+                )
         self.client.clear()