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

jarvis/jarvis_tools/virtual_tty.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
-from typing import Dict, Any
+import fcntl
 import os
-import time
 import pty
-import fcntl
-import signal
 import select
+import signal
+import time
+from typing import Any, Dict
+
 
 class VirtualTTYTool:
     name = "virtual_tty"

jarvis/jarvis_utils/__init__.py

@@ -13,8 +13,10 @@ Jarvis工具模块
 - utils: 通用工具
 """
 import os
+
 import colorama
 from rich.traceback import install as install_rich_traceback
+
 # 从新模块重新导出
 # 这些导入是项目功能所必需的，可能会被动态使用
 # 初始化colorama以支持跨平台的彩色文本

jarvis/jarvis_utils/builtin_replace_map.py

@@ -5,7 +5,7 @@
 格式: {"标记名": {"template": "替换模板", "description": "描述信息"}}
 """
 
-from jarvis.jarvis_utils.tag import ot, ct
+from jarvis.jarvis_utils.tag import ct, ot
 
 BUILTIN_REPLACE_MAP = {
     "CodeBase": {

jarvis/jarvis_utils/config.py

@@ -1,14 +1,46 @@
 # -*- coding: utf-8 -*-
 import os
 from functools import lru_cache
+
+from typing import Any, Dict, List
+
+
 import yaml
+
+
 from jarvis.jarvis_utils.builtin_replace_map import BUILTIN_REPLACE_MAP
+
+
+# 全局环境变量存储
+
+GLOBAL_CONFIG_DATA: Dict[str, Any] = {}
+
+
+def set_global_env_data(env_data: Dict[str, Any]) -> None:
+    """设置全局环境变量数据"""
+    global GLOBAL_CONFIG_DATA
+    GLOBAL_CONFIG_DATA = env_data
+
+def set_config(key: str, value: Any) -> None:
+    """设置配置"""
+    GLOBAL_CONFIG_DATA[key] = value
+
+
 """配置管理模块。
 
 该模块提供了获取Jarvis系统各种配置设置的函数。
 所有配置都从环境变量中读取，带有回退默认值。
 """
 
+def get_git_commit_prompt() -> str:
+    """
+    获取Git提交提示模板
+    
+    返回:
+        str: Git提交信息生成提示模板，如果未配置则返回空字符串
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_GIT_COMMIT_PROMPT", "")
+
 # 输出窗口预留大小
 INPUT_WINDOW_REVERSE_SIZE = 2048
 
@@ -17,16 +49,27 @@ def get_replace_map() -> dict:
     """
     获取替换映射表。
     
-    从数据目录下的replace_map.yaml文件中读取替换映射表，
+    优先使用GLOBAL_CONFIG_DATA['JARVIS_REPLACE_MAP']的配置，
+    如果没有则从数据目录下的replace_map.yaml文件中读取替换映射表，
     如果文件不存在则返回内置替换映射表。
     
     返回:
         dict: 合并后的替换映射表字典(内置+文件中的映射表)
     """
+    if 'JARVIS_REPLACE_MAP' in GLOBAL_CONFIG_DATA:
+        return {**BUILTIN_REPLACE_MAP, **GLOBAL_CONFIG_DATA['JARVIS_REPLACE_MAP']}
+        
     replace_map_path = os.path.join(get_data_dir(), 'replace_map.yaml')
     if not os.path.exists(replace_map_path):
         return BUILTIN_REPLACE_MAP.copy()
     
+    from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+    PrettyOutput.print(
+        "警告：使用replace_map.yaml进行配置的方式已被弃用，将在未来版本中移除。"
+        "请迁移到使用GLOBAL_CONFIG_DATA中的JARVIS_REPLACE_MAP配置。",
+        output_type=OutputType.WARNING
+    )
+    
     with open(replace_map_path, 'r', encoding='utf-8', errors='ignore') as file:
         file_map = yaml.safe_load(file) or {}
         return {**BUILTIN_REPLACE_MAP, **file_map}
@@ -38,7 +81,7 @@ def get_max_token_count() -> int:
     返回:
         int: 模型能处理的最大token数量。
     """
-    return int(os.getenv('JARVIS_MAX_TOKEN_COUNT', '960000'))
+    return int(GLOBAL_CONFIG_DATA.get('JARVIS_MAX_TOKEN_COUNT', '960000'))
 
 def get_max_input_token_count() -> int:
     """
@@ -47,7 +90,7 @@ def get_max_input_token_count() -> int:
     返回:
         int: 模型能处理的最大输入token数量。
     """
-    return int(os.getenv('JARVIS_MAX_INPUT_TOKEN_COUNT', '32000'))
+    return int(GLOBAL_CONFIG_DATA.get('JARVIS_MAX_INPUT_TOKEN_COUNT', '32000'))
 
 
 def is_auto_complete() -> bool:
@@ -57,7 +100,7 @@ def is_auto_complete() -> bool:
     返回：
         bool: 如果启用了自动补全则返回True，默认为False
     """
-    return os.getenv('JARVIS_AUTO_COMPLETE', 'false') == 'true'
+    return GLOBAL_CONFIG_DATA.get('JARVIS_AUTO_COMPLETE', 'false') == 'true'
 
 
 def get_shell_name() -> str:
@@ -67,7 +110,7 @@ def get_shell_name() -> str:
     返回：
         str: Shell名称（例如bash, zsh），默认为bash
     """
-    shell_path = os.getenv('SHELL', '/bin/bash')
+    shell_path = GLOBAL_CONFIG_DATA.get('SHELL', '/bin/bash')
     return os.path.basename(shell_path)
 def get_normal_platform_name() -> str:
     """
@@ -76,7 +119,7 @@ def get_normal_platform_name() -> str:
     返回：
         str: 平台名称，默认为'yuanbao'
     """
-    return os.getenv('JARVIS_PLATFORM', 'yuanbao')
+    return GLOBAL_CONFIG_DATA.get('JARVIS_PLATFORM', 'yuanbao')
 def get_normal_model_name() -> str:
     """
     获取正常操作的模型名称。
@@ -84,7 +127,7 @@ def get_normal_model_name() -> str:
     返回：
         str: 模型名称，默认为'deep_seek'
     """
-    return os.getenv('JARVIS_MODEL', 'deep_seek_v3')
+    return GLOBAL_CONFIG_DATA.get('JARVIS_MODEL', 'deep_seek_v3')
 
 
 def get_thinking_platform_name() -> str:
@@ -94,7 +137,7 @@ def get_thinking_platform_name() -> str:
     返回：
         str: 平台名称，默认为'yuanbao'
     """
-    return os.getenv('JARVIS_THINKING_PLATFORM', os.getenv('JARVIS_PLATFORM', 'yuanbao'))
+    return GLOBAL_CONFIG_DATA.get('JARVIS_THINKING_PLATFORM', GLOBAL_CONFIG_DATA.get('JARVIS_PLATFORM', 'yuanbao'))
 def get_thinking_model_name() -> str:
     """
     获取思考操作的模型名称。
@@ -102,7 +145,7 @@ def get_thinking_model_name() -> str:
     返回：
         str: 模型名称，默认为'deep_seek'
     """
-    return os.getenv('JARVIS_THINKING_MODEL', os.getenv('JARVIS_MODEL', 'deep_seek'))
+    return GLOBAL_CONFIG_DATA.get('JARVIS_THINKING_MODEL', GLOBAL_CONFIG_DATA.get('JARVIS_MODEL', 'deep_seek'))
 
 def is_execute_tool_confirm() -> bool:
     """
@@ -111,7 +154,7 @@ def is_execute_tool_confirm() -> bool:
     返回：
         bool: 如果需要确认则返回True，默认为False
     """
-    return os.getenv('JARVIS_EXECUTE_TOOL_CONFIRM', 'false') == 'true'
+    return GLOBAL_CONFIG_DATA.get('JARVIS_EXECUTE_TOOL_CONFIRM', 'false') == 'true'
 def is_confirm_before_apply_patch() -> bool:
     """
     检查应用补丁前是否需要确认。
@@ -119,7 +162,7 @@ def is_confirm_before_apply_patch() -> bool:
     返回：
         bool: 如果需要确认则返回True，默认为False
     """
-    return os.getenv('JARVIS_CONFIRM_BEFORE_APPLY_PATCH', 'true') == 'true'
+    return GLOBAL_CONFIG_DATA.get('JARVIS_CONFIRM_BEFORE_APPLY_PATCH', 'true') == 'true'
 
 def get_max_tool_call_count() -> int:
     """
@@ -128,7 +171,7 @@ def get_max_tool_call_count() -> int:
     返回：
         int: 最大连续工具调用次数，默认为20
     """
-    return int(os.getenv('JARVIS_MAX_TOOL_CALL_COUNT', '20'))
+    return int(GLOBAL_CONFIG_DATA.get('JARVIS_MAX_TOOL_CALL_COUNT', '20'))
 
 
 def get_data_dir() -> str:
@@ -139,7 +182,7 @@ def get_data_dir() -> str:
         str: 数据目录路径，优先从JARVIS_DATA_PATH环境变量获取，
              如果未设置或为空，则使用~/.jarvis作为默认值
     """
-    data_path = os.getenv('JARVIS_DATA_PATH', '').strip()
+    data_path = GLOBAL_CONFIG_DATA.get('JARVIS_DATA_PATH', '').strip()
     if not data_path:
         return os.path.expanduser('~/.jarvis')
     return data_path
@@ -151,7 +194,7 @@ def get_auto_update() -> bool:
     返回：
         bool: 如果需要自动更新则返回True，默认为True
     """
-    return os.getenv('JARVIS_AUTO_UPDATE', 'true') == 'true'
+    return GLOBAL_CONFIG_DATA.get('JARVIS_AUTO_UPDATE', 'true') == 'true'
 
 def get_max_big_content_size() -> int:
     """
@@ -160,7 +203,7 @@ def get_max_big_content_size() -> int:
     返回：
         int: 最大大内容大小
     """
-    return int(os.getenv('JARVIS_MAX_BIG_CONTENT_SIZE', '1024000'))
+    return int(GLOBAL_CONFIG_DATA.get('JARVIS_MAX_BIG_CONTENT_SIZE', '1024000'))
 
 def get_pretty_output() -> bool:
     """
@@ -169,7 +212,7 @@ def get_pretty_output() -> bool:
     返回：
         bool: 如果启用PrettyOutput则返回True，默认为True
     """
-    return os.getenv('JARVIS_PRETTY_OUTPUT', 'false') == 'true'
+    return GLOBAL_CONFIG_DATA.get('JARVIS_PRETTY_OUTPUT', 'false') == 'true'
 
 def is_use_methodology() -> bool:
     """
@@ -178,4 +221,32 @@ def is_use_methodology() -> bool:
     返回：
         bool: 如果启用方法论则返回True，默认为True
     """
-    return os.getenv('JARVIS_USE_METHODOLOGY', 'true') == 'true'
+    return GLOBAL_CONFIG_DATA.get('JARVIS_USE_METHODOLOGY', 'false') == 'true'
+
+def is_use_analysis() -> bool:
+    """
+    获取是否启用任务分析。
+
+    返回：
+        bool: 如果启用任务分析则返回True，默认为True
+    """
+    return GLOBAL_CONFIG_DATA.get('JARVIS_USE_ANALYSIS', 'false') == 'true'
+
+def is_print_prompt() -> bool:
+    """
+    获取是否打印提示。
+
+    返回：
+        bool: 如果打印提示则返回True，默认为True
+    """
+    return GLOBAL_CONFIG_DATA.get('JARVIS_PRINT_PROMPT', 'false') == 'true'
+
+
+def get_mcp_config() -> List[Dict[str, Any]]:
+    """
+    获取MCP配置列表。
+
+    返回:
+        List[Dict[str, Any]]: MCP配置项列表，如果未配置则返回空列表
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_MCP", [])

jarvis/jarvis_utils/embedding.py

@@ -1,11 +1,12 @@
 # -*- coding: utf-8 -*-
+import functools
 import os
-from transformers import AutoTokenizer
 from typing import List
-import functools
 
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from transformers import AutoTokenizer
+
 from jarvis.jarvis_utils.config import get_data_dir
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 # 全局缓存，避免重复加载模型
 _global_tokenizers = {}

jarvis/jarvis_utils/file_processors.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import unicodedata
 
+
 class FileProcessor:
     """Base class for file processor"""
     @staticmethod

jarvis/jarvis_utils/git_utils.py

@@ -12,10 +12,14 @@ Git工具模块
 import os
 import re
 import subprocess
-from typing import List, Tuple, Dict
-from jarvis.jarvis_utils.config import get_auto_update, is_confirm_before_apply_patch
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
+from typing import Dict, List, Tuple
+
+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
+
+
 def find_git_root(start_dir: str = ".") -> str:
     """
     切换到给定路径的Git根目录，如果不是Git仓库则初始化。
@@ -101,49 +105,41 @@ def get_commits_between(start_hash: str, end_hash: str) -> List[Tuple[str, str]]
 
 
 def get_diff() -> str:
-    """使用git获取暂存区差异"""
-    import subprocess
-    
-    # 初始化状态
-    need_reset = False
+    """使用git获取工作区差异，包括修改和新增的文件内容
     
+    返回:
+        str: 差异内容或错误信息
+    """
     try:
-        # 暂存所有修改
-        subprocess.run(['git', 'add', '.'], check=True)
-        need_reset = True
+        # 暂存新增文件
+        subprocess.run(['git', 'add', '-N', '.'], check=True)
         
-        # 获取差异
+        # 获取所有差异（包括新增文件）
         result = subprocess.run(
-            ['git', 'diff', '--cached'],
+            ['git', 'diff', 'HEAD'],
             capture_output=True,
             text=False,
             check=True
         )
         
-        # 解码输出
-        try:
-            ret = result.stdout.decode('utf-8')
-        except UnicodeDecodeError:
-            ret = result.stdout.decode('utf-8', errors='replace')
-        
         # 重置暂存区
-        subprocess.run(['git', "reset", "--mixed"], check=False)
-        return ret
+        subprocess.run(['git', 'reset'], check=True)
         
+        try:
+            return result.stdout.decode('utf-8')
+        except UnicodeDecodeError:
+            return result.stdout.decode('utf-8', errors='replace')
+            
     except subprocess.CalledProcessError as e:
-        if need_reset:
-            subprocess.run(['git', "reset", "--mixed"], check=False)
         return f"获取差异失败: {str(e)}"
     except Exception as e:
-        if need_reset:
-            subprocess.run(['git', "reset", "--mixed"], check=False)
         return f"发生意外错误: {str(e)}"
 
 
 
 
 
-def revert_file(filepath: str):
+def revert_file(filepath: str) -> None:
     """增强版git恢复，处理新文件"""
     import subprocess
     try:
@@ -166,7 +162,7 @@ def revert_file(filepath: str):
 # 修改后的恢复函数
 
 
-def revert_change():
+def revert_change() -> None:
     """恢复所有未提交的修改到HEAD状态"""
     import subprocess
     try:
@@ -180,7 +176,7 @@ def revert_change():
             subprocess.run(['git', 'reset', '--hard', 'HEAD'], check=True)
         subprocess.run(['git', 'clean', '-fd'], check=True)
     except subprocess.CalledProcessError as e:
-        return f"恢复更改失败: {str(e)}"
+        PrettyOutput.print(f"恢复更改失败: {str(e)}", OutputType.ERROR)
 
 
 def handle_commit_workflow() -> bool:
@@ -196,15 +192,15 @@ def handle_commit_workflow() -> bool:
     import subprocess
     try:
         # 获取当前分支的提交总数
-        commit_count = subprocess.run(
+        commit_result = subprocess.run(
             ['git', 'rev-list', '--count', 'HEAD'],
             capture_output=True,
             text=True
         )
-        if commit_count.returncode != 0:
+        if commit_result.returncode != 0:
             return False
             
-        commit_count = int(commit_count.stdout.strip())
+        commit_count = int(commit_result.stdout.strip())
         
         # 暂存所有修改
         subprocess.run(['git', 'add', '.'], check=True)
@@ -317,15 +313,28 @@ def check_and_update_git_repo(repo_path: str) -> bool:
         if has_uncommitted_changes():
             return False
 
-        # 获取远程更新
-        subprocess.run(["git", "fetch"], cwd=git_root, check=True)
-        # 检查本地是否落后
-        result = subprocess.run(["git", "rev-list", "--count", "HEAD..origin/main"], 
-                              cwd=git_root, capture_output=True, text=True)
-        if result.returncode == 0 and int(result.stdout.strip()) > 0:
-            PrettyOutput.print("检测到新版本，正在更新Jarvis...", OutputType.INFO)
-            subprocess.run(["git", "pull"], cwd=git_root, check=True)
-            PrettyOutput.print("Jarvis已更新到最新版本", OutputType.SUCCESS)
+        # 获取远程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)
+        # 获取最新远程tag
+        remote_tag_result = subprocess.run(
+            ["git", "ls-remote", "--tags", "--refs", "origin"],
+            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)])
+            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)
             return True
         return False
     except Exception as e:
@@ -333,3 +342,37 @@ def check_and_update_git_repo(repo_path: str) -> bool:
         return False
     finally:
         os.chdir(curr_dir)
+
+
+def get_diff_file_list() -> List[str]:
+    """获取HEAD到当前变更的文件列表，包括修改和新增的文件
+    
+    返回:
+        List[str]: 修改和新增的文件路径列表
+    """
+    try:
+        # 暂存新增文件
+        subprocess.run(['git', 'add', '-N', '.'], check=True)
+        
+        # 获取所有差异文件（包括新增文件）
+        result = subprocess.run(
+            ['git', 'diff', '--name-only', 'HEAD'],
+            capture_output=True,
+            text=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 []
+    except Exception as e:
+        PrettyOutput.print(f"获取差异文件列表异常: {str(e)}", OutputType.ERROR)
+        return []

jarvis/jarvis_utils/globals.py

@@ -7,11 +7,13 @@
 - 带有自定义主题的控制台配置
 - 环境初始化
 """
-from typing import Any, Set, Dict
-import colorama
 import os
+from typing import Any, Dict, Set
+
+import colorama
 from rich.console import Console
 from rich.theme import Theme
+
 # 初始化colorama以支持跨平台的彩色文本
 colorama.init()
 # 禁用tokenizers并行以避免多进程问题

jarvis/jarvis_utils/input.py

@@ -8,17 +8,21 @@
 - 带有模糊匹配的文件路径补全
 - 用于输入控制的自定义键绑定
 """
+from colorama import Fore
+from colorama import Style as ColoramaStyle
+from fuzzywuzzy import process
 from prompt_toolkit import PromptSession
-from prompt_toolkit.styles import Style as PromptStyle
-from prompt_toolkit.formatted_text import FormattedText
 from prompt_toolkit.completion import Completer, Completion, PathCompleter
 from prompt_toolkit.document import Document
+from prompt_toolkit.formatted_text import FormattedText
 from prompt_toolkit.key_binding import KeyBindings
-from fuzzywuzzy import process
-from colorama import Fore, Style as ColoramaStyle
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
-from jarvis.jarvis_utils.tag import ot
+from prompt_toolkit.styles import Style as PromptStyle
+
 from jarvis.jarvis_utils.config import get_replace_map
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_utils.tag import ot
+
+
 def get_single_line_input(tip: str) -> str:
     """
     获取支持历史记录的单行输入。
@@ -176,9 +180,12 @@ def get_multiline_input(tip: str) -> str:
         'prompt': 'ansicyan',
     })
     try:
