jarvis-ai-assistant 0.3.24__py3-none-any.whl → 0.3.25__py3-none-any.whl

jarvis/__init__.py

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

jarvis/jarvis_agent/jarvis.py

@@ -384,21 +384,21 @@ def handle_builtin_config_selector(
                 table.add_column("描述", style="white")
 
                 for idx, opt in enumerate(options, 1):
-                    category = opt.get("category", "")
-                    name = opt.get("name", "")
-                    file_path = opt.get("file", "")
+                    category = str(opt.get("category", ""))
+                    name = str(opt.get("name", ""))
+                    file_path = str(opt.get("file", ""))
                     # 描述列显示配置描述；若为 roles 同时显示角色数量与列表
                     if category == "roles":
                         count = opt.get("roles_count")
-                        details = opt.get("details", "")
-                        parts = []
+                        details_val = opt.get("details", "")
+                        parts: list[str] = []
                         if isinstance(count, int) and count > 0:
                             parts.append(f"{count} 个角色")
-                        if details:
-                            parts.append(details)
+                        if isinstance(details_val, str) and details_val:
+                            parts.append(details_val)
                         desc_display = "\n".join(parts) if parts else ""
                     else:
-                        desc_display = opt.get("desc", "")
+                        desc_display = str(opt.get("desc", ""))
                     table.add_row(str(idx), category, name, file_path, desc_display)
 
                 Console().print(table)
@@ -412,29 +412,29 @@ def handle_builtin_config_selector(
                         index = int(choice.strip())
                         if 1 <= index <= len(options):
                             sel = options[index - 1]
-                            args = []
+                            args: list[str] = []
 
                             if sel["category"] == "agent":
                                 # jarvis-agent 支持 -f/--config（全局配置）与 -c/--agent-definition
-                                args = [sel["cmd"], "-c", sel["file"]]
+                                args = [str(sel["cmd"]), "-c", str(sel["file"])]
                                 if model_group:
-                                    args += ["-g", model_group]
+                                    args += ["-g", str(model_group)]
                                 if config_file:
-                                    args += ["-f", config_file]
+                                    args += ["-f", str(config_file)]
                                 if task:
-                                    args += ["--task", task]
+                                    args += ["--task", str(task)]
 
                             elif sel["category"] == "multi_agent":
                                 # jarvis-multi-agent 需要 -c/--config，用户输入通过 -i/--input 传递
-                                args = [sel["cmd"], "-c", sel["file"]]
+                                args = [str(sel["cmd"]), "-c", str(sel["file"])]
                                 if task:
-                                    args += ["-i", task]
+                                    args += ["-i", str(task)]
 
                             elif sel["category"] == "roles":
                                 # jarvis-platform-manager role 子命令，支持 -c/-t/-g
-                                args = [sel["cmd"], "role", "-c", sel["file"]]
+                                args = [str(sel["cmd"]), "role", "-c", str(sel["file"])]
                                 if model_group:
-                                    args += ["-g", model_group]
+                                    args += ["-g", str(model_group)]
 
                             if args:
                                 PrettyOutput.print(

jarvis/jarvis_data/config_schema.json

@@ -165,6 +165,13 @@
             "JARVIS_MAX_INPUT_TOKEN_COUNT": {
               "type": "number",
               "default": 32000
+            },
+            "ENV": {
+              "type": "object",
+              "description": "该模型组特定的环境变量，会覆盖全局 ENV 配置",
+              "additionalProperties": {
+                "type": "string"
+              }
             }
           },
           "required": [

jarvis/jarvis_git_utils/git_commiter.py

@@ -113,9 +113,9 @@ class GitCommitTool:
             # 获取文件列表
             files_cmd = ["git", "diff", "--cached", "--name-only"]
             process = subprocess.Popen(
-                files_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+                files_cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE, text=True
             )
-            files_output = process.communicate()[0].decode()
+            files_output = process.communicate()[0]
             files = [f.strip() for f in files_output.split("\n") if f.strip()]
             file_count = len(files)
 
@@ -124,8 +124,9 @@ class GitCommitTool:
                 ["git", "diff", "--cached", "--exit-code"],
                 stdout=subprocess.PIPE,
                 stderr=subprocess.PIPE,
+                text=True,
             )
-            diff = process.communicate()[0].decode(errors="ignore")
+            diff = process.communicate()[0]
 
             try:
                 temp_diff_file_path = None

jarvis/jarvis_platform/base.py

@@ -9,6 +9,7 @@ from typing_extensions import Self
 from rich import box  # type: ignore
 from rich.live import Live  # type: ignore
 from rich.panel import Panel  # type: ignore
+from rich.status import Status  # type: ignore
 from rich.text import Text  # type: ignore
 
 from jarvis.jarvis_utils.config import (
@@ -120,23 +121,44 @@ class BasePlatform(ABC):
         else:
             response = ""
 
-            text_content = Text(overflow="fold")  # 添加文本溢出处理
-            panel = Panel(
-                text_content,
-                title=f"[bold cyan]{self.name()}[/bold cyan]",
-                subtitle="[dim]思考中... (按 Ctrl+C 中断)[/dim]",
-                border_style="bright_blue",
-                box=box.ROUNDED,
-                expand=True  # 允许面板自动调整大小
-            )
-
             if not self.suppress_output:
                 if get_pretty_output():
-                    # 优化Live输出，减少闪烁
+                    chat_iterator = self.chat(message)
+                    first_chunk = None
+
+                    with Status(
+                        f"🤔 {self.name()} 正在思考中...", spinner="dots", console=console
+                    ):
+                        try:
+                            while True:
+                                first_chunk = next(chat_iterator)
+                                if first_chunk:
+                                    break
+                        except StopIteration:
+                            return ""
+
+                    text_content = Text(overflow="fold")
+                    panel = Panel(
+                        text_content,
+                        title=f"[bold cyan]{self.name()}[/bold cyan]",
+                        subtitle="[yellow]正在回答... (按 Ctrl+C 中断)[/yellow]",
+                        border_style="bright_blue",
+                        box=box.ROUNDED,
+                        expand=True,  # 允许面板自动调整大小
+                    )
+
                     buffer = []
                     buffer_count = 0
                     with Live(panel, refresh_per_second=4, transient=False) as live:
-                        for s in self.chat(message):
+                        # Process first chunk
+                        response += first_chunk
+                        buffer.append(first_chunk)
+                        buffer_count += 1
+
+                        # Process rest of the chunks
+                        for s in chat_iterator:
+                            if not s:
+                                continue
                             response += s  # Accumulate the full response string
                             buffer.append(s)
                             buffer_count += 1
@@ -144,13 +166,17 @@ class BasePlatform(ABC):
                             # 积累一定量或达到最后再更新，减少闪烁
                             if buffer_count >= 5 or s == "":
                                 # Append buffered content to the Text object
-                                text_content.append("".join(buffer), style="bright_white")
+                                text_content.append(
+                                    "".join(buffer), style="bright_white"
+                                )
                                 buffer.clear()
                                 buffer_count = 0
 
                                 # --- Scrolling Logic ---
                                 # Calculate available height in the panel
-                                max_text_height = console.height - 5  # Leave space for borders/titles
+                                max_text_height = (
+                                    console.height - 5
+                                )  # Leave space for borders/titles
                                 if max_text_height <= 0:
                                     max_text_height = 1
 
@@ -163,11 +189,15 @@ class BasePlatform(ABC):
                                 # If content overflows, truncate to show only the last few lines
                                 if len(lines) > max_text_height:
                                     new_text = "\n".join(
-                                        text_content.plain.splitlines()[-max_text_height:]
+                                        text_content.plain.splitlines()[
+                                            -max_text_height:
+                                        ]
                                     )
                                     text_content.plain = new_text
 
-                                panel.subtitle = "[yellow]正在回答... (按 Ctrl+C 中断)[/yellow]"
+                                panel.subtitle = (
+                                    "[yellow]正在回答... (按 Ctrl+C 中断)[/yellow]"
+                                )
                                 live.update(panel)
 
                             if is_immediate_abort() and get_interrupt():
@@ -175,7 +205,9 @@ class BasePlatform(ABC):
 
                         # Ensure any remaining content in the buffer is displayed
                         if buffer:
-                            text_content.append("".join(buffer), style="bright_white")
+                            text_content.append(
+                                "".join(buffer), style="bright_white"
+                            )
 
                         # At the end, display the entire response
                         text_content.plain = response

jarvis/jarvis_rag/cli.py

@@ -357,6 +357,12 @@ def retrieve(
         None, "--db-path", help="向量数据库的路径。覆盖全局配置。"
     ),
     n_results: int = typer.Option(5, "--top-n", help="要检索的文档数量。"),
+    rewrite: bool = typer.Option(
+        True,
+        "--rewrite/--no-rewrite",
+        help="是否对查询进行LLM重写以提升召回，默认开启。",
+        show_default=True,
+    ),
 ):
     """仅从RAG知识库检索文档并打印结果。"""
     try:
@@ -371,6 +377,7 @@ def retrieve(
             collection_name=collection_name,
             use_bm25=use_bm25,
             use_rerank=use_rerank,
+            use_query_rewrite=rewrite,
         )
 
         PrettyOutput.print(f"正在为问题检索文档: '{question}'", OutputType.INFO)

jarvis/jarvis_rag/embedding_manager.py

@@ -1,6 +1,9 @@
 import torch
+import os
 from typing import List, cast
 from langchain_huggingface import HuggingFaceEmbeddings
+from huggingface_hub import snapshot_download
+
 
 from .cache import EmbeddingCache
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
@@ -38,18 +41,135 @@ class EmbeddingManager:
         encode_kwargs = {"normalize_embeddings": True}
 
         try:
-            # First try to load model locally
+            # First try to load model from local cache without any network access
             try:
                 from sentence_transformers import SentenceTransformer
-                local_model = SentenceTransformer(self.model_name, device=model_kwargs["device"])
+                local_dir = None
+                # Prefer explicit local dir via env or direct path
+
+                if os.path.isdir(self.model_name):
+                    return HuggingFaceEmbeddings(
+                        model_name=self.model_name,
+                        model_kwargs=model_kwargs,
+                        encode_kwargs=encode_kwargs,
+                        show_progress=False,
+                    )
+
+                # Try common local cache directories for sentence-transformers and HF hub
+                try:
+                    home = os.path.expanduser("~")
+                    st_home = os.path.join(home, ".cache", "sentence_transformers")
+                    torch_st_home = os.path.join(home, ".cache", "torch", "sentence_transformers")
+                    # Build common name variants found in local caches
+                    org, name = (
+                        self.model_name.split("/", 1)
+                        if "/" in self.model_name
+                        else ("", self.model_name)
+                    )
+                    san1 = self.model_name.replace("/", "_")
+                    san2 = self.model_name.replace("/", "__")
+                    san3 = self.model_name.replace("/", "--")
+                    # include plain 'name' for caches that drop org prefix
+                    name_variants = list(dict.fromkeys([self.model_name, san1, san2, san3, name]))
+                    candidates = []
+                    for base in [st_home, torch_st_home]:
+                        for nv in name_variants:
+                            p = os.path.join(base, nv)
+                            if os.path.isdir(p):
+                                candidates.append(p)
+                        # Fuzzy scan cache directory for entries that include variants
+                        try:
+                            for entry in os.listdir(base):
+                                ep = os.path.join(base, entry)
+                                if not os.path.isdir(ep):
+                                    continue
+                                if (
+                                    (org and entry.startswith(f"{org}__") and name in entry)
+                                    or (san1 in entry)
+                                    or (name in entry)
+                                ):
+                                    candidates.append(ep)
+                        except Exception:
+                            pass
+
+                    # Hugging Face Hub cache snapshots
+                    hf_cache = os.path.join(home, ".cache", "huggingface", "hub")
+                    if "/" in self.model_name:
+                        org, name = self.model_name.split("/", 1)
+                        models_dir = os.path.join(hf_cache, f"models--{org}--{name}", "snapshots")
+                        if os.path.isdir(models_dir):
+                            try:
+                                snaps = sorted(
+                                    [os.path.join(models_dir, d) for d in os.listdir(models_dir)],
+                                    key=lambda p: os.path.getmtime(p),
+                                    reverse=True,
+                                )
+                            except Exception:
+                                snaps = [os.path.join(models_dir, d) for d in os.listdir(models_dir)]
+                            for sp in snaps:
+                                if os.path.isdir(sp):
+                                    candidates.append(sp)
+                                    break
+
+                    for cand in candidates:
+                        try:
+                            return HuggingFaceEmbeddings(
+                                model_name=cand,
+                                model_kwargs=model_kwargs,
+                                encode_kwargs=encode_kwargs,
+                                show_progress=False,
+                            )
+                        except Exception:
+                            continue
+                except Exception:
+                    pass
+
+                try:
+                    # Try resolve local cached directory; do not hit network
+                    local_dir = snapshot_download(repo_id=self.model_name, local_files_only=True)
+                except Exception:
+                    local_dir = None
+
+                if local_dir:
+                    return HuggingFaceEmbeddings(
+                        model_name=local_dir,
+                        model_kwargs=model_kwargs,
+                        encode_kwargs=encode_kwargs,
+                        show_progress=False,
+                    )
+
+
+
+                # Fall back to remote download if local cache not found and not offline
                 return HuggingFaceEmbeddings(
-                    client=local_model,
                     model_name=self.model_name,
                     model_kwargs=model_kwargs,
                     encode_kwargs=encode_kwargs,
+                    show_progress=True,
                 )
-            except Exception:
-                # Fall back to remote download if local loading fails
+            except Exception as _e:
+                # 如果已检测到本地候选路径（直接目录 / 本地缓存快照），则视为本地加载失败，
+                # 为避免在用户期望“本地优先不联网”的情况下触发联网，直接抛错并给出修复建议。
+                had_local_candidate = False
+                try:
+                    had_local_candidate = (
+                        os.path.isdir(self.model_name)
+                        # 如果上面 snapshot_download 命中了本地缓存，会将 local_dir 设为非 None
+                        or (locals().get("local_dir") is not None)
+                    )
+                except Exception:
+                    pass
+
+                if had_local_candidate:
+                    PrettyOutput.print(
+                        "检测到本地模型路径但加载失败。为避免触发网络访问，已中止远程回退。\n"
+                        "请确认本地目录包含完整的 Transformers/Tokenizer 文件（如 config.json、model.safetensors、tokenizer.json/merges.txt 等），\n"
+                        "或在配置中将 embedding_model 设置为该本地目录，或将模型放置到默认的 Hugging Face 缓存目录（例如 ~/.cache/huggingface/hub）。",
+                        OutputType.ERROR,
+                    )
+                    raise
+
+                # 未发现任何本地候选，则保持原有行为：回退至远程下载
                 return HuggingFaceEmbeddings(
                     model_name=self.model_name,
                     model_kwargs=model_kwargs,

jarvis/jarvis_rag/rag_pipeline.py

@@ -34,6 +34,7 @@ class JarvisRAGPipeline:
         collection_name: str = "jarvis_rag_collection",
         use_bm25: bool = True,
         use_rerank: bool = True,
+        use_query_rewrite: bool = True,
     ):
         """
         初始化RAG管道。
@@ -69,6 +70,8 @@ class JarvisRAGPipeline:
         self.collection_name = collection_name
         self.use_bm25 = use_bm25
         self.use_rerank = use_rerank
+        # 查询重写开关（默认开启，可由CLI控制）
+        self.use_query_rewrite = use_query_rewrite
 
         # 延迟加载的组件
         self._embedding_manager: Optional[EmbeddingManager] = None
@@ -229,8 +232,15 @@ class JarvisRAGPipeline:
         """
         # 0. 检测索引变更并可选更新（在重写query之前）
         self._pre_search_update_index_if_needed()
-        # 1. 将原始查询重写为多个查询
-        rewritten_queries = self._get_query_rewriter().rewrite(query_text)
+        # 1. 将原始查询重写为多个查询（可配置）
+        if self.use_query_rewrite:
+            rewritten_queries = self._get_query_rewriter().rewrite(query_text)
+        else:
+            PrettyOutput.print(
+                "已关闭查询重写，将直接使用原始查询进行检索。",
+                OutputType.INFO,
+            )
+            rewritten_queries = [query_text]
 
         # 2. 为每个重写的查询检索初始候选文档
         PrettyOutput.print(
@@ -303,8 +313,15 @@ class JarvisRAGPipeline:
         """
         # 0. 检测索引变更并可选更新（在重写query之前）
         self._pre_search_update_index_if_needed()
-        # 1. 重写查询
-        rewritten_queries = self._get_query_rewriter().rewrite(query_text)
+        # 1. 重写查询（可配置）
+        if self.use_query_rewrite:
+            rewritten_queries = self._get_query_rewriter().rewrite(query_text)
+        else:
+            PrettyOutput.print(
+                "已关闭查询重写，将直接使用原始查询进行检索。",
+                OutputType.INFO,
+            )
+            rewritten_queries = [query_text]
 
         # 2. 检索候选文档
         PrettyOutput.print(

jarvis/jarvis_rag/reranker.py

@@ -1,9 +1,11 @@
 from typing import List
+import os
 
 from langchain.docstore.document import Document
 from sentence_transformers.cross_encoder import (  # type: ignore
     CrossEncoder,
 )
+from huggingface_hub import snapshot_download
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
@@ -21,8 +23,28 @@ class Reranker:
             model_name (str): 要使用的Cross-Encoder模型的名称。
         """
         PrettyOutput.print(f"正在初始化重排模型: {model_name}...", OutputType.INFO)
-        self.model = CrossEncoder(model_name)
-        PrettyOutput.print("重排模型初始化成功。", OutputType.SUCCESS)
+        try:
+            local_dir = None
+
+            if os.path.isdir(model_name):
+                self.model = CrossEncoder(model_name)
+                PrettyOutput.print("重排模型初始化成功。", OutputType.SUCCESS)
+                return
+            try:
+                # Prefer local cache; avoid any network access
+                local_dir = snapshot_download(repo_id=model_name, local_files_only=True)
+            except Exception:
+                local_dir = None
+
+            if local_dir:
+                self.model = CrossEncoder(local_dir)
+            else:
+                self.model = CrossEncoder(model_name)
+
+            PrettyOutput.print("重排模型初始化成功。", OutputType.SUCCESS)
+        except Exception as e:
+            PrettyOutput.print(f"初始化重排模型失败: {e}", OutputType.ERROR)
+            raise
 
     def rerank(
         self, query: str, documents: List[Document], top_n: int = 5

jarvis/jarvis_smart_shell/main.py

@@ -24,20 +24,11 @@ Example:
 
 def execute_command(command: str, should_run: bool) -> None:
     """Print command without execution"""
-    PrettyOutput.print(command, OutputType.CODE, lang="bash")
+    print(command)
     if should_run:
         os.system(command)
 
 
-def _check_fish_shell() -> bool:
-    """Check if current shell is fish
-
-    Returns:
-        bool: True if fish shell, False otherwise
-    """
-    return get_shell_name() == "fish"
-
-
 def _get_config_file() -> str:
     """Get fish config file path
 

jarvis/jarvis_tools/edit_file.py

@@ -122,8 +122,8 @@ class FileSearchReplaceTool:
 
         from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
-        stdout_messages = []
-        stderr_messages = []
+        stdout_messages: list[str] = []
+        stderr_messages: list[str] = []
         overall_success = False
         file_results = []
 
@@ -168,10 +168,10 @@ class FileSearchReplaceTool:
                 )
 
         # 整合所有错误信息到stderr
-        all_stderr = []
-        for result in file_results:
-            if not result["success"]:
-                all_stderr.append(f"文件 {result['file']} 处理失败: {result['stderr']}")
+        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']}")
 
         return {
             "success": overall_success,

jarvis/jarvis_tools/execute_script.py

@@ -74,8 +74,7 @@ class ScriptTool:
         stream.feed(data)
 
         # 清理每行右侧空格，并过滤空行
-        cleaned = []
-        cleaned = []
+        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

@@ -64,12 +64,6 @@ class SubAgentTool:
                 f"背景信息:\n{background}\n\n任务:\n{task}" if background else task
             )
 
-            # 读取背景信息并组合任务
-            background: str = str(args.get("background", "")).strip()
-            enhanced_task = (
-                f"背景信息:\n{background}\n\n任务:\n{task}" if background else task
-            )
-
             # 继承父Agent的运行参数（用于覆盖默认值）；若无父Agent则使用默认/全局配置
             parent_agent = args.get("agent")
             # 如未注入父Agent，尝试从全局获取当前或任一已注册Agent
@@ -160,7 +154,10 @@ class SubAgentTool:
                     try:
                         model_name = parent_agent.model.name()  # type: ignore[attr-defined]
                         if model_name:
-                            agent.model.set_model_name(model_name)  # type: ignore[attr-defined]
+                            from typing import Any
+                            model_obj: Any = getattr(agent, "model", None)
+                            if model_obj is not None:
+                                model_obj.set_model_name(model_name)
                     except Exception:
                         pass
                 if use_tools:

jarvis/jarvis_tools/sub_code_agent.py

@@ -161,7 +161,10 @@ class SubCodeAgentTool:
                     try:
                         parent_model_name = parent_agent.model.name()  # type: ignore[attr-defined]
                         if parent_model_name:
-                            code_agent.agent.model.set_model_name(parent_model_name)  # type: ignore[attr-defined]
+                            from typing import Any
+                            model_obj: Any = getattr(code_agent.agent, "model", None)
+                            if model_obj is not None:
+                                model_obj.set_model_name(parent_model_name)
                     except Exception:
                         pass
             except Exception:

jarvis/jarvis_utils/config.py

@@ -115,6 +115,14 @@ def get_shell_name() -> str:
     return os.path.basename(shell_path).lower()
 
 
+def _apply_llm_group_env_override(group_config: Dict[str, Any]) -> None:
+    """如果模型组配置中包含ENV，则应用环境变量覆盖"""
+    if "ENV" in group_config and isinstance(group_config["ENV"], dict):
+        os.environ.update(
+            {str(k): str(v) for k, v in group_config["ENV"].items() if v is not None}
+        )
+
+
 def _get_resolved_model_config(
     model_group_override: Optional[str] = None,
 ) -> Dict[str, Any]:
@@ -141,6 +149,8 @@ def _get_resolved_model_config(
             if isinstance(group_item, dict) and model_group_name in group_item:
                 group_config = group_item[model_group_name]
                 break
+    
+    _apply_llm_group_env_override(group_config)
 
     # Start with group config
     resolved_config = group_config.copy()

jarvis/jarvis_utils/input.py

@@ -702,7 +702,7 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
                         "未检测到 fzf，无法打开文件选择器。", OutputType.WARNING
                     )
                 else:
-                    files: list[str] = []
+                    files = []
                     try:
                         r = subprocess.run(
                             ["git", "ls-files"],
@@ -835,7 +835,7 @@ def get_multiline_input(tip: str, print_on_empty: bool = True) -> str:
                         "未检测到 fzf，无法打开文件选择器。", OutputType.WARNING
                     )
                 else:
-                    files: list[str] = []
+                    files = []
                     try:
                         import os as _os
 

jarvis/jarvis_utils/utils.py

@@ -1085,6 +1085,14 @@ def _collect_optional_config_interactively(
         )
         or changed
     )
+    changed = (
+        _ask_and_set_int(
+            "JARVIS_TOOL_FILTER_THRESHOLD",
+            "设置AI工具筛选阈值 (当可用工具数超过此值时触发AI筛选, 默认30)",
+            30,
+        )
+        or changed
+    )
 
     # 目录类配置（逗号分隔）
     changed = (
@@ -1164,7 +1172,7 @@ def _collect_optional_config_interactively(
     try:
         if "JARVIS_RAG" not in config_data:
             if get_yes_no("是否配置 RAG 检索增强参数？", default=False):
-                rag_conf = {}
+                rag_conf: Dict[str, Any] = {}
                 emb = get_single_line_input(
                     f"RAG 嵌入模型（留空使用默认: {rag_default_embed}）：",
                     default="",
@@ -1468,20 +1476,15 @@ def while_success(func: Callable[[], Any], sleep_time: float = 0.1) -> Any:
     返回：
     函数执行结果
     """
-    logs: List[str] = []
     result: Any = None
-    success = False
     while True:
         try:
             result = func()
-            success = True
             break
         except Exception:
-            logs.append(f"重试中，等待 {sleep_time}s...")
+            PrettyOutput.print(f"重试中，等待 {sleep_time}s...", OutputType.WARNING)
             time.sleep(sleep_time)
             continue
-    if logs:
-        PrettyOutput.print("\n".join(logs), OutputType.WARNING)
     return result
 
 
@@ -1499,16 +1502,13 @@ def while_true(func: Callable[[], bool], sleep_time: float = 0.1) -> Any:
         与while_success不同，此函数只检查返回是否为True，
         不捕获异常，异常会直接抛出
     """
-    logs: List[str] = []
     ret: bool = False
     while True:
         ret = func()
         if ret:
             break
-        logs.append(f"重试中，等待 {sleep_time}s...")
+        PrettyOutput.print(f"重试中，等待 {sleep_time}s...", OutputType.WARNING)
         time.sleep(sleep_time)
-    if logs:
-        PrettyOutput.print("\n".join(logs), OutputType.WARNING)
     return ret
 
 

{jarvis_ai_assistant-0.3.24.dist-info → jarvis_ai_assistant-0.3.25.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jarvis-ai-assistant
-Version: 0.3.24
+Version: 0.3.25
 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.24.dist-info → jarvis_ai_assistant-0.3.25.dist-info}/RECORD

@@ -1,11 +1,11 @@
-jarvis/__init__.py,sha256=sNrDvwFba715bqcu57BUGzZ7SeFI3Oc-7DTacWo5JxM,74
+jarvis/__init__.py,sha256=Y5YWCRMaj8nleHAZXhZE59v10sX-ZvJ5CW8wpIDG-SM,74
 jarvis/jarvis_agent/__init__.py,sha256=eLSiwd-Eo6KqG0qLJ5peI-symxWUrTsxWCBnOgEO474,37524
 jarvis/jarvis_agent/agent_manager.py,sha256=mmDe26Wa1Dnyp8CkTKupcKipC-5HSuCnk-oVJseOdTg,2801
 jarvis/jarvis_agent/builtin_input_handler.py,sha256=wS-FqpT3pIXwHn1dfL3SpXonUKWgVThbQueUIeyRc2U,2917
 jarvis/jarvis_agent/config_editor.py,sha256=IHyuwI4SRDrqxz8lO0NNgt2F3uYAw1WEKXMxQV49bYI,1928
 jarvis/jarvis_agent/edit_file_handler.py,sha256=5sFz84jqy2gpc0aLOre2bvz8_DitlBoWZs_cQwftWLw,11570
 jarvis/jarvis_agent/file_methodology_manager.py,sha256=PwDUQwq7HVIyPInsN8fgWyMXLwi8heIXPrqfBZJhVHs,4260
-jarvis/jarvis_agent/jarvis.py,sha256=gTqu7-3lXBYGXE8cpmu6ypjc_Jm1GmVhsCsOcoDiXS8,22241
+jarvis/jarvis_agent/jarvis.py,sha256=UNI4PoJpf4L7wp9y8-A6AfMXMQv7ikRk2YXmN5pRKUc,22383
 jarvis/jarvis_agent/main.py,sha256=bFcwXWC6O05jQiXy6ED_bHjdjDo5VwV_i1BoBEAzgP0,3336
 jarvis/jarvis_agent/memory_manager.py,sha256=Ckt6wmXOduu97jfyWQbRDmNH6yX11XzLW2nMTeVhFeY,5316
 jarvis/jarvis_agent/methodology_share_manager.py,sha256=AB_J9BwRgaeENQfL6bH83FOLeLrgHhppMb7psJNevKs,6874
@@ -44,11 +44,11 @@ jarvis/jarvis_code_analysis/checklists/shell.py,sha256=aRFYhQQvTgbYd-uY5pc8UHIUA
 jarvis/jarvis_code_analysis/checklists/sql.py,sha256=vR0T6qC7b4dURjJVAd7kSVxyvZEQXPG1Jqc2sNTGp5c,2355
 jarvis/jarvis_code_analysis/checklists/swift.py,sha256=TPx4I6Gupvs6tSerRKmTSKEPQpOLEbH2Y7LXg1uBgxc,2566
 jarvis/jarvis_code_analysis/checklists/web.py,sha256=25gGD7pDadZQybNFvALYxWvK0VRjGQb1NVJQElwjyk0,3943
-jarvis/jarvis_data/config_schema.json,sha256=GIBSroMb9YE1oW0rZQRVjj1ceQOOFPxeYXQ4eTnLoL8,12323
+jarvis/jarvis_data/config_schema.json,sha256=_O_FQwmEldoGpTJ0EjyDjI6Zc2wkyr_7yVn00WA_Qf4,12575
 jarvis/jarvis_data/tiktoken/9b5ad71b2ce5302211f9c61530b329a4922fc6a4,sha256=Ijkht27pm96ZW3_3OFE-7xAPtR0YyTWXoRO8_-hlsqc,1681126
 jarvis/jarvis_git_squash/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_git_squash/main.py,sha256=6PECdAbTbrsJBRLK1pXBh4hdJ_LADh-XXSic1xJi97E,2255
-jarvis/jarvis_git_utils/git_commiter.py,sha256=q9O__HfoGZCV5tSl3lI0Gp2hynHUzXV5jDlRaFYk_6o,14554
+jarvis/jarvis_git_utils/git_commiter.py,sha256=mtrZpdq42567dnX-Q8OJ6ZtSRaqRDDDQxHAGRMXdej0,14559
 jarvis/jarvis_mcp/__init__.py,sha256=OPMtjD-uq9xAaKCRIDyKIosaFfBe1GBPu1az-mQ0rVM,2048
 jarvis/jarvis_mcp/sse_mcp_client.py,sha256=UIDBaFNuuaJE0YiKmtbZTqwZpkDI5SaS0my1DIJj-3g,22831
 jarvis/jarvis_mcp/stdio_mcp_client.py,sha256=APYUksYKlMx7AVNODKOLrTkKZPnp4kqTQIYIuNDDKko,11286
@@ -60,7 +60,7 @@ jarvis/jarvis_multi_agent/__init__.py,sha256=Ygp4DBBkmEXCRcQV3nr07zOxo2Tb4149mi4
 jarvis/jarvis_multi_agent/main.py,sha256=b9IThFMeUZCYSlgT-VT8r7xeBdrEE_zNT11awEc8IdY,1853
 jarvis/jarvis_platform/__init__.py,sha256=WLQHSiE87PPket2M50_hHzjdMIgPIBx2VF8JfB_NNRk,105
 jarvis/jarvis_platform/ai8.py,sha256=g8JkqPGs9SEbqstNMCc5rCHO0QcPHX9LNvb7HMWwB-Q,11471
-jarvis/jarvis_platform/base.py,sha256=dnd3nidsf7mqwimAzmQSV9s_wGviQ7VjRqOLUkRVLYc,12151
+jarvis/jarvis_platform/base.py,sha256=5RLs5d4iYQ6PdSgKXj9idoCkln68Kmrv7-Sh7HBGbyw,13434
 jarvis/jarvis_platform/human.py,sha256=jWjW8prEag79e6ddqTPV4nz_Gz6zFBfO4a1EbvP8QWA,4908
 jarvis/jarvis_platform/kimi.py,sha256=dLES_E0VmDQ3TwjTZk5vCGdbvdBeSVvvlXR90m6vPfY,15711
 jarvis/jarvis_platform/openai.py,sha256=0YSeDGHRSPQP2haEzFARx_aZH_d_UZ-HSCsJLh2hW5k,8037
@@ -72,15 +72,15 @@ jarvis/jarvis_platform_manager/main.py,sha256=tU25oVQzEFPB8aOqPec8SgnxsapCFuHBkY
 jarvis/jarvis_platform_manager/service.py,sha256=WG2r0JRBGfSLGdsKxqYvmaacU_ne3PTn3RkczTzUb_M,14899
 jarvis/jarvis_rag/__init__.py,sha256=HRTXgnQxDuaE9x-e3r6SYqhJ5d4DSI_rrIxy2IGY6qk,320
 jarvis/jarvis_rag/cache.py,sha256=Tqx_Oe-AhuWlMXHGHUaIuG6OEHoHBVZq7mL3kldtFFU,2723
-jarvis/jarvis_rag/cli.py,sha256=ZuyySys8sV8Mv2B_-WC2pejr2hAbh0c7qhtz0AEEOxw,17219
-jarvis/jarvis_rag/embedding_manager.py,sha256=7JAylkU0Y22X5x8kv5WiwMAgU-MSJEZG8PmhrWOZH4k,4307
+jarvis/jarvis_rag/cli.py,sha256=l2TsLEC9plcJ5C2CF3JAYLigM-64QOPZR9Ywlb5FGiE,17454
+jarvis/jarvis_rag/embedding_manager.py,sha256=SF7BW8hoZWzDhDqlOdhnX6XTw42Fx2GKs7Y_RUT1ydo,10400
 jarvis/jarvis_rag/llm_interface.py,sha256=DH46Vm3AgzK1o41X7wUUYUbbOOVPgmDCxS5l6djm9eA,4561
 jarvis/jarvis_rag/query_rewriter.py,sha256=LGAWZ8kwH_dpquuYqc4QWC7IXmHX3SsnPSYMWOn-nDE,4072
-jarvis/jarvis_rag/rag_pipeline.py,sha256=sPvCucAshr_luGJLx7WiCfQKVHrrHHpb4-SVdAZdJc8,13085
-jarvis/jarvis_rag/reranker.py,sha256=Uzn4n1bNj4kWyQu9-z-jK_5dAU6drn5jEugML-kFHg8,1885
+jarvis/jarvis_rag/rag_pipeline.py,sha256=aaTuxiArtVaPemWeySApw64q204JeLNXpOEtq7Adn1I,13797
+jarvis/jarvis_rag/reranker.py,sha256=7Azc3y5fngwfPKtzZ8tx6iGKNeqC8uDy8yo8VCyLyL4,2670
 jarvis/jarvis_rag/retriever.py,sha256=BNEFZAgxTbmkxzBP1uy1wz3MX8wJN1wx5EtfsHqakqE,18374
 jarvis/jarvis_smart_shell/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-jarvis/jarvis_smart_shell/main.py,sha256=J5O58K5KvUvB_ghbT5XwIi5QGXD3DiBlGDs0wYYvy-w,15197
+jarvis/jarvis_smart_shell/main.py,sha256=JizPfVI-7-GqnYxdg77RHietGet6hZE6xUZoUCwKShE,14971
 jarvis/jarvis_stats/__init__.py,sha256=jJzgP43nxzLbNGs8Do4Jfta1PNCJMf1Oq9YTPd6EnFM,342
 jarvis/jarvis_stats/cli.py,sha256=iWuhA1AQAIOccXVUaO-k87T2b10s08wyeKAY5lUQ4og,12702
 jarvis/jarvis_stats/stats.py,sha256=AiQck1ma78YGR4hjT-leab-6GRMIQQmCp7wcG5SRKWw,19379
@@ -90,8 +90,8 @@ jarvis/jarvis_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSu
 jarvis/jarvis_tools/ask_user.py,sha256=M6DdLNryCE8y1JcdZHEifUgZkPUEPNKc-zDW5p0Mb1k,2029
 jarvis/jarvis_tools/base.py,sha256=tFZkRlbV_a-pbjM-ci9AYmXVJm__FXuzVWKbQEyz4Ao,1639
 jarvis/jarvis_tools/clear_memory.py,sha256=_GlwqlCAsoHeB24Y1CnjLdMawRTc6cq55AA8Yi5AZg4,8249
-jarvis/jarvis_tools/edit_file.py,sha256=BUz0kfv44kqfNDr3tZKS-7Cn5DDhYl8xhHO7X8x7HQI,7086
-jarvis/jarvis_tools/execute_script.py,sha256=kASNTShHVGlHm7pZZxUeyEZHzHAYiZ-87AzrYVyORMw,6231
+jarvis/jarvis_tools/edit_file.py,sha256=4Q0-ofyUVd3R5TAoQqQfTZCBlE5fgvgD3bf7_6wiZ3I,7139
+jarvis/jarvis_tools/execute_script.py,sha256=UeOTv5Vf6KqmPH-gSwFf2xz4pRAADo9KTUUpi6yU138,6221
 jarvis/jarvis_tools/file_analyzer.py,sha256=jzVb8fAJn3dWwpCiYH-Wuxva4kpHqBB2_V3x3mzY0Gs,4158
 jarvis/jarvis_tools/generate_new_tool.py,sha256=OCHkBOCQflgMZXRP4vgX3blnJOUq-_QkcBFRQFj3sj0,7894
 jarvis/jarvis_tools/methodology.py,sha256=_K4GIDUodGEma3SvNRo7Qs5rliijgNespVLyAPN35JU,5233
@@ -102,28 +102,28 @@ jarvis/jarvis_tools/retrieve_memory.py,sha256=hQ3s4IgBHtmUPzuWFl5Pc2FLEuT2gdi4l4
 jarvis/jarvis_tools/rewrite_file.py,sha256=CuvjWPTbUaPbex9FKSmw_Ru4r6R-CX_3vqTqCTp8nHA,6959
 jarvis/jarvis_tools/save_memory.py,sha256=QKj6iYZL2XxPX0NnU9HqvoDOpJZ38mJmatDmHLK2r74,7012
 jarvis/jarvis_tools/search_web.py,sha256=8ugOcGBsAEg59pX_WS0WADuu7Klw7XGR6guEMz4OnwI,6181
-jarvis/jarvis_tools/sub_agent.py,sha256=y9SuuFBVPpQQxS0SXO4T1125YG8zfwKuBXLlHiVPrF8,8084
-jarvis/jarvis_tools/sub_code_agent.py,sha256=9YEYK8hbciGhvC44MU3Y5vQc4hYgOAiahiUbUK_w2iI,7696
+jarvis/jarvis_tools/sub_agent.py,sha256=GTn6JXIsomHw9M46HTybIYgyFHUc72AFrbI4l9cwUro,7983
+jarvis/jarvis_tools/sub_code_agent.py,sha256=JSQKJNBO3zQsCNk3x-CPzqTIRPeOt8rvP4WPC-JQOwI,7848
 jarvis/jarvis_tools/virtual_tty.py,sha256=1AYrVNP5QCX1HGo-xi3XEP93cMWZUOkil4ki2gwf7dI,25504
 jarvis/jarvis_tools/cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 jarvis/jarvis_tools/cli/main.py,sha256=pyvSz0-hBduOqQShduv76UcB5wrK0v6MLonpub9AuXg,9334
 jarvis/jarvis_utils/__init__.py,sha256=67h0ldisGlh3oK4DAeNEL2Bl_VsI3tSmfclasyVlueM,850
 jarvis/jarvis_utils/builtin_replace_map.py,sha256=4BurljGuiG_I93EBs7mlFlPm9wYC_4CmdTG5tQWpF6g,1712
 jarvis/jarvis_utils/clipboard.py,sha256=D3wzQeqg_yiH7Axs4d6MRxyNa9XxdnenH-ND2uj2WVQ,2967
-jarvis/jarvis_utils/config.py,sha256=6wWqByse15Nsi5ciWvaqlC0AfxvK-7DXy95sUCyraKQ,18427
+jarvis/jarvis_utils/config.py,sha256=44MIH-CLRYpv8ltpirnq5_EccE1fVVGQciCiWRuDYmo,18824
 jarvis/jarvis_utils/embedding.py,sha256=oEOEM2qf16DMYwPsQe6srET9BknyjOdY2ef0jsp3Or8,2714
 jarvis/jarvis_utils/file_processors.py,sha256=XiM248SHS7lLgQDCbORVFWqinbVDUawYxWDOsLXDxP8,3043
 jarvis/jarvis_utils/git_utils.py,sha256=AkczUiRcGcOnPfz2v3mdLwV1S41IopiAYD2tjeMTDrE,23586
 jarvis/jarvis_utils/globals.py,sha256=aTrOHcCgPAeZFLFIWMAMiJCYlmr4XhdFZf5gZ745hnE,8900
 jarvis/jarvis_utils/http.py,sha256=eRhV3-GYuWmQ0ogq9di9WMlQkFcVb1zGCrySnOgT1x0,4392
-jarvis/jarvis_utils/input.py,sha256=iLY6kRm-kjKpsDyQQM49ppnXCZs_6jZVqLbvUWglrls,36657
+jarvis/jarvis_utils/input.py,sha256=tGIr3-t46gT3dD-Z6Bcb5xagIifM62cAHRkk3w9p7_Q,36635
 jarvis/jarvis_utils/methodology.py,sha256=3PAMHVF85IflBBblV_mMwkYXMelUML0nZYZ8MOAYUJ8,12918
 jarvis/jarvis_utils/output.py,sha256=svCHLuXHe3Ta_qfoT5DxO80nyYyMfBFIKgziQS__Nmg,13632
 jarvis/jarvis_utils/tag.py,sha256=f211opbbbTcSyzCDwuIK_oCnKhXPNK-RknYyGzY1yD0,431
-jarvis/jarvis_utils/utils.py,sha256=KdNXmXkwZZZwfjoFT-UivjGBBaB3feFNUHQ13U_HApo,62210
-jarvis_ai_assistant-0.3.24.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
-jarvis_ai_assistant-0.3.24.dist-info/METADATA,sha256=g1hsQNJc_yGSieqNhztNwmB7KQR6YjCEoqp2c8icNww,18790
-jarvis_ai_assistant-0.3.24.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-jarvis_ai_assistant-0.3.24.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
-jarvis_ai_assistant-0.3.24.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
-jarvis_ai_assistant-0.3.24.dist-info/RECORD,,
+jarvis/jarvis_utils/utils.py,sha256=sK0-A6DVxqyxJE54K7j2vKGIAVQBpd7O54xOtBWLFt4,62268
+jarvis_ai_assistant-0.3.25.dist-info/licenses/LICENSE,sha256=AGgVgQmTqFvaztRtCAXsAMryUymB18gZif7_l2e1XOg,1063
+jarvis_ai_assistant-0.3.25.dist-info/METADATA,sha256=x_-BQj684awisXcDf-gV-9T7ycgni8QWZiAAZI6KSrg,18790
+jarvis_ai_assistant-0.3.25.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+jarvis_ai_assistant-0.3.25.dist-info/entry_points.txt,sha256=4GcWKFxRJD-QU14gw_3ZaW4KuEVxOcZK9i270rwPdjA,1395
+jarvis_ai_assistant-0.3.25.dist-info/top_level.txt,sha256=1BOxyWfzOP_ZXj8rVTDnNCJ92bBGB0rwq8N1PCpoMIs,7
+jarvis_ai_assistant-0.3.25.dist-info/RECORD,,