jarvis-ai-assistant 0.3.30__py3-none-any.whl → 0.7.6__py3-none-any.whl

jarvis/jarvis_utils/git_utils.py

@@ -14,10 +14,9 @@ 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 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
 
@@ -34,7 +33,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(".")
@@ -105,7 +110,7 @@ def get_commits_between(start_hash: str, end_hash: str) -> List[Tuple[str, str]]
         )
         if result.returncode != 0:
             error_msg = result.stderr.decode("utf-8", errors="replace")
-            PrettyOutput.print(f"获取commit历史失败: {error_msg}", OutputType.ERROR)
+            print(f"❌ 获取commit历史失败: {error_msg}")
             return []
 
         output = result.stdout.decode("utf-8", errors="replace")
@@ -117,7 +122,7 @@ def get_commits_between(start_hash: str, end_hash: str) -> List[Tuple[str, str]]
         return commits
 
     except Exception as e:
-        PrettyOutput.print(f"获取commit历史异常: {str(e)}", OutputType.ERROR)
+        print(f"❌ 获取commit历史异常: {str(e)}")
         return []
 
 
@@ -166,6 +171,59 @@ def get_diff() -> str:
         return f"发生意外错误: {str(e)}"
 
 
+def get_diff_between_commits(start_hash: str, end_hash: Optional[str] = None) -> str:
+    """获取两个commit之间的差异
+
+    参数:
+        start_hash: 起始commit哈希值（不包含）
+        end_hash: 结束commit哈希值（包含），如果为None则使用HEAD
+
+    返回:
+        str: 差异内容或错误信息
+    """
+    try:
+        if end_hash is None:
+            # 如果end_hash为None，使用HEAD
+            end_hash = "HEAD"
+        
+        # 检查start_hash是否存在
+        start_check = subprocess.run(
+            ["git", "rev-parse", "--verify", start_hash],
+            stderr=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+        )
+        if start_check.returncode != 0:
+            return f"起始commit不存在: {start_hash}"
+        
+        # 检查end_hash是否存在
+        end_check = subprocess.run(
+            ["git", "rev-parse", "--verify", end_hash],
+            stderr=subprocess.PIPE,
+            stdout=subprocess.PIPE,
+        )
+        if end_check.returncode != 0:
+            return f"结束commit不存在: {end_hash}"
+        
+        # 获取两个commit之间的差异
+        result = subprocess.run(
+            ["git", "diff", f"{start_hash}..{end_hash}"],
+            capture_output=True,
+            text=False,
+            check=True,
+        )
+        
+        try:
+            return result.stdout.decode("utf-8")
+        except UnicodeDecodeError:
+            return result.stdout.decode("utf-8", errors="replace")
+
+    except subprocess.CalledProcessError as e:
+        error_msg = e.stderr.decode("utf-8", errors="replace") if e.stderr else str(e)
+        return f"获取commit差异失败: {error_msg}"
+    except Exception as e:
+        return f"发生意外错误: {str(e)}"
+
+
 def revert_file(filepath: str) -> None:
     """增强版git恢复，处理新文件"""
     import subprocess
@@ -185,7 +243,7 @@ def revert_file(filepath: str) -> None:
         subprocess.run(["git", "clean", "-f", "--", filepath], check=True)
     except subprocess.CalledProcessError as e:
         error_msg = e.stderr.decode("utf-8", errors="replace") if e.stderr else str(e)
-        PrettyOutput.print(f"恢复文件失败: {error_msg}", OutputType.ERROR)
+        print(f"❌ 恢复文件失败: {error_msg}")
 
 
 # 修改后的恢复函数
@@ -206,7 +264,101 @@ def revert_change() -> None:
             subprocess.run(["git", "reset", "--hard", "HEAD"], check=True)
         subprocess.run(["git", "clean", "-fd"], check=True)
     except subprocess.CalledProcessError as e:
-        PrettyOutput.print(f"恢复更改失败: {str(e)}", OutputType.ERROR)
+        print(f"❌ 恢复更改失败: {str(e)}")
+
+
+def detect_large_code_deletion(threshold: int = 30) -> 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
+
+
+# confirm_large_code_deletion函数已废弃，统一使用大模型询问
+
+
+def check_large_code_deletion(threshold: int = 30) -> bool:
+    """检查是否有大量代码删除
+    
+    参数:
+        threshold: 净删除行数阈值，默认200行
+        
+    返回:
+        bool: 始终返回True，由调用方统一处理大模型询问
+    """
+    # 检测功能现在由调用方统一处理
+    return True
+    
+    # 直接返回True，让调用方统一处理大模型询问
+    return True
 
 
 def handle_commit_workflow() -> bool:
