jarvis-ai-assistant 0.1.193__py3-none-any.whl → 0.1.195__py3-none-any.whl

jarvis/jarvis_mcp/streamable_mcp_client.py

@@ -12,42 +12,45 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class StreamableMcpClient(McpClient):
     """Streamable HTTP MCP客户端实现
-    
+
     参数:
         config: 配置字典，包含以下字段：
             - base_url: str - MCP服务器的基础URL
             - auth_token: str - 认证令牌（可选）
             - headers: Dict[str, str] - 额外的HTTP头（可选）
     """
+
     def __init__(self, config: Dict[str, Any]):
         self.config = config
-        self.base_url = config.get('base_url', '')
+        self.base_url = config.get("base_url", "")
         if not self.base_url:
-            raise ValueError('No base_url specified in config')
-        
+            raise ValueError("No base_url specified in config")
+
         # 设置HTTP客户端
         self.session = requests.Session()
-        self.session.headers.update({
-            'Content-Type': 'application/json',
-            'Accept': 'application/json',
-        })
-        
+        self.session.headers.update(
+            {
+                "Content-Type": "application/json",
+                "Accept": "application/json",
+            }
+        )
+
         # 添加认证令牌（如果提供）
-        auth_token = config.get('auth_token')
+        auth_token = config.get("auth_token")
         if auth_token:
-            self.session.headers['Authorization'] = f'Bearer {auth_token}'
-        
+            self.session.headers["Authorization"] = f"Bearer {auth_token}"
+
         # 添加额外的HTTP头
-        extra_headers = config.get('headers', {})
+        extra_headers = config.get("headers", {})
         self.session.headers.update(extra_headers)
-        
+
         # 请求相关属性
         self.pending_requests = {}  # 存储等待响应的请求 {id: Event}
-        self.request_results = {}   # 存储请求结果 {id: result}
+        self.request_results = {}  # 存储请求结果 {id: result}
         self.notification_handlers = {}
         self.event_lock = threading.Lock()
         self.request_id_counter = 0
-        
+
         # 初始化连接
         self._initialize()
 
@@ -55,22 +58,24 @@ class StreamableMcpClient(McpClient):
         """初始化MCP连接"""
         try:
             # 发送初始化请求
