jarvis-ai-assistant 0.1.192__py3-none-any.whl → 0.1.194__py3-none-any.whl

jarvis/jarvis_code_agent/code_agent.py

@@ -10,27 +10,30 @@ import subprocess
 import sys
 from typing import List, Optional, Tuple
 
-from yaspin import yaspin  # type: ignore
-
-from jarvis import __version__
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
-from jarvis.jarvis_agent.file_input_handler import file_input_handler
 from jarvis.jarvis_agent.shell_input_handler import shell_input_handler
+
 # 忽略yaspin的类型检查
 from jarvis.jarvis_code_agent.lint import get_lint_tools
 from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
-from jarvis.jarvis_utils.git_utils import (find_git_root, get_commits_between,
-                                           get_diff, get_diff_file_list,
-                                           get_latest_commit_hash, get_recent_commits_with_files,
-                                           handle_commit_workflow,
-                                           has_uncommitted_changes)
+from jarvis.jarvis_utils.git_utils import (
+    find_git_root,
+    get_commits_between,
+    get_diff,
+    get_diff_file_list,
+    get_latest_commit_hash,
+    get_recent_commits_with_files,
+    handle_commit_workflow,
+    has_uncommitted_changes,
+)
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import get_loc_stats, init_env, user_confirm
+from yaspin import yaspin  # type: ignore
 
 
 class CodeAgent:
@@ -39,21 +42,26 @@ class CodeAgent:
     负责处理代码分析、修改和git操作。
     """
 
-    def __init__(self, platform: Optional[str] = None,
-                model: Optional[str] = None,
-                need_summary: bool = True):
+    def __init__(
+        self,
+        platform: Optional[str] = None,
+        model: Optional[str] = None,
+        need_summary: bool = True,
+    ):
         self.root_dir = os.getcwd()
         tool_registry = ToolRegistry()  # type: ignore
-        tool_registry.use_tools([
-            "execute_script",
-            "search_web",
-            "ask_user",
-            "read_code",
-            "methodology",
-            "chdir",
-            "edit_file",
-            "rewrite_file"
-        ])
+        tool_registry.use_tools(
+            [
+                "execute_script",
+                "search_web",
+                "ask_user",
+                "read_code",
+                "methodology",
+                "chdir",
+                "edit_file",
+                "rewrite_file",
+            ]
+        )
         code_system_prompt = """
 <code_engineer_guide>
 ## 角色定位
@@ -96,9 +104,11 @@ class CodeAgent:
 </code_engineer_guide>
 """
         # 处理platform参数
-        platform_instance = (PlatformRegistry().create_platform(platform)  # type: ignore
+        platform_instance = (
+            PlatformRegistry().create_platform(platform)  # type: ignore
             if platform
-            else PlatformRegistry().get_normal_platform())  # type: ignore
+            else PlatformRegistry().get_normal_platform()
+        )  # type: ignore
         if model:
             platform_instance.set_model_name(model)  # type: ignore
 
@@ -108,27 +118,12 @@ class CodeAgent:
             auto_complete=False,
             output_handler=[tool_registry],
             platform=platform_instance,
-            input_handler=[
-                file_input_handler,
-                shell_input_handler,
-                builtin_input_handler
-            ],
-            need_summary=need_summary
+            input_handler=[shell_input_handler, builtin_input_handler],
+            need_summary=need_summary,
         )
 
         self.agent.set_after_tool_call_cb(self.after_tool_call_cb)
 
-    def get_root_dir(self) -> str:
-        """获取项目根目录
-
-        返回:
-            str: 项目根目录路径
-        """
-        return self.root_dir
-
-
-
-
     def _init_env(self) -> None:
         """初始化环境，包括：
         1. 查找git根目录
@@ -154,33 +149,33 @@ class CodeAgent:
             PrettyOutput.print("检测到未提交的修改，是否要提交？", OutputType.WARNING)
             if user_confirm("是否要提交？", True):
                 import subprocess
+
                 try:
                     # 获取当前分支的提交总数
