jarvis-ai-assistant 0.3.28__py3-none-any.whl → 0.3.29__py3-none-any.whl

jarvis/jarvis_agent/task_analyzer.py

@@ -8,6 +8,8 @@ from jarvis.jarvis_utils.globals import get_interrupt, set_interrupt
 
 from jarvis.jarvis_agent.prompts import TASK_ANALYSIS_PROMPT
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
+from jarvis.jarvis_agent.utils import join_prompts
+from jarvis.jarvis_agent.events import BEFORE_TOOL_CALL, AFTER_TOOL_CALL, BEFORE_SUMMARY, TASK_COMPLETED
 
 
 class TaskAnalyzer:
@@ -55,10 +57,7 @@ class TaskAnalyzer:
 
     def _prepare_analysis_prompt(self, satisfaction_feedback: str) -> str:
         """准备分析提示"""
-        analysis_prompt = TASK_ANALYSIS_PROMPT
-        if satisfaction_feedback:
-            analysis_prompt += satisfaction_feedback
-        return analysis_prompt
+        return join_prompts([TASK_ANALYSIS_PROMPT, satisfaction_feedback])
 
     def _process_analysis_loop(self):
         """处理分析循环"""
@@ -74,7 +73,7 @@ class TaskAnalyzer:
             # 执行工具调用（补充事件：before_tool_call/after_tool_call）
             try:
                 self.agent.event_bus.emit(
-                    "before_tool_call",
+                    BEFORE_TOOL_CALL,
                     agent=self.agent,
                     current_response=response,
                 )
