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

jarvis/jarvis_tools/ask_codebase.py

@@ -1,22 +1,24 @@
 from typing import Dict, Any
-from jarvis.jarvis_utils import OutputType, PrettyOutput, dont_use_local_model, find_git_root
 from jarvis.jarvis_codebase.main import CodeBase
+from jarvis.jarvis_utils.config import dont_use_local_model
+from jarvis.jarvis_utils.git_utils import find_git_root
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class AskCodebaseTool:
-    """Tool for intelligent codebase querying and analysis using CodeBase"""
-    
+    """用于智能代码库查询和分析的工具"""
+
     name = "ask_codebase"
-    description = "Ask questions about the codebase and get detailed analysis"
+    description = "查询代码库问题并获取详细分析"
     parameters = {
         "type": "object",
         "properties": {
             "question": {
                 "type": "string",
-                "description": "Question about the codebase"
+                "description": "关于代码库的问题"
             },
             "top_k": {
                 "type": "integer",
-                "description": "Number of most relevant files to analyze (optional)",
+                "description": "要分析的最相关文件数量（可选）",
                 "default": 20
             }
         },
@@ -52,14 +54,20 @@ class AskCodebaseTool:
             codebase = CodeBase(git_root)
 
             # Use ask_codebase method
-            _, response = codebase.ask_codebase(question, top_k)
-
+            files, response = codebase.ask_codebase(question, top_k)
+            
+            # Print found files
+            if files:
+                output = "找到的相关文件:\n"
+                for file in files:
+                    output += f"- {file['file']} ({file['reason']})\n"
+                PrettyOutput.print(output, OutputType.INFO, lang="markdown")
+            
             return {
                 "success": True,
                 "stdout": response,
                 "stderr": ""
             }
-
         except Exception as e:
             error_msg = f"分析代码库失败: {str(e)}"
             PrettyOutput.print(error_msg, OutputType.WARNING)
@@ -68,8 +76,6 @@ class AskCodebaseTool:
                 "stdout": "",
                 "stderr": error_msg
             }
-
-
 def main():
     """Command line interface for the tool"""
     import argparse
@@ -79,7 +85,6 @@ def main():
     parser.add_argument('--top-k', type=int, help='Number of files to analyze', default=20)
     
     args = parser.parse_args()
