jarvis-ai-assistant 0.7.16__py3-none-any.whl → 1.0.2__py3-none-any.whl

jarvis/jarvis_utils/methodology.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 方法论管理模块
 该模块提供了加载和搜索方法论的实用工具。
@@ -7,21 +6,27 @@
 - 生成方法论临时文件
 - 上传方法论文件到大模型
 """
+
 import json
 import os
+
+from jarvis.jarvis_utils.output import PrettyOutput
+
+# -*- coding: utf-8 -*-
 import tempfile
-from typing import Any, Dict, List, Optional
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
 
 from jarvis.jarvis_platform.base import BasePlatform
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.config import (
-    get_data_dir,
-    get_methodology_dirs,
-    get_central_methodology_repo,
-    get_max_input_token_count,
-)
-from jarvis.jarvis_utils.utils import daily_check_git_updates
+from jarvis.jarvis_utils.config import get_central_methodology_repo
+from jarvis.jarvis_utils.config import get_cheap_max_input_token_count
+from jarvis.jarvis_utils.config import get_data_dir
+from jarvis.jarvis_utils.config import get_methodology_dirs
 from jarvis.jarvis_utils.embedding import get_context_token_count
+from jarvis.jarvis_utils.utils import daily_check_git_updates
 
 
 def _get_methodology_directory() -> str:
@@ -36,7 +41,7 @@ def _get_methodology_directory() -> str:
         try:
             os.makedirs(methodology_dir, exist_ok=True)
         except Exception as e:
-            print(f"❌ 创建方法论目录失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 创建方法论目录失败: {str(e)}")
     return methodology_dir
 
 
@@ -68,12 +73,12 @@ def _load_all_methodologies() -> Dict[str, str]:
                 try:
                     import subprocess
 
-                    print(f"ℹ️ 正在克隆中心方法论仓库: {central_repo}")
+                    PrettyOutput.auto_print(f"ℹ️ 正在克隆中心方法论仓库: {central_repo}")
                     subprocess.run(
                         ["git", "clone", central_repo, central_repo_path], check=True
                     )
                 except Exception as e:
-                    print(f"❌ 克隆中心方法论仓库失败: {str(e)}")
+                    PrettyOutput.auto_print(f"❌ 克隆中心方法论仓库失败: {str(e)}")
 
     # --- 全局每日更新检查 ---
     daily_check_git_updates(methodology_dirs, "methodologies")
@@ -105,9 +110,9 @@ def _load_all_methodologies() -> Dict[str, str]:
 
     # 统一打印目录警告与文件加载失败信息
     if warn_dirs:
-        print("⚠️ " + "\n⚠️ ".join(warn_dirs))
+        PrettyOutput.auto_print("⚠️ " + "\n⚠️ ".join(warn_dirs))
     if error_lines:
-        print("⚠️ " + "\n⚠️ ".join(error_lines))
+        PrettyOutput.auto_print("⚠️ " + "\n⚠️ ".join(error_lines))
     return all_methodologies
 
 
@@ -140,7 +145,7 @@ def _create_methodology_temp_file(methodologies: Dict[str, str]) -> Optional[str
 
         return temp_path
     except Exception as e:
-        print(f"❌ 创建方法论临时文件失败: {str(e)}")
+        PrettyOutput.auto_print(f"❌ 创建方法论临时文件失败: {str(e)}")
         return None
 
 
@@ -156,12 +161,12 @@ def upload_methodology(platform: BasePlatform, other_files: List[str] = []) -> b
     """
     methodology_dir = _get_methodology_directory()
     if not os.path.exists(methodology_dir):
-        print("⚠️ 方法论文档不存在")
+        PrettyOutput.auto_print("⚠️ 方法论文档不存在")
         return False
 
     methodologies = _load_all_methodologies()
     if not methodologies:
-        print("⚠️ 没有可用的方法论文档")
+        PrettyOutput.auto_print("⚠️ 没有可用的方法论文档")
         return False
 
     temp_file_path = _create_methodology_temp_file(methodologies)
