jarvis-ai-assistant 0.1.126__py3-none-any.whl → 0.1.129__py3-none-any.whl

jarvis/jarvis_tools/chdir.py

@@ -16,31 +16,31 @@ class ChdirTool:
     }
     
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
-        """Execute directory change operation with comprehensive error handling.
+        """执行目录切换操作，并提供全面的错误处理。
         
-        Args:
-            args: Dictionary containing 'path' key with target directory path
+        参数:
+            args: 包含 'path' 键的字典，目标目录路径
             
-        Returns:
-            Dictionary containing:
-                - success: Boolean indicating operation status
-                - stdout: Success message or empty string
-                - stderr: Error message or empty string
+        返回:
+            字典，包含以下内容：
+                - success: 布尔值，表示操作状态
+                - stdout: 成功消息或空字符串
+                - stderr: 错误消息或空字符串
                 
-        Raises:
-            Handles and returns appropriate error messages for:
-                - Non-existent paths
-                - Non-directory paths
-                - Permission errors
-                - Generic exceptions
+        异常处理:
+            处理并返回适当的错误消息：
+                - 不存在的路径
+                - 非目录路径
+                - 权限错误
+                - 其他通用异常
         """
-        # Main execution block with comprehensive error handling
+        # 主执行块，包含全面的错误处理
         try:
-            # Normalize and expand the input path (handles ~ and relative paths)
+            # 规范化并展开输入路径（处理 ~ 和相对路径）
             path = os.path.expanduser(args["path"].strip())
             path = os.path.abspath(path)
             
-            # Validate that the target path exists
+            # 验证目标路径是否存在
             if not os.path.exists(path):
                 return {
                     "success": False,
@@ -48,7 +48,7 @@ class ChdirTool:
                     "stderr": f"目录不存在: {path}"
                 }
                 
-            # Ensure the path points to a directory, not a file
+            # 确保路径指向的是目录，而不是文件
             if not os.path.isdir(path):
                 return {
                     "success": False,
@@ -56,7 +56,7 @@ class ChdirTool:
                     "stderr": f"路径不是目录: {path}"
                 }
                 
-            # Capture current directory and attempt to change to new path
+            # 获取当前目录并尝试切换到新路径
             old_path = os.getcwd()
             os.chdir(path)
             
@@ -66,17 +66,17 @@ class ChdirTool:
                 "stderr": ""
             }
             
-        # Handle cases where user lacks directory access permissions
+        # 处理用户没有目录访问权限的情况
         except PermissionError:
             return {
                 "success": False,
                 "stdout": "",
                 "stderr": f"无权限访问目录: {path}"
             }
-        # Catch-all for any other unexpected errors during directory change
+        # 捕获在目录切换过程中可能出现的其他意外错误
         except Exception as e:
             return {
                 "success": False,
                 "stdout": "",
                 "stderr": f"切换目录失败: {str(e)}"
-            }
+            }

jarvis/jarvis_tools/code_review.py

@@ -1,5 +1,7 @@
 from typing import Dict, Any
 import subprocess
+
+from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_agent import Agent
@@ -41,44 +43,47 @@ class CodeReviewTool:
             review_type = args.get("review_type", "current").strip()
             
             # Build git diff command based on review type
-            if review_type == "commit":
-                if "commit_sha" not in args:
-                    return {
-                        "success": False,
-                        "stdout": {},
-                        "stderr": "commit_sha is required for commit review type"
-                    }
-                commit_sha = args["commit_sha"].strip()
-                diff_cmd = f"git show {commit_sha} | cat -"
-            elif review_type == "range":
-                if "start_commit" not in args or "end_commit" not in args:
-                    return {
-                        "success": False,
-                        "stdout": {},
-                        "stderr": "start_commit and end_commit are required for range review type"
-                    }
-                start_commit = args["start_commit"].strip()
-                end_commit = args["end_commit"].strip()
-                diff_cmd = f"git diff {start_commit}..{end_commit} | cat -"
-            else:  # current changes
-                diff_cmd = "git diff HEAD | cat -"
+            with yaspin(text="正在获取代码变更...", color="cyan") as spinner:
+                if review_type == "commit":
+                    if "commit_sha" not in args:
+                        return {
+                            "success": False,
+                            "stdout": {},
+                            "stderr": "commit_sha is required for commit review type"
+                        }
+                    commit_sha = args["commit_sha"].strip()
+                    diff_cmd = f"git show {commit_sha} | cat -"
+                elif review_type == "range":
+                    if "start_commit" not in args or "end_commit" not in args:
+                        return {
+                            "success": False,
+                            "stdout": {},
+                            "stderr": "start_commit and end_commit are required for range review type"
+                        }
+                    start_commit = args["start_commit"].strip()
+                    end_commit = args["end_commit"].strip()
+                    diff_cmd = f"git diff {start_commit}..{end_commit} | cat -"
+                else:  # current changes
+                    diff_cmd = "git diff HEAD | cat -"
             
-            # Execute git diff command
-            try:
-                diff_output = subprocess.check_output(diff_cmd, shell=True, text=True)
-                if not diff_output:
+                # Execute git diff command
+                try:
+                    diff_output = subprocess.check_output(diff_cmd, shell=True, text=True)
+                    if not diff_output:
+                        return {
+                            "success": False,
+                            "stdout": {},
+                            "stderr": "No changes to review"
+                        }
+                    PrettyOutput.print(diff_output, OutputType.CODE, lang="diff")
+                except subprocess.CalledProcessError as e:
                     return {
                         "success": False,
                         "stdout": {},
-                        "stderr": "No changes to review"
+                        "stderr": f"Failed to get diff: {str(e)}"
                     }
-                PrettyOutput.print(diff_output, OutputType.CODE, lang="diff")
-            except subprocess.CalledProcessError as e:
-                return {
-                    "success": False,
-                    "stdout": {},
-                    "stderr": f"Failed to get diff: {str(e)}"
-                }
+                spinner.text = "代码变更获取完成"
+                spinner.ok("✅")
 
             system_prompt = """You are an autonomous code review expert with a tragic past. Perform in-depth analysis with the vigilance born from painful experience:
 