-    
     tool = AskCodebaseTool()
     result = tool.execute({
         "question": args.question,
@@ -93,4 +98,4 @@ def main():
         
 
 if __name__ == "__main__":
-    main()
+    main()

jarvis/jarvis_tools/ask_user.py

@@ -1,16 +1,17 @@
 from typing import Dict, Any
-from jarvis.jarvis_tools.base import Tool
-from jarvis.jarvis_utils import get_multiline_input, PrettyOutput, OutputType
+
+from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class AskUserTool:
     name="ask_user"
-    description="""Ask the user when information needed to complete the task is missing or when critical decision information is lacking. Users can input multiple lines of text, ending with an empty line. Use cases: 1. Need user to provide more information to complete the task; 2. Need user to make critical decisions; 3. Need user to confirm important operations; 4. Need user to provide additional information"""
+    description="""当完成任务所需的信息缺失或关键决策信息不足时，向用户提问。用户可以输入多行文本，以空行结束。使用场景：1. 需要用户提供更多信息以完成任务；2. 需要用户做出关键决策；3. 需要用户确认重要操作；4. 需要用户提供额外信息"""
     parameters={
         "type": "object",
         "properties": {
             "question": {
                 "type": "string",
-                "description": "The question to ask the user"
+                "description": "要向用户提出的问题"
             }
         },
         "required": ["question"]

jarvis/jarvis_tools/base.py

@@ -1,23 +1,37 @@
 from typing import Dict, Any, Callable
 import json
-
-
-
 class Tool:
+    """工具类，用于封装工具的基本信息和执行方法"""
+    
     def __init__(self, name: str, description: str, parameters: Dict, func: Callable):
+        """
+        初始化工具对象
+        
+        参数:
+            name (str): 工具名称
+            description (str): 工具描述
+            parameters (Dict): 工具参数定义
+            func (Callable): 工具执行函数
+        """
         self.name = name
         self.description = description
         self.parameters = parameters
         self.func = func
-
     def to_dict(self) -> Dict:
-        """Convert to tool format"""
+        """将工具对象转换为字典格式，主要用于序列化"""
         return {
             "name": self.name,
             "description": self.description,
             "parameters": json.dumps(self.parameters, ensure_ascii=False)
         }
-
     def execute(self, arguments: Dict) -> Dict[str, Any]:
-        """Execute tool function"""
-        return self.func(arguments)
+        """
+        执行工具函数
+        
+        参数:
+            arguments (Dict): 工具执行所需的参数
+            
+        返回:
+            Dict[str, Any]: 工具执行结果
+        """
+        return self.func(arguments)

jarvis/jarvis_tools/chdir.py

@@ -1,16 +1,15 @@
 from typing import Dict, Any
 import os
-from jarvis.jarvis_utils import PrettyOutput, OutputType
 
 class ChdirTool:
     name = "chdir"
-    description = "Change current working directory"
+    description = "更改当前工作目录"
     parameters = {
         "type": "object",
         "properties": {
             "path": {
                 "type": "string",
-                "description": "Directory path to switch to, supports both relative and absolute paths"
+                "description": "要切换到的目录路径，支持相对路径和绝对路径"
             }
         },
         "required": ["path"]
@@ -46,7 +45,7 @@ class ChdirTool:
                 return {
                     "success": False,
                     "stdout": "",
-                    "stderr": f"Directory does not exist: {path}"
+                    "stderr": f"目录不存在: {path}"
                 }
                 
             # Ensure the path points to a directory, not a file
@@ -54,7 +53,7 @@ class ChdirTool:
                 return {
                     "success": False,
                     "stdout": "",
-                    "stderr": f"The path is not a directory: {path}"
+                    "stderr": f"路径不是目录: {path}"
                 }
                 
             # Capture current directory and attempt to change to new path
@@ -63,7 +62,7 @@ class ChdirTool:
             
             return {
                 "success": True,
-                "stdout": f"Changed working directory:\nFrom: {old_path}\nTo: {path}",
+                "stdout": f"成功切换工作目录:\n原目录: {old_path}\n新目录: {path}",
                 "stderr": ""
             }
             
@@ -72,12 +71,12 @@ class ChdirTool:
             return {
                 "success": False,
                 "stdout": "",
-                "stderr": f"No permission to access directory: {path}"
+                "stderr": f"无权限访问目录: {path}"
             }
         # Catch-all for any other unexpected errors during directory change
         except Exception as e:
             return {
                 "success": False,
                 "stdout": "",
-                "stderr": f"Failed to switch directory: {str(e)}"
-            }
+                "stderr": f"切换目录失败: {str(e)}"
+            }

jarvis/jarvis_tools/code_review.py

@@ -1,44 +1,41 @@
-from typing import Dict, Any, List
+from typing import Dict, Any
 import subprocess
-import yaml
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.jarvis_utils import OutputType, PrettyOutput, init_env, find_git_root
 from jarvis.jarvis_agent import Agent
 import re
 
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.utils import init_env
+
 class CodeReviewTool:
     name = "code_review"
-    description = "Autonomous code review agent for code changes analysis"
+    description = "自动代码审查工具，用于分析代码变更"
     parameters = {
         "type": "object",
         "properties": {
             "review_type": {
                 "type": "string",
-                "description": "Type of review: 'commit' for specific commit, 'current' for current changes, 'range' for commit range",
+                "description": "审查类型：'commit' 审查特定提交，'current' 审查当前变更，'range' 审查提交范围",
                 "enum": ["commit", "current", "range"],
                 "default": "current"
             },
             "commit_sha": {
                 "type": "string",
-                "description": "Target commit SHA to analyze (required for review_type='commit')"
+                "description": "要分析的提交SHA（review_type='commit'时必填）"
             },
             "start_commit": {
                 "type": "string",
-                "description": "Start commit SHA (required for review_type='range')"
+                "description": "起始提交SHA（review_type='range'时必填）"
             },
             "end_commit": {
                 "type": "string",
-                "description": "End commit SHA (required for review_type='range')"
+                "description": "结束提交SHA（review_type='range'时必填）"
             }
         },
         "required": []
     }
 
-    def __init__(self):
-        init_env()
-        self.repo_root = find_git_root()
-
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         try:
             review_type = args.get("review_type", "current").strip()
@@ -170,13 +167,13 @@ PROPOSED DEFENSE:
             agent = Agent(
                 system_prompt=system_prompt,
                 name="Code Review Agent",
-                summary_prompt="""Please generate a concise summary report of the code review, format as yaml:
+                summary_prompt="""Please generate a concise summary report of the code review in Chinese, format as follows:
 <REPORT>
-- file: xxxx.py
-  location: [start_line_number, end_line_number]
-  description: # Only describe issues directly observable in the diff
-  severity: # Critical/Major/Minor based on concrete evidence
-  suggestion: # Specific, actionable improvements for the observed code
+- 文件: xxxx.py
+  位置: [起始行号, 结束行号]
+  描述: # 仅描述在差异中直接观察到的问题
+  严重程度: # 根据具体证据分为严重/重要/次要
+  建议: # 针对观察到的代码的具体改进建议
 </REPORT>""",
                 is_sub_agent=True,
                 output_handler=[tool_registry],
@@ -207,6 +204,8 @@ def extract_code_report(result: str) -> str:
 def main():
     """CLI entry point"""
     import argparse
+
+    init_env()
     
     parser = argparse.ArgumentParser(description='Autonomous code review tool')
     parser.add_argument('--type', choices=['commit', 'current', 'range'], default='current',
@@ -236,7 +235,7 @@ def main():
     result = tool.execute(tool_args)
     
     if result["success"]:
-        PrettyOutput.section("Autonomous Review Result:", OutputType.SUCCESS)
+        PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
         report = extract_code_report(result["stdout"])
         PrettyOutput.print(report, OutputType.SUCCESS, lang="yaml")
         
@@ -244,4 +243,4 @@ def main():
         PrettyOutput.print(result["stderr"], OutputType.WARNING)
 
 if __name__ == "__main__":
-    main()
+    main()

jarvis/jarvis_tools/create_code_agent.py

@@ -1,17 +1,17 @@
-import os
 from typing import Dict, Any
 from jarvis.jarvis_code_agent.code_agent import CodeAgent
 from jarvis.jarvis_tools.git_commiter import GitCommitTool
 from jarvis.jarvis_tools.code_review import CodeReviewTool, extract_code_report
-from jarvis.jarvis_utils import OutputType, PrettyOutput, has_uncommitted_changes, get_latest_commit_hash
+from jarvis.jarvis_utils.git_utils import get_latest_commit_hash, has_uncommitted_changes
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class CreateCodeAgentTool:
-    """Tool for managing the code development workflow."""
+    """用于管理代码开发工作流的工具"""
     
     name = "create_code_agent"
-    description = "Technical code implementation and development process management"
+    description = "技术代码实现和开发过程管理工具"
     parameters = {
-        "requirement": "Technical specifications for code implementation"
+        "requirement": "代码实现的技术规范"
     }
     
     
@@ -109,4 +109,4 @@ def main():
         PrettyOutput.print(result["stderr"], OutputType.WARNING)
 
 if __name__ == "__main__":
-    main()
+    main()

jarvis/jarvis_tools/create_sub_agent.py

@@ -2,38 +2,38 @@ from typing import Dict, Any
 
 
 from jarvis.jarvis_agent import Agent, origin_agent_system_prompt
-from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.jarvis_utils import OutputType, PrettyOutput
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 
 
 class SubAgentTool:
     name = "create_sub_agent"
-    description = "Create a sub-agent to handle specific tasks, the sub-agent will generate a task summary report"
+    description = "创建子代理以处理特定任务，子代理将生成任务总结报告"
     parameters = {
         "type": "object",
         "properties": {
             "agent_name": {
                 "type": "string",
-                "description": "Sub-agent name"
+                "description": "子代理名称"
             },
             "task": {
                 "type": "string",
-                "description": "Specific task to complete"
+                "description": "要完成的特定任务"
             },
             "context": {
                 "type": "string",
-                "description": "Context information related to the task",
+                "description": "与任务相关的上下文信息",
                 "default": ""
             },
             "goal": {
                 "type": "string",
-                "description": "Completion goal of the task",
+                "description": "任务的完成目标",
                 "default": ""
             },
             "files": {
                 "type": "array",
                 "items": {"type": "string"},
-                "description": "Related file path list, used for file question answering and processing",
+                "description": "相关文件路径列表，用于文件问答和处理",
                 "default": []
             }
         },
@@ -83,4 +83,4 @@ class SubAgentTool:
                 "success": False,
                 "stdout": "",
                 "stderr": f"Sub-agent execution failed: {str(e)}"
-            } 
+            }

jarvis/jarvis_tools/execute_shell.py

@@ -1,55 +1,89 @@
+# Shell command execution module
+# 
+# Provides functionality to execute shell commands safely with:
+# - Command escaping
+# - Output capturing
+# - Temporary file management
+# - Error handling
 from typing import Dict, Any
 import os
 import tempfile
 from pathlib import Path
-
-from jarvis.jarvis_utils import OutputType, PrettyOutput
-
-
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 class ShellTool:
+    """Shell command execution tool
+    
+    Attributes:
+        name: Tool identifier used in API
+        description: Tool description for API documentation
+        parameters: JSON schema for command parameters
+    """
     name = "execute_shell"
-    description = """Execute shell command and return result"""
-
+    description = "执行Shell命令并返回结果"
     parameters = {
         "type": "object",
         "properties": {
             "command": {
                 "type": "string",
-                "description": "Shell command to execute"
+                "description": "要执行的Shell命令"
             }
         },
         "required": ["command"]
     }
-
-
     def _escape_command(self, cmd: str) -> str:
-        """Escape special characters in command"""
+        """Escape special characters in command to prevent shell injection
+        
+        Args:
+            cmd: Raw command string
+            
+        Returns:
+            Escaped command string with single quotes properly handled
+        """
         return cmd.replace("'", "'\"'\"'")
-
     def execute(self, args: Dict) -> Dict[str, Any]:
-        """Execute shell command"""
+        """Execute shell command and capture output
+        
+        Steps:
+        1. Validate and clean input command
+        2. Create temporary file for output capture
+        3. Execute command with output redirection
+        4. Read and process output file
+        5. Clean up temporary resources
+        6. Return structured results
+        
+        Args:
+            args: Dictionary containing 'command' parameter
+            
+        Returns:
+            Dictionary with:
+            - success: Boolean indicating command execution status
+            - stdout: Command output
+            - stderr: Error message if execution failed
+        """
         try:
+            # Get and clean command input
             command = args["command"].strip()
             
-            # Generate temporary file name
+            # Generate temporary file name using process ID for uniqueness
             output_file = os.path.join(tempfile.gettempdir(), f"jarvis_shell_{os.getpid()}.log")
             
-            # Escape special characters in command
+            # Escape special characters in command to prevent injection
             escaped_command = self._escape_command(command)
             
-            # Modify command to use script
+            # 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
+            # Execute command and capture return code
             return_code = os.system(tee_command)
             
-            # Read output file
+            # Read and process output file
             try:
                 with open(output_file, 'r', encoding='utf-8', errors='replace') as f:
                     output = f.read()
-                    # Remove header and footer added by script
+                    # Remove header and footer added by script command
                     if output:
                         lines = output.splitlines()
                         if len(lines) > 2:
@@ -60,6 +94,7 @@ class ShellTool:
                 # Clean up temporary file
                 Path(output_file).unlink(missing_ok=True)
             
+            # Return successful result
             return {
                 "success": True,
                 "stdout": output,
@@ -67,7 +102,7 @@ class ShellTool:
             }
                 
         except Exception as e:
-            # Ensure temporary file is cleaned up
+            # Ensure temporary file is cleaned up even if error occurs
             if 'output_file' in locals():
                 Path(output_file).unlink(missing_ok=True)
             PrettyOutput.print(str(e), OutputType.ERROR)
@@ -75,4 +110,4 @@ class ShellTool:
                 "success": False,
                 "stdout": "",
                 "stderr": str(e)
-            } 
+            }

jarvis/jarvis_tools/execute_shell_script.py

@@ -2,17 +2,19 @@ from typing import Dict, Any
 import os
 import tempfile
 from pathlib import Path
-from jarvis.jarvis_utils import OutputType, PrettyOutput
+
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 
 class ShellScriptTool:
     name = "execute_shell_script"
-    description = """Execute shell script file and return result"""
+    description = "执行Shell脚本文件并返回结果"
     parameters = {
         "type": "object",
         "properties": {
             "script_content": {
                 "type": "string",
-                "description": "Content of the shell script to execute"
+                "description": "要执行的Shell脚本内容"
             }
         },
         "required": ["script_content"]
@@ -33,12 +35,10 @@ class ShellScriptTool:
             try:
                 with open(script_path, 'w', encoding='utf-8') as f:
                     f.write(script_content)
-                os.chmod(script_path, 0o755)  # Make script executable
-                
                 # Use execute_shell to run the script
                 from jarvis.jarvis_tools.execute_shell import ShellTool
                 shell_tool = ShellTool()
-                result = shell_tool.execute({"command": script_path})
+                result = shell_tool.execute({"command": f"bash {script_path}"})
                 
                 return {
                     "success": result["success"],
@@ -55,4 +55,4 @@ class ShellScriptTool:
                 "success": False,
                 "stdout": "",
                 "stderr": str(e)
-            }
+            }

jarvis/jarvis_tools/file_operation.py

@@ -1,19 +1,20 @@
-from typing import Dict, Any, List, Union
+from typing import Dict, Any
 import os
 
-from jarvis.jarvis_utils import OutputType, PrettyOutput
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+
 
 
 class FileOperationTool:
     name = "file_operation"
-    description = "File operations for reading and writing multiple files"
+    description = "用于读写多个文件的操作工具"
     parameters = {
         "type": "object",
         "properties": {
             "operation": {
                 "type": "string",
                 "enum": ["read", "write"],
-                "description": "Type of file operation to perform (read or write multiple files)"
+                "description": "要执行的文件操作类型（读取或写入多个文件）"
             },
             "files": {
                 "type": "array",
@@ -25,13 +26,14 @@ class FileOperationTool:
                     },
                     "required": ["path"]
                 },
-                "description": "List of files to operate on"
+                "description": "要操作的文件列表"
             }
         },
         "required": ["operation", "files"]
     }
 
-    def _handle_single_file(self, operation: str, filepath: str, content: str = "") -> Dict[str, Any]:
+    def _handle_single_file(self, operation: str, filepath: str, content: str = "", 
+                          start_line: int = 1, end_line: int = -1) -> Dict[str, Any]:
         """Handle operations for a single file"""
         try:
             abs_path = os.path.abspath(filepath)
@@ -54,8 +56,29 @@ class FileOperationTool:
                         "stderr": "File too large (>10MB)"
                     }
                     
-                content = open(abs_path, 'r', encoding='utf-8').read()
-                output = f"File: {abs_path}\n{content}"
+                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)
+                    return {
+                        "success": False,
+                        "stdout": "",
+                        "stderr": error_msg
+                    }
+                
+                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,
@@ -119,7 +142,13 @@ class FileOperationTool:
                     continue
                 
                 content = file_info.get("content", "") if operation == "write" else ""
-                result = self._handle_single_file(operation, file_info["path"].strip(), content)
+                result = self._handle_single_file(
+                    operation,
+                    file_info["path"].strip(),
+                    content,
+                    file_info.get("start_line", 1),
+                    file_info.get("end_line", -1)
+                )
                 
                 if result["success"]:
                     all_outputs.append(result["stdout"])
@@ -142,4 +171,4 @@ class FileOperationTool:
                 "success": False,
                 "stdout": "",
                 "stderr": f"File operation failed: {str(e)}"
-            } 
+            }