-                    commit_count = subprocess.run(
-                        ['git', 'rev-list', '--count', 'HEAD'],
+                    commit_result = subprocess.run(
+                        ["git", "rev-list", "--count", "HEAD"],
                         capture_output=True,
-                        text=True
+                        text=True,
+                        check=True,
                     )
-                    if commit_count.returncode != 0:
+                    if commit_result.returncode != 0:
                         return
-                        
-                    commit_count = int(commit_count.stdout.strip())
-                    
+
+                    commit_count = int(commit_result.stdout.strip())
+
                     # 暂存所有修改
-                    subprocess.run(['git', 'add', '.'], check=True)
-                    
+                    subprocess.run(["git", "add", "."], check=True)
+
                     # 提交变更
                     subprocess.run(
-                        ['git', 'commit', '-m', f'CheckPoint #{commit_count + 1}'], 
-                        check=True
+                        ["git", "commit", "-m", f"CheckPoint #{commit_count + 1}"],
+                        check=True,
                     )
                 except subprocess.CalledProcessError as e:
                     PrettyOutput.print(f"提交失败: {str(e)}", OutputType.ERROR)
 
     def _show_commit_history(
-        self,
-        start_commit: Optional[str],
-        end_commit: Optional[str]
+        self, start_commit: Optional[str], end_commit: Optional[str]
     ) -> List[Tuple[str, str]]:
         """显示两个提交之间的提交历史
 
@@ -197,20 +192,14 @@ class CodeAgent:
             commits = []
 
         if commits:
-            commit_messages = (
-                "检测到以下提交记录:\n" +
-                "\n".join(
-                    f"- {commit_hash[:7]}: {message}"
-                    for commit_hash, message in commits
-                )
+            commit_messages = "检测到以下提交记录:\n" + "\n".join(
+                f"- {commit_hash[:7]}: {message}" for commit_hash, message in commits
             )
             PrettyOutput.print(commit_messages, OutputType.INFO)
         return commits
 
     def _handle_commit_confirmation(
-        self, 
-        commits: List[Tuple[str, str]], 
-        start_commit: Optional[str]
+        self, commits: List[Tuple[str, str]], start_commit: Optional[str]
     ) -> None:
         """处理提交确认和可能的重置"""
         if commits and user_confirm("是否接受以上提交记录？", True):
@@ -218,7 +207,7 @@ class CodeAgent:
                 ["git", "reset", "--mixed", str(start_commit)],
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL,
-                check=True
+                check=True,
             )
             git_commiter = GitCommitTool()
             git_commiter.execute({})
@@ -242,15 +231,15 @@ class CodeAgent:
             # 获取项目统计信息并附加到用户输入
             loc_stats = get_loc_stats()
             commits_info = get_recent_commits_with_files()
-            
+
             project_info = []
             if loc_stats:
                 project_info.append(f"代码统计:\n{loc_stats}")
             if commits_info:
                 commits_str = "\n".join(
-                    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 "")
+                    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)
                 )
                 project_info.append(f"最近提交:\n{commits_str}")
@@ -265,7 +254,14 @@ class CodeAgent:
             """
 
             if project_info:
-                enhanced_input = f"项目概况:\n" + "\n\n".join(project_info) + "\n\n" + first_tip + "\n\n任务描述：\n" + user_input
+                enhanced_input = (
+                    f"项目概况:\n"
+                    + "\n\n".join(project_info)
+                    + "\n\n"
+                    + first_tip
+                    + "\n\n任务描述：\n"
+                    + user_input
+                )
             else:
                 enhanced_input = first_tip + "\n\n任务描述：\n" + user_input
 
@@ -283,16 +279,15 @@ class CodeAgent:
 
         except RuntimeError as e:
             return f"Error during execution: {str(e)}"
-        
+
     def after_tool_call_cb(self, agent: Agent) -> None:
         """工具调用后回调函数。"""
         final_ret = ""
         diff = get_diff()
         if diff:
-            # 获取修改的文件列表
-            modified_files = get_diff_file_list()
             start_hash = get_latest_commit_hash()
             PrettyOutput.print(diff, OutputType.CODE, lang="diff")
+            modified_files = get_diff_file_list()
             commited = handle_commit_workflow()
             if commited:
                 # 获取提交信息
@@ -301,16 +296,21 @@ class CodeAgent:
 
                 # 添加提交信息到final_ret
                 if commits:
-                    final_ret += "代码已修改完成\n"
-
+                    final_ret += (
+                        f"\n\n代码已修改完成\n补丁内容:\n```diff\n{diff}\n```\n"
+                    )
                     # 修改后的提示逻辑
                     lint_tools_info = "\n".join(
                         f"   - {file}: 使用 {'、'.join(get_lint_tools(file))}"
-                        for file in modified_files 
+                        for file in modified_files
                         if get_lint_tools(file)
                     )
                     file_list = "\n".join(f"   - {file}" for file in modified_files)
-                    tool_info = f"建议使用以下lint工具进行检查:\n{lint_tools_info}" if lint_tools_info else ""
+                    tool_info = (
+                        f"建议使用以下lint工具进行检查:\n{lint_tools_info}"
+                        if lint_tools_info
+                        else ""
+                    )
                     if lint_tools_info:
                         addon_prompt = f"""
 请对以下修改的文件进行静态扫描:
@@ -320,9 +320,9 @@ class CodeAgent:
                     """
                         agent.set_addon_prompt(addon_prompt)
                 else:
-                    final_ret += "修改没有生效"
+                    final_ret += "\n\n修改没有生效\n"
             else:
-                final_ret += "修改被拒绝\n"
+                final_ret += "\n修改被拒绝\n"
                 final_ret += f"# 补丁预览:\n```diff\n{diff}\n```"
         else:
             return
@@ -331,7 +331,9 @@ class CodeAgent:
             agent.prompt += final_ret
             return
         PrettyOutput.print(final_ret, OutputType.USER, lang="markdown")
-        if not is_confirm_before_apply_patch() or user_confirm("是否使用此回复？", default=True):
+        if not is_confirm_before_apply_patch() or user_confirm(
+            "是否使用此回复？", default=True
+        ):
             agent.prompt += final_ret
             return
         agent.prompt += final_ret
@@ -345,13 +347,16 @@ def main() -> None:
     """Jarvis主入口点。"""
     init_env("欢迎使用 Jarvis-CodeAgent，您的代码工程助手已准备就绪！")
 
-    parser = argparse.ArgumentParser(description='Jarvis Code Agent')
-    parser.add_argument('-p', '--platform', type=str,
-                      help='Target platform name', default=None)
-    parser.add_argument('-m', '--model', type=str,
-                      help='Model name to use', default=None)
-    parser.add_argument('-r', '--requirement', type=str,
-                      help='Requirement to process', default=None)
+    parser = argparse.ArgumentParser(description="Jarvis Code Agent")
+    parser.add_argument(
+        "-p", "--platform", type=str, help="Target platform name", default=None
+    )
+    parser.add_argument(
+        "-m", "--model", type=str, help="Model name to use", default=None
+    )
+    parser.add_argument(
+        "-r", "--requirement", type=str, help="Requirement to process", default=None
+    )
     args = parser.parse_args()
 
     curr_dir = os.getcwd()
@@ -365,9 +370,7 @@ def main() -> None:
             user_input = get_multiline_input("请输入你的需求（输入空行退出）:")
         if not user_input:
             sys.exit(0)
-        agent = CodeAgent(platform=args.platform,
-                        model=args.model,
-                        need_summary=False)
+        agent = CodeAgent(platform=args.platform, model=args.model, need_summary=False)
         agent.run(user_input)
 
     except RuntimeError as e:

jarvis/jarvis_code_agent/lint.py

@@ -15,144 +15,131 @@ from jarvis.jarvis_utils.config import get_data_dir
 # 默认的lint工具配置
 LINT_TOOLS = {
     # C/C++
-    '.c': ['cppcheck', 'clang-tidy'],
-    '.cpp': ['cppcheck', 'clang-tidy'],
-    '.cc': ['cppcheck', 'clang-tidy'],
-    '.cxx': ['cppcheck', 'clang-tidy'],
-    '.h': ['cppcheck', 'clang-tidy'],
-    '.hpp': ['cppcheck', 'clang-tidy'],
-    '.hxx': ['cppcheck', 'clang-tidy'],
-    '.inl': ['cppcheck', 'clang-tidy'],
-    '.ipp': ['cppcheck', 'clang-tidy'],
-    
+    ".c": ["clang-tidy"],
+    ".cpp": ["clang-tidy"],
+    ".cc": ["clang-tidy"],
+    ".cxx": ["clang-tidy"],
+    ".h": ["clang-tidy"],
+    ".hpp": ["clang-tidy"],
+    ".hxx": ["clang-tidy"],
+    ".inl": ["clang-tidy"],
+    ".ipp": ["clang-tidy"],
     # Go
-    '.go': ['golint', 'go vet'],
-    
+    ".go": ["go vet"],
     # Python
-    '.py': ['black', 'pylint', 'mypy', 'isort'],
-    '.pyw': ['black', 'pylint', 'mypy', 'isort'],
-    '.pyi': ['black', 'pylint', 'mypy', 'isort'],
-    '.pyx': ['black', 'pylint', 'mypy', 'isort'],
-    '.pxd': ['black', 'pylint', 'mypy', 'isort'],
-    
+    ".py": ["black", "pylint", "mypy", "isort"],
+    ".pyw": ["black", "pylint", "mypy", "isort"],
+    ".pyi": ["black", "pylint", "mypy", "isort"],
+    ".pyx": ["black", "pylint", "mypy", "isort"],
+    ".pxd": ["black", "pylint", "mypy", "isort"],
     # Rust
-    '.rs': ['cargo clippy', 'rustfmt'],
-    '.rlib': ['cargo clippy', 'rustfmt'],
-    
+    ".rs": ["cargo clippy", "rustfmt"],
+    ".rlib": ["cargo clippy", "rustfmt"],
     # Java
-    '.java': ['checkstyle', 'pmd'],
-    '.class': ['checkstyle', 'pmd'],
-    '.jar': ['checkstyle', 'pmd'],
-    
+    ".java": ["pmd"],
+    ".class": ["pmd"],
+    ".jar": ["pmd"],
     # JavaScript/TypeScript
-    '.js': ['eslint'],
-    '.mjs': ['eslint'],
-    '.cjs': ['eslint'],
-    '.jsx': ['eslint'],
-    '.ts': ['eslint', 'tsc'],
-    '.tsx': ['eslint', 'tsc'],
-    '.cts': ['eslint', 'tsc'],
-    '.mts': ['eslint', 'tsc'],
-    
+    ".js": ["eslint"],
+    ".mjs": ["eslint"],
+    ".cjs": ["eslint"],
+    ".jsx": ["eslint"],
+    ".ts": ["eslint", "tsc"],
+    ".tsx": ["eslint", "tsc"],
+    ".cts": ["eslint", "tsc"],
+    ".mts": ["eslint", "tsc"],
     # PHP
-    '.php': ['phpcs', 'phpstan'],
-    '.phtml': ['phpcs', 'phpstan'],
-    '.php5': ['phpcs', 'phpstan'],
-    '.php7': ['phpcs', 'phpstan'],
-    '.phps': ['phpcs', 'phpstan'],
-    
+    ".php": ["phpstan"],
+    ".phtml": ["phpstan"],
+    ".php5": ["phpstan"],
+    ".php7": ["phpstan"],
+    ".phps": ["phpstan"],
     # Ruby
-    '.rb': ['rubocop'],
-    '.rake': ['rubocop'],
-    '.gemspec': ['rubocop'],
-    
+    ".rb": ["rubocop"],
+    ".rake": ["rubocop"],
+    ".gemspec": ["rubocop"],
     # Swift
-    '.swift': ['swiftlint'],
-    
+    ".swift": ["swiftlint"],
     # Kotlin
-    '.kt': ['ktlint'],
-    '.kts': ['ktlint'],
-    
+    ".kt": ["ktlint"],
+    ".kts": ["ktlint"],
     # C#
-    '.cs': ['dotnet-format', 'roslynator'],
-    '.csx': ['dotnet-format', 'roslynator'],
-    
+    ".cs": ["roslynator"],
+    ".csx": ["roslynator"],
     # SQL
-    '.sql': ['sqlfluff'],
-    
+    ".sql": ["sqlfluff"],
     # Shell/Bash
-    '.sh': ['shellcheck'],
-    '.bash': ['shellcheck'],
-    
+    ".sh": ["shellcheck"],
+    ".bash": ["shellcheck"],
     # HTML/CSS
-    '.html': ['htmlhint'],
-    '.htm': ['htmlhint'],
-    '.xhtml': ['htmlhint'],
-    '.css': ['stylelint'],
-    '.scss': ['stylelint'],
-    '.sass': ['stylelint'],
-    '.less': ['stylelint'],
-    
+    ".html": ["htmlhint"],
+    ".htm": ["htmlhint"],
+    ".xhtml": ["htmlhint"],
+    ".css": ["stylelint"],
+    ".scss": ["stylelint"],
+    ".sass": ["stylelint"],
+    ".less": ["stylelint"],
     # XML/JSON/YAML
-    '.xml': ['xmllint'],
-    '.xsd': ['xmllint'],
-    '.dtd': ['xmllint'],
-    '.tld': ['xmllint'],
-    '.jsp': ['xmllint'],
-    '.jspx': ['xmllint'],
-    '.tag': ['xmllint'],
-    '.tagx': ['xmllint'],
-    '.json': ['jsonlint'],
-    '.jsonl': ['jsonlint'],
-    '.json5': ['jsonlint'],
-    '.yaml': ['yamllint'],
-    '.yml': ['yamllint'],
-    
+    ".xml": ["xmllint"],
+    ".xsd": ["xmllint"],
+    ".dtd": ["xmllint"],
+    ".tld": ["xmllint"],
+    ".jsp": ["xmllint"],
+    ".jspx": ["xmllint"],
+    ".tag": ["xmllint"],
+    ".tagx": ["xmllint"],
+    ".json": ["jsonlint"],
+    ".jsonl": ["jsonlint"],
+    ".json5": ["jsonlint"],
+    ".yaml": ["yamllint"],
+    ".yml": ["yamllint"],
     # Markdown/Documentation
-    '.md': ['markdownlint'],
-    '.markdown': ['markdownlint'],
-    '.rst': ['rstcheck'],
-    '.adoc': ['asciidoctor-lint'],
-    
+    ".md": ["markdownlint"],
+    ".markdown": ["markdownlint"],
+    ".rst": ["rstcheck"],
+    ".adoc": ["asciidoctor-lint"],
     # Docker/Terraform/Makefile等无后缀文件
-    'makefile': ['checkmake'],
-    'dockerfile': ['hadolint'],
-    'docker-compose.yml': ['hadolint'],
-    'docker-compose.yaml': ['hadolint'],
-    'jenkinsfile': ['jenkinsfile-linter'],
-    'build': ['buildifier'],
-    'workspace': ['buildifier'],
-    '.bashrc': ['shellcheck'],
-    '.bash_profile': ['shellcheck'],
-    '.zshrc': ['shellcheck'],
-    '.gitignore': ['git-lint'],
-    '.editorconfig': ['editorconfig-checker'],
-    '.eslintrc': ['eslint'],
-    '.prettierrc': ['prettier'],
-    'cmakelists.txt': ['cmake-format'],
-    '.cmake': ['cmake-format'],
+    "makefile": ["checkmake"],
+    "dockerfile": ["hadolint"],
+    "docker-compose.yml": ["hadolint"],
+    "docker-compose.yaml": ["hadolint"],
+    "jenkinsfile": ["jenkinsfile-linter"],
+    "build": ["buildifier"],
+    "workspace": ["buildifier"],
+    ".bashrc": ["shellcheck"],
+    ".bash_profile": ["shellcheck"],
+    ".zshrc": ["shellcheck"],
+    ".gitignore": ["git-lint"],
+    ".editorconfig": ["editorconfig-checker"],
+    ".eslintrc": ["eslint"],
+    ".prettierrc": ["prettier"],
+    "cmakelists.txt": ["cmake-format"],
+    ".cmake": ["cmake-format"],
 }
 
+
 def load_lint_tools_config() -> Dict[str, List[str]]:
     """从yaml文件加载lint工具配置"""
-    config_path = os.path.join(get_data_dir(), 'lint_tools.yaml')
+    config_path = os.path.join(get_data_dir(), "lint_tools.yaml")
     if not os.path.exists(config_path):
         return {}
-    
-    with open(config_path, 'r') as f:
+
+    with open(config_path, "r") as f:
         config = yaml.safe_load(f) or {}
         return {k.lower(): v for k, v in config.items()}  # 确保key是小写
 
+
 # 合并默认配置和yaml配置
 LINT_TOOLS.update(load_lint_tools_config())
 
+
 def get_lint_tools(filename: str) -> List[str]:
     """
     根据文件扩展名或文件名获取对应的lint工具列表
-    
+
     Args:
         file_extension_or_name: 文件扩展名(如'.py')或文件名(如'Makefile')
-        
+
     Returns:
         对应的lint工具列表，如果找不到则返回空列表
     """

jarvis/jarvis_code_analysis/checklists/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """
 Language-specific checklists for code review.
-""" 
+"""

jarvis/jarvis_code_analysis/checklists/c_cpp.py

@@ -48,4 +48,4 @@ CHECKLIST = """
 ### 编译器警告
 - [ ] 是否有未解决的编译器警告
 - [ ] 是否启用了合适的警告级别
-""" 
+"""

jarvis/jarvis_code_analysis/checklists/csharp.py

@@ -73,4 +73,4 @@ CHECKLIST = """
 - [ ] 公共 API 是否有文档说明
 - [ ] 复杂逻辑是否有注释
 - [ ] 注释是否与代码保持同步
-""" 
+"""

jarvis/jarvis_code_analysis/checklists/data_format.py

@@ -80,4 +80,4 @@ CHECKLIST = """
 - [ ] 是否避免了过度暴露内部数据结构
 - [ ] 序列化/反序列化是否安全
 - [ ] 是否避免了使用有风险的格式特性
-""" 
+"""

jarvis/jarvis_code_analysis/checklists/devops.py

@@ -105,4 +105,4 @@ CHECKLIST = """
 - [ ] 是否有版本控制和变更历史
 - [ ] 是否有明确的故障排除指南
 - [ ] 依赖关系是否明确记录
-""" 
+"""

jarvis/jarvis_code_analysis/checklists/docs.py

@@ -85,4 +85,4 @@ CHECKLIST = """
 - [ ] 自动化构建和部署是否配置正确
 - [ ] 是否有预览环境测试文档更改
 - [ ] 是否集成了持续集成/持续部署流程
-""" 
+"""

jarvis/jarvis_code_analysis/checklists/go.py

@@ -50,4 +50,4 @@ CHECKLIST = """
 ### 文档
 - [ ] 导出的函数/类型是否有文档注释
 - [ ] 复杂逻辑是否有注释说明
-""" 
+"""

jarvis/jarvis_code_analysis/checklists/infrastructure.py

@@ -96,4 +96,4 @@ CHECKLIST = """
 - [ ] 是否优化了资源成本
 - [ ] 是否考虑了服务限制和配额
 - [ ] 是否正确配置了自动扩展
-""" 
+"""

jarvis/jarvis_code_analysis/checklists/java.py

@@ -64,4 +64,4 @@ CHECKLIST = """
 - [ ] 公共 API 是否有 JavaDoc 注释
 - [ ] 复杂逻辑是否有注释说明
 - [ ] 注释是否准确且最新
-""" 
+"""