@@ -84,7 +83,7 @@ class TaskAnalyzer:
             self.agent.session.prompt = tool_prompt
             try:
                 self.agent.event_bus.emit(
-                    "after_tool_call",
+                    AFTER_TOOL_CALL,
                     agent=self.agent,
                     current_response=response,
                     need_return=need_return,
@@ -130,9 +129,15 @@ class TaskAnalyzer:
     def _handle_interrupt_with_tool_calls(self, user_input: str) -> str:
         """处理有工具调用时的中断"""
         if self.agent.user_confirm("检测到有工具调用，是否继续处理工具调用？", True):
-            return f"被用户中断，用户补充信息为：{user_input}\n\n用户同意继续工具调用。"
+            return join_prompts([
+                f"被用户中断，用户补充信息为：{user_input}",
+                "用户同意继续工具调用。"
+            ])
         else:
-            return f"被用户中断，用户补充信息为：{user_input}\n\n检测到有工具调用，但被用户拒绝执行。请根据用户的补充信息重新考虑下一步操作。"
+            return join_prompts([
+                f"被用户中断，用户补充信息为：{user_input}",
+                "检测到有工具调用，但被用户拒绝执行。请根据用户的补充信息重新考虑下一步操作。"
+            ])
 
     def collect_satisfaction_feedback(self, auto_completed: bool) -> str:
         """收集满意度反馈"""
@@ -140,18 +145,18 @@ class TaskAnalyzer:
 
         if not auto_completed and self.agent.use_analysis:
             if self.agent.user_confirm("您对本次任务的完成是否满意？", True):
-                satisfaction_feedback = "\n\n用户对本次任务的完成表示满意。"
+                satisfaction_feedback = "用户对本次任务的完成表示满意。"
             else:
                 feedback = self.agent._multiline_input(
                     "请提供您的反馈意见（可留空直接回车）:", False
                 )
                 if feedback:
                     satisfaction_feedback = (
-                        f"\n\n用户对本次任务的完成不满意，反馈意见如下：\n{feedback}"
+                        f"用户对本次任务的完成不满意，反馈意见如下：\n{feedback}"
                     )
                 else:
                     satisfaction_feedback = (
-                        "\n\n用户对本次任务的完成不满意，未提供具体反馈意见。"
+                        "用户对本次任务的完成不满意，未提供具体反馈意见。"
                     )
 
         return satisfaction_feedback
@@ -162,9 +167,9 @@ class TaskAnalyzer:
     def _subscribe_events(self) -> None:
         bus = self.agent.get_event_bus()  # type: ignore[attr-defined]
         # 在生成总结前触发（保持与原顺序一致）
-        bus.subscribe("before_summary", self._on_before_summary)
+        bus.subscribe(BEFORE_SUMMARY, self._on_before_summary)
         # 当无需总结时，作为兜底触发分析
-        bus.subscribe("task_completed", self._on_task_completed)
+        bus.subscribe(TASK_COMPLETED, self._on_task_completed)
 
     def _on_before_summary(self, **payload) -> None:
         if self._analysis_done:

jarvis/jarvis_agent/task_manager.py

@@ -14,6 +14,7 @@ from jarvis.jarvis_agent import (
     get_multiline_input,
     user_confirm,
 )
+from jarvis.jarvis_agent.utils import join_prompts
 from jarvis.jarvis_utils.config import get_data_dir
 from jarvis.jarvis_utils.fzf import fzf_select
 
@@ -109,7 +110,7 @@ class TaskManager:
                     if need_additional:
                         additional_input = get_multiline_input("请输入补充信息：")
                         if additional_input:
-                            selected_task = f"{selected_task}\n\n补充信息:\n{additional_input}"
+                            selected_task = join_prompts([selected_task, f"补充信息:\n{additional_input}"])
                     return selected_task
             except Exception:
                 # 如果解析失败，则回退到手动输入
@@ -138,9 +139,10 @@ class TaskManager:
                     if need_additional:
                         additional_input = get_multiline_input("请输入补充信息：")
                         if additional_input:
-                            selected_task = (
-                                f"{selected_task}\n\n补充信息:\n{additional_input}"
-                            )
+                            selected_task = join_prompts([
+                                selected_task,
+                                f"补充信息:\n{additional_input}"
+                            ])
                     return selected_task
                 PrettyOutput.print(
                     "无效的选择。请选择列表中的一个号码。", OutputType.WARNING

jarvis/jarvis_agent/utils.py

@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+"""
+工具函数（jarvis_agent.utils）
+
+- join_prompts: 统一的提示拼接策略（仅拼接非空段落，使用双换行）
+- is_auto_complete: 统一的自动完成标记检测
+"""
+from typing import Iterable, List, Any
+from enum import Enum
+from jarvis.jarvis_utils.tag import ot
+
+def join_prompts(parts: Iterable[str]) -> str:
+    """
+    将多个提示片段按统一规则拼接：
+    - 过滤掉空字符串
+    - 使用两个换行分隔
+    - 不进行额外 strip，保持调用方原样语义
+    """
+    non_empty: List[str] = [p for p in parts if p]
+    return "\n\n".join(non_empty)
+
+def is_auto_complete(response: str) -> bool:
+    """
+    检测是否包含自动完成标记。
+    当前实现：包含 ot('!!!COMPLETE!!!') 即视为自动完成。
+    """
+    try:
+        return ot("!!!COMPLETE!!!") in response
+    except Exception:
+        # 防御性处理：即使 ot 出现异常，也不阻塞主流程
+        return "!!!COMPLETE!!!" in response
+
+def normalize_next_action(next_action: Any) -> str:
+    """
+    规范化下一步动作为字符串:
+    - 如果是 Enum, 返回其 value（若为字符串）
+    - 如果是 str, 原样返回
+    - 其他情况返回空字符串
+    """
+    try:
+        if isinstance(next_action, Enum):
+            value = getattr(next_action, "value", None)
+            return value if isinstance(value, str) else ""
+        if isinstance(next_action, str):
+            return next_action
+        return ""
+    except Exception:
+        return ""
+
+__all__ = ["join_prompts", "is_auto_complete", "normalize_next_action"]

jarvis/jarvis_mcp/sse_mcp_client.py

@@ -210,7 +210,7 @@ class SSEMcpClient(McpClient):
 
                 # 调用已注册的处理器
                 if method in self.notification_handlers:
-                    error_lines: list[str] = []
+                    error_lines: List[str] = []
                     for handler in self.notification_handlers[method]:
                         try:
                             handler(params)

jarvis/jarvis_memory_organizer/memory_organizer.py

@@ -63,7 +63,7 @@ class MemoryOrganizer:
         """加载指定类型的所有记忆"""
         memories = []
         memory_files = self._get_memory_files(memory_type)
-        error_lines: list[str] = []
+        error_lines: List[str] = []
 
         for memory_file in memory_files:
             try:
@@ -388,8 +388,8 @@ tags:
         )
 
         # 删除原始记忆文件（先汇总日志，最后统一打印）
-        info_lines: list[str] = []
-        warn_lines: list[str] = []
+        info_lines: List[str] = []
+        warn_lines: List[str] = []
         for orig_memory in original_memories:
             if "file_path" in orig_memory:
                 try:
@@ -428,7 +428,7 @@ tags:
             导出的记忆数量
         """
         all_memories = []
-        progress_lines: list[str] = []
+        progress_lines: List[str] = []
 
         for memory_type in memory_types:
             progress_lines.append(f"正在导出 {memory_type} 类型的记忆...")

jarvis/jarvis_platform/kimi.py

@@ -194,7 +194,7 @@ class KimiModel(BasePlatform):
         uploaded_files = []
         for index, file_path in enumerate(file_list, 1):
             file_name = os.path.basename(file_path)
-            log_lines: list[str] = [f"处理文件 [{index}/{len(file_list)}]: {file_name}"]
+            log_lines: List[str] = [f"处理文件 [{index}/{len(file_list)}]: {file_name}"]
             try:
                 mime_type, _ = mimetypes.guess_type(file_path)
                 action = (

jarvis/jarvis_platform/tongyi.py

@@ -276,7 +276,7 @@ class TongyiPlatform(BasePlatform):
 
             for file_path in file_list:
                 file_name = os.path.basename(file_path)
-                log_lines: list[str] = []
+                log_lines: List[str] = []
                 log_lines.append(f"上传文件 {file_name}")
                 try:
                     if not os.path.exists(file_path):

jarvis/jarvis_platform/yuanbao.py

@@ -133,7 +133,7 @@ class YuanbaoPlatform(BasePlatform):
 
         for file_path in file_list:
             file_name = os.path.basename(file_path)
-            log_lines: list[str] = []
+            log_lines: List[str] = []
             log_lines.append(f"上传文件 {file_name}")
             try:
                 # 1. Prepare the file information

jarvis/jarvis_rag/retriever.py

@@ -185,7 +185,7 @@ class ChromaRetriever:
         if not changed and not deleted:
             return
         # 为避免在循环中逐条打印，先拼接后统一打印
-        lines: list[str] = []
+        lines: List[str] = []
         if changed:
             lines.append(
                 f"检测到 {len(changed)} 个已索引文件发生变化，建议重新索引以保证检索准确性。"
@@ -247,7 +247,7 @@ class ChromaRetriever:
             return
 
         # 先处理删除
-        delete_errors: list[str] = []
+        delete_errors: List[str] = []
         for src in deleted:
             try:
                 self.collection.delete(where={"source": src})  # type: ignore[arg-type]
@@ -258,7 +258,7 @@ class ChromaRetriever:
 
         # 再处理变更（重建）
         docs_to_add: List[Document] = []
-        rebuild_errors: list[str] = []
+        rebuild_errors: List[str] = []
         for src in changed:
             try:
                 # 删除旧条目

jarvis/jarvis_stats/stats.py

@@ -604,8 +604,8 @@ class StatsManager:
 
     @staticmethod
     def _show_multiple_charts(
-        start_time: datetime,
-        end_time: datetime,
+        start_time: Optional[datetime],
+        end_time: Optional[datetime],
         aggregation: str,
         tags: Optional[Dict[str, str]],
         width: Optional[int] = None,

jarvis/jarvis_stats/storage.py

@@ -8,7 +8,7 @@ import json
 import os
 from datetime import datetime, timedelta
 from pathlib import Path
-from typing import Dict, List, Optional, Any
+from typing import Dict, List, Optional, Any, Set
 from collections import defaultdict
 import sys
 import time
@@ -457,7 +457,7 @@ class StatsStorage:
         metrics_from_meta = set(meta.get("metrics", {}).keys())
 
         # 扫描所有数据文件获取实际存在的指标
-        metrics_from_data: set[str] = set()
+        metrics_from_data: Set[str] = set()
         for data_file in self.data_dir.glob("stats_*.json"):
             try:
                 data = self._load_json(data_file)
@@ -467,7 +467,7 @@ class StatsStorage:
                 continue
 
         # 扫描总量缓存目录中已有的指标文件
-        metrics_from_totals: set[str] = set()
+        metrics_from_totals: Set[str] = set()
         try:
             for f in self.totals_dir.glob("*"):
                 if f.is_file():

jarvis/jarvis_tools/edit_file.py

@@ -14,7 +14,7 @@
 - 完善的错误处理和回滚机制
 - 严格的格式保持要求
 """
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 from jarvis.jarvis_agent.edit_file_handler import EditFileHandler
 
@@ -122,7 +122,7 @@ class FileSearchReplaceTool:
 
         from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
-        stdout_messages: list[str] = []
+        stdout_messages: List[str] = []
         overall_success = False
         file_results = []
 
@@ -167,7 +167,7 @@ class FileSearchReplaceTool:
                 )
 
         # 整合所有错误信息到stderr
