jarvis-ai-assistant 0.3.18__py3-none-any.whl → 0.3.20__py3-none-any.whl

jarvis/jarvis_utils/output.py

@@ -10,7 +10,7 @@
 """
 from datetime import datetime
 from enum import Enum
-from typing import Dict, Optional, Tuple, Any
+from typing import Dict, Optional, Tuple, Any, List
 
 from pygments.lexers import guess_lexer
 from pygments.util import ClassNotFound
@@ -22,6 +22,8 @@ from rich.text import Text
 
 from jarvis.jarvis_utils.config import get_pretty_output
 from jarvis.jarvis_utils.globals import console, get_agent_list
+from dataclasses import dataclass
+from abc import ABC, abstractmethod
 
 
 class OutputType(Enum):
@@ -57,6 +59,181 @@ class OutputType(Enum):
     TOOL = "TOOL"
 
 
+@dataclass
+class OutputEvent:
+    """
+    输出事件的通用结构，供不同输出后端（Sink）消费。
+    - text: 文本内容
+    - output_type: 输出类型
+    - timestamp: 是否显示时间戳
+    - lang: 语法高亮语言（可选，不提供则自动检测）
+    - traceback: 是否显示异常堆栈
+    - section: 若为章节标题输出，填入标题文本；否则为None
+    - context: 额外上下文（预留给TUI/日志等）
+    """
+    text: str
+    output_type: OutputType
+    timestamp: bool = True
+    lang: Optional[str] = None
+    traceback: bool = False
+    section: Optional[str] = None
+    context: Optional[Dict[str, Any]] = None
+
+
+class OutputSink(ABC):
+    """输出后端抽象接口，不同前端（控制台/TUI/SSE/日志）实现该接口以消费输出事件。"""
+
+    @abstractmethod
+    def emit(self, event: OutputEvent) -> None:  # pragma: no cover - 抽象方法
+        raise NotImplementedError
+
+
+class ConsoleOutputSink(OutputSink):
+    """
+    默认控制台输出实现，保持与原 PrettyOutput 行为一致。
+    """
+
+    def emit(self, event: OutputEvent) -> None:
+        # 章节输出
+        if event.section is not None:
+            text = Text(event.section, style=event.output_type.value, justify="center")
+            panel = Panel(text, border_style=event.output_type.value)
+            if get_pretty_output():
+                console.print(panel)
+            else:
+                console.print(text)
+            return
+
+        # 普通内容输出
+        lang = (
+            event.lang
+            if event.lang is not None
+            else PrettyOutput._detect_language(event.text, default_lang="markdown")
+        )
+
+        # 与原实现保持一致的样式定义
+        styles: Dict[OutputType, Dict[str, Any]] = {
+            OutputType.SYSTEM: dict(bgcolor="#1e2b3c"),
+            OutputType.CODE: dict(bgcolor="#1c2b1c"),
+            OutputType.RESULT: dict(bgcolor="#1c1c2b"),
+            OutputType.ERROR: dict(bgcolor="#2b1c1c"),
+            OutputType.INFO: dict(bgcolor="#2b2b1c", meta={"icon": "ℹ️"}),
+            OutputType.PLANNING: dict(bgcolor="#2b1c2b"),
+            OutputType.PROGRESS: dict(bgcolor="#1c1c1c"),
+            OutputType.SUCCESS: dict(bgcolor="#1c2b1c"),
+            OutputType.WARNING: dict(bgcolor="#2b2b1c"),
+            OutputType.DEBUG: dict(bgcolor="#1c1c1c"),
+            OutputType.USER: dict(bgcolor="#1c2b2b"),
+            OutputType.TOOL: dict(bgcolor="#1c2b2b"),
+        }
+
+        header_styles = {
+            OutputType.SYSTEM: RichStyle(
+                color="bright_cyan", bgcolor="#1e2b3c", frame=True, meta={"icon": "🤖"}
+            ),
+            OutputType.CODE: RichStyle(
+                color="green", bgcolor="#1c2b1c", frame=True, meta={"icon": "📝"}
+            ),
+            OutputType.RESULT: RichStyle(
+                color="bright_blue", bgcolor="#1c1c2b", frame=True, meta={"icon": "✨"}
+            ),
+            OutputType.ERROR: RichStyle(
+                color="red", frame=True, bgcolor="#2b1c1c", meta={"icon": "❌"}
+            ),
+            OutputType.INFO: RichStyle(
+                color="bright_cyan", frame=True, bgcolor="#2b2b1c", meta={"icon": "ℹ️"}
+            ),
+            OutputType.PLANNING: RichStyle(
+                color="purple",
+                bold=True,
+                frame=True,
+                bgcolor="#2b1c2b",
+                meta={"icon": "📋"},
+            ),
+            OutputType.PROGRESS: RichStyle(
+                color="white",
+                encircle=True,
+                frame=True,
+                bgcolor="#1c1c1c",
+                meta={"icon": "⏳"},
+            ),
+            OutputType.SUCCESS: RichStyle(
+                color="bright_green",
+                bold=True,
+                strike=False,
+                bgcolor="#1c2b1c",
+                meta={"icon": "✅"},
+            ),
+            OutputType.WARNING: RichStyle(
+                color="yellow",
+                bold=True,
+                blink2=True,
+                bgcolor="#2b2b1c",
+                meta={"icon": "⚠️"},
+            ),
+            OutputType.DEBUG: RichStyle(
+                color="grey58",
+                dim=True,
+                conceal=True,
+                bgcolor="#1c1c1c",
+                meta={"icon": "🔍"},
+            ),
+            OutputType.USER: RichStyle(
+                color="spring_green2",
+                frame=True,
+                bgcolor="#1c2b2b",
+                meta={"icon": "👤"},
+            ),
+            OutputType.TOOL: RichStyle(
+                color="dark_sea_green4",
+                bgcolor="#1c2b2b",
+                frame=True,
+                meta={"icon": "🔧"},
+            ),
+        }
+
+        header = Text(
+            PrettyOutput._format(event.output_type, event.timestamp),
+            style=header_styles[event.output_type],
+        )
+        content = Syntax(
+            event.text,
+            lang,
+            theme="monokai",
+            word_wrap=True,
+            background_color=styles[event.output_type]["bgcolor"],
+        )
+        panel = Panel(
+            content,
+            border_style=header_styles[event.output_type],
+            padding=(0, 0),
+            highlight=True,
+        )
+        if get_pretty_output():
+            console.print(panel)
+        else:
+            console.print(content)
+        if event.traceback or event.output_type == OutputType.ERROR:
+            try:
+                console.print_exception()
+            except Exception as e:
+                console.print(f"Error: {e}")
+
+
+# 模块级输出分发器（默认注册控制台后端）
+_output_sinks: List[OutputSink] = [ConsoleOutputSink()]
+
+
+def emit_output(event: OutputEvent) -> None:
+    """向所有已注册的输出后端广播事件。"""
+    for sink in list(_output_sinks):
+        try:
+            sink.emit(event)
+        except Exception as e:
+            # 后端故障不影响其他后端
+            console.print(f"[输出后端错误] {sink.__class__.__name__}: {e}")
+
+
 class PrettyOutput:
     """
     使用rich库格式化和显示富文本输出的类。
