jarvis-ai-assistant 0.2.0__py3-none-any.whl → 0.2.1__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_multi_agent/__init__.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import re
-from typing import Any, Dict, List, Optional, Tuple
+from typing import Any, Dict, List, Optional, Tuple, Union
 
 import yaml
 
@@ -89,6 +89,8 @@ content: |2
         Args:
             content: The content containing send message
         """
+        if ot("SEND_MESSAGE") in content and ct("SEND_MESSAGE") not in content:
+            content += "\n" + ct("SEND_MESSAGE")
         data = re.findall(
             ot("SEND_MESSAGE") + r"\n(.*?)\n" + ct("SEND_MESSAGE"), content, re.DOTALL
         )
@@ -102,7 +104,7 @@ content: |2
                 continue
         return ret
 
-    def _get_agent(self, name: str) -> Agent | None:
+    def _get_agent(self, name: str) -> Union[Agent, None]:
         if name in self.agents:
             return self.agents[name]
 
@@ -113,9 +115,9 @@ content: |2
 
         if name != self.main_agent_name and self.original_question:
             system_prompt = config.get("system_prompt", "")
-            config["system_prompt"] = (
-                f"{system_prompt}\n\n# 原始问题\n{self.original_question}"
-            )
+            config[
+                "system_prompt"
+            ] = f"{system_prompt}\n\n# 原始问题\n{self.original_question}"
 
         output_handler = config.get("output_handler", [])
         if len(output_handler) == 0:

jarvis/jarvis_tools/registry.py

@@ -15,6 +15,7 @@ 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, get_tool_load_dirs
+from jarvis.jarvis_utils.input import user_confirm
 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, daily_check_git_updates
@@ -106,14 +107,20 @@ arguments:
 
 
 class OutputHandlerProtocol(Protocol):
-    def name(self) -> str: ...
-    def can_handle(self, response: str) -> bool: ...
-    def prompt(self) -> str: ...
-    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]: ...
+    def name(self) -> str:
+        ...
 
+    def can_handle(self, response: str) -> bool:
+        ...
 
-class ToolRegistry(OutputHandlerProtocol):
+    def prompt(self) -> str:
+        ...
 
+    def handle(self, response: str, agent: Any) -> Tuple[bool, Any]:
+        ...
+
+
+class ToolRegistry(OutputHandlerProtocol):
     def name(self) -> str:
         return "TOOL_CALL"
 
@@ -124,14 +131,16 @@ class ToolRegistry(OutputHandlerProtocol):
         """加载工具"""
         tools = self.get_all_tools()
         if tools:
-            tools_prompt = f"{tool_call_help}\n<tools_section>\n"
+            tools_prompt = f"<tools_section>\n"
             tools_prompt += "  <header>## 可用工具:</header>\n"
             tools_prompt += "  <tools_list>\n"
             for tool in tools:
                 try:
                     tools_prompt += "    <tool>\n"
                     tools_prompt += f"      <name>名称: {tool['name']}</name>\n"
-                    tools_prompt += f"      <description>描述: {tool['description']}</description>\n"
+                    tools_prompt += (
+                        f"      <description>描述: {tool['description']}</description>\n"
+                    )
                     tools_prompt += "      <parameters>\n"
                     tools_prompt += "        <yaml>|\n"
 
@@ -197,9 +206,7 @@ class ToolRegistry(OutputHandlerProtocol):
                 with open(stats_file, "r", encoding="utf-8") as f:
                     return yaml.safe_load(f) or {}
             except Exception as e:
-                PrettyOutput.print(
-                    f"加载工具调用统计失败: {str(e)}", OutputType.WARNING
-                )
+                PrettyOutput.print(f"加载工具调用统计失败: {str(e)}", OutputType.WARNING)
         return {}
 
     def _update_tool_stats(self, name: str) -> None:
@@ -269,9 +276,7 @@ class ToolRegistry(OutputHandlerProtocol):
                 config = yaml.safe_load(open(file_path, "r", encoding="utf-8"))
                 self.register_mcp_tool_by_config(config)
             except Exception as e:
-                PrettyOutput.print(
-                    f"文件 {file_path} 加载失败: {str(e)}", OutputType.WARNING
-                )
+                PrettyOutput.print(f"文件 {file_path} 加载失败: {str(e)}", OutputType.WARNING)
 
     def _load_builtin_tools(self) -> None:
         """从内置工具目录加载工具"""
@@ -508,7 +513,6 @@ class ToolRegistry(OutputHandlerProtocol):
                         and hasattr(item, "execute")
                         and item.name == module_name
                     ):
-
                         if hasattr(item, "check"):
                             if not item.check():
                                 continue
@@ -567,10 +571,46 @@ class ToolRegistry(OutputHandlerProtocol):
             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}",
-            )
+            # can_handle 确保 ot("TOOL_CALL") 在内容中。
+            # 如果数据为空，则表示 ct("TOOL_CALL") 可能丢失。
+            if ot("TOOL_CALL") in content and ct("TOOL_CALL") not in content:
+                # 尝试通过附加结束标签来修复它
+                fixed_content = content.strip() + f"\n{ct('TOOL_CALL')}"
+
+                # 再次提取，并检查YAML是否有效
+                temp_data = re.findall(
+                    ot("TOOL_CALL") + r"(.*?)" + ct("TOOL_CALL"),
+                    fixed_content,
+                    re.DOTALL,
+                )
+
+                if temp_data:
+                    try:
+                        yaml.safe_load(temp_data[0])  # Check if valid YAML
+
+                        # Ask user for confirmation
+                        PrettyOutput.print(
+                            f"检测到缺失的 {ct('TOOL_CALL')} 标签，已自动修复。修复后的内容如下:",
+                            OutputType.INFO,
+                        )
+                        PrettyOutput.print(fixed_content, OutputType.TOOL)
+                        if user_confirm("这是纠正后的，是否需要执行?", default=True):
+                            data = temp_data
+                        else:
+                            return (
+                                {},
+                                f"只有{ot('TOOL_CALL')}标签，未找到{ct('TOOL_CALL')}标签，调用格式错误，请检查工具调用格式。\n{tool_call_help}",
+                            )
+                    except (yaml.YAMLError, EOFError, KeyboardInterrupt):
+                        # Even after fixing, it's not valid YAML, or user cancelled.
+                        # Fall through to the original error.
+                        pass
+
+            if not data:
+                return (
+                    {},
+                    f"只有{ot('TOOL_CALL')}标签，未找到{ct('TOOL_CALL')}标签，调用格式错误，请检查工具调用格式。\n{tool_call_help}",
+                )
         ret = []
         for item in data:
             try:
@@ -685,9 +725,7 @@ class ToolRegistry(OutputHandlerProtocol):
         """
         if len(output.splitlines()) > 60:
             lines = output.splitlines()
