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

jarvis/jarvis_agent/protocols.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
-from typing import Any, Protocol, Tuple
+from typing import Any, Protocol, Tuple, runtime_checkable
 
 
+@runtime_checkable
 class OutputHandlerProtocol(Protocol):
     """
     Defines the interface for an output handler, which is responsible for
@@ -28,3 +29,5 @@ class OutputHandlerProtocol(Protocol):
             A tuple containing a boolean (whether to return) and the result.
         """
         ...
+        
+__all__ = ["OutputHandlerProtocol"]

jarvis/jarvis_agent/run_loop.py

@@ -11,7 +11,8 @@ from enum import Enum
 from typing import Any, TYPE_CHECKING
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
-from jarvis.jarvis_utils.tag import ot
+from jarvis.jarvis_agent.events import BEFORE_TOOL_CALL, AFTER_TOOL_CALL
+from jarvis.jarvis_agent.utils import join_prompts, is_auto_complete, normalize_next_action
 
 if TYPE_CHECKING:
     # 仅用于类型标注，避免运行时循环依赖
@@ -63,7 +64,7 @@ class AgentRunLoop:
                 # 广播工具调用前事件（不影响主流程）
                 try:
                     ag.event_bus.emit(
-                        "before_tool_call",
+                        BEFORE_TOOL_CALL,
                         agent=ag,
                         current_response=current_response,
                     )
@@ -72,12 +73,7 @@ class AgentRunLoop:
                 need_return, tool_prompt = ag._call_tools(current_response)
 
                 # 将上一个提示和工具提示安全地拼接起来
-                prompt_parts = []
-                if ag.session.prompt:
-                    prompt_parts.append(ag.session.prompt)
-                if tool_prompt:
-                    prompt_parts.append(tool_prompt)
-                ag.session.prompt = "\n\n".join(prompt_parts)
+                ag.session.prompt = join_prompts([ag.session.prompt, tool_prompt])
 
                 if need_return:
                     return ag.session.prompt
@@ -88,7 +84,7 @@ class AgentRunLoop:
                 # 广播工具调用后的事件（不影响主流程）
                 try:
                     ag.event_bus.emit(
-                        "after_tool_call",
+                        AFTER_TOOL_CALL,
                         agent=ag,
                         current_response=current_response,
                         need_return=need_return,
@@ -102,27 +98,16 @@ class AgentRunLoop:
                     continue
 
                 # 检查自动完成
-                if ag.auto_complete and ot("!!!COMPLETE!!!") in current_response:
+                if ag.auto_complete and is_auto_complete(current_response):
                     return ag._complete_task(auto_completed=True)
 
                 # 获取下一步用户输入
                 next_action = ag._get_next_user_action()
-                if (
-                    next_action == "continue"
-                    or (
-                        isinstance(next_action, Enum)
-                        and getattr(next_action, "value", None) == "continue"
-                    )
-                ):
+                action = normalize_next_action(next_action)
+                if action == "continue":
                     run_input_handlers = True
                     continue
-                elif (
-                    next_action == "complete"
-                    or (
-                        isinstance(next_action, Enum)
-                        and getattr(next_action, "value", None) == "complete"
-                    )
-                ):
+                elif action == "complete":
                     return ag._complete_task(auto_completed=False)
 
             except Exception as e:

jarvis/jarvis_agent/shell_input_handler.py

@@ -3,6 +3,7 @@ from typing import Any, Tuple
 
 from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.input import user_confirm
+from jarvis.jarvis_agent.utils import join_prompts
 
 
 def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
@@ -28,7 +29,7 @@ def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
         # If any line contains the no-confirm marker, skip the pre-execution confirmation
         no_confirm = any(marker in c for c in cmdline)
 
-        if no_confirm or user_confirm(f"是否要执行以上shell脚本？", default=True):
+        if no_confirm or user_confirm("是否要执行以上shell脚本？", default=True):
             from jarvis.jarvis_tools.registry import ToolRegistry
 
             output = ToolRegistry().handle_tool_calls(
@@ -41,7 +42,11 @@ def shell_input_handler(user_input: str, agent: Any) -> Tuple[str, bool]:
             )
             if user_confirm("是否将执行结果反馈给Agent？", default=True):
                 return (
-                    f"{user_input}\n\n用户执行以下脚本：\n{script}\n\n执行结果：\n{output}",
+                    join_prompts([
+                        user_input,
+                        f"用户执行以下脚本：\n{script}",
+                        f"执行结果：\n{output}",
+                    ]),
                     False,
                 )
             return "", True

jarvis/jarvis_agent/task_analyzer.py

@@ -3,12 +3,13 @@
 任务分析器模块
 负责处理任务分析和方法论生成功能
 """
-from typing import Optional
 
 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:
@@ -44,7 +45,7 @@ class TaskAnalyzer:
             # 循环处理工具调用，直到没有工具调用为止
             self._process_analysis_loop()
 
-        except Exception as e:
+        except Exception:
             PrettyOutput.print("分析失败", OutputType.ERROR)
         finally:
             # 标记已完成一次分析，避免事件回调重复执行
@@ -56,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):
         """处理分析循环"""
@@ -75,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,
                 )
@@ -85,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,
@@ -131,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:
         """收集满意度反馈"""
@@ -141,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
@@ -163,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/user_interaction.py

@@ -6,7 +6,7 @@ UserInteractionHandler: 抽象用户交互（多行输入与确认）逻辑，
 - 仅提供封装，不直接修改 Agent 的现有调用
 - 后续步骤在 Agent 中以旁路方式接入，保持向后兼容
 """
-from typing import Callable, Optional
+from typing import Callable
 
 
 

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_code_agent/code_agent.py

@@ -262,7 +262,7 @@ class CodeAgent:
         if has_uncommitted_changes():
 
             git_commiter = GitCommitTool()
-            git_commiter.execute({"prefix": prefix, "suffix": suffix, "agent": self.agent})
+            git_commiter.execute({"prefix": prefix, "suffix": suffix, "agent": self.agent, "model_group": getattr(self.agent.model, "model_group", None)})
 
     def _init_env(self, prefix: str, suffix: str) -> None:
         """初始化环境，组合以下功能：
@@ -522,7 +522,7 @@ class CodeAgent:
                 check=True,
             )
             git_commiter = GitCommitTool()
-            git_commiter.execute({"prefix": prefix, "suffix": suffix, "agent": self.agent})
+            git_commiter.execute({"prefix": prefix, "suffix": suffix, "agent": self.agent, "model_group": getattr(self.agent.model, "model_group", None)})
 
             # 在用户接受commit后，根据配置决定是否保存记忆
             if self.agent.force_save_memory:

jarvis/jarvis_code_analysis/code_review.py

@@ -3,7 +3,6 @@ import os
 import re
 import subprocess
 import tempfile
-import sys
 from typing import Any, Dict, List, Optional
 
 import typer

jarvis/jarvis_git_utils/git_commiter.py

@@ -2,7 +2,6 @@
 import os
 import re
 import subprocess
-import sys
 import tempfile
 from typing import Any, Dict, Optional
 
@@ -138,7 +137,7 @@ class GitCommitTool:
                 base_prompt = (
                     custom_prompt
                     if custom_prompt
-                    else f"""根据代码差异生成提交信息：
+                    else """根据代码差异生成提交信息：
                 提交信息应使用中文书写
 # 格式模板
 必须使用以下格式：
@@ -219,11 +218,21 @@ commit信息
                     platform = PlatformRegistry().create_platform(platform_name)
                     if platform and model_name:
                         platform.set_model_name(model_name)
-                        if model_group:
-                            platform.model_group = model_group
+                    if platform and model_group:
+                        try:
+                            platform.set_model_group(model_group)
+                        except Exception:
+                            # 兼容早期实现
+                            platform.model_group = model_group  # type: ignore
                 else:
                     platform = PlatformRegistry().get_normal_platform()
 
+                # 跳过模型可用性校验：
+                # 为避免某些平台/代理不支持 get_model_list 接口导致的噪音日志（如 404），
+                # 这里默认不调用 platform.get_model_list() 进行模型可用性校验。
+                # 如果未来需要恢复校验，可参考被移除的逻辑。
+                # no-op
+
                 # Ensure platform is not None
                 if not platform:
                     return {

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_mcp/stdio_mcp_client.py

@@ -73,7 +73,7 @@ class StdioMcpClient(McpClient):
                     f"初始化失败: {response.get('error', 'Unknown error')}"
                 )
 
-            result = response["result"]
+            response["result"]
 
             # 发送initialized通知 - 使用正确的方法名格式
             self._send_notification("notifications/initialized", {})

jarvis/jarvis_memory_organizer/memory_organizer.py

@@ -7,14 +7,11 @@
 """
 
 import json
-import sys
 from collections import defaultdict
-from itertools import combinations
 from pathlib import Path
-from typing import Dict, List, Set, Tuple, Any, Optional
+from typing import Dict, List, Set, Any, Optional
 
 import typer
-import yaml
 
 from jarvis.jarvis_utils.config import (
     get_data_dir,
@@ -66,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:
@@ -311,7 +308,7 @@ tags:
                     group_memories = [memories[i] for i in original_indices]
 
                     # 显示将要合并的记忆（先拼接后统一打印，避免循环逐条输出）
-                    lines = [f"", f"准备合并 {len(group_memories)} 个记忆:"]
+                    lines = ["", f"准备合并 {len(group_memories)} 个记忆:"]
                     for mem in group_memories:
                         lines.append(
                             f"  - ID: {mem.get('id', '未知')}, "
@@ -391,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:
@@ -431,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_methodology/main.py

@@ -11,8 +11,6 @@
 import hashlib
 import json
 import os
-import sys
-from typing import Optional
 
 import typer
 import yaml  # type: ignore

jarvis/jarvis_multi_agent/__init__.py

@@ -73,7 +73,7 @@ content: |2
         if len(send_messages) > 1:
             return (
                 False,
-                f"Send multiple messages, please only send one message at a time.",
+                "Send multiple messages, please only send one message at a time.",
             )
         if len(send_messages) == 0:
             return False, ""
@@ -100,7 +100,7 @@ content: |2
                 msg = yaml.safe_load(item)
                 if "to" in msg and "content" in msg:
                     ret.append(msg)
-            except Exception as e:
+            except Exception:
                 continue
         return ret
 
@@ -161,7 +161,7 @@ content: {msg['content']}
 """
             to_agent_name = msg.get("to")
             if not to_agent_name:
-                return f"消息中未指定 `to` 字段"
+                return "消息中未指定 `to` 字段"
 
             if to_agent_name not in self.agents_config_map:
                 PrettyOutput.print(

jarvis/jarvis_platform/base.py

@@ -88,7 +88,7 @@ class BasePlatform(ABC):
             PrettyOutput.print(
                 f"长上下文，分批提交，共{len(inputs)}部分...", OutputType.INFO
             )
-            prefix_prompt = f"""
+            prefix_prompt = """
             我将分多次提供大量内容，在我明确告诉你内容已经全部提供完毕之前，每次仅需要输出"已收到"，明白请输出"开始接收输入"。
             """
             while_true(lambda: while_success(lambda: self._chat(prefix_prompt), 5), 5)

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/registry.py

@@ -39,7 +39,7 @@ class PlatformRegistry:
                 # 创建 __init__.py 使其成为 Python 包
                 with open(
                     os.path.join(user_platform_dir, "__init__.py"), "w", errors="ignore"
-                ) as f:
+                ):
                     pass
             except Exception as e:
                 PrettyOutput.print(f"创建平台目录失败: {str(e)}", OutputType.ERROR)

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

@@ -69,7 +69,6 @@ class YuanbaoPlatform(BasePlatform):
             "X-Requested-With": "XMLHttpRequest",
             "chat_version": "v1",
             "X-Instance-ID": "5",
-            "X-Requested-With": "XMLHttpRequest",
             "Accept": "application/json, text/plain, */*",
             "Content-Type": "application/json",
             "sec-ch-ua-mobile": "?0",
@@ -134,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_platform_manager/service.py

@@ -10,7 +10,7 @@ import time
 import threading
 import uuid
 from datetime import datetime
-from typing import Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional
 
 import uvicorn
 from fastapi import FastAPI, HTTPException

jarvis/jarvis_rag/cli.py

@@ -1,7 +1,7 @@
 import os
 import sys
 from pathlib import Path
-from typing import Optional, List, Literal, cast, Tuple
+from typing import Optional, List, Tuple
 import mimetypes
 
 import pathspec  # type: ignore

jarvis/jarvis_rag/embedding_manager.py

@@ -43,7 +43,6 @@ class EmbeddingManager:
         try:
             # First try to load model from local cache without any network access
             try:
-                from sentence_transformers import SentenceTransformer
                 local_dir = None
                 # Prefer explicit local dir via env or direct path
 

jarvis/jarvis_rag/llm_interface.py

@@ -1,7 +1,4 @@
 from abc import ABC, abstractmethod
-import os
-import os
-from abc import ABC, abstractmethod
 
 from jarvis.jarvis_agent import Agent as JarvisAgent
 from jarvis.jarvis_platform.base import BasePlatform

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_smart_shell/main.py

@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 import os
-import sys
 from typing import Optional, Tuple
 
 import typer

jarvis/jarvis_stats/cli.py

@@ -16,7 +16,6 @@ from pathlib import Path
 from .stats import StatsManager
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_utils.config import get_data_dir
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 app = typer.Typer(help="Jarvis 统计模块命令行工具")
 console = Console()
@@ -310,7 +309,7 @@ def remove(
             unit = info.get("unit", "-")
             last_updated = info.get("last_updated", "-")
 
-            rprint(f"\n[yellow]准备删除指标:[/yellow]")
+            rprint("\n[yellow]准备删除指标:[/yellow]")
             rprint(f"  名称: {metric}")
             rprint(f"  单位: {unit}")
             rprint(f"  最后更新: {last_updated}")
@@ -340,7 +339,7 @@ def demo():
     stats = StatsManager(_get_stats_dir())
 
     # 添加演示数据
-    with console.status("[bold green]正在生成演示数据...") as status:
+    with console.status("[bold green]正在生成演示数据..."):
         # API响应时间
         for i in range(20):
             response_time = random.uniform(0.1, 2.0)