jarvis-ai-assistant 0.7.16__py3-none-any.whl → 1.0.2__py3-none-any.whl

jarvis/jarvis_code_agent/utils.py

@@ -5,21 +5,26 @@
 """
 
 import subprocess
-from typing import List, Optional
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
 
 from jarvis.jarvis_utils.git_utils import get_recent_commits_with_files
 from jarvis.jarvis_utils.utils import get_loc_stats
 
 
-def get_git_tracked_files_info(project_root: str, max_files: int = 100) -> Optional[str]:
+def get_git_tracked_files_info(
+    project_root: str, max_files: int = 100
+) -> Optional[str]:
     """获取git托管的文件列表或目录结构
-    
+
     如果文件数量超过max_files，则返回目录结构（不含文件）
-    
+
     参数:
         project_root: 项目根目录
         max_files: 文件数量阈值，超过此值则返回目录结构
-        
+
     返回:
         str: 文件列表或目录结构的字符串表示，失败时返回None
     """
@@ -34,16 +39,18 @@ def get_git_tracked_files_info(project_root: str, max_files: int = 100) -> Optio
             check=True,
             cwd=project_root,
         )
-        
+
         if result.returncode != 0 or not result.stdout.strip():
             return None
-        
-        files = [line.strip() for line in result.stdout.strip().splitlines() if line.strip()]
+
+        files = [
+            line.strip() for line in result.stdout.strip().splitlines() if line.strip()
+        ]
         file_count = len(files)
-        
+
         if file_count == 0:
             return None
-        
+
         # 如果文件数量超过阈值，返回目录结构
         if file_count > max_files:
             # 提取所有目录路径
@@ -55,9 +62,9 @@ def get_git_tracked_files_info(project_root: str, max_files: int = 100) -> Optio
                     dir_path = "/".join(parts[:i])
                     if dir_path:
                         dirs.add(dir_path)
-            
+
             # 构建树形目录结构
-            dir_tree = {}
+            dir_tree: Dict[str, Any] = {}
             for dir_path in sorted(dirs):
                 parts = dir_path.split("/")
                 current = dir_tree
@@ -65,8 +72,10 @@ def get_git_tracked_files_info(project_root: str, max_files: int = 100) -> Optio
                     if part not in current:
                         current[part] = {}
                     current = current[part]
-            
-            def format_tree(tree: dict, prefix: str = "", is_last: bool = True) -> List[str]:
+
+            def format_tree(
+                tree: dict, prefix: str = "", is_last: bool = True
+            ) -> List[str]:
                 """格式化目录树"""
                 lines = []
                 items = sorted(tree.items())
@@ -74,19 +83,21 @@ def get_git_tracked_files_info(project_root: str, max_files: int = 100) -> Optio
                     is_last_item = i == len(items) - 1
                     connector = "└── " if is_last_item else "├── "
                     lines.append(f"{prefix}{connector}{name}/")
-                    
+
                     extension = "    " if is_last_item else "│   "
                     if subtree:
-                        lines.extend(format_tree(subtree, prefix + extension, is_last_item))
+                        lines.extend(
+                            format_tree(subtree, prefix + extension, is_last_item)
+                        )
                 return lines
-            
+
             tree_lines = format_tree(dir_tree)
             return f"Git托管目录结构（共{file_count}个文件）:\n" + "\n".join(tree_lines)
         else:
             # 文件数量不多，直接返回文件列表
             files_str = "\n".join(f"  - {file}" for file in sorted(files))
             return f"Git托管文件列表（共{file_count}个文件）:\n{files_str}"
-            
+
     except (subprocess.CalledProcessError, FileNotFoundError):
         return None
     except Exception:
@@ -96,15 +107,15 @@ def get_git_tracked_files_info(project_root: str, max_files: int = 100) -> Optio
 
 def get_project_overview(project_root: str) -> str:
     """获取项目概况信息
-    
+
     参数:
         project_root: 项目根目录