jarvis/jarvis_tools/execute_shell.py

@@ -73,9 +73,6 @@ class ShellTool:
             # Use script command to capture both stdout and stderr
             tee_command = f"script -q -c '{escaped_command}' {output_file}"
             
-            # Log command execution
-            PrettyOutput.print(f"执行命令: {command}", OutputType.INFO)
-            
             # Execute command and capture return code
             return_code = os.system(tee_command)
             

jarvis/jarvis_tools/file_operation.py

@@ -1,6 +1,8 @@
 from typing import Dict, Any
 import os
 
+from yaspin import yaspin
+
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
@@ -37,67 +39,66 @@ class FileOperationTool:
         """Handle operations for a single file"""
         try:
             abs_path = os.path.abspath(filepath)
-            PrettyOutput.print(f"文件操作: {operation} - {abs_path}", OutputType.INFO)
-            
             if operation == "read":
-                if not os.path.exists(abs_path):
-                    PrettyOutput.print(f"文件不存在: {abs_path}", OutputType.WARNING)
-                    return {
-                        "success": False,
-                        "stdout": "",
-                        "stderr": f"文件不存在: {abs_path}"
-                    }
+                with yaspin(text=f"正在读取文件: {abs_path}...", color="cyan") as spinner:
+                    if not os.path.exists(abs_path):
+                        return {
+                            "success": False,
+                            "stdout": "",
+                            "stderr": f"文件不存在: {abs_path}"
+                        }
+                        
+                    if os.path.getsize(abs_path) > 10 * 1024 * 1024:  # 10MB
+                        return {
+                            "success": False,
+                            "stdout": "",
+                            "stderr": "File too large (>10MB)"
+                        }
+                        
+                    with open(abs_path, 'r', encoding='utf-8') as f:
+                        lines = f.readlines()
                     
-                if os.path.getsize(abs_path) > 10 * 1024 * 1024:  # 10MB
-                    PrettyOutput.print(f"文件太大: {abs_path}", OutputType.WARNING)
-                    return {
-                        "success": False,
-                        "stdout": "",
-                        "stderr": "File too large (>10MB)"
-                    }
                     
