jarvis-ai-assistant 0.3.20__py3-none-any.whl → 0.3.22__py3-none-any.whl

jarvis/jarvis_tools/cli/main.py

@@ -23,12 +23,20 @@ def list_tools(
 
     if as_json:
         if detailed:
-            PrettyOutput.print(json.dumps(tools, indent=2, ensure_ascii=False), OutputType.CODE, lang="json")
+            PrettyOutput.print(
+                json.dumps(tools, indent=2, ensure_ascii=False),
+                OutputType.CODE,
+                lang="json",
+            )
         else:
             simple_tools = [
                 {"name": t["name"], "description": t["description"]} for t in tools
             ]
-            PrettyOutput.print(json.dumps(simple_tools, indent=2, ensure_ascii=False), OutputType.CODE, lang="json")
+            PrettyOutput.print(
+                json.dumps(simple_tools, indent=2, ensure_ascii=False),
+                OutputType.CODE,
+                lang="json",
+            )
     else:
         PrettyOutput.section("可用工具列表", OutputType.SYSTEM)
         for tool in tools:
@@ -37,18 +45,27 @@ def list_tools(
             if detailed:
                 PrettyOutput.print("   参数:", OutputType.INFO)
                 import json as _json  # local import to ensure available
-                PrettyOutput.print(_json.dumps(tool["parameters"], ensure_ascii=False, indent=2), OutputType.CODE, lang="json")
+
+                PrettyOutput.print(
+                    _json.dumps(tool["parameters"], ensure_ascii=False, indent=2),
+                    OutputType.CODE,
+                    lang="json",
+                )
 
 
 @app.command("stat")
 def stat_tools(
     as_json: bool = typer.Option(False, "--json", help="以JSON格式输出"),
-    last_days: Optional[int] = typer.Option(None, "--days", help="显示最近N天的统计（默认显示所有历史数据）"),
-    format: str = typer.Option("table", "--format", help="显示格式: table, chart, summary")
+    last_days: Optional[int] = typer.Option(
+        None, "--days", help="显示最近N天的统计（默认显示所有历史数据）"
+    ),
+    format: str = typer.Option(
+        "table", "--format", help="显示格式: table, chart, summary"
+    ),
 ):
     """显示工具调用统计信息"""
     from jarvis.jarvis_stats.stats import StatsManager
-    
+
     if format == "table":
         registry = ToolRegistry()
         stats = registry._get_tool_stats()
@@ -64,13 +81,24 @@ def stat_tools(
         table_data.sort(key=lambda x: x[1], reverse=True)
 
         if as_json:
-            PrettyOutput.print(json.dumps(dict(table_data), indent=2), OutputType.CODE, lang="json")
+            PrettyOutput.print(
+                json.dumps(dict(table_data), indent=2), OutputType.CODE, lang="json"
+            )
         else:
             time_desc = f"最近{last_days}天" if last_days else "所有历史"
             PrettyOutput.section(f"工具调用统计 ({time_desc})", OutputType.SYSTEM)
             if table_data:
-                PrettyOutput.print(tabulate(table_data, headers=["工具名称", "调用次数"], tablefmt="grid"), OutputType.CODE, lang="text")
-                PrettyOutput.print(f"\n总计: {len(table_data)} 个工具被使用，共 {sum(x[1] for x in table_data)} 次调用", OutputType.INFO)
+                PrettyOutput.print(
+                    tabulate(
+                        table_data, headers=["工具名称", "调用次数"], tablefmt="grid"
+                    ),
+                    OutputType.CODE,
+                    lang="text",
+                )
+                PrettyOutput.print(
+                    f"\n总计: {len(table_data)} 个工具被使用，共 {sum(x[1] for x in table_data)} 次调用",
+                    OutputType.INFO,
+                )
             else:
                 PrettyOutput.print("暂无工具调用记录", OutputType.INFO)
     else:
@@ -79,51 +107,59 @@ def stat_tools(
         # 显示所有标记为 tool 组的指标
         metrics = StatsManager.list_metrics()
         tool_metrics = []
-        
+
         for metric in metrics:
             # 检查是否是工具组的指标
             if last_days:
                 stats_data = StatsManager.get_stats(
-                    metric_name=metric,
-                    last_days=last_days,
-                    tags={"group": "tool"}
+                    metric_name=metric, last_days=last_days, tags={"group": "tool"}
                 )
             else:
                 # 获取所有历史数据
                 from datetime import datetime
+
                 stats_data = StatsManager.get_stats(
                     metric_name=metric,
                     start_time=datetime(2000, 1, 1),
                     end_time=datetime.now(),
-                    tags={"group": "tool"}
+                    tags={"group": "tool"},
                 )
             if stats_data and stats_data.get("records"):
                 tool_metrics.append(metric)
-        
+
         if tool_metrics:
             for metric in tool_metrics:
                 if format == "chart":
                     if last_days:
-                        StatsManager.plot(metric, last_days=last_days, tags={"group": "tool"})
+                        StatsManager.plot(
+                            metric, last_days=last_days, tags={"group": "tool"}
+                        )
                     else:
                         from datetime import datetime
+
                         StatsManager.plot(
-                            metric, 
-                            start_time=datetime(2000, 1, 1), 
-                            end_time=datetime.now(), 
-                            tags={"group": "tool"}
+                            metric,
+                            start_time=datetime(2000, 1, 1),
+                            end_time=datetime.now(),
+                            tags={"group": "tool"},
                         )
                 elif format == "summary":
                     if last_days:
-                        StatsManager.show(metric, last_days=last_days, format="summary", tags={"group": "tool"})
+                        StatsManager.show(
+                            metric,
+                            last_days=last_days,
+                            format="summary",
+                            tags={"group": "tool"},
+                        )
                     else:
                         from datetime import datetime
+
                         StatsManager.show(
-                            metric, 
-                            start_time=datetime(2000, 1, 1), 
-                            end_time=datetime.now(), 
-                            format="summary", 
-                            tags={"group": "tool"}
+                            metric,
+                            start_time=datetime(2000, 1, 1),
+                            end_time=datetime.now(),
+                            format="summary",
+                            tags={"group": "tool"},
                         )
         else:
             PrettyOutput.print("暂无工具调用记录", OutputType.INFO)
@@ -159,9 +195,7 @@ def call_tool(
             with open(args_file, "r", encoding="utf-8") as f:
                 tool_args = json.load(f)
         except (json.JSONDecodeError, FileNotFoundError) as e:
-            PrettyOutput.print(
-                f"错误: 无法从文件加载参数: {str(e)}", OutputType.ERROR
-            )
+            PrettyOutput.print(f"错误: 无法从文件加载参数: {str(e)}", OutputType.ERROR)
             raise typer.Exit(code=1)
 
     required_params = tool_obj.parameters.get("required", [])

jarvis/jarvis_tools/edit_file.py

@@ -31,7 +31,6 @@ class FileSearchReplaceTool:
    - reason: 修改原因描述
    - SEARCH: 需要查找的原始代码(必须包含足够上下文)
    - REPLACE: 替换后的新代码
-3. 工具会自动选择最适合的编辑模式
 
 ## 核心原则
 1. **精准修改**: 只修改必要的代码部分，保持其他部分不变
@@ -132,107 +131,35 @@ class FileSearchReplaceTool:
             file_path = os.path.abspath(file_info["path"])
             changes = file_info["changes"]
 
-            # 创建已处理文件变量，用于失败时回滚
-            original_content = None
-            processed = False
-            file_success = True
-
             try:
-                file_exists = os.path.exists(file_path)
-                content = ""
-
-                try:
-                    # 如果文件存在，则读取内容
-                    if file_exists:
-                        with open(file_path, "r", encoding="utf-8") as f:
-                            content = f.read()
-                            original_content = content
-
-
-                    success, temp_content = EditFileHandler._fast_edit(
-                        file_path, changes
+                success, result = EditFileHandler._fast_edit(file_path, changes)
+                if success:
+                    stdout_message = f"文件 {file_path} 修改完成"
+                    stdout_messages.append(stdout_message)
+                    overall_success = True
+                    file_results.append(
+                        {
+                            "file": file_path,
+                            "success": True,
+                            "stdout": stdout_message,
+                            "stderr": "",
+                        }
+                    )
+                else:
+                    PrettyOutput.print(
+                        f"文件 {file_path} 处理失败", OutputType.ERROR
                     )
-                    if not success:
-                        PrettyOutput.print(f"文件 {file_path} 处理失败", OutputType.ERROR)
-                        file_results.append(
-                            {
-                                "file": file_path,
-                                "success": False,
-                                "stdout": "",
-                                "stderr": temp_content,
-                            }
-                        )
-                        continue
-
-
-
-                    # 只有当所有替换操作都成功时，才写回文件
-                    if success and (
-                        temp_content != original_content or not file_exists
-                    ):
-                        # 确保目录存在
-                        os.makedirs(
-                            os.path.dirname(os.path.abspath(file_path)), exist_ok=True
-                        )
-
-                        with open(file_path, "w", encoding="utf-8") as f:
-                            f.write(temp_content)
-
-                        processed = True
-
-                        action = "创建并写入" if not file_exists else "成功修改"
-                        stdout_message = f"文件 {file_path} {action} 完成"
-                        stdout_messages.append(stdout_message)
-
-                        overall_success = True
-
-                        file_results.append(
-                            {
-                                "file": file_path,
-                                "success": True,
-                                "stdout": stdout_message,
-                                "stderr": "",
-                            }
-                        )
-
-                except Exception as e:
-                    stderr_message = f"处理文件 {file_path} 时出错: {str(e)}"
-                    stderr_messages.append(stderr_message)
-                    PrettyOutput.print(stderr_message, OutputType.WARNING)
-                    file_success = False
                     file_results.append(
                         {
                             "file": file_path,
                             "success": False,
                             "stdout": "",
-                            "stderr": stderr_message,
+                            "stderr": result,
                         }
                     )
-
             except Exception as e:
                 error_msg = f"文件搜索替换操作失败: {str(e)}"
                 PrettyOutput.print(error_msg, OutputType.WARNING)
-
-                # 如果有已修改的文件，尝试回滚
-                if processed:
-                    rollback_message = "操作失败，正在回滚修改..."
-                    stderr_messages.append(rollback_message)
-                    PrettyOutput.print(rollback_message, OutputType.WARNING)
-
-                    try:
-                        if original_content is None:
-                            # 如果是新创建的文件，则删除
-                            if os.path.exists(file_path):
-                                os.remove(file_path)
-                            stderr_messages.append(f"已删除新创建的文件: {file_path}")
-                        else:
-                            # 如果是修改的文件，则恢复原内容
-                            with open(file_path, "w", encoding="utf-8") as f:
-                                f.write(original_content)
-                            stderr_messages.append(f"已回滚文件: {file_path}")
-                    except:
-                        stderr_messages.append(f"回滚文件失败: {file_path}")
-
                 file_results.append(
                     {
                         "file": file_path,

jarvis/jarvis_tools/file_analyzer.py

@@ -105,7 +105,6 @@ class FileAnalyzerTool:
 
             analysis_result = platform.chat_until_success(analysis_request)
 
-
             # 清理会话
             platform.delete_chat()
 

jarvis/jarvis_tools/generate_new_tool.py

@@ -80,7 +80,9 @@ class generate_new_tool:
             # 验证工具代码中的名称是否与tool_name一致
             import re
 
-            match = re.search(r"^\s*name\s*=\s*[\"'](.+?)[\"']", tool_code, re.MULTILINE)
+            match = re.search(
+                r"^\s*name\s*=\s*[\"'](.+?)[\"']", tool_code, re.MULTILINE
+            )
             if not match:
                 return {
                     "success": False,
@@ -146,8 +148,6 @@ class generate_new_tool:
                     )
                     success_message += f"\n注册到当前会话失败，可能需要重新启动Jarvis"
 
-
-
             # 检查并安装缺失的依赖
             try:
                 required_packages = set()

jarvis/jarvis_tools/read_code.py

@@ -115,7 +115,6 @@ class ReadCodeTool:
                 f"{numbered_content}\n\n"
             )
 
-
             if agent:
                 files = agent.get_user_data("files")
                 if files:

jarvis/jarvis_tools/read_webpage.py

@@ -81,15 +81,25 @@ class WebpageTool:
                 resp = http_get(url, timeout=10.0, allow_redirects=True)
                 content_md = md(resp.text, strip=["script", "style"])
             except requests.exceptions.HTTPError as e:
-                PrettyOutput.print(f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}", OutputType.WARNING)
-                return {"success": False, "stdout": "", "stderr": f"HTTP错误：{e.response.status_code}"}
+                PrettyOutput.print(
+                    f"⚠️ HTTP错误 {e.response.status_code} 访问 {url}",
+                    OutputType.WARNING,
+                )
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": f"HTTP错误：{e.response.status_code}",
+                }
             except requests.exceptions.RequestException as e:
                 PrettyOutput.print(f"⚠️ 请求错误: {e}", OutputType.WARNING)
                 return {"success": False, "stdout": "", "stderr": f"请求错误：{e}"}
 
             if not content_md or not content_md.strip():
-                return {"success": False, "stdout": "", "stderr": "无法从网页抓取有效内容。"}
-
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "无法从网页抓取有效内容。",
+                }
 
             summary_prompt = f"""以下是网页 {url} 的内容（已转换为Markdown）：
 ----------------

jarvis/jarvis_tools/registry.py

@@ -172,10 +172,14 @@ class ToolRegistry(OutputHandlerProtocol):
 
     def handle(self, response: str, agent_: Any) -> Tuple[bool, Any]:
         try:
-            tool_call, err_msg = self._extract_tool_calls(response)
+            tool_call, err_msg, auto_completed = self._extract_tool_calls(response)
             if err_msg:
                 return False, err_msg
-            return False, self.handle_tool_calls(tool_call, agent_)
+            result = self.handle_tool_calls(tool_call, agent_)
+            if auto_completed:
+                # 如果自动补全了结束标签，在结果中添加说明信息
+                result = f"检测到工具调用缺少结束标签，已自动补全{ct('TOOL_CALL')}。请确保后续工具调用包含完整的开始和结束标签。\n\n{result}"
+            return False, result
         except Exception as e:
             PrettyOutput.print(f"工具调用处理失败: {str(e)}", OutputType.ERROR)
             from jarvis.jarvis_agent import Agent
@@ -288,7 +292,6 @@ class ToolRegistry(OutputHandlerProtocol):
                 if tool_name in self.tools:
                     del self.tools[tool_name]
 
-
     def _load_mcp_tools(self) -> None:
         """加载MCP工具，优先从配置获取，其次从目录扫描"""
         from jarvis.jarvis_utils.config import get_mcp_config
@@ -351,7 +354,6 @@ class ToolRegistry(OutputHandlerProtocol):
                 try:
                     import subprocess
 
-
                     subprocess.run(
                         ["git", "clone", central_repo, central_repo_path], check=True
                     )
@@ -611,16 +613,17 @@ class ToolRegistry(OutputHandlerProtocol):
         )
 
     @staticmethod
-    def _extract_tool_calls(content: str) -> Tuple[Dict[str, Dict[str, Any]], str]:
+    def _extract_tool_calls(content: str) -> Tuple[Dict[str, Dict[str, Any]], str, bool]:
         """从内容中提取工具调用。
 
         参数:
             content: 包含工具调用的内容
 
         返回:
-            Tuple[Dict[str, Dict[str, Any]], str]:
+            Tuple[Dict[str, Dict[str, Any]], str, bool]:
                 - 第一个元素是提取的工具调用字典
                 - 第二个元素是错误消息字符串(成功时为"")
+                - 第三个元素是是否自动补全了结束标签
 
         异常:
             Exception: 如果工具调用缺少必要字段
@@ -629,6 +632,7 @@ class ToolRegistry(OutputHandlerProtocol):
         data = re.findall(
             ot("TOOL_CALL") + r"(.*?)" + ct("TOOL_CALL"), content, re.DOTALL
         )
+        auto_completed = False
         if not data:
             # can_handle 确保 ot("TOOL_CALL") 在内容中。
             # 如果数据为空，则表示 ct("TOOL_CALL") 可能丢失。
@@ -649,8 +653,8 @@ class ToolRegistry(OutputHandlerProtocol):
 
                         # Ask user for confirmation
 
-
                         data = temp_data
+                        auto_completed = True
                     except (yaml.YAMLError, EOFError, KeyboardInterrupt):
                         # Even after fixing, it's not valid YAML, or user cancelled.
                         # Fall through to the original error.
@@ -660,6 +664,7 @@ class ToolRegistry(OutputHandlerProtocol):
                 return (
                     {},
                     f"只有{ot('TOOL_CALL')}标签，未找到{ct('TOOL_CALL')}标签，调用格式错误，请检查工具调用格式。\n{tool_call_help}",
+                    False,
                 )
         ret = []
         for item in data:
@@ -672,6 +677,7 @@ class ToolRegistry(OutputHandlerProtocol):
                     {e}
 
                 {tool_call_help}""",
+                    False,
                 )
 
             if "name" in msg and "arguments" in msg and "want" in msg:
@@ -682,10 +688,11 @@ class ToolRegistry(OutputHandlerProtocol):
                     f"""工具调用格式错误，请检查工具调用格式（缺少name、arguments、want字段）。
 
                 {tool_call_help}""",
+                    False,
                 )
         if len(ret) > 1:
-            return {}, "检测到多个工具调用，请一次只处理一个工具调用。"
-        return ret[0] if ret else {}, ""
+            return {}, "检测到多个工具调用，请一次只处理一个工具调用。", False
+        return ret[0] if ret else {}, "", auto_completed
 
     def register_tool(
         self,

jarvis/jarvis_tools/retrieve_memory.py

@@ -166,7 +166,6 @@ class RetrieveMemoryTool:
 
             # 打印结果摘要
 
-
             if tags:
                 pass
 

jarvis/jarvis_tools/save_memory.py

@@ -174,7 +174,6 @@ class SaveMemoryTool:
 
             # 生成总结报告
 
-
             # 构建返回结果
             output = {
                 "total": len(memories),

jarvis/jarvis_tools/search_web.py

@@ -81,8 +81,6 @@ class SearchWebTool:
 
             url_list_str = "\n".join(f"  - {u}" for u in visited_urls)
 
-
-
             summary_prompt = f"请为查询“{query}”总结以下内容：\n\n{full_content}"
 
             if not agent.model: