jarvis-ai-assistant 0.1.222__py3-none-any.whl → 0.7.0__py3-none-any.whl

jarvis/jarvis_utils/embedding.py

@@ -21,6 +21,9 @@ def get_context_token_count(text: str) -> int:
     返回：
         int: 文本中的token数量
     """
+    # 防御性检查：入参为 None 或空字符串时直接返回 0
+    if text is None or text == "":
+        return 0
     try:
         import tiktoken
 

jarvis/jarvis_utils/fzf.py

@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+"""FZF selector utility."""
+import shutil
+import subprocess
+from typing import List, Optional, Union, Dict, Any, cast
+
+def fzf_select(
+    options: Union[List[str], List[Dict[str, Any]]],
+    prompt: str = "SELECT> ",
+    key: Optional[str] = None,
+) -> Optional[str]:
+    """
+    Uses fzf to select an item from a list.
+
+    Args:
+        options: A list of strings or dicts to choose from.
+        prompt: The prompt to display in fzf.
+        key: If options is a list of dicts, this is the key to display.
+
+    Returns:
+        The selected item, or None if fzf is not available or the selection is cancelled.
+    """
+    if shutil.which("fzf") is None:
+        return None
+
+    if not options:
+        return None
+
+    if isinstance(options[0], dict):
+        if key is None:
+            raise ValueError("A key must be provided for a list of dicts.")
+        options_dict = cast(List[Dict[str, Any]], options)
+        input_lines = [str(item.get(key, "")) for item in options_dict]
+    else:
+        input_lines = [str(item) for item in options]
+
+    try:
+        process = subprocess.run(
+            [
+                "fzf",
+                "--prompt",
+                prompt,
+                "--height",
+                "40%",
+                "--border",
+                "--layout=reverse",
+            ],
+            input="\n".join(input_lines),
+            stdout=subprocess.PIPE,
+            stderr=subprocess.PIPE,
+            text=True,
+            check=True,
+        )
+        selected = process.stdout.strip()
+        return selected if selected else None
+    except (subprocess.CalledProcessError, FileNotFoundError):
+        return None

jarvis/jarvis_utils/git_utils.py

@@ -14,11 +14,12 @@ import os
 import re
 import subprocess
 import sys
-from typing import Any, Dict, List, Set, Tuple
+from typing import Any, Dict, List, Optional, Set, Tuple
 
-from jarvis.jarvis_utils.config import is_confirm_before_apply_patch
+from jarvis.jarvis_utils.config import get_data_dir, is_confirm_before_apply_patch
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.input import user_confirm
+from jarvis.jarvis_utils.utils import is_rag_installed
 
 
 def find_git_root_and_cd(start_dir: str = ".") -> str:
@@ -33,7 +34,13 @@ def find_git_root_and_cd(start_dir: str = ".") -> str:
     """
     os.chdir(start_dir)
     try:
-        git_root = os.popen("git rev-parse --show-toplevel").read().strip()
+        result = subprocess.run(
+            ["git", "rev-parse", "--show-toplevel"],
+            capture_output=True,
+            text=True,
+            check=True,
+        )
+        git_root = result.stdout.strip()
         if not git_root:
             subprocess.run(["git", "init"], check=True)
             git_root = os.path.abspath(".")
@@ -208,6 +215,126 @@ def revert_change() -> None:
         PrettyOutput.print(f"恢复更改失败: {str(e)}", OutputType.ERROR)
 
 
+def detect_large_code_deletion(threshold: int = 200) -> Optional[Dict[str, int]]:
+    """检测是否有大量代码删除
+    
+    参数:
+        threshold: 净删除行数阈值，默认200行
+        
+    返回:
+        Optional[Dict[str, int]]: 如果检测到大量删除，返回包含统计信息的字典：
+            {
+                'insertions': int,  # 新增行数
+                'deletions': int,   # 删除行数
+                'net_deletions': int  # 净删除行数
+            }
+            如果没有大量删除或发生错误，返回None
+    """
+    try:
+        # 临时暂存所有文件以便获取完整的diff统计
+        subprocess.run(["git", "add", "-N", "."], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        
+        # 检查是否有HEAD
+        head_check = subprocess.run(
+            ["git", "rev-parse", "--verify", "HEAD"],
+            stderr=subprocess.DEVNULL,
+            stdout=subprocess.DEVNULL,
+        )
+        
+        if head_check.returncode == 0:
+            # 有HEAD，获取相对于HEAD的diff统计
+            diff_result = subprocess.run(
+                ["git", "diff", "HEAD", "--shortstat"],
+                capture_output=True,
+                text=True,
+                encoding="utf-8",
+                errors="replace",
+                check=False,
+            )
+        else:
+            # 空仓库，获取工作区diff统计
+            diff_result = subprocess.run(
+                ["git", "diff", "--shortstat"],
+                capture_output=True,
+                text=True,
+                encoding="utf-8",
+                errors="replace",
+                check=False,
+            )
+        
+        # 重置暂存区
+        subprocess.run(["git", "reset"], check=False, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        
+        # 解析插入和删除行数
+        if diff_result.returncode == 0 and diff_result.stdout:
+            insertions = 0
+            deletions = 0
+            insertions_match = re.search(r"(\d+)\s+insertions?\(\+\)", diff_result.stdout)
+            deletions_match = re.search(r"(\d+)\s+deletions?\(\-\)", diff_result.stdout)
+            if insertions_match:
+                insertions = int(insertions_match.group(1))
+            if deletions_match:
+                deletions = int(deletions_match.group(1))
+            
+            # 检查是否有大量代码删除（净删除超过阈值）
+            net_deletions = deletions - insertions
+            if net_deletions > threshold:
+                return {
+                    'insertions': insertions,
+                    'deletions': deletions,
+                    'net_deletions': net_deletions
+                }
+        return None
+    except Exception:
+        # 如果检查过程中出错，返回None
+        return None
+
+
+def confirm_large_code_deletion(detection_result: Dict[str, int]) -> bool:
+    """询问用户是否确认大量代码删除
+    
+    参数:
+        detection_result: 检测结果字典，包含 'insertions', 'deletions', 'net_deletions'
+        
+    返回:
+        bool: 如果用户确认，返回True；如果用户拒绝，返回False
+    """
+    insertions = detection_result['insertions']
+    deletions = detection_result['deletions']
+    net_deletions = detection_result['net_deletions']
+    
+    PrettyOutput.print(
+        f"⚠️ 检测到大量代码删除：净删除 {net_deletions} 行（删除 {deletions} 行，新增 {insertions} 行）",
+        OutputType.WARNING,
+    )
+    if not user_confirm(
+        "此补丁包含大量代码删除，是否合理？", default=True
+    ):
+        # 用户认为不合理，拒绝提交
+        revert_change()
+        PrettyOutput.print(
+            "已拒绝本次提交（用户认为补丁不合理）", OutputType.INFO
+        )
+        return False
+    return True
+
+
+def check_large_code_deletion(threshold: int = 200) -> bool:
+    """检查是否有大量代码删除并询问用户确认
+    
+    参数:
+        threshold: 净删除行数阈值，默认200行
+        
+    返回:
+        bool: 如果检测到大量删除且用户拒绝提交，返回False；否则返回True
+    """
+    detection_result = detect_large_code_deletion(threshold)
+    if detection_result is None:
+        return True
+    
+    return confirm_large_code_deletion(detection_result)
+
+
 def handle_commit_workflow() -> bool:
     """Handle the git commit workflow and return the commit details.
 
@@ -228,6 +355,10 @@ def handle_commit_workflow() -> bool:
         if not has_uncommitted_changes():
             return False
 
+        # 在提交前检查是否有大量代码删除
+        if not check_large_code_deletion():
+            return False
+
         # 获取当前分支的提交总数
         commit_result = subprocess.run(
             ["git", "rev-list", "--count", "HEAD"], capture_output=True, text=True
@@ -245,7 +376,7 @@ def handle_commit_workflow() -> bool:
             ["git", "commit", "-m", f"CheckPoint #{commit_count + 1}"], check=True
         )
         return True
-    except subprocess.CalledProcessError as e:
+    except subprocess.CalledProcessError:
         return False
 
 
@@ -282,7 +413,7 @@ def get_latest_commit_hash() -> str:
         return ""
 
 
-def get_modified_line_ranges() -> Dict[str, Tuple[int, int]]:
+def get_modified_line_ranges() -> Dict[str, List[Tuple[int, int]]]:
     """从Git差异中获取所有更改文件的修改行范围
 
     返回：
@@ -290,10 +421,16 @@ def get_modified_line_ranges() -> Dict[str, Tuple[int, int]]:
         行号从1开始。
     """
     # 获取所有文件的Git差异
-    diff_output = os.popen("git show").read()
+    # 仅用于解析修改行范围，减少上下文以降低输出体积和解析成本
+    proc = subprocess.run(
+        ["git", "show", "--no-color"],
+        capture_output=True,
+        text=True,
+    )
+    diff_output = proc.stdout
 
     # 解析差异以获取修改的文件及其行范围
-    result = {}
+    result: Dict[str, List[Tuple[int, int]]] = {}
     current_file = None
 
     for line in diff_output.splitlines():
@@ -309,7 +446,9 @@ def get_modified_line_ranges() -> Dict[str, Tuple[int, int]]:
             start_line = int(range_match.group(1))  # 保持从1开始
             line_count = int(range_match.group(2)) if range_match.group(2) else 1
             end_line = start_line + line_count - 1
-            result[current_file] = (start_line, end_line)
+            if current_file not in result:
+                result[current_file] = []
+            result[current_file].append((start_line, end_line))
 
     return result
 
@@ -326,7 +465,7 @@ def is_file_in_git_repo(filepath: str) -> bool:
 
         # 检查文件路径是否在仓库根目录下
         return os.path.abspath(filepath).startswith(os.path.abspath(repo_root))
-    except:
+    except Exception:
         return False
 
 
@@ -339,25 +478,21 @@ def check_and_update_git_repo(repo_path: str) -> bool:
     返回:
         bool: 是否执行了更新
     """
+    # 检查上次检查日期
+    last_check_file = os.path.join(get_data_dir(), "last_git_check")
+    today_str = datetime.date.today().strftime("%Y-%m-%d")
+    if os.path.exists(last_check_file):
+        with open(last_check_file, "r") as f:
+            last_check_date = f.read().strip()
+        if last_check_date == today_str:
+            return False
+
     curr_dir = os.path.abspath(os.getcwd())
     git_root = find_git_root_and_cd(repo_path)
     if git_root is None:
         return False
 
     try:
-        # 检查最新提交时间是否为今天
-        commit_date_result = subprocess.run(
-            ["git", "log", "-1", "--format=%cd", "--date=short"],
-            cwd=git_root,
-            capture_output=True,
-            text=True,
-        )
-        if commit_date_result.returncode == 0:
-            commit_date = commit_date_result.stdout.strip()
-            today = datetime.date.today().strftime("%Y-%m-%d")
-            if commit_date == today:
-                return False
-
         # 检查是否有未提交的修改
         if has_uncommitted_changes():
             return False
@@ -418,8 +553,51 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                     hasattr(sys, "base_prefix") and sys.base_prefix != sys.prefix
                 )
 
-                # 尝试普通安装
-                install_cmd = [sys.executable, "-m", "pip", "install", "-e", "."]
+                # 检测 uv 可用性：优先虚拟环境内的 uv，其次 PATH 中的 uv
+                from shutil import which as _which
+                uv_executable = None
+                if sys.platform == "win32":
+                    venv_uv = os.path.join(sys.prefix, "Scripts", "uv.exe")
+                else:
+                    venv_uv = os.path.join(sys.prefix, "bin", "uv")
+                if os.path.exists(venv_uv):
+                    uv_executable = venv_uv
+                else:
+                    path_uv = _which("uv")
+                    if path_uv:
+                        uv_executable = path_uv
+
+                # 根据环境选择安装命令
+                # 检测是否安装了 RAG 特性（更精确）
+                rag_installed = is_rag_installed()
+
+                # 根据 uv 可用性与 RAG 特性选择安装命令（优先使用 uv）
+                if uv_executable:
+                    if rag_installed:
+                        install_cmd = [uv_executable, "pip", "install", "-e", ".[rag]"]
+                    else:
+                        install_cmd = [uv_executable, "pip", "install", "-e", "."]
+                else:
+                    if rag_installed:
+                        install_cmd = [
+                            sys.executable,
+                            "-m",
+                            "pip",
+                            "install",
+                            "-e",
+                            ".[rag]",
+                        ]
+                    else:
+                        install_cmd = [
+                            sys.executable,
+                            "-m",
+                            "pip",
+                            "install",
+                            "-e",
+                            ".",
+                        ]
+
+                # 尝试安装
                 result = subprocess.run(
                     install_cmd, cwd=git_root, capture_output=True, text=True
                 )
@@ -454,6 +632,9 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                     f"安装过程中发生意外错误: {str(e)}", OutputType.ERROR
                 )
                 return False