-        
+
     返回:
         项目概况字符串
     """
     project_info = []
-    
+
     # 获取代码统计
     try:
         loc_stats = get_loc_stats()
@@ -112,7 +123,7 @@ def get_project_overview(project_root: str) -> str:
             project_info.append(f"代码统计:\n{loc_stats}")
     except Exception:
         pass
-    
+
     # 获取Git托管的文件信息
     try:
         git_files_info = get_git_tracked_files_info(project_root)
@@ -120,13 +131,13 @@ def get_project_overview(project_root: str) -> str:
             project_info.append(git_files_info)
     except Exception:
         pass
-    
+
     # 获取最近提交信息
     try:
         commits_info = get_recent_commits_with_files()
         if commits_info:
             commits_str = "\n".join(
-                f"提交 {i+1}: {commit['hash'][:7]} - {commit['message']} ({len(commit['files'])}个文件)\n"
+                f"提交 {i + 1}: {commit['hash'][:7]} - {commit['message']} ({len(commit['files'])}个文件)\n"
                 + "\n".join(f"    - {file}" for file in commit["files"][:5])
                 + ("\n    ..." if len(commit["files"]) > 5 else "")
                 for i, commit in enumerate(commits_info[:5])
@@ -134,8 +145,7 @@ def get_project_overview(project_root: str) -> str:
             project_info.append(f"最近提交:\n{commits_str}")
     except Exception:
         pass
-    
+
     if project_info:
         return "项目概况:\n" + "\n\n".join(project_info)
     return ""
-

jarvis/jarvis_code_analysis/checklists/loader.py

@@ -2,29 +2,29 @@
 """
 Utility module for loading language-specific code review checklists.
 """
-from typing import Dict, Optional
+
+from typing import Dict
+from typing import Optional
 
 # Import checklist modules
-from jarvis.jarvis_code_analysis.checklists import (
-    c_cpp,
-    csharp,
-    data_format,
-    devops,
-    docs,
-    go,
-    infrastructure,
-    java,
-    javascript,
-    kotlin,
-    php,
-    python,
-    ruby,
-    rust,
-    shell,
-    sql,
-    swift,
-    web,
-)
+from jarvis.jarvis_code_analysis.checklists import c_cpp
+from jarvis.jarvis_code_analysis.checklists import csharp
+from jarvis.jarvis_code_analysis.checklists import data_format
+from jarvis.jarvis_code_analysis.checklists import devops
+from jarvis.jarvis_code_analysis.checklists import docs
+from jarvis.jarvis_code_analysis.checklists import go
+from jarvis.jarvis_code_analysis.checklists import infrastructure
+from jarvis.jarvis_code_analysis.checklists import java
+from jarvis.jarvis_code_analysis.checklists import javascript
+from jarvis.jarvis_code_analysis.checklists import kotlin
+from jarvis.jarvis_code_analysis.checklists import php
+from jarvis.jarvis_code_analysis.checklists import python
+from jarvis.jarvis_code_analysis.checklists import ruby
+from jarvis.jarvis_code_analysis.checklists import rust
+from jarvis.jarvis_code_analysis.checklists import shell
+from jarvis.jarvis_code_analysis.checklists import sql
+from jarvis.jarvis_code_analysis.checklists import swift
+from jarvis.jarvis_code_analysis.checklists import web
 
 # Map of language identifiers to their checklist content
 CHECKLIST_MAP = {

jarvis/jarvis_code_analysis/code_review.py

@@ -3,18 +3,22 @@ import os
 import re
 import subprocess
 import tempfile
-from typing import Any, Dict, List, Optional
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
 
 import typer
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_code_analysis.checklists.loader import get_language_checklist
-
 from jarvis.jarvis_tools.read_code import ReadCodeTool
-
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput  # 保留用于语法高亮
-from jarvis.jarvis_utils.tag import ct, ot
-from jarvis.jarvis_utils.utils import init_env, is_context_overflow
+from jarvis.jarvis_utils.output import OutputType  # 保留用于语法高亮
+from jarvis.jarvis_utils.output import PrettyOutput
+from jarvis.jarvis_utils.tag import ct
+from jarvis.jarvis_utils.tag import ot
+from jarvis.jarvis_utils.utils import init_env
+from jarvis.jarvis_utils.utils import is_context_overflow
 
 app = typer.Typer(help="自动代码审查工具")
 
@@ -282,9 +286,13 @@ def execute_code_review(
                 # Extract changed files using git command
                 files_cmd = f"git show --name-only --pretty=format: {commit_sha}"
                 try:
-                    files_output = subprocess.check_output(files_cmd, shell=True, text=True)
+                    files_output = subprocess.check_output(
+                        files_cmd, shell=True, text=True
+                    )
                     # Filter out empty lines without using grep
-                    file_paths = [f.strip() for f in files_output.split("\n") if f.strip()]
+                    file_paths = [
+                        f.strip() for f in files_output.split("\n") if f.strip()
+                    ]
                 except subprocess.CalledProcessError:
                     # Fallback to regex extraction if git command fails
                     file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
@@ -320,8 +328,12 @@ def execute_code_review(
                 # Extract changed files using git command
                 files_cmd = f"git diff --name-only {start_commit}..{end_commit}"
                 try:
-                    files_output = subprocess.check_output(files_cmd, shell=True, text=True)
-                    file_paths = [f.strip() for f in files_output.split("\n") if f.strip()]
+                    files_output = subprocess.check_output(
+                        files_cmd, shell=True, text=True
+                    )
+                    file_paths = [
+                        f.strip() for f in files_output.split("\n") if f.strip()
+                    ]
                 except subprocess.CalledProcessError:
                     # Fallback to regex extraction if git command fails
                     file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
@@ -337,7 +349,9 @@ def execute_code_review(
                     }
                 file_path = args["file_path"].strip()
                 file_paths = [file_path]
-                diff_output = ReadCodeTool().execute({"files": [{"path": file_path}]})["stdout"]
+                diff_output = ReadCodeTool().execute({"files": [{"path": file_path}]})[
+                    "stdout"
+                ]
 
             else:  # current changes
                 diff_cmd = "git diff HEAD | cat -"
@@ -360,8 +374,12 @@ def execute_code_review(
                 # Extract changed files using git command
                 files_cmd = "git diff --name-only HEAD"
                 try:
-                    files_output = subprocess.check_output(files_cmd, shell=True, text=True)
-                    file_paths = [f.strip() for f in files_output.split("\n") if f.strip()]
+                    files_output = subprocess.check_output(
+                        files_cmd, shell=True, text=True
+                    )
+                    file_paths = [
+                        f.strip() for f in files_output.split("\n") if f.strip()
+                    ]
                 except subprocess.CalledProcessError:
                     # Fallback to regex extraction if git command fails
                     file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
@@ -408,7 +426,9 @@ def execute_code_review(
             # Combine review info with diff output
             diff_output = review_info + diff_output
 
-            PrettyOutput.print(diff_output, OutputType.CODE, lang="diff")  # 保留语法高亮
+            PrettyOutput.print(
+                diff_output, OutputType.CODE, lang="diff"
+            )  # 保留语法高亮
 
             system_prompt = """<code_review_guide>
 <role>
