jarvis-ai-assistant 0.1.178__py3-none-any.whl → 0.1.180__py3-none-any.whl

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_data/config_schema.json

@@ -0,0 +1,260 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "title": "Jarvis环境变量配置模式",
+  "description": "Jarvis系统配置模式",
+  "type": "object",
+  "properties": {
+    "JARVIS_MCP": {
+      "type": "array",
+      "description": "MCP工具配置列表",
+      "items": {
+        "type": "object",
+        "oneOf": [
+          {
+            "type": "object",
+            "required": [
+              "type",
+              "base_url"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "sse",
+                  "streamable"
+                ],
+                "description": "MCP客户端类型"
+              },
+              "base_url": {
+                "type": "string",
+                "format": "uri",
+                "description": "MCP服务器基础URL"
+              },
+              "auth_token": {
+                "type": "string",
+                "description": "认证令牌(可选)"
+              },
+              "headers": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "description": "额外的HTTP头(可选)"
+              },
+              "name": {
+                "type": "string",
+                "description": "工具名称(可选)"
+              },
+              "enable": {
+                "type": "boolean",
+                "default": true,
+                "description": "是否启用该工具(可选)"
+              }
+            }
+          },
+          {
+            "type": "object",
+            "required": [
+              "type",
+              "command"
+            ],
+            "properties": {
+              "type": {
+                "type": "string",
+                "enum": [
+                  "stdio"
+                ],
+                "description": "MCP客户端类型"
+              },
+              "command": {
+                "type": "string",
+                "description": "要执行的命令"
+              },
+              "args": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "命令参数列表(可选)"
+              },
+              "env": {
+                "type": "object",
+                "additionalProperties": {
+                  "type": "string"
+                },
+                "description": "环境变量(可选)"
+              },
+              "name": {
+                "type": "string",
+                "description": "工具名称(可选)"
+              },
+              "enable": {
+                "type": "boolean",
+                "default": true,
+                "description": "是否启用该工具(可选)"
+              }
+            }
+          }
+        ]
+      }
+    },
+    "ENV": {
+      "type": "object",
+      "description": "需要设置的额外环境变量",
+      "additionalProperties": {
+        "type": "string"
+      },
+      "default": {}
+    },
+    "JARVIS_GIT_COMMIT_PROMPT": {
+      "type": "string",
+      "description": "Git提交信息生成提示模板",
+      "default": ""
+    },
+    "JARVIS_MAX_TOKEN_COUNT": {
+      "type": "string",
+      "description": "模型能处理的最大token数量",
+      "default": "960000"
+    },
+    "JARVIS_MAX_INPUT_TOKEN_COUNT": {
+      "type": "string",
+      "description": "模型能处理的最大输入token数量",
+      "default": "32000"
+    },
+    "JARVIS_AUTO_COMPLETE": {
+      "type": "string",
+      "description": "是否启用自动补全功能",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "SHELL": {
+      "type": "string",
+      "description": "系统shell名称(如: bash, zsh)",
+      "default": "/bin/bash"
+    },
+    "JARVIS_PLATFORM": {
+      "type": "string",
+      "description": "常规操作平台名称",
+      "default": "yuanbao"
+    },
+    "JARVIS_MODEL": {
+      "type": "string",
+      "description": "常规操作模型名称",
+      "default": "deep_seek_v3"
+    },
+    "JARVIS_THINKING_PLATFORM": {
+      "type": "string",
+      "description": "思考操作平台名称",
+      "default": "yuanbao"
+    },
+    "JARVIS_THINKING_MODEL": {
+      "type": "string",
+      "description": "思考操作模型名称",
+      "default": "deep_seek"
+    },
+    "JARVIS_EXECUTE_TOOL_CONFIRM": {
+      "type": "string",
+      "description": "执行工具前是否需要确认",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_CONFIRM_BEFORE_APPLY_PATCH": {
+      "type": "string",
+      "description": "应用补丁前是否需要确认",
+      "default": "true",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_MAX_TOOL_CALL_COUNT": {
+      "type": "string",
+      "description": "最大连续工具调用次数",
+      "default": "20"
+    },
+    "JARVIS_DATA_PATH": {
+      "type": "string",
+      "description": "Jarvis数据存储目录路径",
+      "default": "~/.jarvis"
+    },
+    "JARVIS_AUTO_UPDATE": {
+      "type": "string",
+      "description": "是否自动更新git仓库",
+      "default": "true",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_MAX_BIG_CONTENT_SIZE": {
+      "type": "string",
+      "description": "最大大内容尺寸",
+      "default": "1024000"
+    },
+    "JARVIS_PRETTY_OUTPUT": {
+      "type": "string",
+      "description": "是否启用美化输出",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_USE_METHODOLOGY": {
+      "type": "string",
+      "description": "是否启用方法论",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_USE_ANALYSIS": {
+      "type": "string",
+      "description": "是否启用任务分析",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_PRINT_PROMPT": {
+      "type": "string",
+      "description": "是否打印提示",
+      "default": "false",
+      "enum": [
+        "true",
+        "false"
+      ]
+    },
+    "JARVIS_REPLACE_MAP": {
+      "type": "object",
+      "description": "自定义替换映射表配置",
+      "additionalProperties": {
+        "type": "object",
+        "properties": {
+          "append": {
+            "type": "boolean",
+            "description": "Whether to append to existing template"
+          },
+          "template": {
+            "type": "string",
+            "description": "Replacement template content"
+          },
+          "description": {
+            "type": "string",
+            "description": "Description of the replacement"
+          }
+        },
+        "required": ["template"]
+      }
+    }
+  },
+  "additionalProperties": false
+}

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("✅ 生成提交消息")
@@ -249,7 +252,7 @@ class GitCommitTool:
                     "stdout": yaml.safe_dump({
                         "commit_hash": commit_hash,
                         "commit_message": commit_message
-                    }),
+                    }, allow_unicode=True),
                     "stderr": ""
                 }
             finally:
@@ -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 ''