jarvis-ai-assistant 0.1.177__py3-none-any.whl → 0.1.179__py3-none-any.whl

jarvis/jarvis_agent/main.py

@@ -1,10 +1,12 @@
 # -*- coding: utf-8 -*-
 import argparse
-import yaml
 import os
+
+import yaml
+
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_utils.input import get_multiline_input
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 
 

jarvis/jarvis_code_agent/code_agent.py

@@ -4,34 +4,33 @@
 该模块提供CodeAgent类，用于处理代码修改任务。
 """
 
+import argparse
 import os
-import sys
 import subprocess
-import argparse
-from typing import Any, Dict, Optional, List, Tuple
+import sys
+from typing import Any, Dict, List, Optional, Tuple
 
-# 忽略yaspin的类型检查
-from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
 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.shell_input_handler import shell_input_handler
-from jarvis.jarvis_platform.registry import PlatformRegistry
+# 忽略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.git_utils import (
-    find_git_root,
-    get_commits_between,
-    get_diff,
-    get_latest_commit_hash,
-    handle_commit_workflow,
-    has_uncommitted_changes
-)
+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,
+                                           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 init_env, user_confirm
-from jarvis import __version__
+
 
 class CodeAgent:
     """Jarvis系统的代码修改代理。
@@ -49,7 +48,6 @@ class CodeAgent:
             "search_web",
             "ask_user",
             "ask_codebase",
-            "lsp_get_diagnostics",
             "read_code",
             "methodology",
             "chdir",
@@ -327,7 +325,9 @@ class CodeAgent:
                 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'])}个文件)"
+                    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}")
@@ -354,6 +354,8 @@ class CodeAgent:
         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")
             commited = handle_commit_workflow()
@@ -372,13 +374,22 @@ class CodeAgent:
                     final_ret += f"# 应用补丁:\n```diff\n{diff}\n```"
 
                     # 修改后的提示逻辑
+                    lint_tools_info = "\n".join(
+                        f"   - {file}: 使用 {'、'.join(get_lint_tools(file))}"
+                        for file in modified_files 
+                        if get_lint_tools(file)
+                    )
                     addon_prompt = """
-                    [系统提示开始]
-                    如果对应语言有静态检查工具，请使用静态检查工具检查修改的代码，如果本次修改引入了警告和错误，请根据警告和错误信息修复代码
-                    在引入警告和错误都被修复的前提下，如果用户的需求未完成，请继续修改代码，如果已经完成，请终止，不要实现任何超出用户需求外的内容
-                    如果有任何信息不明确，调用工具获取信息
-                    每次响应必须且只能包含一个操作
-                    [系统提示结束]
+1. 请对以下修改的文件进行静态扫描:
+""" + "\n".join(f"   - {file}" for file in modified_files) + (
+                        f"""
+2. 建议使用以下lint工具进行检查:
+{lint_tools_info}""" if lint_tools_info else ""
+                    ) + """
+3. 如果本次修改引入了警告和错误，请根据警告和错误信息修复代码
+4. 在引入的警告和错误都被修复的前提下，如果用户的需求未完成，请继续修改代码，如果已经完成，请终止，不要实现任何超出用户需求外的内容
+5. 如果有任何信息不明确，调用工具获取信息
+6. 每次响应必须且只能包含一个操作
                     """
 
                     agent.set_addon_prompt(addon_prompt)

jarvis/jarvis_code_agent/lint.py