@@ -166,148 +343,51 @@ class PrettyOutput:
         traceback: bool = False,
     ):
         """
-        使用样式和语法高亮打印格式化输出。
-
-        参数：
-            text: 要打印的文本内容
-            output_type: 输出类型（影响样式）
-            timestamp: 是否显示时间戳
-            lang: 语法高亮的语言
-            traceback: 是否显示错误的回溯信息
+        使用样式和语法高亮打印格式化输出（已抽象为事件 + Sink 机制）。
+        保持对现有调用方的向后兼容，同时为TUI/日志等前端预留扩展点。
         """
-        styles: Dict[OutputType, Dict[str, Any]] = {
-            OutputType.SYSTEM: dict(bgcolor="#1e2b3c"),
-            OutputType.CODE: dict(bgcolor="#1c2b1c"),
-            OutputType.RESULT: dict(bgcolor="#1c1c2b"),
-            OutputType.ERROR: dict(bgcolor="#2b1c1c"),
-            OutputType.INFO: dict(bgcolor="#2b2b1c", meta={"icon": "ℹ️"}),
-            OutputType.PLANNING: dict(bgcolor="#2b1c2b"),
-            OutputType.PROGRESS: dict(bgcolor="#1c1c1c"),
-            OutputType.SUCCESS: dict(bgcolor="#1c2b1c"),
-            OutputType.WARNING: dict(bgcolor="#2b2b1c"),
-            OutputType.DEBUG: dict(bgcolor="#1c1c1c"),
-            OutputType.USER: dict(bgcolor="#1c2b2b"),
-            OutputType.TOOL: dict(bgcolor="#1c2b2b"),
-        }
-
-        header_styles = {
-            OutputType.SYSTEM: RichStyle(
-                color="bright_cyan", bgcolor="#1e2b3c", frame=True, meta={"icon": "🤖"}
-            ),
-            OutputType.CODE: RichStyle(
-                color="green", bgcolor="#1c2b1c", frame=True, meta={"icon": "📝"}
-            ),
-            OutputType.RESULT: RichStyle(
-                color="bright_blue", bgcolor="#1c1c2b", frame=True, meta={"icon": "✨"}
-            ),
-            OutputType.ERROR: RichStyle(
-                color="red", frame=True, bgcolor="#2b1c1c", meta={"icon": "❌"}
-            ),
-            OutputType.INFO: RichStyle(
-                color="bright_cyan", frame=True, bgcolor="#2b2b1c", meta={"icon": "ℹ️"}
-            ),
-            OutputType.PLANNING: RichStyle(
-                color="purple",
-                bold=True,
-                frame=True,
-                bgcolor="#2b1c2b",
-                meta={"icon": "📋"},
-            ),
-            OutputType.PROGRESS: RichStyle(
-                color="white",
-                encircle=True,
-                frame=True,
-                bgcolor="#1c1c1c",
-                meta={"icon": "⏳"},
-            ),
-            OutputType.SUCCESS: RichStyle(
-                color="bright_green",
-                bold=True,
-                strike=False,
-                bgcolor="#1c2b1c",
-                meta={"icon": "✅"},
-            ),
-            OutputType.WARNING: RichStyle(
-                color="yellow",
-                bold=True,
-                blink2=True,
-                bgcolor="#2b2b1c",
-                meta={"icon": "⚠️"},
-            ),
-            OutputType.DEBUG: RichStyle(
-                color="grey58",
-                dim=True,
-                conceal=True,
-                bgcolor="#1c1c1c",
-                meta={"icon": "🔍"},
-            ),
-            OutputType.USER: RichStyle(
-                color="spring_green2",
-                frame=True,
-                bgcolor="#1c2b2b",
-                meta={"icon": "👤"},
-            ),
-            OutputType.TOOL: RichStyle(
-                color="dark_sea_green4",
-                bgcolor="#1c2b2b",
-                frame=True,
-                meta={"icon": "🔧"},
-            ),
-        }
-
-        lang = (
-            lang
-            if lang is not None
-            else PrettyOutput._detect_language(text, default_lang="markdown")
+        event = OutputEvent(
+            text=text,
+            output_type=output_type,
+            timestamp=timestamp,
+            lang=lang,
+            traceback=traceback,
         )
-        header = Text(
-            PrettyOutput._format(output_type, timestamp),
-            style=header_styles[output_type],
-        )
-        content = Syntax(
-            text,
-            lang,
-            theme="monokai",
-            word_wrap=True,
-            background_color=styles[output_type]["bgcolor"],
-        )
-        panel = Panel(
-            content,
-            border_style=header_styles[output_type],
-            title=header,
-            title_align="left",
-            padding=(0, 0),
-            highlight=True,
-        )
-        if get_pretty_output():
-            console.print(panel)
-        else:
-            if len(text.strip().splitlines()) > 1:
-                console.print(header)
-                console.print(content)
-            else:
-                console.print(header, content)
-        if traceback or output_type == OutputType.ERROR:
-            try:
-                console.print_exception()
-            except Exception as e:
-                console.print(f"Error: {e}")
+        emit_output(event)
 
     @staticmethod
     def section(title: str, output_type: OutputType = OutputType.INFO):
         """
-        在样式化面板中打印章节标题。
-
-        参数：
-            title: 章节标题文本
-            output_type: 输出类型（影响样式）
+        在样式化面板中打印章节标题（通过事件 + Sink 机制分发）。
         """
-        text = Text(title, style=output_type.value, justify="center")
-        panel = Panel(text, border_style=output_type.value)
-        if get_pretty_output():
-            console.print(panel)
+        event = OutputEvent(
+            text="",
+            output_type=output_type,
+            section=title,
+        )
+        emit_output(event)
+
+    @staticmethod
+    # Sink管理（为外部注册自定义后端预留）
+    @staticmethod
+    def add_sink(sink: OutputSink) -> None:
+        """注册一个新的输出后端。"""
+        _output_sinks.append(sink)
+
+    @staticmethod
+    def clear_sinks(keep_default: bool = True) -> None:
+        """清空已注册的输出后端；可选择保留默认控制台后端。"""
+        if keep_default:
+            globals()["_output_sinks"] = [
+                s for s in _output_sinks if isinstance(s, ConsoleOutputSink)
+            ]
         else:
-            console.print(text)
+            _output_sinks.clear()
+
+    @staticmethod
+    def get_sinks() -> List[OutputSink]:
+        """获取当前已注册的输出后端列表（副本）。"""
+        return list(_output_sinks)
 
     @staticmethod
     def print_gradient_text(

jarvis/jarvis_utils/utils.py

@@ -139,7 +139,7 @@ def _check_pip_updates() -> bool:
             # 检测是否安装了 RAG 特性
             rag_installed = False
             try:
-                import langchain  # noqa
+                import langchain  # type: ignore # noqa
 
                 rag_installed = True
             except ImportError:
@@ -212,46 +212,37 @@ def _show_usage_stats(welcome_str: str) -> None:
             "commit": {"title": "💾 提交统计", "metrics": {}, "suffix": "个"},
             "command": {"title": "📱 命令使用", "metrics": {}, "suffix": "次"},
             "adoption": {"title": "🎯 采纳情况", "metrics": {}, "suffix": ""},
+            "other": {"title": "📦 其他指标", "metrics": {}, "suffix": ""},
         }
 
-        # 遍历所有指标，获取统计数据
+        # 遍历所有指标，使用快速总量读取以避免全量扫描
         for metric in all_metrics:
-            # 获取该指标的所有数据
-            stats_data = StatsManager.get_stats(
-                metric_name=metric,
-                start_time=datetime(2000, 1, 1),
-                end_time=datetime.now(),
-            )
+            try:
+                total = StatsManager.get_metric_total(metric)
+            except Exception:
+                total = 0.0
 
-            if stats_data and isinstance(stats_data, dict) and "records" in stats_data:
-                # 按照标签分组统计
-                tag_totals: Dict[str, float] = {}
-                for record in stats_data["records"]:
-                    tags = record.get("tags", {})
-                    group = tags.get("group", "other")
-                    tag_totals[group] = tag_totals.get(group, 0) + record["value"]
-
-                # 根据标签将指标分配到相应类别
-                for group, total in tag_totals.items():
-                    if total > 0:
-                        if group == "tool":
-                            categorized_stats["tool"]["metrics"][metric] = int(total)
-                        elif group == "code_agent":
-                            # 根据指标名称细分
-                            if metric.startswith("code_lines_"):
-                                categorized_stats["lines"]["metrics"][metric] = int(
-                                    total
-                                )
-                            elif "commit" in metric:
-                                categorized_stats["commit"]["metrics"][metric] = int(
-                                    total
-                                )
-                            else:
-                                categorized_stats["code"]["metrics"][metric] = int(
-                                    total
-                                )
-                        elif group == "command":
-                            categorized_stats["command"]["metrics"][metric] = int(total)
+            if not total or total <= 0:
+                continue
+
+            # 优先使用元信息中的分组（在写入指标时已记录）
+            info = StatsManager.get_metric_info(metric) or {}
+            group = info.get("group", "other")
+
+            if group == "tool":
+                categorized_stats["tool"]["metrics"][metric] = int(total)
+            elif group == "code_agent":
+                # 根据指标名称细分
+                if metric.startswith("code_lines_"):
+                    categorized_stats["lines"]["metrics"][metric] = int(total)
+                elif "commit" in metric:
+                    categorized_stats["commit"]["metrics"][metric] = int(total)
+                else:
+                    categorized_stats["code"]["metrics"][metric] = int(total)
+            elif group == "command":
+                categorized_stats["command"]["metrics"][metric] = int(total)
+            else:
+                categorized_stats["other"]["metrics"][metric] = int(total)
 
         # 合并长短命令的历史统计数据
         command_stats = categorized_stats["command"]["metrics"]
@@ -560,7 +551,7 @@ def _show_usage_stats(welcome_str: str) -> None:
                 layout_items: List[RenderableType] = []
                 layout_items.append(right_column_group)
                 if has_content:
-                    layout_items.append(table)
+                    layout_items.append(Align.center(table))
                 layout_renderable = Group(*layout_items)
             else:
                 # 左右布局（当前）
@@ -576,8 +567,8 @@ def _show_usage_stats(welcome_str: str) -> None:
                 layout_table.add_column(ratio=5)  # 右侧
 
                 if has_content:
-                    # 将总结信息放在左侧，统计表格放在右侧
-                    layout_table.add_row(right_column_group, table)
+                    # 将总结信息放在左侧，统计表格放在右侧（表格居中显示）
+                    layout_table.add_row(right_column_group, Align.center(table))
                 else:
                     # 如果没有统计数据，则总结信息占满
                     layout_table.add_row(right_column_group)
@@ -1161,7 +1152,7 @@ def while_success(func: Callable[[], Any], sleep_time: float = 0.1) -> Any:
             return func()
         except Exception as e:
             PrettyOutput.print(
-                f"执行失败: {str(e)}, 等待 {sleep_time}s...", OutputType.WARNING
+                f"重试中，等待 {sleep_time}s...", OutputType.WARNING
             )
             time.sleep(sleep_time)
             continue
@@ -1185,7 +1176,7 @@ def while_true(func: Callable[[], bool], sleep_time: float = 0.1) -> Any:
         ret = func()
         if ret:
             break
-        PrettyOutput.print(f"执行失败, 等待 {sleep_time}s...", OutputType.WARNING)
+        PrettyOutput.print(f"重试中，等待 {sleep_time}s...", OutputType.WARNING)
         time.sleep(sleep_time)
     return ret
 
@@ -1267,7 +1258,7 @@ def _pull_git_repo(repo_path: Path, repo_type: str):
     if not git_dir.is_dir():
         return
 
-    PrettyOutput.print(f"正在更新{repo_type}库 '{repo_path.name}'...", OutputType.INFO)
+
     try:
         # 检查是否有远程仓库
         remote_result = subprocess.run(
@@ -1281,10 +1272,6 @@ def _pull_git_repo(repo_path: Path, repo_type: str):
             timeout=10,
         )
         if not remote_result.stdout.strip():
-            PrettyOutput.print(
-                f"'{repo_path.name}' 未配置远程仓库，跳过更新。",
-                OutputType.INFO,
-            )
             return
 
         # 检查git仓库状态
@@ -1356,10 +1343,6 @@ def _pull_git_repo(repo_path: Path, repo_type: str):
         )
 
         if not ls_remote_result.stdout.strip():