+        import os
+
         from prompt_toolkit.history import FileHistory
+
         from jarvis.jarvis_utils.config import get_data_dir
-        import os
+
         # 获取数据目录路径
         history_dir = get_data_dir()
         # 初始化带历史记录的会话

jarvis/jarvis_utils/methodology.py

@@ -7,17 +7,18 @@
 - 生成方法论临时文件
 - 上传方法论文件到大模型
 """
-import os
 import json
+import os
 import tempfile
 from typing import Any, Dict, Optional
 
 from jarvis.jarvis_platform.base import BasePlatform
-from jarvis.jarvis_utils.config import get_data_dir
-from jarvis.jarvis_utils.output import PrettyOutput, OutputType
 from jarvis.jarvis_platform.registry import PlatformRegistry
+from jarvis.jarvis_utils.config import get_data_dir
+from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import is_context_overflow
 
+
 def _get_methodology_directory() -> str:
     """
     获取方法论目录路径，如果不存在则创建
@@ -139,7 +140,8 @@ def load_methodology(user_input: str, tool_registery: Optional[Any] = None) -> s
     返回：
         str: 相关的方法论提示，如果未找到方法论则返回空字符串
     """
-    from yaspin import yaspin # type: ignore
+    from yaspin import yaspin  # type: ignore
+
     from jarvis.jarvis_tools.registry import ToolRegistry
 
     prompt = tool_registery.prompt() if tool_registery else ""

jarvis/jarvis_utils/output.py

@@ -8,18 +8,22 @@
 - 多种编程语言的语法高亮支持
 - 结构化输出的面板显示
 """
-from enum import Enum
 from datetime import datetime
+from enum import Enum
 from typing import Optional, Tuple
-from rich.panel import Panel
-from rich.text import Text
-from rich.syntax import Syntax
-from rich.style import Style as RichStyle
+
 from pygments.lexers import guess_lexer
 from pygments.util import ClassNotFound
+from rich.box import SIMPLE
+from rich.panel import Panel
+from rich.style import Style as RichStyle
+from rich.syntax import Syntax
+from rich.text import Text
+
 from jarvis.jarvis_utils.config import get_pretty_output
 from jarvis.jarvis_utils.globals import console, get_agent_list
-from rich.box import SIMPLE
+
+
 class OutputType(Enum):
     """
     输出类型枚举，用于分类和样式化不同类型的消息。