@@ -0,0 +1,164 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+"""
+Lint工具配置模块
+"""
+
+import os
+from typing import Dict, List
+
+import yaml
+
+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'],
+    
+    # Go
+    '.go': ['golint', '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'],
+    
+    # Rust
+    '.rs': ['cargo clippy', 'rustfmt'],
+    '.rlib': ['cargo clippy', 'rustfmt'],
+    
+    # Java
+    '.java': ['checkstyle', 'pmd'],
+    '.class': ['checkstyle', 'pmd'],
+    '.jar': ['checkstyle', 'pmd'],
+    
+    # JavaScript/TypeScript
+    '.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'],
+    
+    # Ruby
+    '.rb': ['rubocop'],
+    '.rake': ['rubocop'],
+    '.gemspec': ['rubocop'],
+    
+    # Swift
+    '.swift': ['swiftlint'],
+    
+    # Kotlin
+    '.kt': ['ktlint'],
+    '.kts': ['ktlint'],
+    
+    # C#
+    '.cs': ['dotnet-format', 'roslynator'],
+    '.csx': ['dotnet-format', 'roslynator'],
+    
+    # SQL
+    '.sql': ['sqlfluff'],
+    
+    # Shell/Bash
+    '.sh': ['shellcheck'],
+    '.bash': ['shellcheck'],
+    
+    # HTML/CSS
+    '.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'],
+    
+    # Markdown/Documentation
+    '.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'],
+}
+
+def load_lint_tools_config() -> Dict[str, List[str]]:
+    """从yaml文件加载lint工具配置"""
+    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:
+        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工具列表，如果找不到则返回空列表
+    """
+    filename = os.path.basename(filename)
+    lint_tools = LINT_TOOLS.get(filename.lower(), [])
+    if lint_tools:
+        return lint_tools
+    ext = os.path.splitext(filename)[1]
+    return LINT_TOOLS.get(ext.lower(), [])

jarvis/jarvis_code_analysis/checklists/loader.py

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

jarvis/jarvis_code_analysis/code_review.py

@@ -1,19 +1,21 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any, List
-import subprocess
 import os
 import re
+import subprocess
 import tempfile
+from typing import Any, Dict, List
 
 from yaspin import yaspin
+
+from jarvis.jarvis_agent import Agent
+from jarvis.jarvis_code_analysis.checklists.loader import \
+    get_language_checklist
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.read_code import ReadCodeTool
-from jarvis.jarvis_agent import Agent
-
 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.tag import ot, ct
-from jarvis.jarvis_code_analysis.checklists.loader import get_language_checklist
+
 
 class CodeReviewTool:
     name = "code_review"

jarvis/jarvis_dev/main.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
-from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_multi_agent import MultiAgent
+from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_tools.registry import ToolRegistry
 from jarvis.jarvis_utils.input import get_multiline_input
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -562,7 +562,6 @@ TL_PROMPT = f"""
 ## 工具使用指南
 - **file_operation**：管理技术文档和指导文件
 - **ask_codebase**：分析代码库，理解实现细节
-- **lsp_get_diagnostics**：检查代码问题和警告
 - **execute_script**：执行开发工具和命令
 - **methodology**：应用开发方法论和最佳实践
 </tools>
@@ -900,7 +899,6 @@ QA_PROMPT = f"""
 - **file_operation**：管理测试文档和测试脚本
 - **ask_codebase**：了解代码库实现以设计测试
 - **execute_script**：执行测试命令和测试套件
-- **lsp_get_diagnostics**：检查代码问题和警告
 - **read_code**：阅读和理解代码以设计测试用例
 - **methodology**：应用测试方法论和最佳实践
 </tools>
@@ -1030,7 +1028,6 @@ def create_dev_team() -> MultiAgent:
     TL_output_handler.use_tools([
         "file_operation",
         "ask_codebase",
-        "lsp_get_diagnostics",
         "execute_script",
         "methodology",
         "edit_file",
@@ -1056,8 +1053,6 @@ def create_dev_team() -> MultiAgent:
         "file_operation",
         "ask_codebase",
         "execute_script",
-        "lsp_get_diagnostics",
-        "execute_script",
         "read_code",
         "methodology",
         "edit_file",
@@ -1135,7 +1130,6 @@ def create_dev_team() -> MultiAgent:
 ## 工具使用指南
 - **file_operation**：管理技术文档和指导文件
 - **ask_codebase**：分析代码库，理解实现细节
-- **lsp_get_diagnostics**：检查代码问题和警告
 - **execute_script**：执行开发工具和命令
 
 ## 文档管理规范
@@ -1181,7 +1175,6 @@ def create_dev_team() -> MultiAgent:
 - **file_operation**：管理测试文档和测试脚本
 - **ask_codebase**：了解代码库实现以设计测试
 - **execute_script**：执行测试命令和测试套件
-- **lsp_get_diagnostics**：检查代码问题和警告
 - **execute_script**：执行各类脚本（Shell命令、Shell脚本、Python脚本）
 - **read_code**：阅读和理解代码以设计测试用例
 

jarvis/jarvis_git_details/main.py

@@ -8,7 +8,7 @@
 import os
 import re
 import subprocess
-from typing import Dict, Any
+from typing import Any, Dict
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_platform.registry import PlatformRegistry

jarvis/jarvis_git_squash/main.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
-import sys
 import argparse
-from typing import Dict
-from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 import subprocess
+import sys
+from typing import Dict
 
+from jarvis.jarvis_git_utils.git_commiter import GitCommitTool
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env, user_confirm
+
+
 class GitSquashTool:
     name = "git_squash_agent"
     description = "Squash commits interactively using a base commit hash"

jarvis/jarvis_git_utils/git_commiter.py

@@ -1,20 +1,23 @@
 # -*- coding: utf-8 -*-
+import argparse
+import os
 import re
 import shlex
 import subprocess
-from typing import Dict, Any, Optional
+import sys
 import tempfile
+from typing import Any, Dict, Optional
+
 import yaml
 from yaspin import yaspin
-from jarvis.jarvis_platform.registry import PlatformRegistry
-import sys
-import argparse
-import os
 
-from jarvis.jarvis_utils.git_utils import find_git_root, has_uncommitted_changes
+from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_utils.config import get_git_commit_prompt
+from jarvis.jarvis_utils.git_utils import (find_git_root,
+                                           has_uncommitted_changes)
 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.tag import ot, ct
 
 
 class GitCommitTool:
@@ -24,11 +27,6 @@ class GitCommitTool:
     parameters = {
         "type": "object",
         "properties": {
-            "lang": {
-                "type": "string",
-                "description": "提交信息的语言",
-                "default": "Chinese"
-            },
             "root_dir": {
                 "type": "string",
                 "description": "Git仓库的根目录路径（可选）",
@@ -123,15 +121,16 @@ class GitCommitTool:
                         spinner.text = "正在生成提交消息..."
                         
                         # 准备提示信息
-                        base_prompt = f'''根据代码差异生成提交信息：
-                        提交信息应使用{args.get('lang', '中文')}书写
-    # 必需结构
+                        custom_prompt = get_git_commit_prompt()
+                        base_prompt = custom_prompt if custom_prompt else f'''根据代码差异生成提交信息：
+                        提交信息应使用中文书写
+    # 格式模板
     必须使用以下格式：
-    {ot("COMMIT_MESSAGE")}
+
     <类型>(<范围>): <主题>
     
     [可选] 详细描述变更内容和原因
-    {ct("COMMIT_MESSAGE")}
+
     # 格式规则
     1. 类型: fix(修复bug), feat(新功能), docs(文档), style(格式), refactor(重构), test(测试), chore(其他)
     2. 范围表示变更的模块或组件 (例如: auth, database, ui)
@@ -140,6 +139,12 @@ class GitCommitTool:
     5. 详细描述部分应解释"是什么"和"为什么"，而非"如何"
     6. 仅输出提交信息，不要输出其他内容
     '''
+                        base_prompt += f"""
+    # 输出格式
+    {ot("COMMIT_MESSAGE")}
+    commit信息
+    {ct("COMMIT_MESSAGE")}
+                        """
 
                         # 获取模型并尝试上传文件
                         platform = PlatformRegistry().get_normal_platform()
@@ -209,10 +214,8 @@ class GitCommitTool:
                                 break
                             prompt = f"""格式错误，请按照以下格式重新生成提交信息：
                             {ot("COMMIT_MESSAGE")}