-        all_stderr: list[str] = []
+        all_stderr: List[str] = []
         for file_result in file_results:
             if not file_result["success"]:
                 all_stderr.append(f"文件 {file_result['file']} 处理失败: {file_result['stderr']}")

jarvis/jarvis_tools/execute_script.py

@@ -2,7 +2,7 @@
 import os
 import tempfile
 from pathlib import Path
-from typing import Any, Dict
+from typing import Any, Dict, List
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
@@ -74,7 +74,7 @@ class ScriptTool:
         stream.feed(data)
 
         # 清理每行右侧空格，并过滤空行
-        cleaned: list[str] = []
+        cleaned: List[str] = []
         for y in range(screen.lines):
             line = screen.buffer[y]
             stripped = "".join(char.data for char in line.values()).rstrip()

jarvis/jarvis_tools/sub_agent.py

@@ -8,7 +8,7 @@ sub_agent 工具
 - 继承父 Agent 的部分配置：model_group、input_handler、execute_tool_confirm、multiline_inputer；其他参数需显式提供
 - 子Agent必须自动完成(auto_complete=True)且需要summary(need_summary=True)
 """
-from typing import Any, Dict
+from typing import Any, Dict, List
 import json
 
 from jarvis.jarvis_agent import Agent
@@ -107,7 +107,7 @@ class SubAgentTool:
 
             # 解析可用工具列表（支持数组或以逗号分隔的字符串）
             _use_tools = args.get("use_tools", None)
-            use_tools: list[str] = []
+            use_tools: List[str] = []
             if isinstance(_use_tools, list):
                 use_tools = [str(x).strip() for x in _use_tools if str(x).strip()]
             elif isinstance(_use_tools, str):

jarvis/jarvis_tools/sub_code_agent.py

@@ -8,7 +8,7 @@ sub_code_agent 工具
 - 不依赖父 Agent，所有配置使用系统默认与全局变量
 - 子Agent必须自动完成(auto_complete=True)且需要summary(need_summary=True)
 """