@@ -229,6 +381,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
@@ -291,7 +447,13 @@ def get_modified_line_ranges() -> Dict[str, List[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: Dict[str, List[Tuple[int, int]]] = {}
@@ -329,7 +491,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
 
 
@@ -394,23 +556,17 @@ def check_and_update_git_repo(repo_path: str) -> bool:
             and remote_tag_result.returncode == 0
             and local_tag_result.stdout.strip() != remote_tag_result.stdout.strip()
         ):
-            PrettyOutput.print(
-                f"检测到新版本tag {remote_tag_result.stdout.strip()}，正在更新Jarvis...",
-                OutputType.INFO,
-            )
+            print(f"ℹ️ 检测到新版本tag {remote_tag_result.stdout.strip()}，正在更新Jarvis...")
             subprocess.run(
                 ["git", "checkout", remote_tag_result.stdout.strip()],
                 cwd=git_root,
                 check=True,
             )
-            PrettyOutput.print(
-                f"Jarvis已更新到tag {remote_tag_result.stdout.strip()}",
-                OutputType.SUCCESS,
-            )
+            print(f"✅ Jarvis已更新到tag {remote_tag_result.stdout.strip()}")
 
             # 执行pip安装更新代码
             try:
-                PrettyOutput.print("正在安装更新后的代码...", OutputType.INFO)
+                print("ℹ️ 正在安装更新后的代码...")
 
                 # 检查是否在虚拟环境中
                 in_venv = hasattr(sys, "real_prefix") or (
@@ -467,7 +623,7 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                 )
 
                 if result.returncode == 0:
-                    PrettyOutput.print("代码更新安装成功", OutputType.SUCCESS)
+                    print("✅ 代码更新安装成功")
                     return True
 
                 # 处理权限错误
@@ -485,23 +641,21 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                             text=True,
                         )
                         if user_result.returncode == 0:
-                            PrettyOutput.print("用户级代码安装成功", OutputType.SUCCESS)
+                            print("✅ 用户级代码安装成功")
                             return True
                         error_msg = user_result.stderr.strip()
 
-                PrettyOutput.print(f"代码安装失败: {error_msg}", OutputType.ERROR)
+                print(f"❌ 代码安装失败: {error_msg}")
                 return False
             except Exception as e:
-                PrettyOutput.print(
-                    f"安装过程中发生意外错误: {str(e)}", OutputType.ERROR
-                )
+                print(f"❌ 安装过程中发生意外错误: {str(e)}")
                 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)
+        print(f"⚠️ Git仓库更新检查失败: {e}")
         return False
     finally:
         os.chdir(curr_dir)
@@ -528,18 +682,16 @@ def get_diff_file_list() -> List[str]:
         subprocess.run(["git", "reset"], check=True)
 
         if result.returncode != 0:
-            PrettyOutput.print(
-                f"获取差异文件列表失败: {result.stderr}", OutputType.ERROR
-            )
+            print(f"❌ 获取差异文件列表失败: {result.stderr}")
             return []
 
         return [f for f in result.stdout.splitlines() if f]
 
     except subprocess.CalledProcessError as e:
-        PrettyOutput.print(f"获取差异文件列表失败: {str(e)}", OutputType.ERROR)
+        print(f"❌ 获取差异文件列表失败: {str(e)}")
         return []
     except Exception as e:
-        PrettyOutput.print(f"获取差异文件列表异常: {str(e)}", OutputType.ERROR)
+        print(f"❌ 获取差异文件列表异常: {str(e)}")
         return []
 
 
@@ -610,7 +762,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
 
@@ -688,10 +840,8 @@ def confirm_add_new_files() -> None:
             need_confirm = True
 
         if output_lines:
-            PrettyOutput.print(
-                "\n".join(output_lines),
-                OutputType.WARNING if need_confirm else OutputType.INFO,
-            )
+            emoji = "⚠️ " if need_confirm else "ℹ️ "
+            print(emoji + ("\n" + emoji).join(output_lines))
 
         return need_confirm
 
@@ -705,8 +855,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")
+                print("ℹ️ 已将未跟踪文件添加到 .gitignore，正在重新检测...")
+            except Exception as e:
+                print(f"⚠️ 更新 .gitignore 失败: {str(e)}")
+
             continue
 
         break

jarvis/jarvis_utils/globals.py

@@ -19,9 +19,9 @@ MAX_HISTORY_SIZE = 50
 short_term_memories: List[Dict[str, Any]] = []
 MAX_SHORT_TERM_MEMORIES = 100
 
-import colorama
-from rich.console import Console
-from rich.theme import Theme
+import colorama  # noqa: E402
+from rich.console import Console  # noqa: E402
+from rich.theme import Theme  # noqa: E402
 
 # 初始化colorama以支持跨平台的彩色文本
 colorama.init()

jarvis/jarvis_utils/http.py

@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-import requests
+import requests  # type: ignore[import-untyped]
 from typing import Any, Dict, Optional, Generator