-    <类型>(<范围>): <主题>
-    
-    [可选] 详细描述变更内容和原因
-    {ct("COMMIT_MESSAGE")}
+                            commit信息
+                            {ct("COMMIT_MESSAGE")}
                             """
                             commit_message = platform.chat_until_success(prompt)
                         spinner.write("✅ 生成提交消息")
@@ -267,14 +270,12 @@ class GitCommitTool:
 def main():
     init_env("欢迎使用 Jarvis-GitCommitTool，您的Git提交助手已准备就绪！")
     parser = argparse.ArgumentParser(description='Git commit tool')
-    parser.add_argument('--lang', type=str, default='Chinese', help='Language for commit messages')
     parser.add_argument('--root-dir', type=str, default='.', help='Root directory of the Git repository')
     parser.add_argument('--prefix', type=str, default='', help='Prefix to prepend to commit message (separated by space)')
     parser.add_argument('--suffix', type=str, default='', help='Suffix to append to commit message (separated by newline)')
     args = parser.parse_args()
     tool = GitCommitTool()
     tool.execute({
-        "lang": args.lang if hasattr(args, 'lang') else 'Chinese',
         "root_dir": args.root_dir,
         "prefix": args.prefix if hasattr(args, 'prefix') else '',
         "suffix": args.suffix if hasattr(args, 'suffix') else ''

jarvis/jarvis_mcp/sse_mcp_client.py

@@ -1,12 +1,14 @@
 # -*- coding: utf-8 -*-
-from typing import Any, Dict, List, Callable
-import requests
 import json
 import threading
 import time
-from urllib.parse import urljoin, urlencode, parse_qs
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from typing import Any, Callable, Dict, List
+from urllib.parse import parse_qs, urlencode, urljoin
+
+import requests
+
 from jarvis.jarvis_mcp import McpClient
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class SSEMcpClient(McpClient):

jarvis/jarvis_mcp/stdio_mcp_client.py

@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
-from typing import Any, Dict, List
-import subprocess
-import os
 import json
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+import os
+import subprocess
+from typing import Any, Dict, List
+
 from jarvis.jarvis_mcp import McpClient
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class StdioMcpClient(McpClient):