-                with open(abs_path, 'r', encoding='utf-8') as f:
-                    lines = f.readlines()
-                
-                # Handle line range
-                total_lines = len(lines)
-                start_line = start_line if start_line >= 0 else total_lines + start_line + 1
-                end_line = end_line if end_line >= 0 else total_lines + end_line + 1
-                start_line = max(1, min(start_line, total_lines))
-                end_line = max(1, min(end_line, total_lines))
-                if end_line == -1:
-                    end_line = total_lines
-                
-                if start_line > end_line:
-                    error_msg = f"无效的行范围 [{start_line, end_line}] (文件总行数: {total_lines})"
-                    PrettyOutput.print(error_msg, OutputType.WARNING)
+                    total_lines = len(lines)
+                    start_line = start_line if start_line >= 0 else total_lines + start_line + 1
+                    end_line = end_line if end_line >= 0 else total_lines + end_line + 1
+                    start_line = max(1, min(start_line, total_lines))
+                    end_line = max(1, min(end_line, total_lines))
+                    if end_line == -1:
+                        end_line = total_lines
+                    
+                    if start_line > end_line:
+                        spinner.text = "无效的行范围"
+                        spinner.fail("❌")
+                        error_msg = f"无效的行范围 [{start_line, end_line}] (文件总行数: {total_lines})"
+                        return {
+                            "success": False,
+                            "stdout": "",
+                            "stderr": error_msg
+                        }
+                    
+                    content = "".join(lines[start_line - 1:end_line])
+                    output = f"\n文件: {abs_path}\n行: [{start_line}-{end_line}]\n{content}" + "\n\n" + "="*80 + "\n\n"
+                    
+                    spinner.text = f"文件读取完成: {abs_path}"
+                    spinner.ok("✅")
                     return {
-                        "success": False,
-                        "stdout": "",
-                        "stderr": error_msg
+                        "success": True,
+                        "stdout": output,
+                        "stderr": ""
                     }
-                
-                content = "".join(lines[start_line - 1:end_line])
-                output = f"\文件: {abs_path}\行: [{start_line}-{end_line}]\n{content}" + "\n\n" + "="*80 + "\n\n"
-                
-                return {
-                    "success": True,
-                    "stdout": output,
-                    "stderr": ""
-                }
-                
             elif operation == "write":