-from typing import Any, Dict
+from typing import Any, Dict, List
 import json
 
 from jarvis.jarvis_code_agent.code_agent import CodeAgent
@@ -85,7 +85,7 @@ class SubCodeAgentTool:
                 except Exception:
                     parent_agent = None
             model_group = None
-            use_tools: list[str] = []
+            use_tools: List[str] = []
             try:
                 if parent_agent is not None:
                     if getattr(parent_agent, "model", None):

jarvis/jarvis_utils/config.py

@@ -285,7 +285,7 @@ def get_pretty_output() -> bool:
     if platform.system() == "Windows":
         return False
 
-    return GLOBAL_CONFIG_DATA.get("JARVIS_PRETTY_OUTPUT", False)
+    return GLOBAL_CONFIG_DATA.get("JARVIS_PRETTY_OUTPUT", True)
 
 
 def is_use_methodology() -> bool:
@@ -423,9 +423,9 @@ def is_force_save_memory() -> bool:
     获取是否强制保存记忆。
 
     返回：
-        bool: 如果强制保存记忆则返回True，默认为True
+        bool: 如果强制保存记忆则返回True，默认为False
     """
-    return GLOBAL_CONFIG_DATA.get("JARVIS_FORCE_SAVE_MEMORY", True) is True
+    return GLOBAL_CONFIG_DATA.get("JARVIS_FORCE_SAVE_MEMORY", False) is True
 
 
 def is_enable_static_analysis() -> bool:

jarvis/jarvis_utils/fzf.py

@@ -2,10 +2,10 @@
 """FZF selector utility."""
 import shutil
 import subprocess
-from typing import List, Optional, Union
+from typing import List, Optional, Union, Dict, Any, cast
 
 def fzf_select(
-    options: Union[List[str], List[dict]],
+    options: Union[List[str], List[Dict[str, Any]]],
     prompt: str = "SELECT> ",
     key: Optional[str] = None,
 ) -> Optional[str]:
@@ -29,7 +29,8 @@ def fzf_select(
     if isinstance(options[0], dict):
         if key is None:
             raise ValueError("A key must be provided for a list of dicts.")
-        input_lines = [str(item.get(key, "")) for item in options]
+        options_dict = cast(List[Dict[str, Any]], options)
+        input_lines = [str(item.get(key, "")) for item in options_dict]
     else:
         input_lines = [str(item) for item in options]
 

jarvis/jarvis_utils/input.py

@@ -11,7 +11,7 @@
 import os
 import sys
 import base64
-from typing import Iterable, List
+from typing import Iterable, List, Optional
 import wcwidth
 
 from colorama import Fore
@@ -308,7 +308,7 @@ class FileCompleter(Completer):
                 import os as _os
 
                 if self._all_files_cache is None:
-                    files: list[str] = []
+                    files: List[str] = []
                     for root, dirs, fnames in _os.walk(".", followlinks=False):
                         # Exclude .git directory
                         dirs[:] = [d for d in dirs if d != ".git"]
@@ -429,7 +429,7 @@ def _show_history_and_copy():
 
 
 def _get_multiline_input_internal(
-    tip: str, preset: str | None = None, preset_cursor: int | None = None
+    tip: str, preset: Optional[str] = None, preset_cursor: Optional[int] = None
 ) -> str:
     """
     Internal function to get multiline input using prompt_toolkit.
