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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: jarvis-ai-assistant
-Version: 0.1.148
+Version: 0.1.150
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -40,32 +40,20 @@ Classifier: Programming Language :: Python :: 3.11
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: requests>=2.25.1
-Requires-Dist: pyyaml>=5.1
-Requires-Dist: colorama>=0.4.6
-Requires-Dist: prompt_toolkit>=3.0.0
-Requires-Dist: openai>=1.20.0
-Requires-Dist: numpy>=1.19.5
-Requires-Dist: faiss-cpu>=1.8.0
-Requires-Dist: sentence-transformers>=2.2.2
-Requires-Dist: bs4>=0.0.1
-Requires-Dist: PyMuPDF>=1.21.0
-Requires-Dist: python-docx>=0.8.11
-Requires-Dist: tiktoken>=0.3.0
-Requires-Dist: tqdm>=4.65.0
-Requires-Dist: docx>=0.2.4
-Requires-Dist: yaspin>=2.4.0
-Requires-Dist: rich>=13.3.1
-Requires-Dist: pygments>=2.15.0
-Requires-Dist: fuzzywuzzy>=0.18.0
-Requires-Dist: python-Levenshtein>=0.25.0
-Requires-Dist: jedi>=0.17.2
-Requires-Dist: psutil>=7.0.0
-Requires-Dist: fastapi>=0.115.4
-Requires-Dist: uvicorn>=0.33.0
-Requires-Dist: python-pptx>=1.0.0
-Requires-Dist: pandas>=2.0.0
-Requires-Dist: html2text>=2024.2.26
+Requires-Dist: requests==2.32.3
+Requires-Dist: colorama==0.4.6
+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
+Requires-Dist: jedi==0.19.2
+Requires-Dist: fastapi==0.115.12
+Requires-Dist: uvicorn==0.33.0
+Requires-Dist: rich==14.0.0
+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
 Provides-Extra: dev
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: black; extra == "dev"
@@ -82,6 +70,7 @@ Requires-Dist: mypy; extra == "dev"
 
 *您的智能开发和系统交互助手*
 
