jarvis-ai-assistant 0.1.132__py3-none-any.whl → 0.1.138__py3-none-any.whl

jarvis/jarvis_tools/code_review.py

@@ -4,6 +4,7 @@ import os
 
 from yaspin import yaspin
 from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_tools.read_code import ReadCodeTool
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_agent import Agent
 import re
@@ -52,14 +53,14 @@ class CodeReviewTool:
         try:
             review_type = args.get("review_type", "current").strip()
             root_dir = args.get("root_dir", ".")
-            
+
             # Store current directory
             original_dir = os.getcwd()
-            
+
             try:
                 # Change to root_dir
                 os.chdir(root_dir)
-                
+
                 # Build git diff command based on review type
                 with yaspin(text="正在获取代码变更...", color="cyan") as spinner:
                     if review_type == "commit":
@@ -89,10 +90,10 @@ class CodeReviewTool:
                                 "stderr": "file_path is required for file review type"
                             }
                         file_path = args["file_path"].strip()
-                        diff_cmd = f"cat {file_path}"
+                        diff_cmd = ReadCodeTool().execute({"files": [{"path": file_path}]})["stdout"]
                     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)
@@ -114,6 +115,25 @@ class CodeReviewTool:
 
                 system_prompt = """你是一位精益求精的首席代码审查专家，拥有多年企业级代码审计经验。你需要对所有代码变更进行极其全面、严谨且深入的审查，确保代码质量达到最高标准。
 
+# 代码审查工具选择
+优先使用执行shell命令进行静态分析，而非依赖内置代码审查功能：
+
+| 分析需求 | 首选工具 | 备选工具 |
+|---------|---------|----------|
+| 代码质量检查 | execute_shell | - |
+| 语法检查 | 语言特定lint工具 | - |
+| 安全分析 | 安全扫描工具 | - |
+| 代码统计 | loc | - |
+
+# 推荐命令
+- Python: `pylint <file_path>`, `flake8 <file_path>`, `mypy <file_path>`
+- JavaScript/TypeScript: `eslint <file_path>`, `tsc --noEmit <file_path>`
+- Java: `checkstyle <file_path>`, `pmd -d <file_path>`
+- C/C++: `cppcheck <file_path>`, `clang-tidy <file_path>`
+- Go: `golint <file_path>`, `go vet <file_path>`
+- Rust: `cargo clippy`, `rustfmt --check <file_path>`
+- 通用搜索：`rg "pattern" <files>` 查找特定代码模式
+
 # 专家审查标准
 1. 必须逐行分析每个修改文件，细致审查每一处变更，不遗漏任何细节
 2. 基于坚实的证据识别问题，不做主观臆测，给出明确的问题定位和详细分析
@@ -204,9 +224,9 @@ class CodeReviewTool:
 - **位置**: [起始行号-结束行号]
 - **分类**: [使用SCRIPPPS框架中相关类别]
 - **严重程度**: [P0/P1/P2/P3] - [简要说明判定理由]
-- **问题描述**: 
+- **问题描述**:
   [详细描述问题，包括技术原理和潜在影响]
-- **改进建议**: 
+- **改进建议**:
   ```
   [提供完整、可执行的代码示例，而非概念性建议]
   ```
@@ -226,7 +246,6 @@ class CodeReviewTool:
 
 如果没有发现任何问题，请在REPORT标签内进行全面分析后明确说明"经过全面审查，未发现问题"并解释原因。
 必须确保对所有修改的文件都进行了审查，并在报告中明确提及每个文件，即使某些文件没有发现问题。""",
-                    is_sub_agent=True,
                     output_handler=[tool_registry],
                     platform=PlatformRegistry().get_thinking_platform(),
                     auto_complete=True
@@ -240,14 +259,14 @@ class CodeReviewTool:
             finally:
                 # Always restore original directory
                 os.chdir(original_dir)
-                
+
         except Exception as e:
             return {
                 "success": False,
                 "stdout": {},
                 "stderr": f"Review failed: {str(e)}"
             }
-        
+
 
 def extract_code_report(result: str) -> str:
     sm = re.search(ot("REPORT")+r'\n(.*?)\n'+ct("REPORT"), result, re.DOTALL)
@@ -260,33 +279,33 @@ def main():
     import argparse
 
     init_env()
