jarvis-ai-assistant 0.1.207__py3-none-any.whl → 0.1.209__py3-none-any.whl

jarvis/jarvis_code_agent/code_agent.py

@@ -10,24 +10,26 @@ import subprocess
 import sys
 from typing import List, Optional, Tuple
 
-from yaspin import yaspin  # type: ignore
-
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.builtin_input_handler import builtin_input_handler
 from jarvis.jarvis_agent.edit_file_handler import EditFileHandler
 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 (confirm_add_new_files, 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 (
+    confirm_add_new_files,
+    find_git_root_and_cd,
+    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
@@ -54,8 +56,6 @@ class CodeAgent:
                 "ask_user",
                 "read_code",
                 "methodology",
-                "chdir",
-                # "edit_file",
                 "rewrite_file",
             ]
         )
@@ -134,21 +134,64 @@ class CodeAgent:
 
         self.agent.set_after_tool_call_cb(self.after_tool_call_cb)
 
+    def _find_git_root(self) -> str:
+        """查找并切换到git根目录
+
+        返回:
+            str: git根目录路径
+        """
+        print("🔍 正在查找git根目录...")
+        curr_dir = os.getcwd()
+        git_dir = find_git_root_and_cd(curr_dir)
+        self.root_dir = git_dir
+        print(f"✅ 已找到git根目录: {git_dir}")
+        return git_dir
+
+    def _update_gitignore(self, git_dir: str) -> None:
+        """检查并更新.gitignore文件，确保忽略.jarvis目录
+
+        参数:
+            git_dir: git根目录路径
+        """
+        print("📝 正在检查.gitignore文件...")
+        gitignore_path = os.path.join(git_dir, ".gitignore")
+        jarvis_ignore = ".jarvis"
+
+        if not os.path.exists(gitignore_path):
+            with open(gitignore_path, "w") as f:
+                f.write(f"{jarvis_ignore}\n")
+            print(f"✅ 已创建.gitignore文件并添加'{jarvis_ignore}'")
+        else:
+            with open(gitignore_path, "r+") as f:
+                content = f.read()
+                if jarvis_ignore not in content.splitlines():
+                    f.write(f"\n{jarvis_ignore}\n")
+                    print(f"✅ 已更新.gitignore文件，添加'{jarvis_ignore}'")
+                else:
+                    print("ℹ️ .jarvis已在.gitignore中")
+
+    def _handle_git_changes(self) -> None:
+        """处理git仓库中的未提交修改"""
+        print("🔄 正在检查未提交的修改...")
+        if has_uncommitted_changes():
+            print("⏳ 发现未提交修改，正在处理...")
+            git_commiter = GitCommitTool()
+            git_commiter.execute({})
+            print("✅ 未提交修改已处理完成")
+        else:
+            print("✅ 没有未提交的修改")
+
     def _init_env(self) -> None:
-        """初始化环境，包括：
+        """初始化环境，组合以下功能：
         1. 查找git根目录
-        2. 检查并处理未提交的修改
+        2. 检查并更新.gitignore文件
+        3. 处理未提交的修改
         """
-        with yaspin(text="正在初始化环境...", color="cyan") as spinner:
-            curr_dir = os.getcwd()
-            git_dir = find_git_root(curr_dir)
-            self.root_dir = git_dir
-            if has_uncommitted_changes():
-                with spinner.hidden():
-                    git_commiter = GitCommitTool()
-                    git_commiter.execute({})
-            spinner.text = "环境初始化完成"
-            spinner.ok("✅")
+        print("🚀 正在初始化环境...")
+        git_dir = self._find_git_root()
+        self._update_gitignore(git_dir)
+        self._handle_git_changes()
+        print("✅ 环境初始化完成")
 
     def _handle_uncommitted_changes(self) -> None:
         """处理未提交的修改，包括：
@@ -378,18 +421,19 @@ def main() -> None:
     args = parser.parse_args()
 
     curr_dir = os.getcwd()
-    git_dir = find_git_root(curr_dir)
+    git_dir = find_git_root_and_cd(curr_dir)
     PrettyOutput.print(f"当前目录: {git_dir}", OutputType.INFO)
 
     try:
+        agent = CodeAgent(platform=args.platform, model=args.model, need_summary=False)
         if args.requirement:
-            user_input = args.requirement
+            agent.run(args.requirement)
         else:
-            user_input = get_multiline_input("请输入你的需求（输入空行退出）:")
-        if not user_input:
-            sys.exit(0)
-        agent = CodeAgent(platform=args.platform, model=args.model, need_summary=False)
-        agent.run(user_input)
+            while True:
+                user_input = get_multiline_input("请输入你的需求（输入空行退出）:")
+                if not user_input:
+                    return
+                agent.run(user_input)
 
     except RuntimeError as e:
         PrettyOutput.print(f"错误: {str(e)}", OutputType.ERROR)

jarvis/jarvis_code_agent/lint.py

@@ -8,7 +8,7 @@ Lint工具配置模块
 import os
 from typing import Dict, List
 
-import yaml
+import yaml  # type: ignore
 
 from jarvis.jarvis_utils.config import get_data_dir
 
@@ -27,11 +27,11 @@ LINT_TOOLS = {
     # Go
     ".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"],
+    ".pyw": ["black", "pylint", "mypy"],
+    ".pyi": ["black", "pylint", "mypy"],
+    ".pyx": ["black", "pylint", "mypy"],
+    ".pxd": ["black", "pylint", "mypy"],
     # Rust
     ".rs": ["cargo clippy", "rustfmt"],
     ".rlib": ["cargo clippy", "rustfmt"],

jarvis/jarvis_code_analysis/code_review.py

@@ -5,11 +5,8 @@ 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_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_utils.output import OutputType, PrettyOutput
@@ -281,167 +278,165 @@ class CodeReviewTool:
                 diff_output = ""
 
                 # Build git diff command based on review type
-                with yaspin(text="正在获取代码变更...", color="cyan") as spinner:
-                    if review_type == "commit":
-                        if "commit_sha" not in args:
-                            return {
-                                "success": False,
-                                "stdout": {},
-                                "stderr": "commit_sha is required for commit review type",
-                            }
-                        commit_sha = args["commit_sha"].strip()
-                        diff_cmd = f"git show {commit_sha} | cat -"
-
-                        # Execute git command and get diff output
-                        diff_output = subprocess.check_output(
-                            diff_cmd, shell=True, text=True
+                print("📊 正在获取代码变更...")
+
+                if review_type == "commit":
+                    if "commit_sha" not in args:
+                        return {
+                            "success": False,
+                            "stdout": {},
+                            "stderr": "commit_sha is required for commit review type",
+                        }
+                    commit_sha = args["commit_sha"].strip()
+                    diff_cmd = f"git show {commit_sha} | cat -"
+
+                    # Execute git command and get diff output
+                    diff_output = subprocess.check_output(
+                        diff_cmd, shell=True, text=True
+                    )
+                    if not diff_output:
+                        return {
+                            "success": False,
+                            "stdout": {},
+                            "stderr": "No changes to review",
+                        }
+
+                    # Extract changed files using git command
+                    files_cmd = f"git show --name-only --pretty=format: {commit_sha} | grep -v '^$'"
+                    try:
+                        files_output = subprocess.check_output(
+                            files_cmd, shell=True, text=True
                         )
-                        if not diff_output:
-                            return {
-                                "success": False,
-                                "stdout": {},
-                                "stderr": "No changes to review",
-                            }
-
-                        # Extract changed files using git command
-                        files_cmd = f"git show --name-only --pretty=format: {commit_sha} | grep -v '^$'"
-                        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()
-                            ]
-                        except subprocess.CalledProcessError:
-                            # Fallback to regex extraction if git command fails
-                            file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
-                            files = re.findall(file_pattern, diff_output)
-                            file_paths = [match[0] for match in files]
-
-                    elif review_type == "range":
-                        if "start_commit" not in args or "end_commit" not in args:
-                            return {
-                                "success": False,
-                                "stdout": {},
-                                "stderr": "start_commit and end_commit are required for range review type",
-                            }
-                        start_commit = args["start_commit"].strip()
-                        end_commit = args["end_commit"].strip()
-                        diff_cmd = f"git diff {start_commit}..{end_commit} | cat -"
-
-                        # Execute git command and get diff output
-                        diff_output = subprocess.check_output(
-                            diff_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|$)"
+                        files = re.findall(file_pattern, diff_output)
+                        file_paths = [match[0] for match in files]
+
+                elif review_type == "range":
+                    if "start_commit" not in args or "end_commit" not in args:
+                        return {
+                            "success": False,
+                            "stdout": {},
+                            "stderr": "start_commit and end_commit are required for range review type",
+                        }
+                    start_commit = args["start_commit"].strip()
+                    end_commit = args["end_commit"].strip()
+                    diff_cmd = f"git diff {start_commit}..{end_commit} | cat -"
+
+                    # Execute git command and get diff output
+                    diff_output = subprocess.check_output(
+                        diff_cmd, shell=True, text=True
+                    )
+                    if not diff_output:
+                        return {
+                            "success": False,
+                            "stdout": {},
+                            "stderr": "No changes to 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
                         )