-                os.makedirs(os.path.dirname(os.path.abspath(abs_path)), exist_ok=True)
-                with open(abs_path, 'w', encoding='utf-8') as f:
-                    f.write(content)
-                
-                PrettyOutput.print(f"写入文件: {abs_path}", OutputType.INFO)
-                return {
-                    "success": True,
-                    "stdout": f"Successfully wrote content to {abs_path}",
-                    "stderr": ""
-                }
-            PrettyOutput.print(f"未知操作: {operation}", OutputType.WARNING)
+                with yaspin(text=f"正在写入文件: {abs_path}...", color="cyan") as spinner:
+                    os.makedirs(os.path.dirname(os.path.abspath(abs_path)), exist_ok=True)
+                    with open(abs_path, 'w', encoding='utf-8') as f:
+                        f.write(content)
+                    spinner.text = f"文件写入完成: {abs_path}"
+                    spinner.ok("✅")
+                    return {
+                        "success": True,
+                        "stdout": f"Successfully wrote content to {abs_path}",
+                        "stderr": ""
+                    }
             return {
                 "success": False,
                 "stdout": "",

jarvis/jarvis_tools/git_commiter.py

@@ -4,6 +4,7 @@ import subprocess
 from typing import Dict, Any
 import tempfile
 import yaml
+from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
 import sys
 import argparse
@@ -54,59 +55,68 @@ class GitCommitTool:
                 PrettyOutput.print("没有未提交的更改", OutputType.SUCCESS)
                 return {"success": True, "stdout": "No changes to commit", "stderr": ""}
             
-            PrettyOutput.print("准备添加文件到提交...", OutputType.SYSTEM)
-            subprocess.Popen(
-                ["git", "add", "."],
-                stdout=subprocess.DEVNULL,
-                stderr=subprocess.DEVNULL
-            ).wait()
-            
-            PrettyOutput.print("获取差异...", OutputType.SYSTEM)
-            process = subprocess.Popen(
-                ["git", "diff", "--cached", "--exit-code"],
-                stdout=subprocess.PIPE,
-                stderr=subprocess.PIPE
-            )
-            diff = process.communicate()[0].decode()
-            PrettyOutput.print(diff, OutputType.CODE, lang="diff")
-            
-            prompt = f'''根据以下规则生成提交信息：
-            提交信息应使用{args.get('lang', '中文')}书写
-# 必需结构
-必须使用以下格式：
-<COMMIT_MESSAGE>
-<类型>(<范围>): <主题>
-使用祈使语气描述变更内容
-</COMMIT_MESSAGE>
-# 格式规则
-1. 类型: fix, feat, docs, style, refactor, test, chore
-2. 范围表示模块 (例如: auth, database)
-3. 主题行 <= 72个字符，不以句号结尾
-4. 正文使用现在时态解释每个变更的内容和原因
-5. 不要遗漏任何变更
-# 分析材料
-{diff}
-'''
-            
-            PrettyOutput.print("生成提交消息...", OutputType.SYSTEM)
-            platform = PlatformRegistry().get_codegen_platform()
-            platform.set_suppress_output(True)
-            commit_message = platform.chat_until_success(prompt)
-            commit_message = self._extract_commit_message(commit_message)
-            
-            # 使用临时文件处理提交消息
-            with tempfile.NamedTemporaryFile(mode='w', delete=True) as tmp_file:
-                tmp_file.write(commit_message)
-                tmp_file.flush()  # 确保内容写入文件
-                commit_cmd = ["git", "commit", "-F", tmp_file.name]
-                PrettyOutput.print("提交...", OutputType.INFO)
+            with yaspin(text="正在初始化提交流程...", color="cyan") as spinner:
+                # 添加文件
+                spinner.text = "正在添加文件到提交..."
                 subprocess.Popen(
-                    commit_cmd,
+                    ["git", "add", "."],
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL
                 ).wait()
+                spinner.write("✅ 添加文件到提交")
+                
+                # 获取差异
+                spinner.text = "正在获取代码差异..."
+                process = subprocess.Popen(
+                    ["git", "diff", "--cached", "--exit-code"],
+                    stdout=subprocess.PIPE,
+                    stderr=subprocess.PIPE
+                )
+                diff = process.communicate()[0].decode()
+                spinner.write("✅ 获取差异")
+                
+                # 生成提交信息
+                spinner.text = "正在生成提交消息..."
+                prompt = f'''根据以下规则生成提交信息：
+                提交信息应使用{args.get('lang', '中文')}书写
+    # 必需结构
+    必须使用以下格式：
+    <COMMIT_MESSAGE>
+    <类型>(<范围>): <主题>
+    使用祈使语气描述变更内容
+    </COMMIT_MESSAGE>
+    # 格式规则
+    1. 类型: fix, feat, docs, style, refactor, test, chore
+    2. 范围表示模块 (例如: auth, database)
+    3. 主题行 <= 72个字符，不以句号结尾
+    4. 正文使用现在时态解释每个变更的内容和原因
+    5. 不要遗漏任何变更
+    # 分析材料
+    {diff}
+    '''
+                platform = PlatformRegistry().get_codegen_platform()
+                commit_message = platform.chat_until_success(prompt)
+                commit_message = self._extract_commit_message(commit_message)
+                spinner.write("✅ 生成提交消息")
+                
+                # 执行提交
+                spinner.text = "正在准备提交..."
+                with tempfile.NamedTemporaryFile(mode='w', delete=True) as tmp_file:
+                    tmp_file.write(commit_message)
+                    tmp_file.flush()
+                    spinner.text = "正在执行提交..."
+                    commit_cmd = ["git", "commit", "-F", tmp_file.name]
+                    subprocess.Popen(
+                        commit_cmd,
+                        stdout=subprocess.DEVNULL,
+                        stderr=subprocess.DEVNULL
+                    ).wait()
+                    spinner.write("✅ 提交")
+
+                commit_hash = self._get_last_commit_hash()
+                spinner.text = "完成提交"
+                spinner.ok("✅")
 
-            commit_hash = self._get_last_commit_hash()
             PrettyOutput.print(f"提交哈希: {commit_hash}\n提交消息: {commit_message}", OutputType.SUCCESS)
 
             return {
@@ -116,7 +126,7 @@ class GitCommitTool:
                     "commit_message": commit_message
                 }),
                 "stderr": ""