-    
+
     parser = argparse.ArgumentParser(description='Autonomous code review tool')
     subparsers = parser.add_subparsers(dest='type')
-    
+
     # Commit subcommand
     commit_parser = subparsers.add_parser('commit', help='Review specific commit')
     commit_parser.add_argument('commit', help='Commit SHA to review')
-    
+
     # Current subcommand
     current_parser = subparsers.add_parser('current', help='Review current changes')
-    
+
     # Range subcommand
     range_parser = subparsers.add_parser('range', help='Review commit range')
     range_parser.add_argument('start_commit', help='Start commit SHA')
     range_parser.add_argument('end_commit', help='End commit SHA')
-    
+
     # File subcommand
     file_parser = subparsers.add_parser('file', help='Review specific file')
     file_parser.add_argument('file', help='File path to review')
-    
+
     # Common arguments
     parser.add_argument('--root-dir', type=str, help='Root directory of the codebase', default=".")
-    
+
     # Set default subcommand to 'current'
     parser.set_defaults(type='current')
     args = parser.parse_args()
-    
+
     tool = CodeReviewTool()
     tool_args = {
         "review_type": args.type,
@@ -299,14 +318,14 @@ def main():
         tool_args["end_commit"] = args.end_commit
     elif args.type == 'file':
         tool_args["file_path"] = args.file
-    
+
     result = tool.execute(tool_args)
-    
+
     if result["success"]:
         PrettyOutput.section("自动代码审查结果:", OutputType.SUCCESS)
         report = extract_code_report(result["stdout"])
         PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")
-        
+
     else:
         PrettyOutput.print(result["stderr"], OutputType.WARNING)
 

jarvis/jarvis_tools/create_code_agent.py

@@ -8,7 +8,7 @@ from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 class CreateCodeAgentTool:
     """用于管理代码开发工作流的工具"""
-    
+
     name = "create_code_agent"
     description = "技术代码实现和开发过程管理工具"
     parameters = {
@@ -25,16 +25,16 @@ class CreateCodeAgentTool:
             "default": "."
         }
     }
-    
-    
+
+
     def execute(self, args: Dict[str, Any]) -> Dict[str, Any]:
         try:
             requirement = args.get("requirement", "")
             root_dir = args.get("root_dir", ".")
-            
+
             # Store current directory
             original_dir = os.getcwd()
-            
+
             try:
                 # Change to root_dir
                 os.chdir(root_dir)
@@ -44,7 +44,7 @@ class CreateCodeAgentTool:
                         "stderr": "Requirement must be provided",
                         "stdout": ""
                     }
-                
+
                 # Step 1: Handle uncommitted changes
                 start_commit = None
                 if has_uncommitted_changes():
@@ -57,18 +57,18 @@ class CreateCodeAgentTool:
                             "stderr": "Failed to commit changes: " + result["stderr"],
                             "stdout": ""
                         }
-                
+
                 # Get current commit hash
                 start_commit = get_latest_commit_hash()
-                
+
                 # Step 2: Development
                 PrettyOutput.print("开始开发...", OutputType.INFO)
                 agent = CodeAgent()
                 agent.run(requirement)
-                
+
                 # Get new commit hash after development
                 end_commit = get_latest_commit_hash()
-                
+
                 # Step 3: Code Review
                 PrettyOutput.print("开始代码审查...", OutputType.INFO)
                 reviewer = CodeReviewTool()
@@ -78,17 +78,17 @@ class CreateCodeAgentTool:
                     "end_commit": end_commit,
                     "root_dir": root_dir
                 })
-                
+
                 if not review_result["success"]:
                     return {
                         "success": False,
                         "stderr": "Code review failed: " + review_result["stderr"],
                         "stdout": ""
                     }
-                
+
                 # Step 4: Generate Summary
                 summary = f"""开发总结:
-                
+
 开始提交: {start_commit}
 结束提交: {end_commit}
 
@@ -98,7 +98,7 @@ class CreateCodeAgentTool:
 代码审查结果:
 {extract_code_report(review_result["stdout"])}
 """