-                        if not diff_output:
-                            return {
-                                "success": False,
-                                "stdout": {},
-                                "stderr": "No changes to 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()
-                            ]
-                        except subprocess.CalledProcessError:
-                            # Fallback to regex extraction if git command fails
-                            file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
-                            files = re.findall(file_pattern, diff_output)
-                            file_paths = [match[0] for match in files]
-
-                    elif review_type == "file":
-                        if "file_path" not in args:
-                            return {
-                                "success": False,
-                                "stdout": {},
-                                "stderr": "file_path is required for file review type",
-                            }
-                        file_path = args["file_path"].strip()
-                        file_paths = [file_path]
-                        diff_output = ReadCodeTool().execute(
-                            {"files": [{"path": file_path}]}
-                        )["stdout"]
-
-                    else:  # current changes
-                        diff_cmd = "git diff HEAD | cat -"
-
-                        # Execute git command and get diff output
-                        diff_output = subprocess.check_output(
-                            diff_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|$)"
+                        files = re.findall(file_pattern, diff_output)
+                        file_paths = [match[0] for match in files]
+
+                elif review_type == "file":
+                    if "file_path" not in args:
+                        return {
+                            "success": False,
+                            "stdout": {},
+                            "stderr": "file_path is required for file review type",
+                        }
+                    file_path = args["file_path"].strip()
+                    file_paths = [file_path]
+                    diff_output = ReadCodeTool().execute(
+                        {"files": [{"path": file_path}]}
+                    )["stdout"]
+
+                else:  # current changes
+                    diff_cmd = "git diff HEAD | cat -"
+
+                    # Execute git command and get diff output
+                    diff_output = subprocess.check_output(
+                        diff_cmd, shell=True, text=True
+                    )
+                    if not diff_output:
+                        return {
+                            "success": False,
+                            "stdout": {},
+                            "stderr": "No changes to 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
                         )
-                        if not diff_output:
-                            return {
-                                "success": False,
-                                "stdout": {},
-                                "stderr": "No changes to 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()
-                            ]
-                        except subprocess.CalledProcessError:
-                            # Fallback to regex extraction if git command fails
-                            file_pattern = r"diff --git a/.*?\s+b/(.*?)(\n|$)"
-                            files = re.findall(file_pattern, diff_output)
-                            file_paths = [match[0] for match in files]
-
-                    # Detect languages from the file paths
-                    detected_languages = self._detect_languages_from_files(file_paths)
-
-                    # Add review type and related information to the diff output
-                    review_info = f"""
+                        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|$)"
+                        files = re.findall(file_pattern, diff_output)
+                        file_paths = [match[0] for match in files]
+
+                # Detect languages from the file paths
+                detected_languages = self._detect_languages_from_files(file_paths)
+
+                # Add review type and related information to the diff output
+                review_info = f"""
 ----- 代码审查信息 -----
 审查类型: {review_type}"""
 
-                    # Add specific information based on review type
-                    if review_type == "commit":
-                        review_info += f"\n提交SHA: {args['commit_sha']}"
-                    elif review_type == "range":
-                        review_info += f"\n起始提交: {args['start_commit']}\n结束提交: {args['end_commit']}"
-                    elif review_type == "file":
-                        review_info += f"\n文件路径: {args['file_path']}"
-                    else:  # current changes
-                        review_info += "\n当前未提交修改"
-
-                    # Add file list
-                    if file_paths:
-                        review_info += "\n\n----- 变更文件列表 -----"
-                        for i, path in enumerate(file_paths, 1):
-                            review_info += f"\n{i}. {path}"
-
-                    # Add language-specific checklists
-                    if detected_languages:
-                        review_info += "\n\n----- 检测到的编程语言 -----"
-                        review_info += (
-                            f"\n检测到的语言: {', '.join(detected_languages)}"
-                        )
-
-                        review_info += "\n\n----- 语言特定审查清单 -----"
-                        for lang in detected_languages:
-                            checklist = self._get_language_checklist(lang)
-                            if checklist:
-                                review_info += f"\n{checklist}"
-
-                    review_info += "\n------------------------\n\n"
-
-                    # Combine review info with diff output
-                    diff_output = review_info + diff_output
-
-                    PrettyOutput.print(diff_output, OutputType.CODE, lang="diff")
-                    spinner.text = "代码变更获取完成"
-                    spinner.ok("✅")
+                # Add specific information based on review type
+                if review_type == "commit":
+                    review_info += f"\n提交SHA: {args['commit_sha']}"
+                elif review_type == "range":
+                    review_info += f"\n起始提交: {args['start_commit']}\n结束提交: {args['end_commit']}"
+                elif review_type == "file":
+                    review_info += f"\n文件路径: {args['file_path']}"
+                else:  # current changes
+                    review_info += "\n当前未提交修改"
+
+                # Add file list
+                if file_paths:
+                    review_info += "\n\n----- 变更文件列表 -----"
+                    for i, path in enumerate(file_paths, 1):
+                        review_info += f"\n{i}. {path}"
+
+                # Add language-specific checklists
+                if detected_languages:
+                    review_info += "\n\n----- 检测到的编程语言 -----"
+                    review_info += f"\n检测到的语言: {', '.join(detected_languages)}"
+
+                    review_info += "\n\n----- 语言特定审查清单 -----"
+                    for lang in detected_languages:
+                        checklist = self._get_language_checklist(lang)
+                        if checklist:
+                            review_info += f"\n{checklist}"
+
+                review_info += "\n------------------------\n\n"
+
+                # Combine review info with diff output
+                diff_output = review_info + diff_output
+
+                PrettyOutput.print(diff_output, OutputType.CODE, lang="diff")
+                print("✅ 代码变更获取完成")
 
                 system_prompt = """<code_review_guide>
 <role>