+[视频介绍](#video-introduction) •
 [快速开始](#quick-start) •
 [配置说明](#configuration) •
 [工具说明](#tools) •
@@ -92,6 +81,11 @@ Requires-Dist: mypy; extra == "dev"
 
 ---
 
+## 📺 视频介绍<a id="video-introduction"></a>
+
+[![视频介绍](docs/images/intro.png)](https://player.bilibili.com/player.html?isOutside=true&aid=114306578382907&bvid=BV1x2dAYeEpM&cid=29314583629&p=1)
+
+
 ## 🚀 快速开始 <a id="quick-start"></a>
 ### 安装
 ```bash
@@ -194,13 +188,12 @@ jarvis-methodology --help
 |------|----------|--------|------|
 | 核心配置 | `JARVIS_MAX_TOKEN_COUNT` | 102400000 | 上下文窗口的最大token数量 |
 | 核心配置 | `JARVIS_MAX_INPUT_TOKEN_COUNT` | 32000 | 输入的最大token数量 |
-| 核心配置 | `JARVIS_THREAD_COUNT` | 1 | 并行处理的线程数量 |
-| 核心配置 | `JARVIS_AUTO_COMPLETE` | false | 是否启用自动补全功能 
+| 核心配置 | `JARVIS_AUTO_COMPLETE` | false | 是否启用自动完成功能（任务判定完成的时候会自动终止） |
 | 核心配置 | `JARVIS_SHELL_NAME` | bash | 系统shell名称 |
 | 核心配置 | `JARVIS_PLATFORM` | yuanbao | 默认AI平台 |
 | 核心配置 | `JARVIS_MODEL` | deep_seek_v3 | 默认模型 |
-| 核心配置 | `JARVIS_THINKING_PLATFORM` | JARVIS_PLATFORM | 思考任务使用的平台 |
-| 核心配置 | `JARVIS_THINKING_MODEL` | JARVIS_MODEL | 思考任务使用的模型 |
+| 核心配置 | `JARVIS_THINKING_PLATFORM` | JARVIS_PLATFORM | 推理任务使用的平台 |
+| 核心配置 | `JARVIS_THINKING_MODEL` | JARVIS_MODEL | 推理任务使用的模型 |
 | 核心配置 | `JARVIS_EXECUTE_TOOL_CONFIRM` | false | 执行工具前是否需要确认 |
 | 核心配置 | `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | true | 应用补丁前是否需要确认 |
 | 核心配置 | `JARVIS_MAX_TOOL_CALL_COUNT` | 20 | 最大连续工具调用次数 |
@@ -215,17 +208,17 @@ jarvis-methodology --help
 | ask_user | 交互式用户输入收集 |
 | chdir | 更改当前工作目录 |
 | code_plan | 理解需求并制定详细的代码修改计划，在修改前获取用户确认 |
-| create_code_agent | 代码开发工具，当需要修改代码时使用，如果只是简单文件修改，使用文件操作或者脚本即可 |
+| create_code_agent | 代码开发工具，当需要修改代码时使用 |
 | create_sub_agent | 创建子代理以处理特定任务，子代理将生成任务总结报告 |
 | execute_script | 执行脚本并返回结果，支持任意解释器。 |
 | file_analyzer | 分析文件内容并提取关键信息。支持的文件：文本文件、word文档、pdf文件、图片 |
-| file_operation | 文件批量操作工具，可批量读写多个文件，支持文本、PDF、Word、Excel、PPT等格式，适用于需要同时处理多个文件的场景（读取配置文件、保存生成内容等） |
+| file_operation | 文件批量操作工具，可批量读写多个文件，支持文本文件，适用于需要同时处理多个文件的场景（读取配置文件、保存生成内容等） |
 | find_methodology | 方法论查找工具，用于在执行过程中查看历史方法论辅助决策 |
 | lsp_get_diagnostics | 获取代码诊断信息（错误、警告） |
-| methodology | 经验管理工具，支持添加、更新和删除操作 |
+| methodology | 方法论管理工具，支持添加、更新和删除操作 |
 | read_code | 代码阅读与分析工具，用于读取源代码文件并添加行号，针对代码文件优化，提供更好的格式化输出和行号显示，适用于代码分析、审查和理解代码实现的场景 |
-| read_webpage | 读取网页内容，提取标题、文本和超链接 |
-| search_web | 使用bing进行网络搜索 |
+| read_webpage | 读取网页内容并分析 |
+| search_web | 使用互联网搜索 |
 | virtual_tty | 控制虚拟终端执行各种操作，如启动终端、输入命令、获取输出等。 |
 
 
@@ -235,7 +228,7 @@ jarvis-methodology --help
 ---
 ## 🛠️ 扩展开发 <a id="extensions"></a>
 ### 添加新工具
-在 `~/.jarvis/tools/》 中创建新的 Python 文件：
+在 `~/.jarvis/tools/` 中创建新的 Python 文件：
 ```python
 from typing import Dict, Any
 from jarvis.utils import OutputType, PrettyOutput
@@ -284,7 +277,7 @@ class CustomTool:
 
 
 ### 添加新大模型平台
-在 `~/.jarvis/platforms/》 中创建新的 Python 文件：
+在 `~/.jarvis/platforms/` 中创建新的 Python 文件：
 ```python
 from jarvis.jarvis_platform.base import BasePlatform
 class CustomPlatform(BasePlatform):

{jarvis_ai_assistant-0.1.148 → jarvis_ai_assistant-0.1.150}/README.md

@@ -8,6 +8,7 @@
 
 *您的智能开发和系统交互助手*
 
+[视频介绍](#video-introduction) •
 [快速开始](#quick-start) •
 [配置说明](#configuration) •
 [工具说明](#tools) •
@@ -18,6 +19,11 @@
 
 ---
 
+## 📺 视频介绍<a id="video-introduction"></a>
+
+[![视频介绍](docs/images/intro.png)](https://player.bilibili.com/player.html?isOutside=true&aid=114306578382907&bvid=BV1x2dAYeEpM&cid=29314583629&p=1)
+
+
 ## 🚀 快速开始 <a id="quick-start"></a>
 ### 安装
 ```bash
@@ -120,13 +126,12 @@ jarvis-methodology --help
 |------|----------|--------|------|
 | 核心配置 | `JARVIS_MAX_TOKEN_COUNT` | 102400000 | 上下文窗口的最大token数量 |
 | 核心配置 | `JARVIS_MAX_INPUT_TOKEN_COUNT` | 32000 | 输入的最大token数量 |
-| 核心配置 | `JARVIS_THREAD_COUNT` | 1 | 并行处理的线程数量 |
-| 核心配置 | `JARVIS_AUTO_COMPLETE` | false | 是否启用自动补全功能 
+| 核心配置 | `JARVIS_AUTO_COMPLETE` | false | 是否启用自动完成功能（任务判定完成的时候会自动终止） |
 | 核心配置 | `JARVIS_SHELL_NAME` | bash | 系统shell名称 |
 | 核心配置 | `JARVIS_PLATFORM` | yuanbao | 默认AI平台 |
 | 核心配置 | `JARVIS_MODEL` | deep_seek_v3 | 默认模型 |
-| 核心配置 | `JARVIS_THINKING_PLATFORM` | JARVIS_PLATFORM | 思考任务使用的平台 |
-| 核心配置 | `JARVIS_THINKING_MODEL` | JARVIS_MODEL | 思考任务使用的模型 |
+| 核心配置 | `JARVIS_THINKING_PLATFORM` | JARVIS_PLATFORM | 推理任务使用的平台 |
+| 核心配置 | `JARVIS_THINKING_MODEL` | JARVIS_MODEL | 推理任务使用的模型 |
 | 核心配置 | `JARVIS_EXECUTE_TOOL_CONFIRM` | false | 执行工具前是否需要确认 |
 | 核心配置 | `JARVIS_CONFIRM_BEFORE_APPLY_PATCH` | true | 应用补丁前是否需要确认 |
 | 核心配置 | `JARVIS_MAX_TOOL_CALL_COUNT` | 20 | 最大连续工具调用次数 |
@@ -141,17 +146,17 @@ jarvis-methodology --help
 | ask_user | 交互式用户输入收集 |
 | chdir | 更改当前工作目录 |
 | code_plan | 理解需求并制定详细的代码修改计划，在修改前获取用户确认 |
-| create_code_agent | 代码开发工具，当需要修改代码时使用，如果只是简单文件修改，使用文件操作或者脚本即可 |
+| create_code_agent | 代码开发工具，当需要修改代码时使用 |
 | create_sub_agent | 创建子代理以处理特定任务，子代理将生成任务总结报告 |
 | execute_script | 执行脚本并返回结果，支持任意解释器。 |
 | file_analyzer | 分析文件内容并提取关键信息。支持的文件：文本文件、word文档、pdf文件、图片 |
-| file_operation | 文件批量操作工具，可批量读写多个文件，支持文本、PDF、Word、Excel、PPT等格式，适用于需要同时处理多个文件的场景（读取配置文件、保存生成内容等） |
+| file_operation | 文件批量操作工具，可批量读写多个文件，支持文本文件，适用于需要同时处理多个文件的场景（读取配置文件、保存生成内容等） |
 | find_methodology | 方法论查找工具，用于在执行过程中查看历史方法论辅助决策 |
 | lsp_get_diagnostics | 获取代码诊断信息（错误、警告） |
-| methodology | 经验管理工具，支持添加、更新和删除操作 |
+| methodology | 方法论管理工具，支持添加、更新和删除操作 |
 | read_code | 代码阅读与分析工具，用于读取源代码文件并添加行号，针对代码文件优化，提供更好的格式化输出和行号显示，适用于代码分析、审查和理解代码实现的场景 |
-| read_webpage | 读取网页内容，提取标题、文本和超链接 |
-| search_web | 使用bing进行网络搜索 |
+| read_webpage | 读取网页内容并分析 |
+| search_web | 使用互联网搜索 |
 | virtual_tty | 控制虚拟终端执行各种操作，如启动终端、输入命令、获取输出等。 |
 
 
@@ -161,7 +166,7 @@ jarvis-methodology --help
 ---
 ## 🛠️ 扩展开发 <a id="extensions"></a>
 ### 添加新工具
-在 `~/.jarvis/tools/》 中创建新的 Python 文件：
+在 `~/.jarvis/tools/` 中创建新的 Python 文件：
 ```python
 from typing import Dict, Any
 from jarvis.utils import OutputType, PrettyOutput
@@ -210,7 +215,7 @@ class CustomTool:
 
 
 ### 添加新大模型平台
-在 `~/.jarvis/platforms/》 中创建新的 Python 文件：
+在 `~/.jarvis/platforms/` 中创建新的 Python 文件：
 ```python
 from jarvis.jarvis_platform.base import BasePlatform
 class CustomPlatform(BasePlatform):

{jarvis_ai_assistant-0.1.148 → jarvis_ai_assistant-0.1.150}/pyproject.toml

@@ -2,9 +2,13 @@
 requires = ["setuptools>=45", "wheel"]
 build-backend = "setuptools.build_meta"
 
+[[tool.uv.index]]
+url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
+default = true
+
 [project]
 name = "jarvis-ai-assistant"
-version = "0.1.148"
+version = "0.1.150"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]
@@ -22,32 +26,20 @@ classifiers = [
 ]
 keywords = ["jarvis", "ai", "assistant", "tools", "automation"]
 dependencies = [
-    "requests>=2.25.1",
-    "pyyaml>=5.1",
-    "colorama>=0.4.6",
-    "prompt_toolkit>=3.0.0",
-    "openai>=1.20.0",
-    "numpy>=1.19.5",
-    "faiss-cpu>=1.8.0",
-    "sentence-transformers>=2.2.2",
-    "bs4>=0.0.1",
-    "PyMuPDF>=1.21.0",
-    "python-docx>=0.8.11",
-    "tiktoken>=0.3.0",
-    "tqdm>=4.65.0",
-    "docx>=0.2.4",
-    "yaspin>=2.4.0",
-    "rich>=13.3.1",
-    "pygments>=2.15.0",
-    "fuzzywuzzy>=0.18.0",
-    "python-Levenshtein>=0.25.0",
-    "jedi>=0.17.2",
-    "psutil>=7.0.0",
-    "fastapi>=0.115.4",
-    "uvicorn>=0.33.0",
-    "python-pptx>=1.0.0",
-    "pandas>=2.0.0",
-    "html2text>=2024.2.26",
+    "requests==2.32.3",
+    "colorama==0.4.6",
+    "prompt_toolkit==3.0.50",
+    "yaspin==2.4.0",
+    "pygments==2.19.1",
+    "fuzzywuzzy==0.18.0",
+    "jedi==0.19.2",
+    "fastapi==0.115.12",
+    "uvicorn==0.33.0",
+    "rich==14.0.0",
+    "transformers==4.46.3",
+    "torch==2.4.1",
+    "python-Levenshtein==0.25.1",
+    "sseclient==0.0.27",
 ]
 requires-python = ">=3.8"
 

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

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.1.148",
+    version="0.1.150",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",
@@ -13,32 +13,20 @@ setup(
     package_dir={"": "src"},
     include_package_data=True,
     install_requires=[
-        "requests>=2.25.1",
-        "pyyaml>=5.1",
-        "colorama>=0.4.6",
-        "prompt_toolkit>=3.0.0",
-        "openai>=1.20.0",
-        "numpy>=1.19.5",
-        "faiss-cpu>=1.8.0",
-        "sentence-transformers>=2.2.2",
-        "bs4>=0.0.1",
-        "PyMuPDF>=1.21.0",
-        "python-docx>=0.8.11",
-        "tiktoken>=0.3.0",
-        "tqdm>=4.65.0",
-        "docx>=0.2.4",
-        "yaspin>=2.4.0",
-        "rich>=13.3.1",
-        "pygments>=2.15.0",
-        "fuzzywuzzy>=0.18.0",
-        "python-Levenshtein>=0.25.0",
-        "jedi>=0.17.2",
-        "psutil>=7.0.0",
-        "fastapi>=0.115.4",
-        "uvicorn>=0.33.0",
-        "python-pptx>=1.0.0",
-        "pandas>=2.0.0",
-        "html2text>=2024.2.26",
+        "requests==2.32.3",
+        "colorama==0.4.6",
+        "prompt_toolkit==3.0.50",
+        "yaspin==2.4.0",
+        "pygments==2.19.1",
+        "fuzzywuzzy==0.18.0",
+        "jedi==0.19.2",
+        "fastapi==0.115.12",
+        "uvicorn==0.33.0",
+        "rich==14.0.0",
+        "transformers==4.46.3",
+        "torch==2.4.1",
+        "python-Levenshtein==0.25.1",
+        "sseclient==0.0.27",
     ],
     entry_points={
         "console_scripts": [

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

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

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

@@ -4,6 +4,7 @@ import sys
 
 from typing import Dict  # 仅保留实际使用的类型导入
 
+from jarvis.jarvis_utils.config import get_data_dir
 from prompt_toolkit import prompt
 import yaml
 from yaspin import yaspin
@@ -25,13 +26,14 @@ def _load_tasks() -> Dict[str, str]:
     """Load tasks from .jarvis files in user home and current directory."""
     tasks: Dict[str, str] = {}
 
-    # Check .jarvis/pre-command in user directory
-    user_jarvis = os.path.expanduser("~/.jarvis/pre-command")
-    if os.path.exists(user_jarvis):
-        spinner_text = f"从{user_jarvis}加载预定义任务..."
+    # Check pre-command in data directory
+    data_dir = get_data_dir()
+    pre_command_path = os.path.join(data_dir, "pre-command")
+    if os.path.exists(pre_command_path):
+        spinner_text = f"从{pre_command_path}加载预定义任务..."
         with yaspin(text=spinner_text, color="cyan") as spinner:
             try:
-                with open(user_jarvis, "r", encoding="utf-8", errors="ignore") as f:
+                with open(pre_command_path, "r", encoding="utf-8", errors="ignore") as f:
                     user_tasks = yaml.safe_load(f)
                 if isinstance(user_tasks, dict):
                     for name, desc in user_tasks.items():

{jarvis_ai_assistant-0.1.148 → jarvis_ai_assistant-0.1.150}/src/jarvis/jarvis_agent/main.py

@@ -1,7 +1,6 @@
 import argparse
 import yaml
 import os
-from typing import Optional, List
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import PrettyOutput, OutputType

{jarvis_ai_assistant-0.1.148 → jarvis_ai_assistant-0.1.150}/src/jarvis/jarvis_agent/patch.py

@@ -238,7 +238,8 @@ def revert_file(filepath: str):
         # 检查文件是否在版本控制中
         result = subprocess.run(
             ['git', 'ls-files', '--error-unmatch', filepath],
-            stderr=subprocess.PIPE
+            stderr=subprocess.PIPE,
+            text=False  # 禁用自动文本解码
         )
         if result.returncode == 0:
             subprocess.run(['git', 'checkout', 'HEAD',
@@ -248,33 +249,67 @@ def revert_file(filepath: str):
                 os.remove(filepath)
         subprocess.run(['git', 'clean', '-f', '--', filepath], check=True)
     except subprocess.CalledProcessError as e:
-        PrettyOutput.print(f"恢复文件失败: {str(e)}", OutputType.ERROR)
+        error_msg = e.stderr.decode('utf-8', errors='replace') if e.stderr else str(e)
+        PrettyOutput.print(f"恢复文件失败: {error_msg}", OutputType.ERROR)
 # 修改后的恢复函数
 
 
 def revert_change():
+    """恢复所有未提交的修改到HEAD状态"""
     import subprocess
-    subprocess.run(['git', 'reset', '--hard', 'HEAD'], check=True)
-    subprocess.run(['git', 'clean', '-fd'], check=True)
+    try:
+        # 检查是否为空仓库
+        head_check = subprocess.run(
+            ['git', 'rev-parse', '--verify', 'HEAD'],
+            stderr=subprocess.PIPE,
+            stdout=subprocess.PIPE
+        )
+        if head_check.returncode == 0:
+            subprocess.run(['git', 'reset', '--hard', 'HEAD'], check=True)
+        subprocess.run(['git', 'clean', '-fd'], check=True)
+    except subprocess.CalledProcessError as e:
+        return f"恢复更改失败: {str(e)}"
 # 修改后的获取差异函数
 
 
 def get_diff() -> str:
     """使用git获取暂存区差异"""
     import subprocess
+    
+    # 初始化状态
+    need_reset = False
+    
     try:
+        # 暂存所有修改
         subprocess.run(['git', 'add', '.'], check=True)
+        need_reset = True
+        
+        # 获取差异
         result = subprocess.run(
             ['git', 'diff', '--cached'],
             capture_output=True,
-            text=True,
+            text=False,
             check=True
         )
-        ret = result.stdout
-        subprocess.run(['git', "reset", "--mixed", "HEAD"], check=True)
+        
+        # 解码输出
+        try:
+            ret = result.stdout.decode('utf-8')
+        except UnicodeDecodeError:
+            ret = result.stdout.decode('utf-8', errors='replace')
+        
+        # 重置暂存区
+        subprocess.run(['git', "reset", "--mixed"], check=False)
         return ret
+        
     except subprocess.CalledProcessError as e:
+        if need_reset:
+            subprocess.run(['git', "reset", "--mixed"], check=False)
         return f"获取差异失败: {str(e)}"
+    except Exception as e:
+        if need_reset:
+            subprocess.run(['git', "reset", "--mixed"], check=False)
+        return f"发生意外错误: {str(e)}"
 
 
 def handle_commit_workflow() -> bool:

{jarvis_ai_assistant-0.1.148 → jarvis_ai_assistant-0.1.150}/src/jarvis/jarvis_code_analysis/code_review.py

@@ -4,7 +4,6 @@ import os
 import re
 import tempfile
 
-from httpx import get
 from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.read_code import ReadCodeTool

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

@@ -3,7 +3,6 @@ import shlex
 import subprocess
 from typing import Dict, Any, Optional
 import tempfile
-from click import Option
 import yaml
 from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry

{jarvis_ai_assistant-0.1.148 → jarvis_ai_assistant-0.1.150}/src/jarvis/jarvis_lsp/base.py

@@ -1,5 +1,5 @@
 from abc import ABC, abstractmethod
-from typing import List, Dict, Optional, Tuple, Any, Union
+from typing import List, Dict, Any, Union
 
 class BaseLSP(ABC):
     """Base class for Language Server Protocol integration.

{jarvis_ai_assistant-0.1.148 → jarvis_ai_assistant-0.1.150}/src/jarvis/jarvis_lsp/cpp.py

@@ -1,7 +1,7 @@
 import os
 import shutil
 import subprocess
-from typing import List, Dict, Optional, Tuple, Any
+from typing import List, Dict, Optional, Any
 import json
 from jarvis.jarvis_lsp.base import BaseLSP
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput

{jarvis_ai_assistant-0.1.148 → jarvis_ai_assistant-0.1.150}/src/jarvis/jarvis_lsp/go.py

@@ -1,7 +1,7 @@
 import os
 import shutil
 import subprocess
-from typing import List, Dict, Optional, Tuple, Any
+from typing import List, Dict, Optional, Any
 import json
 from jarvis.jarvis_lsp.base import BaseLSP
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput

{jarvis_ai_assistant-0.1.148 → jarvis_ai_assistant-0.1.150}/src/jarvis/jarvis_lsp/python.py

@@ -1,4 +1,4 @@
-from typing import List, Dict, Optional, Tuple, Any
+from typing import List, Dict, Any
 import jedi
 from jarvis.jarvis_lsp.base import BaseLSP
 

{jarvis_ai_assistant-0.1.148 → jarvis_ai_assistant-0.1.150}/src/jarvis/jarvis_lsp/registry.py

@@ -6,6 +6,7 @@ import sys
 from typing import Dict, Type, Optional, List
 from jarvis.jarvis_lsp.base import BaseLSP
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.config import get_data_dir
 
 REQUIRED_METHODS = [
     ('initialize', ['workspace_path']),
@@ -21,7 +22,7 @@ class LSPRegistry:
     @staticmethod
     def get_lsp_dir() -> str:
         """Get LSP implementation directory."""
-        user_lsp_dir = os.path.expanduser("~/.jarvis/lsp")
+        user_lsp_dir = os.path.join(get_data_dir(), "lsp")
         if not os.path.exists(user_lsp_dir):
             try:
                 os.makedirs(user_lsp_dir)

{jarvis_ai_assistant-0.1.148 → jarvis_ai_assistant-0.1.150}/src/jarvis/jarvis_lsp/rust.py

@@ -1,7 +1,7 @@
 import os
 import shutil
 import subprocess
-from typing import List, Dict, Optional, Tuple, Any
+from typing import List, Dict, Optional, Any
 import json
 from jarvis.jarvis_lsp.base import BaseLSP
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput

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

@@ -0,0 +1,36 @@
+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
+
+