-            PrettyOutput.print(
-                f"{repo_type}库 '{repo_path.name}' 的远程仓库是空的，跳过更新。",
-                OutputType.INFO,
-            )
             return
 
         # 执行 git pull
@@ -1387,12 +1370,6 @@ def _pull_git_repo(repo_path: Path, repo_type: str):
             PrettyOutput.print(
                 f"{repo_type}库 '{repo_path.name}' 已更新。", OutputType.SUCCESS
             )
-            if pull_result.stdout.strip():
-                PrettyOutput.print(pull_result.stdout.strip(), OutputType.INFO)
-        else:
-            PrettyOutput.print(
-                f"{repo_type}库 '{repo_path.name}' 已是最新版本。", OutputType.INFO
-            )
 
     except FileNotFoundError:
         PrettyOutput.print(
@@ -1433,7 +1410,7 @@ def daily_check_git_updates(repo_dirs: List[str], repo_type: str):
             pass
 
     if should_check_for_updates:
-        PrettyOutput.print(f"执行每日{repo_type}库更新检查...", OutputType.INFO)
+
         for repo_dir in repo_dirs:
             p_repo_dir = Path(repo_dir)
             if p_repo_dir.exists() and p_repo_dir.is_dir():

{jarvis_ai_assistant-0.3.18.dist-info → jarvis_ai_assistant-0.3.20.dist-info}/METADATA

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