@@ -690,22 +685,16 @@ class CodeReviewTool:
                                 "stdout": "",
                                 "stderr": "代码差异太大，无法处理",
                             }
-
-                        with yaspin(
-                            text="正在上传代码差异文件...", color="cyan"
-                        ) as spinner:
-                            upload_success = agent.model.upload_files([temp_file_path])
-                            if upload_success:
-                                spinner.ok("✅")
-                                PrettyOutput.print(
-                                    f"已成功上传代码差异文件", OutputType.SUCCESS
-                                )
-                            else:
-                                return {
-                                    "success": False,
-                                    "stdout": "",
-                                    "stderr": "上传代码差异文件失败",
-                                }
+                        print("📤 正在上传代码差异文件...")
+                        upload_success = agent.model.upload_files([temp_file_path])
+                        if upload_success:
+                            print("✅ 已成功上传代码差异文件")
+                        else:
+                            return {
+                                "success": False,
+                                "stdout": "",
+                                "stderr": "上传代码差异文件失败",
+                            }
 
                     # Prepare the prompt based on upload status
                     if is_large_content:

jarvis/jarvis_data/config_schema.json

@@ -121,16 +121,6 @@
       "description": "模型能处理的最大输入token数量",
       "default": 32000
     },
-    "JARVIS_AUTO_COMPLETE": {
-      "type": "boolean",
-      "description": "是否启用自动补全功能",
-      "default": false
-    },
-    "SHELL": {
-      "type": "string",
-      "description": "系统shell名称(如: bash, zsh)",
-      "default": "/bin/bash"
-    },
     "JARVIS_PLATFORM": {
       "type": "string",
       "description": "常规操作平台名称",
@@ -161,21 +151,11 @@
       "description": "应用补丁前是否需要确认",
       "default": false
     },
-    "JARVIS_MAX_TOOL_CALL_COUNT": {
-      "type": "number",
-      "description": "最大连续工具调用次数",
-      "default": 20
-    },
     "JARVIS_DATA_PATH": {
       "type": "string",
       "description": "Jarvis数据存储目录路径",
       "default": "~/.jarvis"
     },
-    "JARVIS_AUTO_UPDATE": {
-      "type": "boolean",
-      "description": "是否自动更新git仓库",
-      "default": true
-    },
     "JARVIS_MAX_BIG_CONTENT_SIZE": {
       "type": "number",
       "description": "最大大内容尺寸",
@@ -201,11 +181,6 @@
       "description": "是否打印提示",
       "default": false
     },
-    "JARVIS_USE_HISTORY_COUNT": {
-      "type": "number",
-      "description": "使用的历史记录数量",
-      "default": 0
-    },
     "JARVIS_REPLACE_MAP": {
       "type": "object",
       "description": "自定义替换映射表配置",