-            return "\n".join(
-                lines[:30] + ["\n...内容太长，已截取前后30行...\n"] + lines[-30:]
-            )
+            return "\n".join(lines[:30] + ["\n...内容太长，已截取前后30行...\n"] + lines[-30:])
         return output
 
     def handle_tool_calls(self, tool_call: Dict[str, Any], agent: Any) -> str:

{jarvis_ai_assistant-0.2.0.dist-info → jarvis_ai_assistant-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.2.0
+Version: 0.2.1
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire
@@ -104,13 +104,25 @@ Dynamic: requires-python
 - Windows没有测试过，但Windows 10以上的用户可以在WSL上使用此工具
 
 ### 安装
+
+#### 一键安装 (推荐)
+只需一行命令即可完成所有安装和配置：
+```bash
+bash -c "$(curl -fsSL https://raw.githubusercontent.com/skyfireitdiy/Jarvis/main/scripts/install.sh)"
+```
+> 该脚本会自动检测Python环境、克隆项目、安装依赖并设置好路径。
+
+#### 手动安装
+
+**1. 从源码安装**
 ```bash
-# 从源码安装（推荐）
 git clone https://github.com/skyfireitdiy/Jarvis
 cd Jarvis
 pip3 install -e .
+```
 
-# 或者从PyPI安装（可能更新不及时）
+**2. 从PyPI安装 (可能不是最新版)**
+```bash
 pip3 install jarvis-ai-assistant
 ```
 

{jarvis_ai_assistant-0.2.0.dist-info → jarvis_ai_assistant-0.2.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-jarvis/__init__.py,sha256=EmFCOffXrFq1m3oGpL5fp5ciwQF4OV_6X1esvw2Ukdg,73
+jarvis/__init__.py,sha256=7YS_CmhWeXPE4rP8NAcZnRuHXCr7rFpRpDd4pK4v2GQ,73
 jarvis/jarvis_agent/__init__.py,sha256=BmBbMUsCwe_0znrwxSipaKj-MuOgJTZvLbyKzBFfpic,22559
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=Qs4LAr4xdKLBJpQE81YP4CkucAop86ms0iVoKa1nnso,2468
 jarvis/jarvis_agent/edit_file_handler.py,sha256=ml1o-BE2Ca1-ybPlKuhstLQYwdJag39o0_-PXTUvFaE,11646
@@ -47,7 +47,7 @@ jarvis/jarvis_mcp/sse_mcp_client.py,sha256=AhYLPQb0mE9-6ZQw1JesRNyEy0esJumNEFb5L
 jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=APYUksYKlMx7AVNODKOLrTkKZPnp4kqTQIYIuNDDKko,11286
 jarvis/jarvis_mcp/streamable_mcp_client.py,sha256=1OZpsG82U2MLbGuojllJAblFUAMmp1N0i5fsKM4n5Ts,14453
 jarvis/jarvis_methodology/main.py,sha256=-PqsWvtpUJkkhiGgV-1JegEnEZBmv8SHnNMNNm_-QQc,11720
-jarvis/jarvis_multi_agent/__init__.py,sha256=efB04nWPRl4EOD64RThqQ6w78GZc2t0GGisX2wwTP8I,5949
+jarvis/jarvis_multi_agent/__init__.py,sha256=kCgtAX7VvliyEOQxIj2DvNjRAuh6bpNaOtDn60nzph4,6089
 jarvis/jarvis_multi_agent/main.py,sha256=h7VUSwoPrES0XTK8z5kt3XLX1mmcm8UEuFEHQOUWPH4,1696
 jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
 jarvis/jarvis_platform/ai8.py,sha256=yi7xG8ld4Yrf7drz-uu_JT_XCGYRB0obhygt-jKik8o,10871
@@ -83,7 +83,7 @@ jarvis/jarvis_tools/generate_new_tool.py,sha256=ppMRuTYUZ0c02rHo7xi8DCGiDVPZTANV
 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=3SMzVM9rhI9Gl8EdI13_NOHBxwygueqw-nUcCi6AgRM,26754
+jarvis/jarvis_tools/registry.py,sha256=FO72qNhDXeBRMnLc9IR87X0SNqAkGkzbHYtbw-7OMgI,28604
 jarvis/jarvis_tools/rewrite_file.py,sha256=eG_WKg6cVAXmuGwUqlWkcuyay5S8DOzEi8vZCmX3O8w,7255
 jarvis/jarvis_tools/search_web.py,sha256=DDAPjYWTFaF85zsnhJ6VNDSc1BcY8EHus5ymKP9nnPs,5703
 jarvis/jarvis_tools/virtual_tty.py,sha256=KKr3jpvQWWMPr2o40hlmN6fuXJCN8H4_ma5QU40Citc,16089
@@ -102,9 +102,9 @@ jarvis/jarvis_utils/methodology.py,sha256=V2Y0mbamrWBhhCK-3foAM1hKewOEcIDcXO-Sv_
 jarvis/jarvis_utils/output.py,sha256=2QMpzb8ZOysQ6HHsRjRzjgUnNXaFGkIiZ_qElPKLbsA,10858
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
 jarvis/jarvis_utils/utils.py,sha256=G6UuiBrPlWLpau1LbSGStrlAHCHG8JufINLD_bwtjTE,20006
-jarvis_ai_assistant-0.2.0.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.2.0.dist-info/METADATA,sha256=ddh41XdsU955MHnmlVF1YhXW5D2oYZK-M7ZsTUqVMAs,25713
-jarvis_ai_assistant-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.2.0.dist-info/entry_points.txt,sha256=JXK_n-d9HZ_RLz959CvpK5-UPOCwssn5oAH8dAHuebA,1277
-jarvis_ai_assistant-0.2.0.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.2.0.dist-info/RECORD,,
+jarvis_ai_assistant-0.2.1.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.2.1.dist-info/METADATA,sha256=2CaCKJhb4POadlWKBvaXRe1Lf1YVPNI1jCGXbbkQuDo,26021
+jarvis_ai_assistant-0.2.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.2.1.dist-info/entry_points.txt,sha256=JXK_n-d9HZ_RLz959CvpK5-UPOCwssn5oAH8dAHuebA,1277
+jarvis_ai_assistant-0.2.1.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.2.1.dist-info/RECORD,,