+        # 更新检查日期文件
+        with open(last_check_file, "w") as f:
+            f.write(today_str)
         return False
     except Exception as e:
         PrettyOutput.print(f"Git仓库更新检查失败: {e}", OutputType.WARNING)
@@ -534,17 +715,19 @@ def get_recent_commits_with_files() -> List[Dict[str, Any]]:
             ],
             capture_output=True,
             text=True,
+            encoding="utf-8",
+            errors="replace",
         )
-        if result.returncode != 0:
+        if result.returncode != 0 or result.stdout is None:
             return []
 
         # 解析提交信息
-        commits = []
+        commits: List[Dict[str, Any]] = []
         lines = result.stdout.splitlines()
         for i in range(0, len(lines), 4):
             if i + 3 >= len(lines):
                 break
-            commit = {
+            commit: Dict[str, Any] = {
                 "hash": lines[i],
                 "message": lines[i + 1],
                 "author": lines[i + 2],
@@ -563,7 +746,7 @@ def get_recent_commits_with_files() -> List[Dict[str, Any]]:
             if files_result.returncode == 0:
                 file_lines = files_result.stdout.splitlines()
                 unique_files: Set[str] = set(filter(None, file_lines))
-                commit["files"] = list(unique_files)[:20]  # type: ignore[list-item] # 限制最多20个文件
+                commit["files"] = list(unique_files)[:20]  # 限制最多20个文件
 
         return commits
 
@@ -658,8 +841,47 @@ def confirm_add_new_files() -> None:
 
         if not user_confirm(
             "是否要添加这些变更（如果不需要请修改.gitignore文件以忽略不需要的文件）？",
-            False,
+            True,
         ):
+            # 用户选择 N：自动将未跟踪文件列表添加到仓库根目录的 .gitignore
+            try:
+                repo_root_result = subprocess.run(
+                    ["git", "rev-parse", "--show-toplevel"],
+                    capture_output=True,
+                    text=True,
+                    check=True,
+                )
+                repo_root = repo_root_result.stdout.strip() or "."
+            except Exception:
+                repo_root = "."
+            gitignore_path = os.path.join(repo_root, ".gitignore")
+
+            # 仅对未跟踪的新文件进行忽略（已跟踪文件无法通过 .gitignore 忽略）
+            files_to_ignore = sorted(set(new_files))
+
+            # 读取已存在的 .gitignore 以避免重复添加
+            existing_lines: Set[str] = set()
+            try:
+                if os.path.exists(gitignore_path):
+                    with open(gitignore_path, "r", encoding="utf-8") as f:
+                        existing_lines = set(line.strip() for line in f if line.strip())
+            except Exception:
+                existing_lines = set()
+
+            # 追加未存在的文件路径到 .gitignore（使用相对于仓库根目录的路径）
+            try:
+                with open(gitignore_path, "a", encoding="utf-8") as f:
+                    for file in files_to_ignore:
+                        abs_path = os.path.abspath(file)
+                        rel_path = os.path.relpath(abs_path, repo_root)
+                        # 避免无效的相对路径（不应出现 .. 前缀），有则回退用原始值
+                        entry = rel_path if not rel_path.startswith("..") else file
+                        if entry not in existing_lines:
+                            f.write(entry + "\n")
+                PrettyOutput.print("已将未跟踪文件添加到 .gitignore，正在重新检测...", OutputType.INFO)
+            except Exception as e:
+                PrettyOutput.print(f"更新 .gitignore 失败: {str(e)}", OutputType.WARNING)
+
             continue
 
         break