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

jarvis/jarvis_utils/config.py

@@ -63,13 +63,7 @@ def get_replace_map() -> dict:
     if not os.path.exists(replace_map_path):
         return BUILTIN_REPLACE_MAP.copy()
 
-    from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-
-    PrettyOutput.print(
-        "警告：使用replace_map.yaml进行配置的方式已被弃用，将在未来版本中移除。"
-        "请迁移到使用GLOBAL_CONFIG_DATA中的JARVIS_REPLACE_MAP配置。",
-        output_type=OutputType.WARNING,
-    )
+    print("⚠️ 警告：使用replace_map.yaml进行配置的方式已被弃用，将在未来版本中移除。请迁移到使用GLOBAL_CONFIG_DATA中的JARVIS_REPLACE_MAP配置。")
 
     with open(replace_map_path, "r", encoding="utf-8", errors="ignore") as file:
         file_map = yaml.safe_load(file) or {}
@@ -139,10 +133,24 @@ def _get_resolved_model_config(
     model_groups = GLOBAL_CONFIG_DATA.get("JARVIS_LLM_GROUPS", [])
 
     if model_group_name and isinstance(model_groups, list):
+        found = False
         for group_item in model_groups:
             if isinstance(group_item, dict) and model_group_name in group_item:
                 group_config = group_item[model_group_name]
+                found = True
                 break
+        
+        # 当显式指定了模型组但未找到时，报错并退出
+        if model_group_override and not found:
+            print(f"❌ 错误：指定的模型组 '{model_group_name}' 不存在于配置中。")
+            print("ℹ️ 可用的模型组: " + 
+                ", ".join(
+                    list(group.keys())[0] 
+                    for group in model_groups 
+                    if isinstance(group, dict)
+                ) if model_groups else "无可用模型组")
+            import sys
+            sys.exit(1)
     
     _apply_llm_group_env_override(group_config)
 
@@ -157,6 +165,10 @@ def _get_resolved_model_config(
         "JARVIS_PLATFORM",
         "JARVIS_MODEL",
         "JARVIS_MAX_INPUT_TOKEN_COUNT",
+        "JARVIS_CHEAP_PLATFORM",
+        "JARVIS_CHEAP_MODEL",
+        "JARVIS_SMART_PLATFORM",
+        "JARVIS_SMART_MODEL",
     ]
     for key in override_keys:
         if key in GLOBAL_CONFIG_DATA:
@@ -176,10 +188,10 @@ def get_normal_platform_name(model_group_override: Optional[str] = None) -> str:
     获取正常操作的平台名称。
 
     返回：
-        str: 平台名称，默认为'yuanbao'
+        str: 平台名称，默认为'openai'
     """
     config = _get_resolved_model_config(model_group_override)
-    return cast(str, config.get("JARVIS_PLATFORM", "yuanbao"))
+    return cast(str, config.get("JARVIS_PLATFORM", "openai"))
 
 
 def get_normal_model_name(model_group_override: Optional[str] = None) -> str:
@@ -187,10 +199,10 @@ def get_normal_model_name(model_group_override: Optional[str] = None) -> str:
     获取正常操作的模型名称。
 
     返回：
-        str: 模型名称，默认为'deep_seek_v3'
+        str: 模型名称，默认为'gpt-5'
     """
     config = _get_resolved_model_config(model_group_override)
-    return cast(str, config.get("JARVIS_MODEL", "deep_seek_v3"))
+    return cast(str, config.get("JARVIS_MODEL", "gpt-5"))
 
 
 def _deprecated_platform_name_v1(model_group_override: Optional[str] = None) -> str:
@@ -217,6 +229,62 @@ def _deprecated_model_name_v1(model_group_override: Optional[str] = None) -> str
     return get_normal_model_name(model_group_override)
 
 
+def get_cheap_platform_name(model_group_override: Optional[str] = None) -> str:
+    """
+    获取廉价操作的平台名称。
+
+    返回：
+        str: 平台名称，如果未配置则回退到正常操作平台
+    """
+    config = _get_resolved_model_config(model_group_override)
+    cheap_platform = config.get("JARVIS_CHEAP_PLATFORM")
+    if cheap_platform:
+        return cast(str, cheap_platform)
+    return get_normal_platform_name(model_group_override)
+
+
+def get_cheap_model_name(model_group_override: Optional[str] = None) -> str:
+    """
+    获取廉价操作的模型名称。
+
+    返回：
+        str: 模型名称，如果未配置则回退到正常操作模型
+    """
+    config = _get_resolved_model_config(model_group_override)
+    cheap_model = config.get("JARVIS_CHEAP_MODEL")
+    if cheap_model:
+        return cast(str, cheap_model)
+    return get_normal_model_name(model_group_override)
+
+
+def get_smart_platform_name(model_group_override: Optional[str] = None) -> str:
+    """
+    获取智能操作的平台名称。
+
+    返回：
+        str: 平台名称，如果未配置则回退到正常操作平台
+    """
+    config = _get_resolved_model_config(model_group_override)
+    smart_platform = config.get("JARVIS_SMART_PLATFORM")
+    if smart_platform:
+        return cast(str, smart_platform)
+    return get_normal_platform_name(model_group_override)
+
+
+def get_smart_model_name(model_group_override: Optional[str] = None) -> str:
+    """
+    获取智能操作的模型名称。
+
+    返回：
+        str: 模型名称，如果未配置则回退到正常操作模型
+    """
+    config = _get_resolved_model_config(model_group_override)
+    smart_model = config.get("JARVIS_SMART_MODEL")
+    if smart_model:
+        return cast(str, smart_model)
+    return get_normal_model_name(model_group_override)
+
+
 def is_execute_tool_confirm() -> bool:
     """
     检查工具执行是否需要确认。
@@ -237,28 +305,11 @@ def is_confirm_before_apply_patch() -> bool:
     return cast(bool, GLOBAL_CONFIG_DATA.get("JARVIS_CONFIRM_BEFORE_APPLY_PATCH", False))
 
 
-def get_patch_format() -> str:
-    """
-    获取补丁格式。
-
-    - "search": 仅使用精确匹配的 `SEARCH` 模式。此模式对能力较弱的模型更稳定，因为它要求代码片段完全匹配。
-    - "search_range": 仅使用 `SEARCH_START` 和 `SEARCH_END` 的范围匹配模式。此模式对能力较强的模型更灵活，因为它允许在代码块内部进行修改，而不要求整个块完全匹配。
-    - "all": 同时支持以上两种模式（默认）。
-
-    返回:
-        str: "all", "search", or "search_range"
-    """
-    mode = GLOBAL_CONFIG_DATA.get("JARVIS_PATCH_FORMAT", "all")
-    if mode in ["all", "search", "search_range"]:
-        return cast(str, mode)
-    return "all"
-
-
 def get_data_dir() -> str:
     """
     获取Jarvis数据存储目录路径。
 
-    返回:
+    返回: 
         str: 数据目录路径，优先从JARVIS_DATA_PATH环境变量获取，
              如果未设置或为空，则使用~/.jarvis作为默认值
     """
@@ -730,40 +781,6 @@ def get_tool_filter_threshold() -> int:
     """
     return int(GLOBAL_CONFIG_DATA.get("JARVIS_TOOL_FILTER_THRESHOLD", 30))
 
-def get_plan_max_depth() -> int:
-    """
-    获取任务规划的最大层数。
-    
-    返回:
-        int: 最大规划层数，默认为2（可通过 GLOBAL_CONFIG_DATA['JARVIS_PLAN_MAX_DEPTH'] 配置）
-    """
-    try:
-        return int(GLOBAL_CONFIG_DATA.get("JARVIS_PLAN_MAX_DEPTH", 2))
-    except Exception:
-        return 2
-
-
-def is_plan_enabled() -> bool:
-    """
-    获取是否默认启用任务规划。
-
-    返回:
-        bool: 如果启用任务规划则返回True，默认为True
-    """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_PLAN_ENABLED", True) is True
-
-
-def get_auto_summary_rounds() -> int:
-    """
-    获取基于对话轮次的自动总结阈值。
-
-    返回:
-        int: 轮次阈值，默认20
-    """
-    try:
-        return int(GLOBAL_CONFIG_DATA.get("JARVIS_AUTO_SUMMARY_ROUNDS", 50))
-    except Exception:
-        return 50
 
 
 
@@ -871,3 +888,21 @@ def is_enable_intent_recognition() -> bool:
         bool: 是否启用意图识别，默认为True（可通过 GLOBAL_CONFIG_DATA['JARVIS_ENABLE_INTENT_RECOGNITION'] 配置）
     """
     return GLOBAL_CONFIG_DATA.get("JARVIS_ENABLE_INTENT_RECOGNITION", True) is True
+
+
+def is_enable_memory_organizer() -> bool:
+    """
+    获取是否启用自动记忆整理功能。
+    
+    返回:
+        bool: 是否启用自动记忆整理，默认为False（可通过 GLOBAL_CONFIG_DATA['JARVIS_ENABLE_MEMORY_ORGANIZER'] 配置）
+    """
+    return GLOBAL_CONFIG_DATA.get("JARVIS_ENABLE_MEMORY_ORGANIZER", False) is True
+def get_conversation_turn_threshold() -> int:
+    """
+    获取对话轮次阈值，用于触发总结。
+    
+    返回:
+        int: 对话轮次阈值，默认为50
+    """
+    return int(GLOBAL_CONFIG_DATA.get("JARVIS_CONVERSATION_TURN_THRESHOLD", 50))

jarvis/jarvis_utils/embedding.py

@@ -3,7 +3,6 @@ import os
 from pathlib import Path
 from typing import List
 
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 # 设置tiktoken缓存目录
 script_dir = Path(__file__).parent
@@ -28,10 +27,11 @@ def get_context_token_count(text: str) -> int:
         import tiktoken
 
         encoding = tiktoken.get_encoding("cl100k_base")
-        return len(encoding.encode(text))
+        # 调整token计算为原来的10/7倍
+        return int(len(encoding.encode(text)) * 10 / 7)
     except Exception as e:
-        PrettyOutput.print(f"计算token失败: {str(e)}", OutputType.WARNING)
-        return len(text) // 4  # 每个token大约4个字符的粗略估计
+        print(f"⚠️ 计算token失败: {str(e)}")
+        return int(len(text) // 4 * 10 / 7)  # 每个token大约4个字符的粗略估计，调整为10/7倍
 
 
 def split_text_into_chunks(
@@ -80,6 +80,6 @@ def split_text_into_chunks(
         return chunks
 
     except Exception as e:
-        PrettyOutput.print(f"文本分割失败: {str(e)}", OutputType.WARNING)
+        print(f"⚠️ 文本分割失败: {str(e)}")
         # 发生错误时回退到简单的字符分割
         return [text[i : i + max_length] for i in range(0, len(text), max_length)]

jarvis/jarvis_utils/fzf.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-"""FZF selector utility."""
+"""FZF选择器工具。"""
 import shutil
 import subprocess
 from typing import List, Optional, Union, Dict, Any, cast
@@ -10,15 +10,15 @@ def fzf_select(
     key: Optional[str] = None,
 ) -> Optional[str]:
     """
-    Uses fzf to select an item from a list.
+    使用fzf从列表中选择一个项目。
 
-    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.
+    参数:
+        options: 可供选择的字符串或字典列表。
+        prompt: 在fzf中显示的提示信息。
+        key: 如果options是字典列表，则此参数指定要显示的键名。
 
-    Returns:
-        The selected item, or None if fzf is not available or the selection is cancelled.
+    返回:
+        选中的项目，如果fzf不可用或选择被取消则返回None。
     """
     if shutil.which("fzf") is None:
         return None

jarvis/jarvis_utils/git_utils.py

@@ -17,7 +17,6 @@ import sys
 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
 
@@ -111,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")
@@ -123,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 []
 
 
@@ -172,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
@@ -191,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}")
 
 
 # 修改后的恢复函数
@@ -212,10 +264,10 @@ 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 = 200) -> Optional[Dict[str, int]]:
+def detect_large_code_deletion(threshold: int = 30) -> Optional[Dict[str, int]]:
     """检测是否有大量代码删除
     
     参数:
@@ -290,49 +342,23 @@ def detect_large_code_deletion(threshold: int = 200) -> Optional[Dict[str, int]]
         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
+# confirm_large_code_deletion函数已废弃，统一使用大模型询问
 
 
-def check_large_code_deletion(threshold: int = 200) -> bool:
-    """检查是否有大量代码删除并询问用户确认
+def check_large_code_deletion(threshold: int = 30) -> bool:
+    """检查是否有大量代码删除
     
     参数:
         threshold: 净删除行数阈值，默认200行
         
     返回:
-        bool: 如果检测到大量删除且用户拒绝提交，返回False；否则返回True
+        bool: 始终返回True，由调用方统一处理大模型询问
     """
-    detection_result = detect_large_code_deletion(threshold)
-    if detection_result is None:
-        return True
+    # 检测功能现在由调用方统一处理
+    return True
     
-    return confirm_large_code_deletion(detection_result)
+    # 直接返回True，让调用方统一处理大模型询问
+    return True
 
 
 def handle_commit_workflow() -> bool:
@@ -530,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 (
@@ -603,7 +623,7 @@ def check_and_update_git_repo(repo_path: str) -> bool:
                 )
 
                 if result.returncode == 0:
-                    PrettyOutput.print("代码更新安装成功", OutputType.SUCCESS)
+                    print("✅ 代码更新安装成功")
                     return True
 
                 # 处理权限错误
@@ -621,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)
@@ -664,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 []
 
 
@@ -824,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
 
@@ -878,9 +892,9 @@ def confirm_add_new_files() -> None:
                         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)
+                print("ℹ️ 已将未跟踪文件添加到 .gitignore，正在重新检测...")
             except Exception as e:
-                PrettyOutput.print(f"更新 .gitignore 失败: {str(e)}", OutputType.WARNING)
+                print(f"⚠️ 更新 .gitignore 失败: {str(e)}")
 
             continue