jarvis-ai-assistant 0.1.193__py3-none-any.whl → 0.1.195__py3-none-any.whl

jarvis/jarvis_utils/git_utils.py

@@ -14,8 +14,7 @@ import re
 import subprocess
 from typing import Any, Dict, List, Tuple
 
-from jarvis.jarvis_utils.config import (get_auto_update,
-                                        is_confirm_before_apply_patch)
+from jarvis.jarvis_utils.config import get_auto_update, is_confirm_before_apply_patch
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import user_confirm
 
@@ -42,29 +41,47 @@ def find_git_root(start_dir: str = ".") -> str:
         git_root = os.path.abspath(".")
     os.chdir(git_root)
     return git_root
+
+
 def has_uncommitted_changes() -> bool:
     """检查Git仓库中是否有未提交的更改
-    
+
     返回:
         bool: 如果有未提交的更改返回True，否则返回False
     """
     # 静默添加所有更改
-    subprocess.run(["git", "add", "."], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(
+        ["git", "add", "."], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
+    )
 
     # 检查工作目录更改
-    working_changes = subprocess.run(["git", "diff", "--exit-code"],
-                                    stdout=subprocess.DEVNULL,
-                                    stderr=subprocess.DEVNULL).returncode != 0
+    working_changes = (
+        subprocess.run(
+            ["git", "diff", "--exit-code"],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        ).returncode
+        != 0
+    )
 
     # 检查暂存区更改
-    staged_changes = subprocess.run(["git", "diff", "--cached", "--exit-code"],
-                                   stdout=subprocess.DEVNULL,
-                                   stderr=subprocess.DEVNULL).returncode != 0
+    staged_changes = (
+        subprocess.run(
+            ["git", "diff", "--cached", "--exit-code"],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+        ).returncode
+        != 0
+    )
 
     # 静默重置更改
-    subprocess.run(["git", "reset"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+    subprocess.run(
+        ["git", "reset"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL
+    )
 
     return working_changes or staged_changes
+
+
 def get_commits_between(start_hash: str, end_hash: str) -> List[Tuple[str, str]]:
     """获取两个提交哈希值之间的提交列表
 
@@ -78,103 +95,112 @@ def get_commits_between(start_hash: str, end_hash: str) -> List[Tuple[str, str]]
     try:
         # 使用git log和pretty格式获取哈希值和信息
         result = subprocess.run(
-            ['git', 'log', f'{start_hash}..{end_hash}', '--pretty=format:%H|%s'],
+            ["git", "log", f"{start_hash}..{end_hash}", "--pretty=format:%H|%s"],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            text=False  # 禁用自动文本解码
+            text=False,  # 禁用自动文本解码
         )
         if result.returncode != 0:
-            error_msg = result.stderr.decode('utf-8', errors='replace')
+            error_msg = result.stderr.decode("utf-8", errors="replace")
             PrettyOutput.print(f"获取commit历史失败: {error_msg}", OutputType.ERROR)
             return []
 
-        output = result.stdout.decode('utf-8', errors='replace')
+        output = result.stdout.decode("utf-8", errors="replace")
         commits = []
         for line in output.splitlines():
-            if '|' in line:
-                commit_hash, message = line.split('|', 1)
+            if "|" in line:
+                commit_hash, message = line.split("|", 1)
                 commits.append((commit_hash, message))
         return commits
 
     except Exception as e:
         PrettyOutput.print(f"获取commit历史异常: {str(e)}", OutputType.ERROR)
         return []
-    
+
 
 # 修改后的获取差异函数
 
 
 def get_diff() -> str:
     """使用git获取工作区差异，包括修改和新增的文件内容
-    
+
     返回:
         str: 差异内容或错误信息
     """
     try:
-        # 暂存新增文件
-        subprocess.run(['git', 'add', '-N', '.'], check=True)
-        
-        # 获取所有差异（包括新增文件）
-        result = subprocess.run(
-            ['git', 'diff', 'HEAD'],
-            capture_output=True,
-            text=False,
-            check=True
+        # 检查是否为空仓库
+        head_check = subprocess.run(
+            ["git", "rev-parse", "--verify", "HEAD"],
+            stderr=subprocess.PIPE,
+            stdout=subprocess.PIPE,
         )
-        
-        # 重置暂存区
-        subprocess.run(['git', 'reset'], check=True)
-        
+        if head_check.returncode != 0:
+            # 空仓库情况，直接获取工作区差异
+            result = subprocess.run(
+                ["git", "diff"], capture_output=True, text=False, check=True
+            )
+        else:
+            # 暂存新增文件
+            subprocess.run(["git", "add", "-N", "."], check=True)
+
+            # 获取所有差异（包括新增文件）
+            result = subprocess.run(
+                ["git", "diff", "HEAD"], capture_output=True, text=False, check=True
+            )
+
+            # 重置暂存区
+            subprocess.run(["git", "reset"], check=True)
+
         try:
-            return result.stdout.decode('utf-8')
+            return result.stdout.decode("utf-8")
         except UnicodeDecodeError:
-            return result.stdout.decode('utf-8', errors='replace')
-            
+            return result.stdout.decode("utf-8", errors="replace")
+
     except subprocess.CalledProcessError as e:
         return f"获取差异失败: {str(e)}"
     except Exception as e:
         return f"发生意外错误: {str(e)}"
 
 
-
-
-
 def revert_file(filepath: str) -> None:
     """增强版git恢复，处理新文件"""
     import subprocess
+
     try:
         # 检查文件是否在版本控制中
         result = subprocess.run(
-            ['git', 'ls-files', '--error-unmatch', filepath],
+            ["git", "ls-files", "--error-unmatch", filepath],
             stderr=subprocess.PIPE,
-            text=False  # 禁用自动文本解码
+            text=False,  # 禁用自动文本解码
         )
         if result.returncode == 0:
-            subprocess.run(['git', 'checkout', 'HEAD',
-                           '--', filepath], check=True)
+            subprocess.run(["git", "checkout", "HEAD", "--", filepath], check=True)
         else:
             if os.path.exists(filepath):
                 os.remove(filepath)
-        subprocess.run(['git', 'clean', '-f', '--', filepath], check=True)
+        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)
+        error_msg = e.stderr.decode("utf-8", errors="replace") if e.stderr else str(e)
         PrettyOutput.print(f"恢复文件失败: {error_msg}", OutputType.ERROR)
+
+
 # 修改后的恢复函数
 
 
 def revert_change() -> None:
     """恢复所有未提交的修改到HEAD状态"""
     import subprocess
+
     try:
         # 检查是否为空仓库
         head_check = subprocess.run(
-            ['git', 'rev-parse', '--verify', 'HEAD'],
+            ["git", "rev-parse", "--verify", "HEAD"],
             stderr=subprocess.PIPE,
-            stdout=subprocess.PIPE
+            stdout=subprocess.PIPE,
         )
         if head_check.returncode == 0:
-            subprocess.run(['git', 'reset', '--hard', 'HEAD'], check=True)
-        subprocess.run(['git', 'clean', '-fd'], check=True)
+            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)
 
@@ -188,27 +214,25 @@ def handle_commit_workflow() -> bool:
     if is_confirm_before_apply_patch() and not user_confirm("是否要提交代码？", default=True):
         revert_change()
         return False
-    
+
     import subprocess
+
     try:
         # 获取当前分支的提交总数
         commit_result = subprocess.run(
-            ['git', 'rev-list', '--count', 'HEAD'],
-            capture_output=True,
-            text=True
+            ["git", "rev-list", "--count", "HEAD"], capture_output=True, text=True
         )
         if commit_result.returncode != 0:
             return False
-            
+
         commit_count = int(commit_result.stdout.strip())
-        
+
         # 暂存所有修改
-        subprocess.run(['git', 'add', '.'], check=True)
-        
+        subprocess.run(["git", "add", "."], check=True)
+
         # 提交变更
         subprocess.run(
-            ['git', 'commit', '-m', f'CheckPoint #{commit_count + 1}'], 
-            check=True
+            ["git", "commit", "-m", f"CheckPoint #{commit_count + 1}"], check=True
         )
         return True
     except subprocess.CalledProcessError as e:
@@ -224,24 +248,30 @@ def get_latest_commit_hash() -> str:
     try:
         # 首先检查是否存在HEAD引用
         head_check = subprocess.run(
-            ['git', 'rev-parse', '--verify', 'HEAD'],
+            ["git", "rev-parse", "--verify", "HEAD"],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            text=False
+            text=False,
         )
         if head_check.returncode != 0:
             return ""  # 空仓库或无效HEAD
 
         # 获取HEAD的完整哈希值
         result = subprocess.run(
-            ['git', 'rev-parse', 'HEAD'],
+            ["git", "rev-parse", "HEAD"],
             stdout=subprocess.PIPE,
             stderr=subprocess.PIPE,
-            text=False
+            text=False,
+        )
+        return (
+            result.stdout.decode("utf-8", errors="replace").strip()
+            if result.returncode == 0
+            else ""
         )
-        return result.stdout.decode('utf-8', errors='replace').strip() if result.returncode == 0 else ""
     except Exception:
         return ""
+
+
 def get_modified_line_ranges() -> Dict[str, Tuple[int, int]]:
     """从Git差异中获取所有更改文件的修改行范围
 
@@ -274,18 +304,16 @@ def get_modified_line_ranges() -> Dict[str, Tuple[int, int]]:
     return result
 
 
-
 def is_file_in_git_repo(filepath: str) -> bool:
     """检查文件是否在当前Git仓库中"""
     import subprocess
+
     try:
         # 获取Git仓库根目录
         repo_root = subprocess.run(
-            ['git', 'rev-parse', '--show-toplevel'],
-            capture_output=True,
-            text=True
+            ["git", "rev-parse", "--show-toplevel"], capture_output=True, text=True
         ).stdout.strip()
-        
+
         # 检查文件路径是否在仓库根目录下
         return os.path.abspath(filepath).startswith(os.path.abspath(repo_root))
     except:
@@ -316,25 +344,49 @@ def check_and_update_git_repo(repo_path: str) -> bool:
         # 获取远程tag更新
         subprocess.run(["git", "fetch", "--tags"], cwd=git_root, check=True)
         # 获取最新本地tag
-        local_tag_result = subprocess.run(["git", "describe", "--tags", "--abbrev=0"],
-                                cwd=git_root, capture_output=True, text=True)
+        local_tag_result = subprocess.run(
+            ["git", "describe", "--tags", "--abbrev=0"],
+            cwd=git_root,
+            capture_output=True,
+            text=True,
+        )
         # 获取最新远程tag
         remote_tag_result = subprocess.run(
             ["git", "ls-remote", "--tags", "--refs", "origin"],
-            cwd=git_root, capture_output=True, text=True
+            cwd=git_root,
+            capture_output=True,
+            text=True,
         )
         if remote_tag_result.returncode == 0:
             # 提取最新的tag名称
             tags = [ref.split("/")[-1] for ref in remote_tag_result.stdout.splitlines()]
-            tags = sorted(tags, key=lambda x: [int(i) if i.isdigit() else i for i in re.split(r'([0-9]+)', x)])
+            tags = sorted(
+                tags,
+                key=lambda x: [
+                    int(i) if i.isdigit() else i for i in re.split(r"([0-9]+)", x)
+                ],
+            )
             remote_tag = tags[-1] if tags else ""
             remote_tag_result.stdout = remote_tag
 
-        if (local_tag_result.returncode == 0 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)
-            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)
+        if (
+            local_tag_result.returncode == 0
+            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,
+            )
+            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,
+            )
             return True
         return False
     except Exception as e:
@@ -346,30 +398,28 @@ def check_and_update_git_repo(repo_path: str) -> bool:
 
 def get_diff_file_list() -> List[str]:
     """获取HEAD到当前变更的文件列表，包括修改和新增的文件
-    
+
     返回:
         List[str]: 修改和新增的文件路径列表
     """
     try:
         # 暂存新增文件
-        subprocess.run(['git', 'add', '-N', '.'], check=True)
-        
+        subprocess.run(["git", "add", "-N", "."], check=True)
+
         # 获取所有差异文件（包括新增文件）
         result = subprocess.run(
-            ['git', 'diff', '--name-only', 'HEAD'],
-            capture_output=True,
-            text=True
+            ["git", "diff", "--name-only", "HEAD"], capture_output=True, text=True
         )
-        
+
         # 重置暂存区
-        subprocess.run(['git', 'reset'], check=True)
-        
+        subprocess.run(["git", "reset"], check=True)
+
         if result.returncode != 0:
             PrettyOutput.print(f"获取差异文件列表失败: {result.stderr}", OutputType.ERROR)
             return []
-        
+
         return [f for f in result.stdout.splitlines() if f]
-        
+
     except subprocess.CalledProcessError as e:
         PrettyOutput.print(f"获取差异文件列表失败: {str(e)}", OutputType.ERROR)
         return []
@@ -378,19 +428,18 @@ def get_diff_file_list() -> List[str]:
         return []
 
 
-
 def get_recent_commits_with_files() -> List[Dict[str, Any]]:
     """获取最近5次提交的commit信息和文件清单
-    
+
     返回:
         List[Dict[str, Any]]: 包含commit信息和文件清单的字典列表，格式为:
             [
                 {
-                    'hash': 提交hash,
-                    'message': 提交信息,
-                    'author': 作者,
-                    'date': 提交日期,
-                    'files': [修改的文件列表] (最多20个文件)
+                    'hash': str,
+                    'message': str,
+                    'author': str,
+                    'date': str,
+                    'files': List[str]  # 修改的文件列表 (最多20个文件)
                 },
                 ...
             ]
@@ -399,9 +448,9 @@ def get_recent_commits_with_files() -> List[Dict[str, Any]]:
     try:
         # 获取最近5次提交的基本信息
         result = subprocess.run(
-            ['git', 'log', '-5', '--pretty=format:%H%n%s%n%an%n%ad'],
+            ["git", "log", "-5", "--pretty=format:%H%n%s%n%an%n%ad"],
             capture_output=True,
-            text=True
+            text=True,
         )
         if result.returncode != 0:
             return []
@@ -413,26 +462,27 @@ def get_recent_commits_with_files() -> List[Dict[str, Any]]:
             if i + 3 >= len(lines):
                 break
             commit = {
-                'hash': lines[i],
-                'message': lines[i+1],
-                'author': lines[i+2],
-                'date': lines[i+3],
-                'files': []
+                "hash": lines[i],
+                "message": lines[i + 1],
+                "author": lines[i + 2],
+                "date": lines[i + 3],
+                "files": [],
             }
             commits.append(commit)
 
         # 获取每个提交的文件修改清单
         for commit in commits:
             files_result = subprocess.run(
-                ['git', 'show', '--name-only', '--pretty=format:', commit['hash']],
+                ["git", "show", "--name-only", "--pretty=format:", commit["hash"]],
                 capture_output=True,
-                text=True
+                text=True,
             )
             if files_result.returncode == 0:
-                files = list(set(filter(None, files_result.stdout.splitlines())))
-                commit['files'] = files[:20]  # 限制最多20个文件
+                file_lines = files_result.stdout.splitlines()
+                unique_files = set(filter(None, file_lines))
+                commit["files"] = list(unique_files)[:20]  # 限制最多20个文件
 
         return commits
 
     except subprocess.CalledProcessError:
-        return []
+        return []

jarvis/jarvis_utils/globals.py

@@ -8,7 +8,7 @@
 - 环境初始化
 """
 import os
-from typing import Any, Dict, Set
+from typing import Any, Set
 
 import colorama
 from rich.console import Console