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

jarvis/jarvis_agent/task_manager.py

@@ -1,20 +1,20 @@
 # -*- coding: utf-8 -*-
 """任务管理模块，负责加载和选择预定义任务"""
+
 import os
 from typing import Dict
 
-import yaml  # type: ignore
+import yaml
 from prompt_toolkit import prompt
-from rich.table import Table
 from rich.console import Console
+from rich.table import Table
 
-from jarvis.jarvis_agent import (
-    get_multiline_input,
-    user_confirm,
-)
+from jarvis.jarvis_agent import get_multiline_input
+from jarvis.jarvis_agent import 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
+from jarvis.jarvis_utils.output import PrettyOutput
 
 
 class TaskManager:
@@ -29,7 +29,7 @@ class TaskManager:
         data_dir = get_data_dir()
         pre_command_path = os.path.join(data_dir, "pre-command")
         if os.path.exists(pre_command_path):
-            print(f"ℹ️ 从{pre_command_path}加载预定义任务...")
+            PrettyOutput.auto_print(f"ℹ️ 从{pre_command_path}加载预定义任务...")
             try:
                 with open(
                     pre_command_path, "r", encoding="utf-8", errors="ignore"
@@ -39,15 +39,15 @@ class TaskManager:
                     for name, desc in user_tasks.items():
                         if desc:
                             tasks[str(name)] = str(desc)
-                print(f"✅ 预定义任务加载完成 {pre_command_path}")
+                PrettyOutput.auto_print(f"✅ 预定义任务加载完成 {pre_command_path}")
             except (yaml.YAMLError, OSError):
-                print(f"❌ 预定义任务加载失败 {pre_command_path}")
+                PrettyOutput.auto_print(f"❌ 预定义任务加载失败 {pre_command_path}")
 
         # Check .jarvis/pre-command in current directory
         pre_command_path = ".jarvis/pre-command"
         if os.path.exists(pre_command_path):
             abs_path = os.path.abspath(pre_command_path)
-            print(f"ℹ️ 从{abs_path}加载预定义任务...")
+            PrettyOutput.auto_print(f"ℹ️ 从{abs_path}加载预定义任务...")
             try:
                 with open(
                     pre_command_path, "r", encoding="utf-8", errors="ignore"
@@ -57,9 +57,9 @@ class TaskManager:
                     for name, desc in local_tasks.items():
                         if desc:
                             tasks[str(name)] = str(desc)
-                print(f"✅ 预定义任务加载完成 {pre_command_path}")
+                PrettyOutput.auto_print(f"✅ 预定义任务加载完成 {pre_command_path}")
             except (yaml.YAMLError, OSError):
-                print(f"❌ 预定义任务加载失败 {pre_command_path}")
+                PrettyOutput.auto_print(f"❌ 预定义任务加载失败 {pre_command_path}")
 
         return tasks
 
@@ -77,7 +77,7 @@ class TaskManager:
         for i, name in enumerate(task_names, 1):
             table.add_row(str(i), name)
         Console().print(table)
-        print("ℹ️ [0] 跳过预定义任务")
+        PrettyOutput.auto_print("ℹ️ [0] 跳过预定义任务")
 
         # Try fzf selection first (with numbered options and a skip option)
         fzf_list = [f"{0:>3} | 跳过预定义任务"] + [
@@ -92,13 +92,17 @@ class TaskManager:
                     return ""
                 if 1 <= idx <= len(task_names):
                     selected_task = tasks[task_names[idx - 1]]
-                    print(f"ℹ️ 将要执行任务:\n {selected_task}")
+                    PrettyOutput.auto_print(f"ℹ️ 将要执行任务:\n {selected_task}")
                     # 询问是否需要补充信息
-                    need_additional = user_confirm("需要为此任务添加补充信息吗？", default=False)
+                    need_additional = user_confirm(
+                        "需要为此任务添加补充信息吗？", default=False
+                    )
                     if need_additional:
                         additional_input = get_multiline_input("请输入补充信息：")
                         if additional_input:
-                            selected_task = join_prompts([selected_task, f"补充信息:\n{additional_input}"])
+                            selected_task = join_prompts(
+                                [selected_task, f"补充信息:\n{additional_input}"]
+                            )
                     return selected_task
             except Exception:
                 # 如果解析失败，则回退到手动输入
@@ -117,7 +121,7 @@ class TaskManager:
                     return ""
                 if 1 <= choice <= len(task_names):
                     selected_task = tasks[task_names[choice - 1]]
-                    print(f"ℹ️ 将要执行任务:\n {selected_task}")
+                    PrettyOutput.auto_print(f"ℹ️ 将要执行任务:\n {selected_task}")
                     # 询问是否需要补充信息
                     need_additional = user_confirm(
                         "需要为此任务添加补充信息吗？", default=False
@@ -125,14 +129,13 @@ class TaskManager:
                     if need_additional:
                         additional_input = get_multiline_input("请输入补充信息：")
                         if additional_input:
-                            selected_task = join_prompts([
-                                selected_task,
-                                f"补充信息:\n{additional_input}"
-                            ])
+                            selected_task = join_prompts(
+                                [selected_task, f"补充信息:\n{additional_input}"]
+                            )
                     return selected_task
-                print("⚠️ 无效的选择。请选择列表中的一个号码。")
+                PrettyOutput.auto_print("⚠️ 无效的选择。请选择列表中的一个号码。")
 
             except (KeyboardInterrupt, EOFError):
                 return ""
             except ValueError as val_err:
-                print(f"❌ 选择任务失败: {str(val_err)}")
+                PrettyOutput.auto_print(f"❌ 选择任务失败: {str(val_err)}")

jarvis/jarvis_agent/tool_executor.py

@@ -1,7 +1,10 @@
 # -*- coding: utf-8 -*-
-from typing import Any, Tuple, TYPE_CHECKING
+from typing import TYPE_CHECKING
+from typing import Any
+from typing import Tuple
 
 from jarvis.jarvis_utils.input import user_confirm
+from jarvis.jarvis_utils.output import PrettyOutput
 
 if TYPE_CHECKING:
     from jarvis.jarvis_agent import Agent
@@ -30,7 +33,7 @@ def execute_tool_call(response: str, agent: "Agent") -> Tuple[bool, Any]:
             f"操作失败：检测到多个操作。一次只能执行一个操作。"
             f"尝试执行的操作：{', '.join([handler.name() for handler in tool_list])}"
         )
-        print(f"⚠️ {error_message}")
+        PrettyOutput.auto_print(f"⚠️ {error_message}")
         return False, error_message
 
     if not tool_list:
@@ -41,12 +44,10 @@ def execute_tool_call(response: str, agent: "Agent") -> Tuple[bool, Any]:
         f"需要执行{tool_to_execute.name()}确认执行？", True
     ):
         try:
-            print(f"🔧 正在执行{tool_to_execute.name()}...")
             result = tool_to_execute.handle(response, agent)
-            print(f"✅ {tool_to_execute.name()}执行完成")
             return result
         except Exception as e:
-            print(f"❌ 工具执行失败: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 工具执行失败: {str(e)}")
             return False, str(e)
 
     return False, ""

jarvis/jarvis_agent/tool_share_manager.py

@@ -1,15 +1,21 @@
 # -*- coding: utf-8 -*-
 """工具分享管理模块"""
-import os
+
 import glob
+import os
 import shutil
-from typing import List, Dict, Any, Set
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Set
 
 import typer
 
 from jarvis.jarvis_agent import user_confirm
 from jarvis.jarvis_agent.share_manager import ShareManager
-from jarvis.jarvis_utils.config import get_central_tool_repo, get_data_dir
+from jarvis.jarvis_utils.config import get_central_tool_repo
+from jarvis.jarvis_utils.config import get_data_dir
+from jarvis.jarvis_utils.output import PrettyOutput
 
 
 class ToolShareManager(ShareManager):
@@ -18,8 +24,8 @@ class ToolShareManager(ShareManager):
     def __init__(self):
         central_repo = get_central_tool_repo()
         if not central_repo:
-            print("❌ 错误：未配置中心工具仓库（JARVIS_CENTRAL_TOOL_REPO）")
-            print("ℹ️ 请在配置文件中设置中心工具仓库的Git地址")
+            PrettyOutput.auto_print("❌ 错误：未配置中心工具仓库（central_tool_repo）")
+            PrettyOutput.auto_print("ℹ️ 请在配置文件中设置中心工具仓库的Git地址")
             raise typer.Exit(code=1)
 
         super().__init__(central_repo, "central_tool_repo")
@@ -47,7 +53,7 @@ class ToolShareManager(ShareManager):
         # 只从数据目录的tools目录获取工具
         local_tools_dir = os.path.join(get_data_dir(), "tools")
         if not os.path.exists(local_tools_dir):
-            print(f"⚠️ 本地工具目录不存在: {local_tools_dir}")
+            PrettyOutput.auto_print(f"⚠️ 本地工具目录不存在: {local_tools_dir}")
             return []
 
         # 收集本地工具文件（排除已存在的）
@@ -76,8 +82,8 @@ class ToolShareManager(ShareManager):
         share_list = ["\n将要分享以下工具到中心仓库（注意：文件将被移动而非复制）："]
         for tool in resources:
             share_list.append(f"- {tool['tool_name']} ({tool['filename']})")
-        joined_list = '\n'.join(share_list)
-        print(f"⚠️ {joined_list}")
+        joined_list = "\n".join(share_list)
+        PrettyOutput.auto_print(f"⚠️ {joined_list}")
 
         if not user_confirm("确认移动这些工具到中心仓库吗？（原文件将被删除）"):
             return []
@@ -101,7 +107,9 @@ class ToolShareManager(ShareManager):
             # 获取本地资源
             local_resources = self.get_local_resources()
             if not local_resources:
-                print("⚠️ 没有找到新的工具文件（所有工具可能已存在于中心仓库）")
+                PrettyOutput.auto_print(
+                    "⚠️ 没有找到新的工具文件（所有工具可能已存在于中心仓库）"
+                )
                 return
 
             # 选择要分享的资源
@@ -113,15 +121,17 @@ class ToolShareManager(ShareManager):
             moved_list = self.share_resources(selected_resources)
             if moved_list:
                 # 一次性显示所有移动结果
-                joined_moved = '\n'.join(moved_list)
-                print(f"✅ {joined_moved}")
+                joined_moved = "\n".join(moved_list)
+                PrettyOutput.auto_print(f"✅ {joined_moved}")
 
                 # 提交并推送
                 self.commit_and_push(len(selected_resources))
 
-                print("✅ 工具已成功分享到中心仓库！")
-                print(f"ℹ️ 原文件已从 {os.path.join(get_data_dir(), 'tools')} 移动到中心仓库")
+                PrettyOutput.auto_print("✅ 工具已成功分享到中心仓库！")
+                PrettyOutput.auto_print(
+                    f"ℹ️ 原文件已从 {os.path.join(get_data_dir(), 'tools')} 移动到中心仓库"
+                )
 
         except Exception as e:
-            print(f"❌ 分享工具时出错: {str(e)}")
+            PrettyOutput.auto_print(f"❌ 分享工具时出错: {str(e)}")
             raise typer.Exit(code=1)

jarvis/jarvis_agent/user_interaction.py

@@ -6,8 +6,8 @@ UserInteractionHandler: 抽象用户交互（多行输入与确认）逻辑，
 - 仅提供封装，不直接修改 Agent 的现有调用
 - 后续步骤在 Agent 中以旁路方式接入，保持向后兼容
 """
-from typing import Callable
 
+from typing import Callable
 
 
 class UserInteractionHandler:
@@ -31,9 +31,9 @@ class UserInteractionHandler:
         2) func(tip)
         """
         try:
-            return self._multiline_inputer(tip, print_on_empty=print_on_empty)  # type: ignore[call-arg]
+            return self._multiline_inputer(tip, print_on_empty=print_on_empty)
         except TypeError:
-            return self._multiline_inputer(tip)  # type: ignore[misc]
+            return self._multiline_inputer(tip)
 
     def confirm(self, tip: str, default: bool = True) -> bool:
         """

jarvis/jarvis_agent/utils.py

@@ -5,10 +5,15 @@
 - join_prompts: 统一的提示拼接策略（仅拼接非空段落，使用双换行）
 - is_auto_complete: 统一的自动完成标记检测
 """
-from typing import Iterable, List, Any
+
 from enum import Enum
+from typing import Any
+from typing import Iterable
+from typing import List
+
 from jarvis.jarvis_utils.tag import ot
 
+
 def join_prompts(parts: Iterable[str]) -> str:
     """
     将多个提示片段按统一规则拼接：
@@ -23,6 +28,7 @@ def join_prompts(parts: Iterable[str]) -> str:
         return ""
     return "\n\n".join(non_empty)
 
+
 def is_auto_complete(response: str) -> bool:
     """
     检测是否包含自动完成标记。
@@ -34,6 +40,7 @@ def is_auto_complete(response: str) -> bool:
         # 防御性处理：即使 ot 出现异常，也不阻塞主流程
         return "!!!COMPLETE!!!" in response
 
+
 def normalize_next_action(next_action: Any) -> str:
     """
     规范化下一步动作为字符串:
@@ -51,4 +58,5 @@ def normalize_next_action(next_action: Any) -> str:
     except Exception:
         return ""
 
+
 __all__ = ["join_prompts", "is_auto_complete", "normalize_next_action"]

jarvis/jarvis_agent/web_bridge.py

@@ -12,12 +12,18 @@ WebBridge: WebSocket 交互桥
   * {"type":"user_input","request_id":"...","text":"..."}
   * {"type":"confirm_response","request_id":"...","value": true/false}
 """
+
 from __future__ import annotations
 
 import threading
 import uuid
-from queue import Queue, Empty
-from typing import Callable, Dict, Optional, Set, Any
+from queue import Empty
+from queue import Queue
+from typing import Any
+from typing import Callable
+from typing import Dict
+from typing import Optional
+from typing import Set
 
 DEFAULT_WAIT_TIMEOUT = None  # 阻塞等待直到收到响应（可按需改为秒数）
 
@@ -80,7 +86,12 @@ class WebBridge:
     # ---------------------------
     # 输入/确认 请求-响应 管理
     # ---------------------------
-    def request_multiline_input(self, tip: str, print_on_empty: bool = True, timeout: Optional[float] = DEFAULT_WAIT_TIMEOUT) -> str:
+    def request_multiline_input(
+        self,
+        tip: str,
+        print_on_empty: bool = True,
+        timeout: Optional[float] = DEFAULT_WAIT_TIMEOUT,
+    ) -> str:
         """
         发起一个多行输入请求并阻塞等待浏览器返回。
         返回用户输入的文本（可能为空字符串，表示取消）。
@@ -90,13 +101,15 @@ class WebBridge:
         with self._pending_lock:
             self._pending_inputs[req_id] = q
 
-        self.broadcast({
-            "type": "input_request",
-            "mode": "multiline",
-            "tip": tip,
-            "print_on_empty": bool(print_on_empty),
-            "request_id": req_id,
-        })
+        self.broadcast(
+            {
+                "type": "input_request",
+                "mode": "multiline",
+                "tip": tip,
+                "print_on_empty": bool(print_on_empty),
+                "request_id": req_id,
+            }
+        )
 
         try:
             if timeout is None:
@@ -112,7 +125,12 @@ class WebBridge:
         # 规范化为字符串
         return str(result or "")
 
-    def request_confirm(self, tip: str, default: bool = True, timeout: Optional[float] = DEFAULT_WAIT_TIMEOUT) -> bool:
+    def request_confirm(
+        self,
+        tip: str,
+        default: bool = True,
+        timeout: Optional[float] = DEFAULT_WAIT_TIMEOUT,
+    ) -> bool:
         """
         发起一个确认请求并阻塞等待浏览器返回。
         返回 True/False，若超时则回退为 default。
@@ -122,12 +140,14 @@ class WebBridge:
         with self._pending_lock:
             self._pending_confirms[req_id] = q
 
-        self.broadcast({
-            "type": "confirm_request",
-            "tip": tip,
-            "default": bool(default),
-            "request_id": req_id,
-        })
+        self.broadcast(
+            {
+                "type": "confirm_request",
+                "tip": tip,
+                "default": bool(default),
+                "request_id": req_id,
+            }
+        )
 
         try:
             if timeout is None:

jarvis/jarvis_agent/web_output_sink.py

@@ -22,12 +22,15 @@ WebSocketOutputSink: 将 PrettyOutput 的输出事件通过 WebBridge 广播给
       }
     }
 """
+
 from __future__ import annotations
 
-from typing import Any, Dict
+from typing import Any
+from typing import Dict
 
-from jarvis.jarvis_utils.output import OutputSink, OutputEvent
 from jarvis.jarvis_agent.web_bridge import WebBridge
+from jarvis.jarvis_utils.output import OutputEvent
+from jarvis.jarvis_utils.output import OutputSink
 
 
 class WebSocketOutputSink(OutputSink):