jarvis-ai-assistant 0.3.31__tar.gz → 0.3.32__tar.gz

{jarvis_ai_assistant-0.3.31/src/jarvis_ai_assistant.egg-info → jarvis_ai_assistant-0.3.32}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.31
+Version: 0.3.32
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire

{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.32}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "jarvis-ai-assistant"
-version = "0.3.31"
+version = "0.3.32"
 description = "Jarvis: An AI assistant that uses tools to interact with the system"
 readme = "README.md"
 authors = [{ name = "skyfire", email = "skyfireitdiy@hotmail.com" }]

{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.32}/setup.py

@@ -3,7 +3,7 @@ from setuptools import setup, find_packages  # type: ignore
 
 setup(
     name="jarvis-ai-assistant",
-    version="0.3.31",
+    version="0.3.32",
     author="skyfire",
     author_email="skyfireitdiy@hotmail.com",
     description="An AI assistant that uses various tools to interact with the system",

{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.32}/src/jarvis/__init__.py

@@ -1,4 +1,4 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI Assistant"""
 
-__version__ = "0.3.31"
+__version__ = "0.3.32"

{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.32}/src/jarvis/jarvis_agent/edit_file_handler.py

@@ -166,7 +166,7 @@ class EditFileHandler(OutputHandler):
 - {supported_formats}
 - {ot("RANGE")}start-end{ct("RANGE")} 仅用于区间替换模式（SEARCH_START/SEARCH_END），表示只在指定行号范围内进行匹配与替换（1-based，闭区间）；省略则在整个文件范围内处理
 - 单点替换要求 SEARCH 在有效范围内唯一匹配（仅替换第一个匹配）
-- 区间替换命中有效范围内的第一个 {ot("SEARCH_START")} 及其后的第一个 {ot("SEARCH_END")}
+- 区间替换会从包含 {ot("SEARCH_START")} 的行首开始，到包含 {ot("SEARCH_END")} 的行尾结束，替换整个区域
 否则编辑将失败。"""
 
     def name(self) -> str:
@@ -468,24 +468,42 @@ class EditFileHandler(OutputHandler):
                         error_msg = "未找到SEARCH_START"
                         failed_patches.append({"patch": patch, "error": error_msg})
                     else:
-                        end_idx = base_content.find(search_end, start_idx)
+                        # 从 search_start 之后开始查找 search_end
+                        end_idx = base_content.find(search_end, start_idx + len(search_start))
                         if end_idx == -1:
                             error_msg = "在SEARCH_START之后未找到SEARCH_END"
                             failed_patches.append({"patch": patch, "error": error_msg})
                         else:
-                            # 避免额外空行:
-                            # 若 REPLACE 以换行结尾且 SEARCH_END 后紧跟换行符，
-                            # 则将该换行并入替换范围，防止出现双重换行导致“多一行”
-                            end_of_range = end_idx + len(search_end)
+                            # 将替换范围扩展到整行
+                            # 找到 start_idx 所在行的行首
+                            line_start_idx = base_content.rfind("\n", 0, start_idx) + 1
+
+                            # 找到 end_idx 所在行的行尾
+                            match_end_pos = end_idx + len(search_end)
+                            line_end_idx = base_content.find("\n", match_end_pos)
+
+                            if line_end_idx == -1:
+                                # 如果没有找到换行符，说明是最后一行
+                                end_of_range = len(base_content)
+                            else:
+                                # 包含换行符
+                                end_of_range = line_end_idx + 1
+
+                            final_replace_text = replace_text
+                            original_slice = base_content[line_start_idx:end_of_range]
+
+                            # 如果原始片段以换行符结尾，且替换内容不为空且不以换行符结尾，
+                            # 则为替换内容添加换行符以保持格式
                             if (
-                                end_of_range < len(base_content)
-                                and base_content[end_of_range] == "\n"
-                                and replace_text.endswith("\n")
+                                final_replace_text
+                                and original_slice.endswith("\n")
+                                and not final_replace_text.endswith("\n")
                             ):
-                                end_of_range += 1
+                                final_replace_text += "\n"
+
                             base_content = (
-                                base_content[:start_idx]
-                                + replace_text
+                                base_content[:line_start_idx]
+                                + final_replace_text
                                 + base_content[end_of_range:]
                             )
                             found = True

{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.32}/src/jarvis/jarvis_agent/jarvis.py

@@ -1,6 +1,8 @@
 # -*- coding: utf-8 -*-
 """Jarvis AI 助手主入口模块"""
 from typing import Optional, List
+import shutil
+from datetime import datetime
 
 import typer
 
@@ -16,6 +18,7 @@ from jarvis.jarvis_utils.config import (
     get_agent_definition_dirs,
     get_multi_agent_dirs,
     get_roles_dirs,
+    get_data_dir,
 )
 import jarvis.jarvis_utils.utils as jutils
 from jarvis.jarvis_utils.input import user_confirm, get_single_line_input
@@ -184,6 +187,72 @@ def handle_interactive_config_option(
         return True
 
 
+def handle_backup_option(backup: bool) -> bool:
+    """处理数据备份选项，返回是否已处理并需提前结束。"""
+    if not backup:
+        return False
+
+    init_env("", config_file=None)
+    data_dir = Path(get_data_dir())
+    if not data_dir.is_dir():
+        PrettyOutput.print(f"数据目录不存在: {data_dir}", OutputType.ERROR)
+        return True
+
+    backup_dir = Path(os.path.expanduser("~/jarvis_backups"))
+    backup_dir.mkdir(exist_ok=True)
+
+    timestamp = datetime.now().strftime("%Y%m%d_%H%M%S")
+    backup_file_base = backup_dir / f"jarvis_data_{timestamp}"
+
+    try:
+        archive_path = shutil.make_archive(
+            str(backup_file_base), "zip", root_dir=str(data_dir)
+        )
+        PrettyOutput.print(f"数据已成功备份到: {archive_path}", OutputType.SUCCESS)
+    except Exception as e:
+        PrettyOutput.print(f"数据备份失败: {e}", OutputType.ERROR)
+
+    return True
+
+
+def handle_restore_option(restore_path: Optional[str]) -> bool:
+    """处理数据恢复选项，返回是否已处理并需提前结束。"""
+    if not restore_path:
+        return False
+
+    restore_file = Path(restore_path)
+    if not restore_file.is_file():
+        PrettyOutput.print(f"指定的恢复文件不存在: {restore_path}", OutputType.ERROR)
+        return True
+
+    init_env("", config_file=None)
+    data_dir = Path(get_data_dir())
+
+    if data_dir.exists():
+        if not user_confirm(
+            f"数据目录 '{data_dir}' 已存在，恢复操作将覆盖它。是否继续？", default=False
+        ):
+            PrettyOutput.print("恢复操作已取消。", OutputType.INFO)
+            return True
+        try:
+            shutil.rmtree(data_dir)
+        except Exception as e:
+            PrettyOutput.print(f"无法移除现有数据目录: {e}", OutputType.ERROR)
+            return True
+
+    try:
+        data_dir.mkdir(parents=True)
+        shutil.unpack_archive(str(restore_file), str(data_dir), "zip")
+        PrettyOutput.print(
+            f"数据已从 '{restore_path}' 成功恢复到 '{data_dir}'", OutputType.SUCCESS
+        )
+
+    except Exception as e:
+        PrettyOutput.print(f"数据恢复失败: {e}", OutputType.ERROR)
+
+    return True
+
+
 def preload_config_for_flags(config_file: Optional[str]) -> None:
     """预加载配置（仅用于读取功能开关），不会显示欢迎信息或影响后续 init_env。"""
     try:
@@ -521,6 +590,12 @@ def run_cli(
         "--disable-methodology-analysis",
         help="禁用方法论和任务分析（覆盖配置文件设置）",
     ),
+    backup_data: bool = typer.Option(
+        False, "--backup-data", help="备份 Jarvis 数据目录 (~/.jarvis)"
+    ),
+    restore_data: Optional[str] = typer.Option(
+        None, "--restore-data", help="从指定的压缩包恢复 Jarvis 数据"
+    ),
 ) -> None:
     """Jarvis AI assistant command-line interface."""
     if ctx.invoked_subcommand is not None:
@@ -529,6 +604,14 @@ def run_cli(
     # 使用 rich 输出命令与快捷方式总览
     print_commands_overview()
 
+    # 处理数据备份
+    if handle_backup_option(backup_data):
+        return
+
+    # 处理数据恢复
+    if handle_restore_option(restore_data):
+        return
+
     # 处理配置文件编辑
     if handle_edit_option(edit, config_file):
         return

{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.32}/src/jarvis/jarvis_platform/openai.py

@@ -24,7 +24,32 @@ class OpenAIModel(BasePlatform):
         self.base_url = os.getenv("OPENAI_API_BASE", "https://api.openai.com/v1")
         self.model_name = os.getenv("JARVIS_MODEL") or "gpt-4o"
 
-        self.client = OpenAI(api_key=self.api_key, base_url=self.base_url)
+                # Optional: Inject extra HTTP headers via environment variable
+        # Expected format: OPENAI_EXTRA_HEADERS='{"Header-Name": "value", "X-Trace": "abc"}'
+        headers_str = os.getenv("OPENAI_EXTRA_HEADERS")
+        self.extra_headers: Dict[str, str] = {}
+        if headers_str:
+            try:
+                parsed = json.loads(headers_str)
+                if isinstance(parsed, dict):
+                    # Ensure all header keys/values are strings
+                    self.extra_headers = {str(k): str(v) for k, v in parsed.items()}
+                else:
+                    PrettyOutput.print("OPENAI_EXTRA_HEADERS 应为 JSON 对象，如 {'X-Source':'jarvis'}", OutputType.WARNING)
+            except Exception as e:
+                PrettyOutput.print(f"解析 OPENAI_EXTRA_HEADERS 失败: {e}", OutputType.WARNING)
+
+        # Initialize OpenAI client, try to pass default headers if SDK supports it
+        try:
+            if self.extra_headers:
+                self.client = OpenAI(api_key=self.api_key, base_url=self.base_url, default_headers=self.extra_headers)
+            else:
+                self.client = OpenAI(api_key=self.api_key, base_url=self.base_url)
+        except TypeError:
+            # Fallback: SDK version may not support default_headers
+            self.client = OpenAI(api_key=self.api_key, base_url=self.base_url)
+            if self.extra_headers:
+                PrettyOutput.print("当前 OpenAI SDK 不支持 default_headers，未能注入额外 HTTP 头", OutputType.WARNING)
         self.messages: List[Dict[str, str]] = []
         self.system_message = ""
 

{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.32}/src/jarvis/jarvis_tools/edit_file.py

@@ -34,17 +34,18 @@ class FileSearchReplaceTool:
      - REPLACE: 替换后的新代码
    - 区间替换：
      - reason: 修改原因描述
-     - SEARCH_START: 起始标记（包含在替换范围内）
-     - SEARCH_END: 结束标记（包含在替换范围内）
+     - SEARCH_START: 起始标记
+     - SEARCH_END: 结束标记
      - REPLACE: 替换后的新代码
      - RANGE: 可选的行号范围 'start-end' (1-based, 闭区间), 用于限定匹配范围
+   - **说明**: 区间替换会从包含 SEARCH_START 的行首开始，到包含 SEARCH_END 的行尾结束，替换整个区域
 
 ## 核心原则
 1. **精准修改**: 只修改必要的代码部分，保持其他部分不变
 2. **最小补丁原则**: 生成最小范围的补丁，包含必要的上下文
 3. **唯一匹配**:
    - 单点替换：确保 SEARCH 在文件中唯一匹配
-   - 区间替换：确保 SEARCH_START 在文件中唯一匹配，且在其后 SEARCH_END 也唯一匹配
+   - 区间替换：确保在指定范围内，第一个 SEARCH_START 之后能找到 SEARCH_END
 4. **格式保持**: 严格保持原始代码的格式风格
 5. **部分成功**: 支持多个文件编辑，允许部分文件编辑成功
 
@@ -121,11 +122,10 @@ class FileSearchReplaceTool:
                             - REPLACE: 替换后的新代码
                         2) 区间替换：
                             - reason: 修改原因描述
-                            - SEARCH_START: 起始标记（包含在替换范围内）
-                            - SEARCH_END: 结束标记（包含在替换范围内）
+                            - SEARCH_START: 起始标记
+                            - SEARCH_END: 结束标记
                             - REPLACE: 替换后的新代码
-                        通用可选项：
-                            - RANGE: 形如 'start-end'（1-based，闭区间），仅用于区间替换模式。当提供时仅在该行号范围内执行匹配与替换；省略则在整个文件范围内处理
+                        - **说明**: 区间替换会从包含 SEARCH_START 的行首开始，到包含 SEARCH_END 的行尾结束，替换整个区域
 
         返回:
             Dict[str, Any] 包含:

{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.32}/src/jarvis/jarvis_utils/git_utils.py

@@ -299,7 +299,7 @@ def get_modified_line_ranges() -> Dict[str, List[Tuple[int, int]]]:
     # 获取所有文件的Git差异
     # 仅用于解析修改行范围，减少上下文以降低输出体积和解析成本
     result = subprocess.run(
-        ["git", "show", "-U0", "--no-color"],
+        ["git", "show", "--no-color"],
         capture_output=True,
         text=True,
     )

{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.32}/src/jarvis/jarvis_utils/input.py

@@ -482,7 +482,7 @@ def _get_multiline_input_internal(
         """Handle Ctrl+O by exiting the prompt and returning the sentinel value."""
         event.app.exit(result=CTRL_O_SENTINEL)
 
-    @bindings.add("c-t", filter=has_focus(DEFAULT_BUFFER))
+    @bindings.add("c-t", filter=has_focus(DEFAULT_BUFFER), eager=True)
     def _(event):
         """Return a shell command like '!bash' for upper input_handler to execute."""
 

{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.32}/src/jarvis/jarvis_utils/utils.py

@@ -1719,11 +1719,11 @@ def while_success(func: Callable[[], Any], sleep_time: float = 0.1, max_retries:
         try:
             result = func()
             break
-        except Exception:
+        except Exception as e:
             retry_count += 1
             if retry_count < max_retries:
                 PrettyOutput.print(
-                    f"发生异常，重试中 ({retry_count}/{max_retries})，等待 {sleep_time}s...",
+                    f"发生异常:\n{e}\n重试中 ({retry_count}/{max_retries})，等待 {sleep_time}s...",
                     OutputType.WARNING,
                 )
                 time.sleep(sleep_time)

{jarvis_ai_assistant-0.3.31 → jarvis_ai_assistant-0.3.32/src/jarvis_ai_assistant.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.31
+Version: 0.3.32
 Summary: Jarvis: An AI assistant that uses tools to interact with the system
 Home-page: https://github.com/skyfireitdiy/Jarvis
 Author: skyfire