-            }
+                }
 
         except Exception as e:
             return {
@@ -134,4 +144,4 @@ def main():
     tool.execute({"lang": args.lang if hasattr(args, 'lang') else 'Chinese'})
 
 if __name__ == "__main__":
-    sys.exit(main())
+    sys.exit(main())

jarvis/jarvis_tools/read_code.py

@@ -0,0 +1,143 @@
+from typing import Dict, Any
+import os
+
+from yaspin import yaspin
+
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
+class ReadCodeTool:
+    name = "read_code"
+    description = "用于读取代码文件并在每行前添加行号的工具"
+    parameters = {
+        "type": "object",
+        "properties": {
+            "files": {
+                "type": "array",
+                "items": {
+                    "type": "object",
+                    "properties": {
+                        "path": {"type": "string"},
+                        "start_line": {"type": "number", "default": 1},
+                        "end_line": {"type": "number", "default": -1}
+                    },
+                    "required": ["path"]
+                },
+                "description": "要读取的文件列表"
+            }
+        },
+        "required": ["files"]
+    }
+
+    def _handle_single_file(self, filepath: str, start_line: int = 1, end_line: int = -1) -> Dict[str, Any]:
+        try:
+            abs_path = os.path.abspath(filepath)
+            with yaspin(text=f"正在读取文件: {abs_path}...", color="cyan") as spinner:
+                # 文件存在性检查
+                if not os.path.exists(abs_path):
+                    return {
+                        "success": False,
+                        "stdout": "",
+                        "stderr": f"文件不存在: {abs_path}"
+                    }
+                
+                # 文件大小限制检查（10MB）
+                if os.path.getsize(abs_path) > 10 * 1024 * 1024:
+                    return {
+                        "success": False,
+                        "stdout": "",
+                        "stderr": "文件过大 (>10MB)"
+                    }
+                
+                # 读取文件内容
+                with open(abs_path, 'r', encoding='utf-8') as f:
+                    lines = f.readlines()
+                
+                total_lines = len(lines)
+                
+                # 处理特殊值-1表示文件末尾
+                if end_line == -1:
+                    end_line = total_lines
+                else:
+                    end_line = max(1, min(end_line, total_lines)) if end_line >= 0 else total_lines + end_line + 1
+                
+                start_line = max(1, min(start_line, total_lines)) if start_line >= 0 else total_lines + start_line + 1
+                
+                if start_line > end_line:
+                    spinner.fail("❌")
+                    return {
+                        "success": False,
+                        "stdout": "",
+                        "stderr": f"无效的行范围 [{start_line}-{end_line}] (总行数: {total_lines})"
+                    }
+                
+                # 添加行号并构建输出内容
+                selected_lines = lines[start_line-1:end_line]
+                numbered_content = "".join(
+                    [f"{i:4d} | {line}" 
+                     for i, line in enumerate(selected_lines, start=start_line)]
+                )
+                
+                # 构建输出格式
+                output = (
+                    f"\n🔍 文件: {abs_path}\n"
+                    f"📄 原始行号: {start_line}-{end_line} (共{end_line - start_line + 1}行) | 显示行号: 1-{len(selected_lines)}\n\n"
+                    f"{numbered_content}\n"
+                    f"{'='*80}\n"
+                )
+                
+                spinner.ok("✅")
+                return {
+                    "success": True,
+                    "stdout": output,
+                    "stderr": ""
+                }
+                
+        except Exception as e:
+            PrettyOutput.print(str(e), OutputType.ERROR)
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"文件读取失败: {str(e)}"
+            }
+
+    def execute(self, args: Dict) -> Dict[str, Any]:
+        try:
+            if "files" not in args or not isinstance(args["files"], list):
+                return {
+                    "success": False,
+                    "stdout": "",
+                    "stderr": "参数中必须包含文件列表"
+                }
+            
+            all_outputs = []
+            overall_success = True
+            
+            for file_info in args["files"]:
+                if not isinstance(file_info, dict) or "path" not in file_info:
+                    continue
+                
+                result = self._handle_single_file(
+                    file_info["path"].strip(),
+                    file_info.get("start_line", 1),
+                    file_info.get("end_line", -1)
+                )
+                
+                if result["success"]:
+                    all_outputs.append(result["stdout"])
+                else:
+                    all_outputs.append(f"❌ {file_info['path']}: {result['stderr']}")
+                    overall_success = False
+                
+            return {
+                "success": overall_success,
+                "stdout": "\n".join(all_outputs),
+                "stderr": ""
+            }
+            
+        except Exception as e:
+            PrettyOutput.print(str(e), OutputType.ERROR)
+            return {
+                "success": False,
+                "stdout": "",
+                "stderr": f"代码读取失败: {str(e)}"
+            }