@@ -542,7 +562,6 @@ def execute_code_review(
             # Get model_group from args (thinking mode removed)
             model_group = args.get("model_group")
 
-
             agent = Agent(
                 system_prompt=system_prompt,
                 name="Code Review Agent",
@@ -621,7 +640,9 @@ def execute_code_review(
             max_diff_size = 100 * 1024 * 1024  # Limit to 100MB
 
             if len(diff_output) > max_diff_size:
-                print(f"⚠️ 代码差异内容总大小超过限制 ({len(diff_output)} > {max_diff_size} 字节)，将截断内容")
+                PrettyOutput.auto_print(
+                    f"⚠️ 代码差异内容总大小超过限制 ({len(diff_output)} > {max_diff_size} 字节)，将截断内容"
+                )
                 diff_output = (
                     diff_output[:max_diff_size]
                     + "\n\n[diff content truncated due to size limitations...]"
@@ -633,12 +654,14 @@ def execute_code_review(
 代码信息：
 - 审查类型: {review_type}
 - 变更文件列表: {len(file_paths)} 个文件
-- 检测到的编程语言: {', '.join(detected_languages) if detected_languages else '未检测到特定语言'}
+- 检测到的编程语言: {", ".join(detected_languages) if detected_languages else "未检测到特定语言"}
 
 请根据SCRIPPPS框架和语言特定的审查清单进行分析，提供详细的代码审查报告。"""
 
             # Write the full diff output to a temporary file for uploading
-            with tempfile.NamedTemporaryFile(mode="w", suffix=".diff", delete=False) as temp_file:
+            with tempfile.NamedTemporaryFile(
+                mode="w", suffix=".diff", delete=False
+            ) as temp_file:
                 temp_file_path = temp_file.name
                 temp_file.write(diff_output)
                 temp_file.flush()
@@ -679,7 +702,7 @@ def execute_code_review(
 我已上传了一个包含代码差异的文件。该文件包含:
 - 审查类型: {review_type}
 - 变更文件数量: {len(file_paths)} 个文件
-- 检测到的编程语言: {', '.join(detected_languages) if detected_languages else '未检测到特定语言'}
+- 检测到的编程语言: {", ".join(detected_languages) if detected_languages else "未检测到特定语言"}
 
 请基于上传的代码差异文件进行全面审查，并生成详细的代码审查报告。"""
                     )
@@ -699,7 +722,7 @@ def execute_code_review(
                     try:
                         os.unlink(temp_file_path)
                     except Exception:
-                        print(f"⚠️ 临时文件 {temp_file_path} 未能删除")
+                        PrettyOutput.auto_print(f"⚠️ 临时文件 {temp_file_path} 未能删除")
 
             return {"success": True, "stdout": result, "stderr": ""}
         finally:
@@ -728,7 +751,9 @@ def review_commit(
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
-    auto_complete: bool = typer.Option(False, "--auto-complete/--no-auto-complete", help="是否自动完成"),
+    auto_complete: bool = typer.Option(
+        False, "--auto-complete/--no-auto-complete", help="是否自动完成"
+    ),
 ):
     """审查指定的提交"""
     tool_args = {
@@ -740,11 +765,11 @@ def review_commit(
     }
     result = execute_code_review(tool_args)
     if result["success"]:
-        print("✅ 自动代码审查结果:")
+        PrettyOutput.auto_print("✅ 自动代码审查结果:")
         report = extract_code_report(result["stdout"])
         PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")  # 保留语法高亮
     else:
-        print(f"⚠️ {result['stderr']}")
+        PrettyOutput.auto_print(f"⚠️ {result['stderr']}")
 
 
 @app.command("current")
@@ -753,7 +778,9 @@ def review_current(
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
-    auto_complete: bool = typer.Option(False, "--auto-complete/--no-auto-complete", help="是否自动完成"),
+    auto_complete: bool = typer.Option(
+        False, "--auto-complete/--no-auto-complete", help="是否自动完成"
+    ),
 ):
     """审查当前的变更"""
     tool_args = {
@@ -764,11 +791,11 @@ def review_current(
     }
     result = execute_code_review(tool_args)
     if result["success"]:
-        print("✅ 自动代码审查结果:")
+        PrettyOutput.auto_print("✅ 自动代码审查结果:")
         report = extract_code_report(result["stdout"])
         PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")  # 保留语法高亮
     else:
-        print(f"⚠️ {result['stderr']}")
+        PrettyOutput.auto_print(f"⚠️ {result['stderr']}")
 
 
 @app.command("range")
@@ -779,7 +806,9 @@ def review_range(
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
-    auto_complete: bool = typer.Option(False, "--auto-complete/--no-auto-complete", help="是否自动完成"),
+    auto_complete: bool = typer.Option(
+        False, "--auto-complete/--no-auto-complete", help="是否自动完成"
+    ),
 ):
     """审查提交范围"""
     tool_args = {
@@ -792,11 +821,11 @@ def review_range(
     }
     result = execute_code_review(tool_args)
     if result["success"]:
-        print("✅ 自动代码审查结果:")
+        PrettyOutput.auto_print("✅ 自动代码审查结果:")
         report = extract_code_report(result["stdout"])
         PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")  # 保留语法高亮
     else:
-        print(f"⚠️ {result['stderr']}")
+        PrettyOutput.auto_print(f"⚠️ {result['stderr']}")
 
 
 @app.command("file")
@@ -806,7 +835,9 @@ def review_file(
     model_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
-    auto_complete: bool = typer.Option(False, "--auto-complete/--no-auto-complete", help="是否自动完成"),
+    auto_complete: bool = typer.Option(
+        False, "--auto-complete/--no-auto-complete", help="是否自动完成"
+    ),
 ):
     """审查指定的文件"""
     tool_args = {
@@ -818,11 +849,11 @@ def review_file(
     }
     result = execute_code_review(tool_args)
     if result["success"]:
-        print("✅ 自动代码审查结果:")
+        PrettyOutput.auto_print("✅ 自动代码审查结果:")
         report = extract_code_report(result["stdout"])
         PrettyOutput.print(report, OutputType.SUCCESS, lang="markdown")  # 保留语法高亮
     else:
-        print(f"⚠️ {result['stderr']}")
+        PrettyOutput.auto_print(f"⚠️ {result['stderr']}")
 
 
 def cli():
@@ -837,4 +868,4 @@ def main():
 
 
 if __name__ == "__main__":
-    main()
+    main()