-                
+
                 return {
                     "success": True,
                     "stdout": summary,
@@ -107,7 +107,7 @@ class CreateCodeAgentTool:
             finally:
                 # Always restore original directory
                 os.chdir(original_dir)
-            
+
         except Exception as e:
             return {
                 "success": False,

jarvis/jarvis_tools/create_sub_agent.py

@@ -71,7 +71,6 @@ class SubAgentTool:
                 sub_agent = Agent(
                     system_prompt=origin_agent_system_prompt,
                     name=f"Agent({agent_name})",
-                    is_sub_agent=True
                 )
 
                 # Run sub-agent, pass file list

jarvis/jarvis_tools/execute_python_script.py

@@ -29,7 +29,7 @@ class PythonScriptTool:
                     "stdout": "",
                     "stderr": "Missing or empty script_content parameter"
                 }
-            
+
             # Create temporary script file
             script_path = os.path.join(tempfile.gettempdir(), f"jarvis_script_{os.getpid()}.py")
             try:
@@ -39,7 +39,7 @@ class PythonScriptTool:
                 from jarvis.jarvis_tools.execute_shell import ShellTool
                 shell_tool = ShellTool()
                 result = shell_tool.execute({"command": f"python3 {script_path}"})
-                
+
                 return {
                     "success": result["success"],
                     "stdout": result["stdout"],
@@ -48,7 +48,7 @@ class PythonScriptTool:
             finally:
                 # Clean up temporary script file
                 Path(script_path).unlink(missing_ok=True)
-                
+
         except Exception as e:
             PrettyOutput.print(str(e), OutputType.ERROR)
             return {

jarvis/jarvis_tools/execute_shell.py

@@ -1,5 +1,5 @@
 # Shell command execution module
-# 
+#
 # Provides functionality to execute shell commands safely with:
 # - Command escaping
 # - Output capturing
@@ -12,7 +12,7 @@ from pathlib import Path
 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
@@ -32,10 +32,10 @@ class ShellTool:
     }
     def _escape_command(self, cmd: str) -> str:
         """Escape special characters in command to prevent shell injection
-        
+
         Args:
             cmd: Raw command string
-            
+
         Returns:
             Escaped command string with single quotes properly handled
         """
@@ -44,21 +44,21 @@ class ShellTool:
         try:
             # Get and clean command input
             command = args["command"].strip()
-            
+
             # Generate temporary file name using process ID for uniqueness
             script_file = os.path.join(tempfile.gettempdir(), f"jarvis_shell_{os.getpid()}.sh")
             output_file = os.path.join(tempfile.gettempdir(), f"jarvis_shell_{os.getpid()}.log")
-            
+
             # Write command to script file
             with open(script_file, 'w', encoding='utf-8') as f:
                 f.write(f"#!/bin/bash\n{command}")
-            
+
             # Use script command to capture both stdout and stderr
             tee_command = f"script -q -c 'bash {script_file}' {output_file}"
-            
+
             # Execute command and capture return code
             os.system(tee_command)
-            
+
             # Read and process output file
             try:
                 with open(output_file, 'r', encoding='utf-8', errors='ignore') as f:
@@ -74,14 +74,14 @@ class ShellTool:
                 # Clean up temporary files
                 Path(script_file).unlink(missing_ok=True)
                 Path(output_file).unlink(missing_ok=True)
-            
+
             # Return successful result
             return {
                 "success": True,
                 "stdout": output,
                 "stderr": "",
             }
-                
+
         except Exception as e:
             # Ensure temporary files are cleaned up even if error occurs
             if 'script_file' in locals():

jarvis/jarvis_tools/execute_shell_script.py

@@ -29,7 +29,7 @@ class ShellScriptTool:
                     "stdout": "",
                     "stderr": "Missing or empty script_content parameter"
                 }
-            
+
             # Create temporary script file
             script_path = os.path.join(tempfile.gettempdir(), f"jarvis_shell_script_{os.getpid()}.sh")
             try:
@@ -39,7 +39,7 @@ class ShellScriptTool:
                 from jarvis.jarvis_tools.execute_shell import ShellTool
                 shell_tool = ShellTool()
                 result = shell_tool.execute({"command": f"bash {script_path}"})
-                
+
                 return {
                     "success": result["success"],
                     "stdout": result["stdout"],
@@ -48,7 +48,7 @@ class ShellScriptTool:
             finally:
                 # Clean up temporary script file
                 Path(script_path).unlink(missing_ok=True)
-                
+
         except Exception as e:
             PrettyOutput.print(str(e), OutputType.ERROR)
             return {