@@ -207,12 +212,12 @@ def load_methodology(
 
     try:
         # 加载所有方法论
-        print("📁 加载方法论文件...")
+        PrettyOutput.auto_print("📁 加载方法论文件...")
         methodologies = _load_all_methodologies()
         if not methodologies:
-            print("⚠️ 没有找到方法论文件")
+            PrettyOutput.auto_print("⚠️ 没有找到方法论文件")
             return ""
-        print(f"✅ 加载方法论文件完成 (共 {len(methodologies)} 个)")
+        PrettyOutput.auto_print(f"✅ 加载方法论文件完成 (共 {len(methodologies)} 个)")
 
         if platform_name:
             platform = PlatformRegistry().create_platform(platform_name)
@@ -223,7 +228,7 @@ def load_methodology(
             platform = PlatformRegistry().get_cheap_platform()
 
         if not platform:
-            print("❌ 无法创建平台实例")
+            PrettyOutput.auto_print("❌ 无法创建平台实例")
             return ""
 
         platform.set_suppress_output(True)
@@ -307,10 +312,10 @@ def load_methodology(
                 methodology_token_limit = None
         except Exception:
             pass
-        
-        # 回退方案：使用输入窗口的2/3
+
+        # 回退方案：使用输入窗口的2/3（方法论使用cheap模型）
         if methodology_token_limit is None:
-            max_input_tokens = get_max_input_token_count()
+            max_input_tokens = get_cheap_max_input_token_count()
             methodology_token_limit = int(max_input_tokens * 2 / 3)
 
         # 步骤3：将选择出来的方法论内容提供给大模型生成步骤
@@ -353,7 +358,9 @@ def load_methodology(
 
             # 检查是否会超过token限制
             if total_methodology_tokens + methodology_tokens > available_tokens:
-                print(f"ℹ️ 达到方法论token限制 ({total_methodology_tokens}/{available_tokens})，停止加载更多方法论")
+                PrettyOutput.auto_print(
+                    f"ℹ️ 达到方法论token限制 ({total_methodology_tokens}/{available_tokens})，停止加载更多方法论"
+                )
                 break
 
             final_prompt += methodology_text
@@ -362,16 +369,18 @@ def load_methodology(
 
         # 如果一个方法论都没有加载成功
         if selected_count == 0:
-            print("⚠️ 警告：由于token限制，无法加载任何方法论内容")
+            PrettyOutput.auto_print("⚠️ 警告：由于token限制，无法加载任何方法论内容")
             return "没有历史方法论可参考"
 
         final_prompt += suffix_prompt
 
-        print(f"ℹ️ 成功加载 {selected_count} 个方法论，总token数: {total_methodology_tokens}")
+        PrettyOutput.auto_print(
+            f"ℹ️ 成功加载 {selected_count} 个方法论，总token数: {total_methodology_tokens}"
+        )
 
         # 如果内容不大，直接使用chat_until_success
         return platform.chat_until_success(final_prompt)
 
     except Exception as e:
-        print(f"❌ 加载方法论失败: {str(e)}")
+        PrettyOutput.auto_print(f"❌ 加载方法论失败: {str(e)}")
         return ""

jarvis/jarvis_utils/output.py

@@ -8,22 +8,28 @@
 - 多种编程语言的语法高亮支持
 - 结构化输出的面板显示
 """
-from datetime import datetime
+
+from abc import ABC
+from abc import abstractmethod
+from dataclasses import dataclass
 from enum import Enum
-from typing import Dict, Optional, Tuple, Any, List
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Tuple
+from datetime import datetime
 
 from pygments.lexers import guess_lexer
 from pygments.util import ClassNotFound
-from rich.box import SIMPLE
-from rich.panel import Panel
 from rich.style import Style as RichStyle
 from rich.syntax import Syntax
 from rich.text import Text
 
-from jarvis.jarvis_utils.config import get_pretty_output, is_print_error_traceback
-from jarvis.jarvis_utils.globals import console, get_agent_list
-from dataclasses import dataclass
-from abc import ABC, abstractmethod
+from jarvis.jarvis_utils.config import get_pretty_output
+from jarvis.jarvis_utils.config import is_print_error_traceback
+from jarvis.jarvis_utils.globals import console
+from jarvis.jarvis_utils.globals import get_agent_list
 
 
 class OutputType(Enum):
@@ -97,12 +103,89 @@ class ConsoleOutputSink(OutputSink):
     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)
+            # 使用带背景色和样式的Text替代Panel
+            style_config = {
+                OutputType.SYSTEM: RichStyle(
+                    color="cyan",
+                    bgcolor="#1e2b3c",
+                    frame=True,
+                    meta={"icon": "🤖"},
+                ),
+                OutputType.CODE: RichStyle(
+                    color="dark_green",
+                    bgcolor="#1c2b1c",
+                    frame=True,
+                    meta={"icon": "📝"},
+                ),
+                OutputType.RESULT: RichStyle(
+                    color="blue",
+                    bgcolor="#1c1c2b",
+                    frame=True,
+                    meta={"icon": "✨"},
+                ),
+                OutputType.ERROR: RichStyle(
+                    color="dark_red", frame=True, bgcolor="#2b1c1c", meta={"icon": "❌"}
+                ),
+                OutputType.INFO: RichStyle(
+                    color="cyan",
+                    frame=True,
+                    bgcolor="#2b2b1c",
+                    meta={"icon": "ℹ️"},
+                ),
+                OutputType.PLANNING: RichStyle(
+                    color="dark_magenta",
+                    bold=True,
+                    frame=True,
+                    bgcolor="#2b1c2b",
+                    meta={"icon": "📋"},
+                ),
+                OutputType.PROGRESS: RichStyle(
+                    color="bright_black",
+                    encircle=True,
+                    frame=True,
+                    bgcolor="#1c1c1c",
+                    meta={"icon": "⏳"},
+                ),
+                OutputType.SUCCESS: RichStyle(
+                    color="green",
+                    bold=True,
+                    strike=False,
+                    bgcolor="#1c2b1c",
+                    meta={"icon": "✅"},
+                ),
+                OutputType.WARNING: RichStyle(
+                    color="gold3",
+                    bold=True,
+                    blink2=True,
+                    bgcolor="#2b2b1c",
+                    meta={"icon": "⚠️"},
+                ),
+                OutputType.DEBUG: RichStyle(
+                    color="grey50",
+                    dim=True,
+                    conceal=True,
+                    bgcolor="#1c1c1c",
+                    meta={"icon": "🔍"},
+                ),
+                OutputType.USER: RichStyle(
+                    color="green4",
+                    frame=True,
+                    bgcolor="#1c2b2b",
+                    meta={"icon": "👤"},
+                ),
+                OutputType.TOOL: RichStyle(
+                    color="sea_green3",
+                    bgcolor="#1c2b2b",
+                    frame=True,
+                    meta={"icon": "🔧"},
+                ),
+            }
+            style_obj = style_config.get(event.output_type, RichStyle(color="white"))
+            text = Text(f"\n{event.section}\n", style=style_obj, justify="center")
             if get_pretty_output():
-                console.print(panel)
-            else:
                 console.print(text)
+            else:
+                console.print(Text(event.section, style=event.output_type.value))
             return
 
         # 普通内容输出
@@ -112,7 +195,23 @@ class ConsoleOutputSink(OutputSink):
             else PrettyOutput._detect_language(event.text, default_lang="markdown")
         )
 
-        # 与原实现保持一致的样式定义
+        # 文字颜色映射 - 使用柔和的暗色调
+        text_colors = {
+            OutputType.SYSTEM: "dark_cyan",
+            OutputType.CODE: "dark_green",
+            OutputType.RESULT: "dark_blue",
+            OutputType.ERROR: "dark_red",
+            OutputType.INFO: "blue",
+            OutputType.PLANNING: "purple",
+            OutputType.PROGRESS: "dim",
+            OutputType.SUCCESS: "green",
+            OutputType.WARNING: "orange3",
+            OutputType.DEBUG: "grey50",
+            OutputType.USER: "dark_sea_green",
+            OutputType.TOOL: "dark_olive_green",
+        }
+
+        # 背景色映射（保持原有定义）
         styles: Dict[OutputType, Dict[str, Any]] = {
             OutputType.SYSTEM: dict(bgcolor="#1e2b3c"),
             OutputType.CODE: dict(bgcolor="#1c2b1c"),
@@ -130,63 +229,63 @@ class ConsoleOutputSink(OutputSink):
 
         header_styles = {
             OutputType.SYSTEM: RichStyle(
-                color="bright_cyan", bgcolor="#1e2b3c", frame=True, meta={"icon": "🤖"}
+                color="cyan", bgcolor="#1e2b3c", frame=True, meta={"icon": "🤖"}
             ),
             OutputType.CODE: RichStyle(
-                color="green", bgcolor="#1c2b1c", frame=True, meta={"icon": "📝"}
+                color="dark_green", bgcolor="#1c2b1c", frame=True, meta={"icon": "📝"}
             ),
             OutputType.RESULT: RichStyle(
-                color="bright_blue", bgcolor="#1c1c2b", frame=True, meta={"icon": "✨"}
+                color="blue", bgcolor="#1c1c2b", frame=True, meta={"icon": "✨"}
             ),
             OutputType.ERROR: RichStyle(
-                color="red", frame=True, bgcolor="#2b1c1c", meta={"icon": "❌"}
+                color="dark_red", frame=True, bgcolor="#2b1c1c", meta={"icon": "❌"}
             ),
             OutputType.INFO: RichStyle(
-                color="bright_cyan", frame=True, bgcolor="#2b2b1c", meta={"icon": "ℹ️"}
+                color="cyan", frame=True, bgcolor="#2b2b1c", meta={"icon": "ℹ️"}
             ),
             OutputType.PLANNING: RichStyle(
-                color="purple",
+                color="dark_magenta",
                 bold=True,
                 frame=True,
                 bgcolor="#2b1c2b",
                 meta={"icon": "📋"},
             ),
             OutputType.PROGRESS: RichStyle(
-                color="white",
+                color="bright_black",
                 encircle=True,
                 frame=True,
                 bgcolor="#1c1c1c",
                 meta={"icon": "⏳"},
             ),
             OutputType.SUCCESS: RichStyle(
-                color="bright_green",
+                color="green",
                 bold=True,
                 strike=False,
                 bgcolor="#1c2b1c",
                 meta={"icon": "✅"},
             ),
             OutputType.WARNING: RichStyle(
-                color="yellow",
+                color="gold3",
                 bold=True,
                 blink2=True,
                 bgcolor="#2b2b1c",
                 meta={"icon": "⚠️"},
             ),
             OutputType.DEBUG: RichStyle(
-                color="grey58",
+                color="grey50",
                 dim=True,
                 conceal=True,
                 bgcolor="#1c1c1c",
                 meta={"icon": "🔍"},
             ),
             OutputType.USER: RichStyle(
-                color="spring_green2",
+                color="green4",
                 frame=True,
                 bgcolor="#1c2b2b",
                 meta={"icon": "👤"},
             ),
             OutputType.TOOL: RichStyle(
-                color="dark_sea_green4",
+                color="sea_green3",
                 bgcolor="#1c2b2b",
                 frame=True,
                 meta={"icon": "🔧"},
@@ -204,14 +303,22 @@ class ConsoleOutputSink(OutputSink):
             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,
+        # 直接输出带背景色的内容，不再使用Panel包装
+        agent_name = PrettyOutput._format(event.output_type, event.timestamp)
+        header_text = Text(
+            agent_name,
+            style=RichStyle(color="grey58"),
         )
         if get_pretty_output():
-            console.print(panel)
+            # 合并header和content在同一行显示，应用文字颜色
+            combined_text = Text()
+            combined_text.append(header_text)
+            combined_text.append(" ")  # 添加空格分隔
+            colored_content = Text(
+                event.text, style=RichStyle(color=text_colors[event.output_type])
+            )
+            combined_text.append(colored_content)
+            console.print(combined_text)
         else:
             console.print(content)
         if event.traceback or (
@@ -311,7 +418,7 @@ class PrettyOutput:
         """
         try:
             lexer = guess_lexer(text)
-            detected_lang = lexer.name  # type: ignore[attr-defined]
+            detected_lang = lexer.name
             return PrettyOutput._lang_map.get(detected_lang, default_lang)
         except (ClassNotFound, Exception):
             return default_lang
@@ -319,23 +426,24 @@ class PrettyOutput:
     @staticmethod
     def _format(output_type: OutputType, timestamp: bool = True) -> str:
         """
-        使用时间戳和图标格式化输出头。
+        返回带时间戳前缀的Agent名字格式。
 
         参数：
-            output_type: 输出类型
+            output_type: 输出类型（不再使用）
             timestamp: 是否包含时间戳
 
         返回：
-            Text: 格式化后的rich Text对象
+            str: 包含时间戳和Agent名字的字符串
         """
-        icon = PrettyOutput._ICONS.get(output_type, "")
-        formatted = f"{icon}  "
-        if timestamp:
-            formatted += f"[{datetime.now().strftime('%H:%M:%S')}][{output_type.value}]"
         agent_info = get_agent_list()
-        if agent_info:
-            formatted += f"[{agent_info}]"
-        return formatted
+        if not agent_info:
+            return ""
+
+        if timestamp:
+            current_time = datetime.now().strftime("%H:%M:%S")
+            return f"[{current_time}] {agent_info}"
+        else:
+            return agent_info
 
     @staticmethod
     def print(
@@ -423,5 +531,54 @@ class PrettyOutput:
         colored_text = Text(
             "\n".join(colored_lines), style=OutputType.TOOL.value, justify="center"
         )
-        panel = Panel(colored_text, box=SIMPLE)
-        console.print(panel)
+        # 直接输出渐变文本，不再使用Panel包装
+        console.print(colored_text)
+
+    @staticmethod
+    def auto_print(text: str, timestamp: bool = True) -> None:
+        """
+        自动根据打印信息的前缀emoji判断类型并着色输出。
+
+        支持的emoji前缀映射：
+        - ⚠️ -> WARNING (黄色警告)
+        - ❌ -> ERROR (红色错误)
+        - ✅ -> SUCCESS (绿色成功)
+        - ℹ️ -> INFO (青色信息)
+        - 📋 -> PLANNING (紫色规划)
+        - ⏳ -> PROGRESS (白色进度)
+        - 🔍 -> DEBUG (灰色调试)
+        - 🤖 -> SYSTEM (青色系统)
+        - 📝 -> CODE (绿色代码)
+        - ✨ -> RESULT (蓝色结果)
+        - 👤 -> USER (绿色用户)
+        - 🔧 -> TOOL (绿色工具)
+
+        参数：
+            text: 要打印的文本
+            timestamp: 是否显示时间戳
+        """
+        # 定义emoji到OutputType的映射
+        emoji_mapping = {
+            "⚠️": OutputType.WARNING,
+            "❌": OutputType.ERROR,
+            "✅": OutputType.SUCCESS,
+            "ℹ️": OutputType.INFO,
+            "📋": OutputType.PLANNING,
+            "⏳": OutputType.PROGRESS,
+            "🔍": OutputType.DEBUG,
+            "🤖": OutputType.SYSTEM,
+            "📝": OutputType.CODE,
+            "✨": OutputType.RESULT,
+            "👤": OutputType.USER,
+            "🔧": OutputType.TOOL,
+        }
+
+        # 检测emoji前缀
+        output_type = OutputType.INFO  # 默认类型
+        for emoji, type_enum in emoji_mapping.items():
+            if text.startswith(emoji):
+                output_type = type_enum
+                break
+
+        # 使用现有的print方法进行着色输出
+        PrettyOutput.print(text=text, output_type=output_type, timestamp=timestamp)