jarvis-ai-assistant 0.1.150__py3-none-any.whl → 0.1.152__py3-none-any.whl

{jarvis_ai_assistant-0.1.150.dist-info → jarvis_ai_assistant-0.1.152.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.150
+Version: 0.1.152
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -42,7 +42,7 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests==2.32.3
 Requires-Dist: colorama==0.4.6
-Requires-Dist: prompt-toolkit==3.0.50
+Requires-Dist: prompt_toolkit==3.0.50
 Requires-Dist: yaspin==2.4.0
 Requires-Dist: pygments==2.19.1
 Requires-Dist: fuzzywuzzy==0.18.0
@@ -54,11 +54,16 @@ Requires-Dist: transformers==4.46.3
 Requires-Dist: torch==2.4.1
 Requires-Dist: python-Levenshtein==0.25.1
 Requires-Dist: sseclient==0.0.27
+Requires-Dist: pillow==10.2.1
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
 Requires-Dist: isort; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
+Dynamic: author
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-python
 
 # 🤖 Jarvis AI 助手
 <p align="center">
@@ -276,6 +281,30 @@ class CustomTool:
 ```
 
 
+### 添加MCP
+MCP(模型上下文协议)。在`~/.jarvis/tools/mcp/`中创建YAML配置文件：
+
+#### 本地MCP配置（`stdio`模式）
+```yaml
+type: local
+name: MCP名称
+command: 可执行命令
+args: [参数列表]  # 可选
+env:  # 可选环境变量
+  KEY: VALUE
+```
+
+#### 远程MCP配置（`sse`模式）
+```yaml
+type: remote
+name: MCP名称
+base_url: http://example.com/api
+auth_token: 认证令牌  # 可选
+headers:  # 可选HTTP头
+  X-Custom-Header: value
+```
+
+
 ### 添加新大模型平台
 在 `~/.jarvis/platforms/` 中创建新的 Python 文件：
 ```python

{jarvis_ai_assistant-0.1.150.dist-info → jarvis_ai_assistant-0.1.152.dist-info}/RECORD

@@ -1,5 +1,5 @@
-jarvis/__init__.py,sha256=LAXd2PqzX1hdAOiMxEwjP0kqPkpnlGGCzmHQH7bDoXI,50
-jarvis/jarvis_agent/__init__.py,sha256=QtWu2kh6o5IB_XtGLoxHi5K9lA1t8XoqNUXtX-OqujY,23796
+jarvis/__init__.py,sha256=tsvFvhy5rydxyl_d92GGD4EZIoZ_0NHYhtgTGOJ2GZk,50
+jarvis/jarvis_agent/__init__.py,sha256=LeFNTT1Mzc-PH_bNQ7KRbvBowfQifEQc-Moiun85_9Q,24000
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=0SjlBYnBWKNi3eVdZ7c2NuP82tQej7DEWLAqG6bY1Rc,4357
 jarvis/jarvis_agent/file_input_handler.py,sha256=6R68cSjLBnSJjTKJrSO2IqziRDFnxazU_Jq2t1W1ndo,3695
 jarvis/jarvis_agent/jarvis.py,sha256=-Q-h1M4dgElFnoA2B9H3r0LmnQdoPfiy2JPXzNNihBQ,5155
@@ -35,16 +35,16 @@ jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 jarvis/jarvis_git_details/main.py,sha256=YowncVxYyJ3y2EvGrZhAJeR4yizXp6aB3dqvoYTepFY,6117
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=xBNkAl7_8_pQC-C6RcUImA1mEU4KTqhjtA57rG_mMJ8,2179
-jarvis/jarvis_git_utils/git_commiter.py,sha256=dozU5vmodhb-uiLJBHGRPzUMU1er4xqvjClG3sqNwTA,10780
+jarvis/jarvis_git_utils/git_commiter.py,sha256=pnUiX-KkAMLDBRMXot93T9zTdoYsIJpqVMozMwQo6R0,11096
 jarvis/jarvis_lsp/base.py,sha256=f-76xgNijfQ4G3Q0t8IfOGtCu-q2TSQ7a_in6XwDb_8,2030
 jarvis/jarvis_lsp/cpp.py,sha256=ekci2M9_UtkCSEe9__72h26Gat93r9_knL2VmFr8X5M,3141
 jarvis/jarvis_lsp/go.py,sha256=sSypuQSP5X2YtrVMC8XCc5nXkgfG93SO7sC89lHzoR8,3458
 jarvis/jarvis_lsp/python.py,sha256=OJuYHLHI1aYNNWcAFayy_5GxogwyMC3A7KOYGjxN1yg,1843
 jarvis/jarvis_lsp/registry.py,sha256=-b7lAfZ6SNp3O0ifRiFSLxH0xJlPQhkq4DATDDjJb1U,6491
 jarvis/jarvis_lsp/rust.py,sha256=ICmQs5UVdMZwn5KjaF1YRXBCLUMtGF8Z9IwE5rqWkrU,3686
-jarvis/jarvis_mcp/__init__.py,sha256=gVPImIkjVSYdc9hJykceEiHnO19oX-rHAUuVR3Ztczg,1044
-jarvis/jarvis_mcp/local_mcp_client.py,sha256=cTOVtrMSZCyPsDNvC5egUus11YWSrZYyR7XKBkIIfgo,8404
-jarvis/jarvis_mcp/remote_mcp_client.py,sha256=ji7wO0VxM3I9lDV7eQ1TBTCX9VL6EAVwAVOXnxGxVo4,8112
+jarvis/jarvis_mcp/__init__.py,sha256=gi74_Yz5nsEFhrAyCg1Ovxsj-hLweLjMGoOaceL2yx4,2090
+jarvis/jarvis_mcp/sse_mcp_client.py,sha256=PfhVzJLLb9OAHyxn8wcU2yFRN-EH0_wZiHU_JC8xhvI,23475
+jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=1II-dRWVXXZXZCDfqJNxhmF5kpLt9RHSERe-zZ8iOJ0,11790
 jarvis/jarvis_methodology/main.py,sha256=IBv87UOmdCailgooMtWEcqZcQHmNLhZD-kkGw5jOcVg,3375
 jarvis/jarvis_multi_agent/__init__.py,sha256=SX8lBErhltKyYRM-rymrMz3sJ0Zl3hBXrpsPdFgzkQc,4399
 jarvis/jarvis_multi_agent/main.py,sha256=aGuUC3YQmahabqwDwZXJjfQLYsZ3KIZdf8DZDlVNMe4,1543
@@ -58,7 +58,7 @@ jarvis/jarvis_platform_manager/main.py,sha256=o7UDrcCkLf9dTh2LOO-_bQVHjWf2X6RuSY
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_smart_shell/main.py,sha256=slP_8CwpfMjWFZis0At1ANRlPb3gx1KteAg1B7R7dl4,4546
 jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_tools/ask_codebase.py,sha256=xQTcuDl7cbH6uVkWlkA1HXJAo4_3r09-3SboUkBEBDU,10062
+jarvis/jarvis_tools/ask_codebase.py,sha256=S6NArvKZyK8WEbsEgeGCljjg4D9mteWrq9m352V58jU,9635
 jarvis/jarvis_tools/ask_user.py,sha256=NjxTCHGKo4nthbEQD-isvPCW4PQhTcekEferjnukX70,2143
 jarvis/jarvis_tools/base.py,sha256=vskI4czVdlhbo38ODuF9rFrnWBYQIhJSPAqAkLVcyTs,1165
 jarvis/jarvis_tools/chdir.py,sha256=do_OdtabiH3lZcT_ynjSAX66XgH2gPl9mYiS7dMMDa8,2682
@@ -73,22 +73,22 @@ jarvis/jarvis_tools/lsp_get_diagnostics.py,sha256=IYqv8jQwSK71sZpDBRolSDnYii8t0M
 jarvis/jarvis_tools/methodology.py,sha256=gnlJojY4Dg5v9AAB5xcpKqpPIHs0tOYVtzTHkwOrWk0,5214
 jarvis/jarvis_tools/read_code.py,sha256=_X6D3AIgRD9YplSDnFhXOm8wQAZMA3pkkXy31SG33l0,6041
 jarvis/jarvis_tools/read_webpage.py,sha256=syduSZK4kXRRTPzeZ2W9Q6YH5umKiMJZyjA0cCpSF4g,2198
-jarvis/jarvis_tools/registry.py,sha256=-wzv1Xfzvzu8-A22xTvPnGhgYamuFU_PVmpr_sgoxA8,23083
+jarvis/jarvis_tools/registry.py,sha256=qw9uxfosqjFM1H-i6L4kpgkwK_wNlQjUHmVSP8XxUMU,24821
 jarvis/jarvis_tools/search_web.py,sha256=kWW9K2QUR2AxPq6gcyx4Bgy-0Y4gzcdErq1DNT1EYM4,1333
 jarvis/jarvis_tools/virtual_tty.py,sha256=Rpn9VXUG17LQsY87F_O6UCjN_opXB05mpwozxYf-xVI,16372
 jarvis/jarvis_utils/__init__.py,sha256=KMg-KY5rZIhGTeOD5e2Xo5CU7DX1DUz4ULWAaTQ-ZNw,825
-jarvis/jarvis_utils/config.py,sha256=1OKG64hK740C1RzGk4Kov-6MgpODupMLhuma_OO5vxs,3317
+jarvis/jarvis_utils/config.py,sha256=UXIwt1TknkYIuNW15TNiyZ1HJFdjjAzmt_D7_cd6xxQ,3317
 jarvis/jarvis_utils/embedding.py,sha256=_Q-VurYHQZSsyISClTFjadDaNqNPBMqJe58lMM6bsVs,6991
 jarvis/jarvis_utils/file_processors.py,sha256=oNtVlz2JHcQ60NS6sgI-VsvYXOnsQgFUEVenznCXHC4,2952
 jarvis/jarvis_utils/git_utils.py,sha256=j_Jw6h7JD91XhMf0WD3MAH4URkLUBrrYCLnuLm1GeN4,5630
 jarvis/jarvis_utils/globals.py,sha256=Ed2d6diWXCgI74HVV_tI4qW7yXxLpNvQKN2yG0IH9hc,3388
 jarvis/jarvis_utils/input.py,sha256=QhqZEF4BpOGDgNEBrTBabA5n8DnlU0GaHqbKUEZ13Ls,6953
-jarvis/jarvis_utils/methodology.py,sha256=dVk_1GmVFlZnj1EPR_3wilP2-vyOygAIH56w_8PC8Sw,6281
+jarvis/jarvis_utils/methodology.py,sha256=Q2ldjarnZLU9dBY-i2hOP1WL0SOa8VX_uxNEwE422TY,6400
 jarvis/jarvis_utils/output.py,sha256=BmWdB1bmizv0xfU4Z___9p_xQodorriIcEgADVq9fk0,8416
 jarvis/jarvis_utils/utils.py,sha256=j-YZap58avAzSb9ZuB2I71trVqVxIpFxxZDoh8_7a_o,4653
-jarvis_ai_assistant-0.1.150.dist-info/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.150.dist-info/METADATA,sha256=7qCut4ZuAw6wrI-H61ZzAYaeeljHvPen4W2fDTr0Zrk,10975
-jarvis_ai_assistant-0.1.150.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-jarvis_ai_assistant-0.1.150.dist-info/entry_points.txt,sha256=4ZS8kq6jahnmfDyXFSx39HRi-Tkbp0uFc6cTXt3QIHA,929
-jarvis_ai_assistant-0.1.150.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.150.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.152.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.152.dist-info/METADATA,sha256=px1hZu22QjDeJXmG5oKS2quEvDgShgOhUAWL8kybgnM,11562
+jarvis_ai_assistant-0.1.152.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
+jarvis_ai_assistant-0.1.152.dist-info/entry_points.txt,sha256=4ZS8kq6jahnmfDyXFSx39HRi-Tkbp0uFc6cTXt3QIHA,929
+jarvis_ai_assistant-0.1.152.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.152.dist-info/RECORD,,

{jarvis_ai_assistant-0.1.150.dist-info → jarvis_ai_assistant-0.1.152.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.2)
+Generator: setuptools (79.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

jarvis/jarvis_mcp/remote_mcp_client.py

@@ -1,230 +0,0 @@
-from typing import Any, Dict, List
-import requests
-import sseclient
-from urllib.parse import urljoin
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from . import McpClient
-
-
-class RemoteMcpClient(McpClient):
-    """远程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', '')
-        if not self.base_url:
-            raise ValueError('No base_url specified in config')
-        
-        # 设置HTTP客户端
-        self.session = requests.Session()
-        self.session.headers.update({
-            'Content-Type': 'application/json',
-            'Accept': 'application/json',
-        })
-        
-        # 添加认证令牌（如果提供）
-        auth_token = config.get('auth_token')
-        if auth_token:
-            self.session.headers['Authorization'] = f'Bearer {auth_token}'
-        
-        # 添加额外的HTTP头
-        extra_headers = config.get('headers', {})
-        self.session.headers.update(extra_headers)
-        
-        # 初始化SSE连接
-        self.sse_client = None
-        self._initialize()
-
-    def _initialize(self) -> None:
-        """初始化MCP连接"""
-        try:
-            # 发送初始化请求
-            response = self._send_request('initialize', {
-                'processId': None,  # 远程客户端不需要进程ID
-                'clientInfo': {
-                    'name': 'jarvis',
-                    'version': '1.0.0'
-                },
-                'capabilities': {},
-                'protocolVersion': "2025-03-26"
-            })
-
-            # 验证服务器响应
-            if 'result' not in response:
-                raise RuntimeError(f"初始化失败: {response.get('error', 'Unknown error')}")
-
-            result = response['result']
-            
-            # 发送initialized通知 - 使用正确的方法名格式
-            self._send_notification('notifications/initialized', {})
-
-            # 建立SSE连接
-            sse_url = urljoin(self.base_url, 'events')
-            response = self.session.get(sse_url, stream=True)
-            self.sse_client = sseclient.SSEClient(response)
-
-        except Exception as e:
-            PrettyOutput.print(f"MCP初始化失败: {str(e)}", OutputType.ERROR)
-            raise
-
-    def _send_request(self, method: str, params: Dict[str, Any]) -> Dict[str, Any]:
-        """发送请求到MCP服务器
-        
-        参数:
-            method: 请求方法
-            params: 请求参数
-            
-        返回:
-            Dict[str, Any]: 响应结果
-        """
-        try:
-            # 构建请求
-            request = {
-                'jsonrpc': '2.0',
-                'method': method,
-                'params': params,
-                'id': 1
-            }
-
-            # 发送请求
-            response = self.session.post(
-                urljoin(self.base_url, 'rpc'),
-                json=request
-            )
-            response.raise_for_status()
-            return response.json()
-
-        except Exception as e:
-            PrettyOutput.print(f"发送请求失败: {str(e)}", OutputType.ERROR)
-            raise
-
-    def _send_notification(self, method: str, params: Dict[str, Any]) -> None:
-        """发送通知到MCP服务器（不需要响应）
-        
-        参数:
-            method: 通知方法
-            params: 通知参数
-        """
-        try:
-            # 构建通知
-            notification = {
-                'jsonrpc': '2.0',
-                'method': method,
-                'params': params
-            }
-
-            # 发送通知
-            response = self.session.post(
-                urljoin(self.base_url, 'rpc'),
-                json=notification
-            )
-            response.raise_for_status()
-
-        except Exception as e:
-            PrettyOutput.print(f"发送通知失败: {str(e)}", OutputType.ERROR)
-            raise
-
-    def get_tool_list(self) -> List[Dict[str, Any]]:
-        """获取工具列表
-        
-        返回:
-            List[Dict[str, Any]]: 工具列表，每个工具包含以下字段：
-                - name: str - 工具名称
-                - description: str - 工具描述
-                - parameters: Dict - 工具参数
-        """
-        try:
-            response = self._send_request('tools/list', {})
-            if 'result' in response and 'tools' in response['result']:
-                # 注意这里: 响应结构是 response['result']['tools']
-                tools = response['result']['tools']
-                # 将MCP协议字段转换为内部格式
-                formatted_tools = []
-                for tool in tools:
-                    # 从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
-                    })
-                return formatted_tools
-            else:
-                error_msg = "获取工具列表失败"
-                if 'error' in response:
-                    error_msg += f": {response['error']}"
-                elif 'result' in response:
-                    error_msg += f": 响应格式不正确 - {response['result']}"
-                else:
-                    error_msg += ": 未知错误"
-                    
-                PrettyOutput.print(error_msg, OutputType.ERROR)
-                return []
-        except Exception as e:
-            PrettyOutput.print(f"获取工具列表失败: {str(e)}", OutputType.ERROR)
-            return []
-
-    def execute(self, tool_name: str, arguments: Dict[str, Any]) -> Dict[str, Any]:
-        """执行工具
-        
-        参数:
-            tool_name: 工具名称
-            arguments: 参数字典，包含工具执行所需的参数
-            
-        返回:
-            Dict[str, Any]: 执行结果，包含以下字段：
-                - success: bool - 是否执行成功
-                - stdout: str - 标准输出
-                - stderr: str - 标准错误
-        """
-        try:
-            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
-                }
-            else:
-                return {
-                    '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)
-            }
-
-    def __del__(self):
-        """清理资源"""
-        if self.sse_client and hasattr(self.sse_client, 'resp'):
-            self.sse_client.resp.close()
-        if self.session:
-            self.session.close()