@@ -660,8 +660,8 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
         tip: 提示文本，将显示在底部工具栏中
         print_on_empty: 当输入为空字符串时，是否打印“输入已取消”提示。默认打印。
     """
-    preset: str | None = None
-    preset_cursor: int | None = None
+    preset: Optional[str] = None
+    preset_cursor: Optional[int] = None
     while True:
         user_input = _get_multiline_input_internal(
             tip, preset=preset, preset_cursor=preset_cursor

jarvis/jarvis_utils/utils.py

@@ -7,7 +7,7 @@ import subprocess
 import sys
 import time
 from pathlib import Path
-from typing import Any, Callable, Dict, List, Optional
+from typing import Any, Callable, Dict, List, Optional, Tuple
 from datetime import datetime, date
 
 import yaml  # type: ignore
@@ -97,6 +97,98 @@ def is_rag_installed() -> bool:
     return len(get_missing_rag_modules()) == 0
 
 
+def is_editable_install() -> bool:
+    """
+    检测当前 Jarvis 是否以可编辑模式安装（pip/uv install -e .）。
+
+    判断顺序：
+    1. 读取 PEP 610 的 direct_url.json（dir_info.editable）
+    2. 兼容旧式 .egg-link 安装
+    3. 启发式回退：源码路径上游存在 .git 且不在 site-packages/dist-packages
+    """
+    # 优先使用 importlib.metadata 读取 distribution 的 direct_url.json
+    try:
+        import importlib.metadata as metadata  # Python 3.8+
+    except Exception:
+        metadata = None  # type: ignore
+
+    def _check_direct_url() -> Optional[bool]:
+        if metadata is None:
+            return None
+        candidates = ["jarvis-ai-assistant", "jarvis_ai_assistant"]
+        for name in candidates:
+            try:
+                dist = metadata.distribution(name)
+            except Exception:
+                continue
+            try:
+                files = dist.files or []
+                for f in files:
+                    try:
+                        if f.name == "direct_url.json":
+                            p = Path(str(dist.locate_file(f)))
+                            if p.exists():
+                                with open(p, "r", encoding="utf-8", errors="ignore") as fp:
+                                    info = json.load(fp)
+                                dir_info = info.get("dir_info") or {}
+                                if isinstance(dir_info, dict) and bool(dir_info.get("editable")):
+                                    return True
+                                # 兼容部分工具可能写入顶层 editable 字段
+                                if bool(info.get("editable")):
+                                    return True
+                                return False  # 找到了 direct_url.json 但未标记 editable
+                    except Exception:
+                        continue
+            except Exception:
+                continue
+        return None
+
+    res = _check_direct_url()
+    if res is True:
+        return True
+    if res is False:
+        # 明确不是可编辑安装
+        return False
+
+    # 兼容旧式 .egg-link 可编辑安装
+    try:
+        module_path = Path(__file__).resolve()
+        pkg_root = module_path.parent.parent  # jarvis 包根目录
+        for entry in sys.path:
+            try:
+                p = Path(entry)
+                if not p.exists() or not p.is_dir():
+                    continue
+                for egg in p.glob("*.egg-link"):
+                    try:
+                        text = egg.read_text(encoding="utf-8", errors="ignore")
+                        first_line = (text.strip().splitlines() or [""])[0]
+                        if not first_line:
+                            continue
+                        src_path = Path(first_line).resolve()
+                        # 当前包根目录在 egg-link 指向的源码路径下，视为可编辑安装
+                        if str(pkg_root).startswith(str(src_path)):
+                            return True
+                    except Exception:
+                        continue
+            except Exception:
+                continue
+    except Exception:
+        pass
+
+    # 启发式回退：源码仓库路径
+    try:
+        parents = list(Path(__file__).resolve().parents)
+        has_git = any((d / ".git").exists() for d in parents)
+        in_site = any(("site-packages" in str(d)) or ("dist-packages" in str(d)) for d in parents)
+        if has_git and not in_site:
+            return True
+    except Exception:
+        pass
+
+    return False
+
+
 def _setup_signal_handler() -> None:
     """设置SIGINT信号处理函数"""
     original_sigint = signal.getsignal(signal.SIGINT)
@@ -124,7 +216,7 @@ def _check_pip_updates() -> bool:
     from packaging import version
 
     # 检查上次检查日期
-    last_check_file = Path(get_data_dir()) / "last_pip_check"
+    last_check_file = Path(str(get_data_dir())) / "last_pip_check"
     today_str = date.today().strftime("%Y-%m-%d")
 
     if last_check_file.exists():
@@ -867,7 +959,6 @@ def load_config():
         _load_and_process_config(str(config_file_path.parent), str(config_file_path))
 
 
-from typing import Tuple
 
 
 def _load_config_file(config_file: str) -> Tuple[str, dict]:
@@ -1235,11 +1326,7 @@ def _collect_optional_config_interactively(
                 "            适用于您希望绕过检查并自行管理仓库状态的场景。"
             )
 
-            try:
-                # 查找当前模式在选项中的索引
-                default_index = choices.index(current_mode)
-            except ValueError:
-                default_index = 0  # 默认为第一个选项
+
 
             new_mode = get_choice(
                 tip,
@@ -1848,7 +1935,7 @@ def daily_check_git_updates(repo_dirs: List[str], repo_type: str):
         repo_dirs (List[str]): 需要检查的git仓库目录列表。
         repo_type (str): 仓库的类型名称，例如 "工具" 或 "方法论"，用于日志输出。
     """
-    data_dir = Path(get_data_dir())
+    data_dir = Path(str(get_data_dir()))
     last_check_file = data_dir / f"{repo_type}_updates_last_check.txt"
     should_check_for_updates = True
 

{jarvis_ai_assistant-0.3.28.dist-info → jarvis_ai_assistant-0.3.29.dist-info}/METADATA

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