-            response = self._send_request('initialize', {
-                'processId': None,  # 远程客户端不需要进程ID
-                'clientInfo': {
-                    'name': 'jarvis',
-                    'version': '1.0.0'
+            response = self._send_request(
+                "initialize",
+                {
+                    "processId": None,  # 远程客户端不需要进程ID
+                    "clientInfo": {"name": "jarvis", "version": "1.0.0"},
+                    "capabilities": {},
+                    "protocolVersion": "2025-03-26",
                 },
-                'capabilities': {},
-                'protocolVersion': "2025-03-26"
-            })
+            )
 
             # 验证服务器响应
-            if 'result' not in response:
-                raise RuntimeError(f"初始化失败: {response.get('error', 'Unknown error')}")
+            if "result" not in response:
+                raise RuntimeError(
+                    f"初始化失败: {response.get('error', 'Unknown error')}"
+                )
 
             # 发送initialized通知
-            self._send_notification('notifications/initialized', {})
+            self._send_notification("notifications/initialized", {})
 
         except Exception as e:
             PrettyOutput.print(f"MCP初始化失败: {str(e)}", OutputType.ERROR)
@@ -78,7 +83,7 @@ class StreamableMcpClient(McpClient):
 
     def register_notification_handler(self, method: str, handler: Callable) -> None:
         """注册通知处理器
-        
+
         参数:
             method: 通知方法名
             handler: 处理通知的回调函数，接收params参数
@@ -90,7 +95,7 @@ class StreamableMcpClient(McpClient):
 
     def unregister_notification_handler(self, method: str, handler: Callable) -> None:
         """注销通知处理器
-        
+
         参数:
             method: 通知方法名
             handler: 要注销的处理器函数
@@ -110,38 +115,36 @@ class StreamableMcpClient(McpClient):
 
     def _send_request(self, method: str, params: Dict[str, Any]) -> Dict[str, Any]:
         """发送请求到MCP服务器
-        
+
         参数:
             method: 请求方法
             params: 请求参数
-            
+
         返回:
             Dict[str, Any]: 响应结果
         """
         # 生成唯一请求ID
         req_id = self._get_next_request_id()
-        
+
         # 创建事件标志，用于等待响应
         event = threading.Event()
-        
+
         with self.event_lock:
             self.pending_requests[req_id] = event
-        
+
         try:
             # 构建请求
             request = {
-                'jsonrpc': '2.0',
-                'method': method,
-                'params': params,
-                'id': req_id
+                "jsonrpc": "2.0",
+                "method": method,
+                "params": params,
+                "id": req_id,
             }
 
             # 发送请求到Streamable HTTP端点
-            mcp_url = urljoin(self.base_url, 'mcp')
+            mcp_url = urljoin(self.base_url, "mcp")
             response = self.session.post(
-                mcp_url,
-                json=request,
-                stream=True  # 启用流式传输
+                mcp_url, json=request, stream=True  # 启用流式传输
             )
             response.raise_for_status()
 
@@ -151,22 +154,22 @@ class StreamableMcpClient(McpClient):
                 if line:
                     try:
                         data = json.loads(line)
-                        if 'id' in data and data['id'] == req_id:
+                        if "id" in data and data["id"] == req_id:
                             # 这是我们的请求响应
                             result = data
                             break
-                        elif 'method' in data:
+                        elif "method" in data:
                             # 这是一个通知
-                            method = data.get('method', '')
-                            params = data.get('params', {})
+                            method = data.get("method", "")
+                            params = data.get("params", {})
                             if method in self.notification_handlers:
                                 for handler in self.notification_handlers[method]:
                                     try:
                                         handler(params)
                                     except Exception as e:
                                         PrettyOutput.print(
-                                            f"处理通知时出错 ({method}): {e}", 
-                                            OutputType.ERROR
+                                            f"处理通知时出错 ({method}): {e}",
+                                            OutputType.ERROR,
                                         )
                     except json.JSONDecodeError:
                         PrettyOutput.print(f"无法解析响应: {line}", OutputType.WARNING)
@@ -188,25 +191,18 @@ class StreamableMcpClient(McpClient):
 
     def _send_notification(self, method: str, params: Dict[str, Any]) -> None:
         """发送通知到MCP服务器（不需要响应）
-        
+
         参数:
             method: 通知方法
             params: 通知参数
         """
         try:
             # 构建通知
-            notification = {
-                'jsonrpc': '2.0',
-                'method': method,
-                'params': params
-            }
+            notification = {"jsonrpc": "2.0", "method": method, "params": params}
 
             # 发送通知到Streamable HTTP端点
-            mcp_url = urljoin(self.base_url, 'mcp')
-            response = self.session.post(
-                mcp_url,
-                json=notification
-            )
+            mcp_url = urljoin(self.base_url, "mcp")
+            response = self.session.post(mcp_url, json=notification)
             response.raise_for_status()
 
         except Exception as e:
@@ -215,7 +211,7 @@ class StreamableMcpClient(McpClient):
 
     def get_tool_list(self) -> List[Dict[str, Any]]:
         """获取工具列表
-        
+
         返回:
             List[Dict[str, Any]]: 工具列表，每个工具包含以下字段：
                 - name: str - 工具名称
@@ -223,34 +219,36 @@ class StreamableMcpClient(McpClient):
                 - parameters: Dict - 工具参数
         """
         try:
-            response = self._send_request('tools/list', {})
-            if 'result' in response and 'tools' in response['result']:
+            response = self._send_request("tools/list", {})
+            if "result" in response and "tools" in response["result"]:
                 # 注意这里: 响应结构是 response['result']['tools']
-                tools = response['result']['tools']
+                tools = response["result"]["tools"]
                 # 将MCP协议字段转换为内部格式
                 formatted_tools = []
                 for tool in tools:
                     # 从inputSchema中提取参数定义
-                    input_schema = tool.get('inputSchema', {})
+                    input_schema = tool.get("inputSchema", {})
                     parameters = {}
-                    if 'properties' in input_schema:
-                        parameters = input_schema['properties']
-                    
-                    formatted_tools.append({
-                        'name': tool.get('name', ''),
-                        'description': tool.get('description', ''),
-                        'parameters': parameters
-                    })
+                    if "properties" in input_schema:
+                        parameters = input_schema["properties"]
+
+                    formatted_tools.append(
+                        {
+                            "name": tool.get("name", ""),
+                            "description": tool.get("description", ""),
+                            "parameters": parameters,
+                        }
+                    )
                 return formatted_tools
             else:
                 error_msg = "获取工具列表失败"
-                if 'error' in response:
+                if "error" in response:
                     error_msg += f": {response['error']}"
-                elif 'result' in response:
+                elif "result" in response:
                     error_msg += f": 响应格式不正确 - {response['result']}"
                 else:
                     error_msg += ": 未知错误"
-                    
+
                 PrettyOutput.print(error_msg, OutputType.ERROR)
                 return []
         except Exception as e:
@@ -259,11 +257,11 @@ class StreamableMcpClient(McpClient):
 
     def execute(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
         """执行工具
-        
+
         参数:
             tool_name: 工具名称
             arguments: 参数字典，包含工具执行所需的参数
-            
+
         返回:
             Dict[str, Any]: 执行结果，包含以下字段：
                 - success: bool - 是否执行成功
@@ -271,43 +269,34 @@ class StreamableMcpClient(McpClient):
                 - stderr: str - 标准错误
         """
         try:
-            response = self._send_request('tools/call', {
-                'name': tool_name,
-                'arguments': arguments
-            })
-            if 'result' in response:
-                result = response['result']
+            response = self._send_request(
+                "tools/call", {"name": tool_name, "arguments": arguments}
+            )
+            if "result" in response:
+                result = response["result"]
                 # 从content中提取输出信息
-                stdout = ''
-                stderr = ''
-                for content in result.get('content', []):
-                    if content.get('type') == 'text':
-                        stdout += content.get('text', '')
-                    elif content.get('type') == 'error':
-                        stderr += content.get('text', '')
-                
-                return {
-                    'success': True,
-                    'stdout': stdout,
-                    'stderr': stderr
-                }
+                stdout = ""
+                stderr = ""
+                for content in result.get("content", []):
+                    if content.get("type") == "text":
+                        stdout += content.get("text", "")
+                    elif content.get("type") == "error":
+                        stderr += content.get("text", "")
+
+                return {"success": True, "stdout": stdout, "stderr": stderr}
             else:
                 return {
-                    'success': False,
-                    'stdout': '',
-                    'stderr': response.get('error', 'Unknown error')
+                    "success": False,
+                    "stdout": "",
+                    "stderr": response.get("error", "Unknown error"),
                 }
         except Exception as e:
             PrettyOutput.print(f"执行工具失败: {str(e)}", OutputType.ERROR)
-            return {
-                'success': False,
-                'stdout': '',
-                'stderr': str(e)
-            }
+            return {"success": False, "stdout": "", "stderr": str(e)}
 
     def get_resource_list(self) -> List[Dict[str, Any]]:
         """获取资源列表
-        
+
         返回:
             List[Dict[str, Any]]: 资源列表，每个资源包含以下字段：
                 - uri: str - 资源的唯一标识符
@@ -316,12 +305,12 @@ class StreamableMcpClient(McpClient):
                 - mimeType: str - 资源的MIME类型（可选）
         """
         try:
-            response = self._send_request('resources/list', {})
-            if 'result' in response and 'resources' in response['result']:
-                return response['result']['resources']
+            response = self._send_request("resources/list", {})
+            if "result" in response and "resources" in response["result"]:
+                return response["result"]["resources"]
             else:
                 error_msg = "获取资源列表失败"
-                if 'error' in response:
+                if "error" in response:
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
@@ -333,10 +322,10 @@ class StreamableMcpClient(McpClient):
 
     def get_resource(self, uri: str) -> Dict[str, Any]:
         """获取指定资源的内容
-        
+
         参数:
             uri: str - 资源的URI标识符
-            
+
         返回:
             Dict[str, Any]: 执行结果，包含以下字段：
                 - success: bool - 是否执行成功
@@ -344,51 +333,37 @@ class StreamableMcpClient(McpClient):
                 - stderr: str - 错误信息
         """
         try:
-            response = self._send_request('resources/read', {
-                'uri': uri
-            })
-            if 'result' in response and 'contents' in response['result']:
-                contents = response['result']['contents']
+            response = self._send_request("resources/read", {"uri": uri})
+            if "result" in response and "contents" in response["result"]:
+                contents = response["result"]["contents"]
                 if contents:
                     content = contents[0]  # 获取第一个资源内容
                     # 根据资源类型返回内容
-                    if 'text' in content:
+                    if "text" in content:
                         return {
-                            'success': True,
-                            'stdout': content['text'],
-                            'stderr': ''
+                            "success": True,
+                            "stdout": content["text"],
+                            "stderr": "",
                         }
-                    elif 'blob' in content:
+                    elif "blob" in content:
                         return {
-                            'success': True,
-                            'stdout': content['blob'],
-                            'stderr': ''
+                            "success": True,
+                            "stdout": content["blob"],
+                            "stderr": "",
                         }
-                return {
-                    'success': False,
-                    'stdout': '',
-                    'stderr': '资源内容为空'
-                }
+                return {"success": False, "stdout": "", "stderr": "资源内容为空"}
             else:
                 error_msg = "获取资源内容失败"
-                if 'error' in response:
+                if "error" in response:
                     error_msg += f": {response['error']}"
                 else:
                     error_msg += ": 未知错误"
                 PrettyOutput.print(error_msg, OutputType.ERROR)
-                return {
-                    'success': False,
-                    'stdout': '',
-                    'stderr': error_msg
-                }
+                return {"success": False, "stdout": "", "stderr": error_msg}
         except Exception as e:
             error_msg = f"获取资源内容失败: {str(e)}"
             PrettyOutput.print(error_msg, OutputType.ERROR)
-            return {
-                'success': False,
-                'stdout': '',
-                'stderr': error_msg
-            }
+            return {"success": False, "stdout": "", "stderr": error_msg}
 
     def __del__(self):
         """清理资源"""
@@ -398,7 +373,7 @@ class StreamableMcpClient(McpClient):
                 event.set()  # 释放所有等待的请求
             self.pending_requests.clear()
             self.request_results.clear()
-            
+
         # 关闭HTTP会话
         if self.session:
-            self.session.close() 
+            self.session.close()