jarvis-ai-assistant 0.1.223__py3-none-any.whl → 0.1.224__py3-none-any.whl

jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.1.223"
+__version__ = "0.1.224"

jarvis/jarvis_agent/__init__.py

@@ -92,6 +92,10 @@ class Agent:
         # 只有在记录启动时才停止记录
         delete_agent(self.name)
 
+    def get_tool_usage_prompt(self) -> str:
+        """获取工具使用提示"""
+        return build_action_prompt(self.output_handler)  # type: ignore
+
     def __init__(
         self,
         system_prompt: str,
@@ -199,7 +203,7 @@ class Agent:
 
         PrettyOutput.print(welcome_message, OutputType.SYSTEM)
 
-        action_prompt = build_action_prompt(self.output_handler)  # type: ignore
+        action_prompt = self.get_tool_usage_prompt()
 
         self.model.set_system_prompt(
             f"""

jarvis/jarvis_agent/builtin_input_handler.py

@@ -38,10 +38,7 @@ def builtin_input_handler(user_input: str, agent_: Any) -> Tuple[str, bool]:
             agent.clear()
             return "", True
         elif tag == "ToolUsage":
-            from jarvis.jarvis_tools.registry import ToolRegistry
-            from jarvis.jarvis_agent.prompt_builder import build_action_prompt
-            action_prompt = build_action_prompt(agent.output_handler) # type: ignore
-            agent.set_addon_prompt(action_prompt)
+            agent.set_addon_prompt(agent.get_tool_usage_prompt())
             return "", False
         elif tag == "ReloadConfig":
             from jarvis.jarvis_utils.utils import load_config

jarvis/jarvis_data/config_schema.json

@@ -176,6 +176,14 @@
       "description": "是否启用任务分析",
       "default": true
     },
+    "JARVIS_TOOL_LOAD_DIRS": {
+      "type": "array",
+      "description": "自定义工具加载目录",
+      "items": {
+        "type": "string"
+      },
+      "default": []
+    },
     "JARVIS_PRINT_PROMPT": {
       "type": "boolean",
       "description": "是否打印提示",
@@ -229,7 +237,35 @@
           "template"
         ]
       }
+    },
+    "OPENAI_API_KEY": {
+      "type": "string",
+      "description": "OpenAI API Key"
+    },
+    "OPENAI_API_BASE": {
+      "type": "string",
+      "description": "OpenAI API Base URL"
+    },
+    "KIMI_API_KEY": {
+      "type": "string",
+      "description": "Kimi API Key"
+    },
+    "TONGYI_COOKIES": {
+      "type": "string",
+      "description": "Tongyi Cookies"
+    },
+    "YUANBAO_COOKIES": {
+      "type": "string",
+      "description": "Yuanbao Cookies"
+    },
+    "AI8_API_KEY": {
+      "type": "string",
+      "description": "AI8 API Key"
+    },
+    "OYI_API_KEY": {
+      "type": "string",
+      "description": "Oyi API Key"
     }
   },
-  "additionalProperties": false
+  "additionalProperties": true
 }

jarvis/jarvis_rag/cli.py

@@ -4,7 +4,7 @@ from pathlib import Path
 from typing import Optional, List, Literal, cast
 import mimetypes
 
-import pathspec
+import pathspec  # type: ignore
 import typer
 from langchain.docstore.document import Document
 from langchain_community.document_loaders import (

jarvis/jarvis_tools/registry.py

@@ -14,7 +14,7 @@ from jarvis.jarvis_mcp.sse_mcp_client import SSEMcpClient
 from jarvis.jarvis_mcp.stdio_mcp_client import StdioMcpClient
 from jarvis.jarvis_mcp.streamable_mcp_client import StreamableMcpClient
 from jarvis.jarvis_tools.base import Tool
-from jarvis.jarvis_utils.config import get_data_dir
+from jarvis.jarvis_utils.config import get_data_dir, get_tool_load_dirs
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.tag import ct, ot
 from jarvis.jarvis_utils.utils import is_context_overflow
@@ -118,7 +118,7 @@ class ToolRegistry(OutputHandlerProtocol):
         return "TOOL_CALL"
 
     def can_handle(self, response: str) -> bool:
-        return ToolRegistry._has_tool_calls_block(response)
+        return ot("TOOL_CALL") in response
 
     def prompt(self) -> str:
         """加载工具"""
@@ -165,11 +165,21 @@ class ToolRegistry(OutputHandlerProtocol):
             return tools_prompt
         return ""
 
-    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
-        tool_call, err_msg = self._extract_tool_calls(response)
-        if err_msg:
-            return False, err_msg
-        return False, self.handle_tool_calls(tool_call, agent)
+    def handle(self, response: str, agent_: Any) -> Tuple[bool, Any]:
+        try:
+            tool_call, err_msg = self._extract_tool_calls(response)
+            if err_msg:
+                return False, err_msg
+            return False, self.handle_tool_calls(tool_call, agent_)
+        except Exception as e:
+            PrettyOutput.print(f"工具调用处理失败: {str(e)}", OutputType.ERROR)
+            from jarvis.jarvis_agent import Agent
+
+            agent: Agent = agent_
+            return (
+                False,
+                f"工具调用处理失败: {str(e)}\n\n{agent.get_tool_usage_prompt()}",
+            )
 
     def __init__(self) -> None:
         """初始化工具注册表"""
@@ -276,18 +286,22 @@ class ToolRegistry(OutputHandlerProtocol):
             self.register_tool_by_file(str(file_path))
 
     def _load_external_tools(self) -> None:
-        """从jarvis_data/tools加载外部工具"""
-        external_tools_dir = Path(get_data_dir()) / "tools"
-        if not external_tools_dir.exists():
-            return
+        """从jarvis_data/tools和配置的目录加载外部工具"""
+        tool_dirs = [Path(get_data_dir()) / "tools"] + [
+            Path(p) for p in get_tool_load_dirs()
+        ]
 
-        # 遍历目录中的所有.py文件
-        for file_path in external_tools_dir.glob("*.py"):
-            # 跳过__init__.py
-            if file_path.name == "__init__.py":
+        for tool_dir in tool_dirs:
+            if not tool_dir.exists():
                 continue
 
-            self.register_tool_by_file(str(file_path))
+            # 遍历目录中的所有.py文件
+            for file_path in tool_dir.glob("*.py"):
+                # 跳过__init__.py
+                if file_path.name == "__init__.py":
+                    continue
+
+                self.register_tool_by_file(str(file_path))
 
     def register_mcp_tool_by_config(self, config: Dict[str, Any]) -> bool:
         """从配置字典加载并注册工具
@@ -396,12 +410,13 @@ class ToolRegistry(OutputHandlerProtocol):
                 return False
 
             # 创建MCP客户端
+            mcp_client: McpClient
             if config["type"] == "stdio":
-                mcp_client: McpClient = StdioMcpClient(config)
+                mcp_client = StdioMcpClient(config)
             elif config["type"] == "sse":
-                mcp_client: McpClient = SSEMcpClient(config)
+                mcp_client = SSEMcpClient(config)
             elif config["type"] == "streamable":
-                mcp_client: McpClient = StreamableMcpClient(config)
+                mcp_client = StreamableMcpClient(config)
             else:
                 raise ValueError(f"不支持的MCP客户端类型: {config['type']}")
 
@@ -549,6 +564,8 @@ class ToolRegistry(OutputHandlerProtocol):
         data = re.findall(
             ot("TOOL_CALL") + r"(.*?)" + ct("TOOL_CALL"), content, re.DOTALL
         )
+        if not data:
+            return {}, f"只有{ot('TOOL_CALL')}标签，未找到{ct('TOOL_CALL')}标签，调用格式错误，请检查工具调用格式。\n{tool_call_help}"
         ret = []
         for item in data:
             try:

jarvis/jarvis_utils/config.py

@@ -3,7 +3,6 @@ import os
 from functools import lru_cache
 from typing import Any, Dict, List
 
-import torch
 import yaml  # type: ignore
 
 from jarvis.jarvis_utils.builtin_replace_map import BUILTIN_REPLACE_MAP
@@ -231,6 +230,16 @@ def is_use_analysis() -> bool:
     return GLOBAL_CONFIG_DATA.get("JARVIS_USE_ANALYSIS", True) == True
 
 
+def get_tool_load_dirs() -> List[str]:
+    """
+    获取工具加载目录。
+
+    返回:
+        List[str]: 工具加载目录列表
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_TOOL_LOAD_DIRS", [])
+
+
 def is_print_prompt() -> bool:
     """
     获取是否打印提示。

jarvis/jarvis_utils/git_utils.py

@@ -16,7 +16,7 @@ import subprocess
 import sys
 from typing import Any, Dict, List, Set, Tuple
 
-from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
+from jarvis.jarvis_utils.config import get_data_dir, is_confirm_before_apply_patch
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.input import user_confirm
 
@@ -339,25 +339,21 @@ def check_and_update_git_repo(repo_path: str) -> bool:
     返回:
         bool: 是否执行了更新
     """
+    # 检查上次检查日期
+    last_check_file = os.path.join(get_data_dir(), "last_git_check")
+    today_str = datetime.date.today().strftime("%Y-%m-%d")
+    if os.path.exists(last_check_file):
+        with open(last_check_file, "r") as f:
+            last_check_date = f.read().strip()
+        if last_check_date == today_str:
+            return False
+
     curr_dir = os.path.abspath(os.getcwd())
     git_root = find_git_root_and_cd(repo_path)
     if git_root is None:
         return False
 
     try:
-        # 检查最新提交时间是否为今天
-        commit_date_result = subprocess.run(
-            ["git", "log", "-1", "--format=%cd", "--date=short"],
-            cwd=git_root,
-            capture_output=True,
-            text=True,
-        )
-        if commit_date_result.returncode == 0:
-            commit_date = commit_date_result.stdout.strip()
-            today = datetime.date.today().strftime("%Y-%m-%d")
-            if commit_date == today:
-                return False
-
         # 检查是否有未提交的修改
         if has_uncommitted_changes():
             return False
@@ -454,6 +450,9 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                     f"安装过程中发生意外错误: {str(e)}", OutputType.ERROR
                 )
                 return False
+        # 更新检查日期文件
+        with open(last_check_file, "w") as f:
+            f.write(today_str)
         return False
     except Exception as e:
         PrettyOutput.print(f"Git仓库更新检查失败: {e}", OutputType.WARNING)

{jarvis_ai_assistant-0.1.223.dist-info → jarvis_ai_assistant-0.1.224.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.1.223
+Version: 0.1.224
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.1.223.dist-info → jarvis_ai_assistant-0.1.224.dist-info}/RECORD

@@ -1,6 +1,6 @@
-jarvis/__init__.py,sha256=YlYf-txS383hefwOHMnCEByeqa-lDVLEbMwcCc7hY3Q,75
-jarvis/jarvis_agent/__init__.py,sha256=l37t2lnXsPeQEwPkqrQWmqQ0ogh37GY-iAOQxkjttzY,21479
-jarvis/jarvis_agent/builtin_input_handler.py,sha256=MtPm7N78hPJJJ9PV_p8pkyDE7epBmtngrE9Xn-wbnH8,2682
+jarvis/__init__.py,sha256=gaZuEX29UqdWvgGIXuboMfdenif5NCuNvfhYM6Ffzqg,75
+jarvis/jarvis_agent/__init__.py,sha256=PHTP4P0iOCzdozNYj2d02a-yz-4pm8TykaUqzji7H4I,21607
+jarvis/jarvis_agent/builtin_input_handler.py,sha256=Qs4LAr4xdKLBJpQE81YP4CkucAop86ms0iVoKa1nnso,2468
 jarvis/jarvis_agent/edit_file_handler.py,sha256=ml1o-BE2Ca1-ybPlKuhstLQYwdJag39o0_-PXTUvFaE,11646
 jarvis/jarvis_agent/jarvis.py,sha256=2Ilt-eLs-dCvD6V1-UGyJ3PleY0AozkYhi8Rx6_zUr4,6315
 jarvis/jarvis_agent/main.py,sha256=nXOw2mewhYYmj_8rohcEmETjUFqror1NiRwDusFMUKQ,3055
@@ -35,7 +35,7 @@ jarvis/jarvis_code_analysis/checklists/shell.py,sha256=aRFYhQQvTgbYd-uY5pc8UHIUA
 jarvis/jarvis_code_analysis/checklists/sql.py,sha256=vR0T6qC7b4dURjJVAd7kSVxyvZEQXPG1Jqc2sNTGp5c,2355
 jarvis/jarvis_code_analysis/checklists/swift.py,sha256=TPx4I6Gupvs6tSerRKmTSKEPQpOLEbH2Y7LXg1uBgxc,2566
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=25gGD7pDadZQybNFvALYxWvK0VRjGQb1NVJQElwjyk0,3943
-jarvis/jarvis_data/config_schema.json,sha256=t51JvUc2IEe-QWP5bbocB7sqQAkmtUrPEHSHPfqzDjU,6668
+jarvis/jarvis_data/config_schema.json,sha256=uuDN-25NJRnKfb6KuuqxOnfRGMphkKQbjxfu0Me6pAI,7494
 jarvis/jarvis_data/tiktoken/9b5ad71b2ce5302211f9c61530b329a4922fc6a4,sha256=Ijkht27pm96ZW3_3OFE-7xAPtR0YyTWXoRO8_-hlsqc,1681126
 jarvis/jarvis_git_details/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_details/main.py,sha256=DE1DcX-1lvUsb_K-FExpHs3NBRmo5KZb53PGa8QFBOc,8875
@@ -64,7 +64,7 @@ jarvis/jarvis_platform_manager/main.py,sha256=LxlXSfIfmkYNcajOG_XvvlmwlSWSGb0Dmb
 jarvis/jarvis_platform_manager/service.py,sha256=hQGWQ2qAlzm_C_lNQDuLORQ4rmjR1P1-V3ou7l2Bv0s,13622
 jarvis/jarvis_rag/__init__.py,sha256=HRTXgnQxDuaE9x-e3r6SYqhJ5d4DSI_rrIxy2IGY6qk,320
 jarvis/jarvis_rag/cache.py,sha256=Tqx_Oe-AhuWlMXHGHUaIuG6OEHoHBVZq7mL3kldtFFU,2723
-jarvis/jarvis_rag/cli.py,sha256=iR26y7ZLj4HECl3zveY4fxwn-mhMnQ__IxHQo2NAwD0,13143
+jarvis/jarvis_rag/cli.py,sha256=q1W7XWZ7u7oMckqeNUX7YQoiQ3PzT3Rh-FZvTeG_U3I,13159
 jarvis/jarvis_rag/embedding_manager.py,sha256=BoV6Vr_3F4zbjBAOQ1FdEBnJXGPwBkv1IEkdRP9CgFw,3338
 jarvis/jarvis_rag/llm_interface.py,sha256=44Uu04v2_MxweLmMdR0YWbnxlfchAPAzLBEQmJdLjeU,4368
 jarvis/jarvis_rag/query_rewriter.py,sha256=JM1Q23zZISze77BleRgTPgNAtLUtLAXkEo3G70kaTK8,2190
@@ -83,7 +83,7 @@ jarvis/jarvis_tools/generate_new_tool.py,sha256=2YAs8DC7fJnxOkjSmhmSAwqSpBlicVhY
 jarvis/jarvis_tools/methodology.py,sha256=_K4GIDUodGEma3SvNRo7Qs5rliijgNespVLyAPN35JU,5233
 jarvis/jarvis_tools/read_code.py,sha256=EnI-R-5HyIQYhMD391nZWXHIuHHBF-OJIRE0QpLcPX4,6417
 jarvis/jarvis_tools/read_webpage.py,sha256=NmDUboVZd4CGHBPRFK6dp3uqVhuGopW1bOi3TcaLDF4,2092
-jarvis/jarvis_tools/registry.py,sha256=0SdgBi-b1qnd3QX0VvQy7UVU7Pq9BZGYLiAe7t0DjpQ,25690
+jarvis/jarvis_tools/registry.py,sha256=KA6dw5ka_OSg0BNuVdk0tN8X0InaOWxKgkEs2XOiHFQ,26386
 jarvis/jarvis_tools/rewrite_file.py,sha256=eG_WKg6cVAXmuGwUqlWkcuyay5S8DOzEi8vZCmX3O8w,7255
 jarvis/jarvis_tools/search_web.py,sha256=DqBwNGFK3vZleZ7_4Go3q27DzPCp4m0ZeEi1N7UEFc4,5363
 jarvis/jarvis_tools/virtual_tty.py,sha256=KKr3jpvQWWMPr2o40hlmN6fuXJCN8H4_ma5QU40Citc,16089
@@ -91,10 +91,10 @@ jarvis/jarvis_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG
 jarvis/jarvis_tools/cli/main.py,sha256=Mg6TQDxMdzB1Ua1UrZ2EE-uQWsbaeojWaEGHJp2HimA,6375
 jarvis/jarvis_utils/__init__.py,sha256=67h0ldisGlh3oK4DAeNEL2Bl_VsI3tSmfclasyVlueM,850
 jarvis/jarvis_utils/builtin_replace_map.py,sha256=EI8JnHqr-ZpAhpwocTu48DhHUMHNd8tNUpDNYI47OLE,1717
-jarvis/jarvis_utils/config.py,sha256=E8GhbpbdGyrAxTC89wN7KGE2rJ9zwhmL-HMIgTl9q18,8051
+jarvis/jarvis_utils/config.py,sha256=eTarDAeBdFZx2jX4KQrzanEu4W6hpS5Cw1DHmiB5nN0,8247
 jarvis/jarvis_utils/embedding.py,sha256=oEOEM2qf16DMYwPsQe6srET9BknyjOdY2ef0jsp3Or8,2714
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
-jarvis/jarvis_utils/git_utils.py,sha256=4mNbEgV0icMnB1UL1RWhE9Nxik3mwam2qcGMpd1ODJM,21707
+jarvis/jarvis_utils/git_utils.py,sha256=EpyS8AvvK9M9WnkObtQsU2gXq45PnY-WJo2c4kMtyFM,21702
 jarvis/jarvis_utils/globals.py,sha256=WzZh_acNfHJj1LDulhyLQ7cojksBy0gdrITe0vH1XA0,3901
 jarvis/jarvis_utils/http.py,sha256=Uqt1kcz0HWnAfXHHi1fNGwLb2lcVUqpbrG2Uk_-kcIU,4882
 jarvis/jarvis_utils/input.py,sha256=V2w3xV0MO73c4Y4XY_yy9jVNg7MmN76FmAnpKRiJUog,9160
@@ -102,9 +102,9 @@ jarvis/jarvis_utils/methodology.py,sha256=-cvM6pwgJK7BXCYg2uVjIId_j3v5RUh2z2PBcK
 jarvis/jarvis_utils/output.py,sha256=PRCgudPOB8gMEP3u-g0FGD2c6tBgJhLXUMqNPglfjV8,10813
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=ojupkZQfFIE6ysTyCy0jUdePucpwpvZlZJSXkGsdyQE,15263
-jarvis_ai_assistant-0.1.223.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.1.223.dist-info/METADATA,sha256=Fn58Cq6CpCpo9MjyYGrSWjI9Y2M90LA6VW9IjOu2tOE,24061
-jarvis_ai_assistant-0.1.223.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.1.223.dist-info/entry_points.txt,sha256=JXK_n-d9HZ_RLz959CvpK5-UPOCwssn5oAH8dAHuebA,1277
-jarvis_ai_assistant-0.1.223.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.1.223.dist-info/RECORD,,
+jarvis_ai_assistant-0.1.224.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.1.224.dist-info/METADATA,sha256=UAICgGTzfZc6Gob8uMokO0qUUENIvYUKZQidjdCyq5w,24061
+jarvis_ai_assistant-0.1.224.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.1.224.dist-info/entry_points.txt,sha256=JXK_n-d9HZ_RLz959CvpK5-UPOCwssn5oAH8dAHuebA,1277
+jarvis_ai_assistant-0.1.224.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.1.224.dist-info/RECORD,,