jarvis-ai-assistant 0.1.150__tar.gz → 0.1.152__tar.gz

{jarvis_ai_assistant-0.1.150 → jarvis_ai_assistant-0.1.152}/MANIFEST.in

@@ -2,4 +2,5 @@ include README.md
 include LICENSE
 include pyproject.toml
 recursive-include src/jarvis * 
-exclude __pycache__
+exclude __pycache__
+exclude .venv

{jarvis_ai_assistant-0.1.150/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.1.152}/PKG-INFO

@@ -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
@@ -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 → jarvis_ai_assistant-0.1.152}/README.md

@@ -214,6 +214,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 → jarvis_ai_assistant-0.1.152}/pyproject.toml

@@ -8,7 +8,7 @@ default = true
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.150"
+version = "0.1.152"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -40,6 +40,7 @@ dependencies = [
     "torch==2.4.1",
     "python-Levenshtein==0.25.1",
     "sseclient==0.0.27",
+    "pillow==10.2.1",
 ]
 requires-python = ">=3.8"
 

{jarvis_ai_assistant-0.1.150 → jarvis_ai_assistant-0.1.152}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.150",
+    version="0.1.152",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -27,6 +27,7 @@ setup(
         "torch==2.4.1",
         "python-Levenshtein==0.25.1",
         "sseclient==0.0.27",
+        "pillow==10.2.1",
     ],
     entry_points={
         "console_scripts": [

{jarvis_ai_assistant-0.1.150 → jarvis_ai_assistant-0.1.152}/src/jarvis/__init__.py

@@ -1,3 +1,3 @@
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.150"
+__version__ = "0.1.152"

{jarvis_ai_assistant-0.1.150 → jarvis_ai_assistant-0.1.152}/src/jarvis/jarvis_agent/__init__.py

@@ -5,6 +5,7 @@ from typing import Any, Callable, List, Optional, Tuple, Union
 from yaspin import yaspin
 
 from jarvis.jarvis_agent.output_handler import OutputHandler
+from jarvis.jarvis_agent.patch import PatchOutputHandler
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType
@@ -193,7 +194,7 @@ class Agent:
         self.model.set_suppress_output(False)
 
         from jarvis.jarvis_tools.registry import ToolRegistry
-        self.output_handler = output_handler if output_handler else [ToolRegistry()]
+        self.output_handler = output_handler if output_handler else [ToolRegistry(), PatchOutputHandler()]
         self.multiline_inputer = multiline_inputer if multiline_inputer else get_multiline_input
 
         self.prompt = ""
@@ -591,7 +592,10 @@ arguments:
             self.prompt = f"{user_input}"
 
             if self.first:
-                self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(user_input)}"
+                msg = user_input
+                for handler in self.input_handler:
+                    msg, _ = handler(msg, self)
+                self.prompt = f"{user_input}\n\n以下是历史类似问题的执行经验，可参考：\n{load_methodology(msg)}"
                 self.first = False
 
             while True:

{jarvis_ai_assistant-0.1.150 → jarvis_ai_assistant-0.1.152}/src/jarvis/jarvis_git_utils/git_commiter.py

@@ -177,6 +177,13 @@ class GitCommitTool:
                             # 如果成功提取，就跳出循环
                             if commit_message:
                                 break
+                            prompt = f"""格式错误，请按照以下格式重新生成提交信息：
+                            {ot("COMMIT_MESSAGE")}
+        <类型>(<范围>): <主题>
+        
+        [可选] 详细描述变更内容和原因
+        {ct("COMMIT_MESSAGE")}
+                            """
                         spinner.write("✅ 生成提交消息")
 
                         # 执行提交

jarvis_ai_assistant-0.1.152/src/jarvis/jarvis_mcp/__init__.py

@@ -0,0 +1,65 @@
+from abc import ABC, abstractmethod
+from typing import Any, Dict, List
+
+
+class McpClient(ABC):
+    """MCP客户端抽象基类"""
+    
+    @abstractmethod
+    def get_tool_list(self) -> List[Dict[str, Any]]:
+        """获取工具列表
+        
+        返回:
+            List[Dict[str, Any]]: 工具列表，每个工具包含以下字段：
+                - name: str - 工具名称
+                - description: str - 工具描述
+                - parameters: Dict - 工具参数
+        """
+        pass
+    
+    @abstractmethod
+    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 - 标准错误
+        """
+        pass
+
+    @abstractmethod
+    def get_resource_list(self) -> List[Dict[str, Any]]:
+        """获取资源列表
+        
+        返回:
+            List[Dict[str, Any]]: 资源列表，每个资源包含以下字段：
+                - uri: str - 资源的唯一标识符
+                - name: str - 资源的名称
+                - description: str - 资源的描述（可选）
+                - mimeType: str - 资源的MIME类型（可选）
+        """
+        pass
+
+    @abstractmethod
+    def get_resource(self, uri: str) -> Dict[str, Any]:
+        """获取指定资源的内容
+        
+        参数:
+            uri: str - 资源的URI标识符
+            
+        返回:
+            Dict[str, Any]: 资源内容，包含以下字段：
+                - uri: str - 资源的URI
+                - mimeType: str - 资源的MIME类型（可选）
+                - text: str - 文本内容（如果是文本资源）
+                - blob: str - 二进制内容（如果是二进制资源，base64编码）
+        """
+        pass
+
+