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

jarvis/jarvis_methodology/main.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 """
 方法论导入导出命令行工具
 
@@ -10,23 +9,25 @@
 
 import hashlib
 import json
+
+from jarvis.jarvis_utils.output import PrettyOutput
+
+# -*- coding: utf-8 -*-
 import os
 
 import typer
-import yaml  # type: ignore
+import yaml
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.methodology import (
-    _get_methodology_directory,
-    _load_all_methodologies,
-)
+from jarvis.jarvis_utils.methodology import _get_methodology_directory
+from jarvis.jarvis_utils.methodology import _load_all_methodologies
 
 app = typer.Typer(help="方法论管理工具")
 
 
 @app.command("import")
 def import_methodology(
-    input_file: str = typer.Argument(..., help="要导入的方法论文件路径")
+    input_file: str = typer.Argument(..., help="要导入的方法论文件路径"),
 ):
     """导入方法论文件（合并策略）"""
     try:
@@ -54,9 +55,11 @@ def import_methodology(
                     indent=2,
                 )
 
-        print(f"✅ 成功导入 {len(import_data)} 个方法论（总计 {len(merged_data)} 个）")
+        PrettyOutput.auto_print(
+            f"✅ 成功导入 {len(import_data)} 个方法论（总计 {len(merged_data)} 个）"
+        )
     except (ValueError, OSError) as e:
-        print(f"❌ 导入失败: {str(e)}")
+        PrettyOutput.auto_print(f"❌ 导入失败: {str(e)}")
         raise typer.Exit(code=1)
 
 
@@ -69,9 +72,11 @@ def export_methodology(output_file: str = typer.Argument(..., help="导出文件
         with open(output_file, "w", encoding="utf-8") as f:
             json.dump(methodologies, f, ensure_ascii=False, indent=2)
 
-        print(f"✅ 成功导出 {len(methodologies)} 个方法论到 {output_file}")
+        PrettyOutput.auto_print(
+            f"✅ 成功导出 {len(methodologies)} 个方法论到 {output_file}"
+        )
     except (OSError, TypeError) as e:
-        print(f"❌ 导出失败: {str(e)}")
+        PrettyOutput.auto_print(f"❌ 导出失败: {str(e)}")
         raise typer.Exit(code=1)
 
 
@@ -82,23 +87,23 @@ def list_methodologies():
         methodologies = _load_all_methodologies()
 
         if not methodologies:
-            print("ℹ️ 没有找到方法论")
+            PrettyOutput.auto_print("ℹ️ 没有找到方法论")
             return
 
         # 先拼接再统一打印，避免在循环中逐条输出造成信息稀疏
         lines = ["可用方法论:"]
         for i, (problem_type, _) in enumerate(methodologies.items(), 1):
             lines.append(f"{i}. {problem_type}")
-        joined_lines = '\n'.join(lines)
-        print(f"ℹ️ {joined_lines}")
+        joined_lines = "\n".join(lines)
+        PrettyOutput.auto_print(f"ℹ️ {joined_lines}")
     except (OSError, ValueError) as e:
-        print(f"❌ 列出方法论失败: {str(e)}")
+        PrettyOutput.auto_print(f"❌ 列出方法论失败: {str(e)}")
         raise typer.Exit(code=1)
 
 
 @app.command("extract")
 def extract_methodology(
-    input_file: str = typer.Argument(..., help="要提取方法论的文本文件路径")
+    input_file: str = typer.Argument(..., help="要提取方法论的文本文件路径"),
 ):
     """从文本文件中提取方法论"""
     try:
@@ -138,20 +143,20 @@ def extract_methodology(
 """
 
         # 调用大模型平台提取方法论
-        print("ℹ️ 正在提取方法论...")
+        PrettyOutput.auto_print("ℹ️ 正在提取方法论...")
         try:
             response = platform.chat_until_success(prompt)
         except Exception as e:
-            print("❌ 提取失败")
-            print(f"❌ 提取方法论失败: {str(e)}")
+            PrettyOutput.auto_print("❌ 提取失败")
+            PrettyOutput.auto_print(f"❌ 提取方法论失败: {str(e)}")
             raise typer.Exit(code=1)
 
         # 提取YAML部分
         methodologies_start = response.find("<methodologies>") + len("<methodologies>")
         methodologies_end = response.find("</methodologies>")
         if methodologies_start == -1 or methodologies_end == -1:
-            print("❌ 响应格式无效")
-            print("❌ 大模型未返回有效的<methodologies>格式")
+            PrettyOutput.auto_print("❌ 响应格式无效")
+            PrettyOutput.auto_print("❌ 大模型未返回有效的<methodologies>格式")
             raise typer.Exit(code=1)
 
         yaml_content = response[methodologies_start:methodologies_end].strip()
@@ -162,14 +167,14 @@ def extract_methodology(
                 item["problem_type"]: item["content"] for item in data
             }
         except (yaml.YAMLError, KeyError, TypeError) as e:
-            print("❌ YAML解析失败")
-            print(f"❌ YAML解析错误: {str(e)}")
+            PrettyOutput.auto_print("❌ YAML解析失败")
+            PrettyOutput.auto_print(f"❌ YAML解析错误: {str(e)}")
             raise typer.Exit(code=1)
 
         if not extracted_methodologies:
-            print("⚠️ 未提取到有效方法论")
+            PrettyOutput.auto_print("⚠️ 未提取到有效方法论")
             return
-        print("✅ 提取到有效方法论")
+        PrettyOutput.auto_print("✅ 提取到有效方法论")
 
         # 加载现有方法论
         existing_methodologies = _load_all_methodologies()
@@ -191,15 +196,17 @@ def extract_methodology(
                     indent=2,
                 )
 
-        print(f"✅ 成功从文件提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）")
+        PrettyOutput.auto_print(
+            f"✅ 成功从文件提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）"
+        )
     except Exception as e:
-        print(f"❌ 提取失败: {str(e)}")
+        PrettyOutput.auto_print(f"❌ 提取失败: {str(e)}")
         raise typer.Exit(code=1)
 
 
 @app.command("extract-url")
 def extract_methodology_from_url(
-    url: str = typer.Argument(..., help="要提取方法论的URL")
+    url: str = typer.Argument(..., help="要提取方法论的URL"),
 ):
     """从URL提取方法论"""
     try:
@@ -236,20 +243,20 @@ def extract_methodology_from_url(
 6. 内容字段使用|保留多行格式
 """
         # 调用大模型平台提取方法论
-        print("ℹ️ 正在从URL提取方法论...")
+        PrettyOutput.auto_print("ℹ️ 正在从URL提取方法论...")
         try:
             response = platform.chat_until_success(prompt)
         except Exception as e:
-            print("❌ 提取失败")
-            print(f"❌ 提取方法论失败: {str(e)}")
+            PrettyOutput.auto_print("❌ 提取失败")
+            PrettyOutput.auto_print(f"❌ 提取方法论失败: {str(e)}")
             raise typer.Exit(code=1)
 
         # 提取YAML部分
         methodologies_start = response.find("<methodologies>") + len("<methodologies>")
         methodologies_end = response.find("</methodologies>")
         if methodologies_start == -1 or methodologies_end == -1:
-            print("❌ 响应格式无效")
-            print("❌ 大模型未返回有效的<methodologies>格式")
+            PrettyOutput.auto_print("❌ 响应格式无效")
+            PrettyOutput.auto_print("❌ 大模型未返回有效的<methodologies>格式")
             raise typer.Exit(code=1)
 
         yaml_content = response[methodologies_start:methodologies_end].strip()
@@ -260,14 +267,14 @@ def extract_methodology_from_url(
                 item["problem_type"]: item["content"] for item in data
             }
         except (yaml.YAMLError, KeyError, TypeError) as e:
-            print("❌ YAML解析失败")
-            print(f"❌ YAML解析错误: {str(e)}")
+            PrettyOutput.auto_print("❌ YAML解析失败")
+            PrettyOutput.auto_print(f"❌ YAML解析错误: {str(e)}")
             raise typer.Exit(code=1)
 
         if not extracted_methodologies:
-            print("⚠️ 未提取到有效方法论")
+            PrettyOutput.auto_print("⚠️ 未提取到有效方法论")
             return
-        print("✅ 提取到有效方法论")
+        PrettyOutput.auto_print("✅ 提取到有效方法论")
 
         # 加载现有方法论
         existing_methodologies = _load_all_methodologies()
@@ -289,9 +296,11 @@ def extract_methodology_from_url(
                     indent=2,
                 )
 
-        print(f"✅ 成功从URL提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）")
+        PrettyOutput.auto_print(
+            f"✅ 成功从URL提取 {len(extracted_methodologies)} 个方法论（总计 {len(merged_data)} 个）"
+        )
     except Exception as e:
-        print(f"❌ 从URL提取失败: {str(e)}")
+        PrettyOutput.auto_print(f"❌ 从URL提取失败: {str(e)}")
         raise typer.Exit(code=1)
 
 

jarvis/jarvis_multi_agent/__init__.py

@@ -1,22 +1,37 @@
-# -*- coding: utf-8 -*-
-from jarvis.jarvis_utils.jsonnet_compat import loads as json_loads
 import re
-from typing import Any, Dict, List, Optional, Tuple, Union
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
+from typing import Tuple
+from typing import Union
 
 from jarvis.jarvis_agent import Agent
 from jarvis.jarvis_agent.output_handler import OutputHandler
 from jarvis.jarvis_tools.registry import ToolRegistry
-from jarvis.jarvis_utils.tag import ct, ot
+
+# -*- coding: utf-8 -*-
+from jarvis.jarvis_utils.jsonnet_compat import loads as json_loads
+from jarvis.jarvis_utils.output import PrettyOutput
+from jarvis.jarvis_utils.tag import ct
+from jarvis.jarvis_utils.tag import ot
 
 
 class MultiAgent(OutputHandler):
-    def __init__(self, agents_config: List[Dict], main_agent_name: str, common_system_prompt: str = ""):
+    def __init__(
+        self,
+        agents_config: List[Dict],
+        main_agent_name: str,
+        common_system_prompt: str = "",
+        non_interactive: Optional[bool] = None,
+    ):
         self.agents_config = agents_config
         self.agents_config_map = {c["name"]: c for c in agents_config}
         self.agents: Dict[str, Agent] = {}
         self.main_agent_name = main_agent_name
         self.original_question: Optional[str] = None
         self.common_system_prompt: str = common_system_prompt
+        self.non_interactive = non_interactive
 
     def prompt(self) -> str:
         _multiline_example_msg = """  {
@@ -114,7 +129,9 @@ class MultiAgent(OutputHandler):
             missing = []
             if not to_val:
                 missing.append("to")
-            if content_val is None or (isinstance(content_val, str) and content_val.strip() == ""):
+            if content_val is None or (
+                isinstance(content_val, str) and content_val.strip() == ""
+            ):
                 # 允许空格/空行被视为缺失
                 missing.append("content")
             if missing:
@@ -133,9 +150,15 @@ class MultiAgent(OutputHandler):
                 return False, guidance
             # 类型校验
             if not isinstance(to_val, str):
-                return False, "SEND_MESSAGE 字段类型错误：to 必须为字符串。修复建议：将 to 改为字符串，如 to: ChapterPolisher"
+                return (
+                    False,
+                    "SEND_MESSAGE 字段类型错误：to 必须为字符串。修复建议：将 to 改为字符串，如 to: ChapterPolisher",
+                )
             if not isinstance(content_val, str):
-                return False, "SEND_MESSAGE 字段类型错误：content 必须为字符串。修复建议：将 content 改为字符串"
+                return (
+                    False,
+                    "SEND_MESSAGE 字段类型错误：content 必须为字符串。修复建议：将 content 改为字符串",
+                )
             # 目标校验
             if to_val not in self.agents_config_map:
                 available = ", ".join(self.agents_config_map.keys())
@@ -145,14 +168,14 @@ class MultiAgent(OutputHandler):
                     f"可用智能体：[{available}]\n"
                     "修复建议：\n"
                     "- 将 to 修改为上述可用智能体之一\n"
-                    "- 或检查配置中是否遗漏了该智能体的定义"
+                    "- 或检查配置中是否遗漏了该智能体的定义",
                 )
             # 通过校验，交给上层发送
             return True, {"to": to_val, "content": content_val}
         elif len(parsed) > 1:
             return (
                 False,
-                "检测到多个 SEND_MESSAGE 块。一次只能发送一个消息。\n修复建议：合并消息或分多轮发送，每轮仅保留一个 SEND_MESSAGE 块。"
+                "检测到多个 SEND_MESSAGE 块。一次只能发送一个消息。\n修复建议：合并消息或分多轮发送，每轮仅保留一个 SEND_MESSAGE 块。",
             )
         # 未成功解析，进行诊断并返回可操作指导
         try:
@@ -173,10 +196,11 @@ class MultiAgent(OutputHandler):
                 "to: 目标Agent名称\n"
                 "content: |2\n"
                 "  这里填写要发送的消息内容\n"
-                f"{ct_tag}"
+                f"{ct_tag}",
             )
         # 尝试提取原始块并指出 JSON 问题
         import re as _re
+
         pattern = _re.compile(
             rf"{_re.escape(ot_tag)}[ \t]*\n(.*?)(?:\n)?[ \t]*{_re.escape(ct_tag)}",
             _re.DOTALL,
@@ -192,7 +216,7 @@ class MultiAgent(OutputHandler):
             return (
                 False,
                 "SEND_MESSAGE 格式错误：未能识别完整的消息块。\n"
-                "修复建议：确保起止标签在单独行上，且中间内容为合法的 JSON，包含 to 与 content 字段。"
+                "修复建议：确保起止标签在单独行上，且中间内容为合法的 JSON，包含 to 与 content 字段。",
             )
         raw = blocks[0]
         try:
@@ -205,7 +229,7 @@ class MultiAgent(OutputHandler):
                     "示例：\n"
                     f"{ot('SEND_MESSAGE')}\n"
                     '{{\n  "to": "目标Agent名称",\n  "content": "这里填写要发送的消息内容"\n}}\n'
-                    f"{ct('SEND_MESSAGE')}"
+                    f"{ct('SEND_MESSAGE')}",
                 )
             missing_keys = [k for k in ("to", "content") if k not in msg_obj]
             if missing_keys:
@@ -216,7 +240,7 @@ class MultiAgent(OutputHandler):
                     "示例：\n"
                     f"{ot('SEND_MESSAGE')}\n"
                     '{{\n  "to": "目标Agent名称",\n  "content": "这里填写要发送的消息内容"\n}}\n'
-                    f"{ct('SEND_MESSAGE')}"
+                    f"{ct('SEND_MESSAGE')}",
                 )
             # 针对值类型的提示（更细）
             if not isinstance(msg_obj.get("to"), str):
@@ -234,7 +258,7 @@ class MultiAgent(OutputHandler):
                 "示例：\n"
                 f"{ot('SEND_MESSAGE')}\n"
                 '{{\n  "to": "目标Agent名称",\n  "content": "这里填写要发送的消息内容"\n}}\n'
-                f"{ct('SEND_MESSAGE')}"
+                f"{ct('SEND_MESSAGE')}",
             )
         except Exception as e:
             return (
@@ -251,7 +275,7 @@ class MultiAgent(OutputHandler):
                 "或使用多行字符串（推荐使用 ||| 或 ``` 分隔符）：\n"
                 f"{ot('SEND_MESSAGE')}\n"
                 '{{\n  "to": "目标Agent名称",\n  "content": |||\n多行消息内容\n可以包含换行\n包含"双引号"和\'单引号\'都无需转义\n更清晰易读\n  |||\n}}\n'
-                f"{ct('SEND_MESSAGE')}"
+                f"{ct('SEND_MESSAGE')}",
             )
 
     def name(self) -> str:
@@ -314,6 +338,9 @@ class MultiAgent(OutputHandler):
         # 非主智能体统一禁用自动补全，防止多智能体并行时误触发自动交互
         if name != self.main_agent_name:
             config["auto_complete"] = False
+        # 继承 MultiAgent 的 non_interactive 设置（如果配置中未显式指定）
+        if self.non_interactive is not None and "non_interactive" not in config:
+            config["non_interactive"] = self.non_interactive
 
         # Prepend common system prompt if configured
         common_sp = getattr(self, "common_system_prompt", "")
@@ -351,7 +378,7 @@ class MultiAgent(OutputHandler):
 
             if not isinstance(msg, Dict):
                 # Should not happen if agent.run() returns str or Dict
-                print(f"⚠️ 未知消息类型: {type(msg)}")
+                PrettyOutput.auto_print(f"⚠️ 未知消息类型: {type(msg)}")
                 break
 
             # Generate a brief summary via direct model call to avoid run-loop recursion
@@ -373,24 +400,26 @@ class MultiAgent(OutputHandler):
 - 仅输出纯文本，不包含任何指令或工具调用
 - 使用简洁的要点式表述
 """.strip()
-                    summary_any: Any = agent.model.chat_until_success(  # type: ignore[attr-defined]
+                    summary_any: Any = agent.model.chat_until_success(
                         f"{agent.session.prompt}\n{multi_agent_summary_prompt}"
                     )
-                    summary_text = summary_any.strip() if isinstance(summary_any, str) else ""
+                    summary_text = (
+                        summary_any.strip() if isinstance(summary_any, str) else ""
+                    )
                 except Exception:
                     summary_text = ""
             prompt = f"""
 Please handle this message:
 from: {last_agent_name}
 summary_of_sender_work: {summary_text}
-content: {msg['content']}
+content: {msg["content"]}
 """
             to_agent_name = msg.get("to")
             if not to_agent_name:
                 return "消息中未指定 `to` 字段"
 
             if to_agent_name not in self.agents_config_map:
-                print(f"⚠️ 未找到智能体 {to_agent_name}，正在重试...")
+                PrettyOutput.auto_print(f"⚠️ 未找到智能体 {to_agent_name}，正在重试...")
                 agent = self._get_agent(last_agent_name)
                 if not agent:
                     return f"智能体 {last_agent_name} 未找到"
@@ -399,7 +428,9 @@ content: {msg['content']}
                 )
                 continue
 
-            print(f"ℹ️ {last_agent_name} 正在向 {to_agent_name} 发送消息...")
+            PrettyOutput.auto_print(
+                f"ℹ️ {last_agent_name} 正在向 {to_agent_name} 发送消息..."
+            )
 
             # Keep a reference to the sender before switching to the receiver
             sender_agent = agent
@@ -412,7 +443,9 @@ content: {msg['content']}
             sender_config = self.agents_config_map.get(last_agent_name, {})
             if sender_config.get("clear_after_send_message"):
                 if sender_agent:
-                    print(f"ℹ️ 清除智能体 {last_agent_name} 在发送消息后的历史记录...")
+                    PrettyOutput.auto_print(
+                        f"ℹ️ 清除智能体 {last_agent_name} 在发送消息后的历史记录..."
+                    )
                     sender_agent.clear_history()
 
             last_agent_name = agent.name

jarvis/jarvis_multi_agent/main.py

@@ -2,13 +2,13 @@
 from typing import Optional
 
 import typer
-import yaml  # type: ignore[import-untyped]
-import os
+import yaml
 
 from jarvis.jarvis_multi_agent import MultiAgent
+from jarvis.jarvis_utils.config import set_config
 from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.output import PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
-from jarvis.jarvis_utils.config import set_config
 
 app = typer.Typer(help="多智能体系统启动器")
 
@@ -23,29 +23,25 @@ def cli(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
     non_interactive: bool = typer.Option(
-        False, "-n", "--non-interactive", help="启用非交互模式：用户无法与命令交互，脚本执行超时限制为5分钟"
+        False,
+        "-n",
+        "--non-interactive",
+        help="启用非交互模式：用户无法与命令交互，脚本执行超时限制为5分钟",
     ),
 ):
     """从YAML配置文件初始化并运行多智能体系统"""
-    # CLI 标志：非交互模式（不依赖配置文件）
-    if non_interactive:
-        try:
-            os.environ["JARVIS_NON_INTERACTIVE"] = "true"
-        except Exception:
-            pass
-        # 注意：全局配置同步在 init_env 之后执行，避免被覆盖
     # 非交互模式要求从命令行传入任务
     if non_interactive and not (user_input and str(user_input).strip()):
-        print("❌ 非交互模式已启用：必须使用 --input 传入任务内容，因多行输入不可用。")
+        PrettyOutput.auto_print(
+            "❌ 非交互模式已启用：必须使用 --input 传入任务内容，因多行输入不可用。"
+        )
         raise typer.Exit(code=2)
     init_env()
-    
+
     # 在初始化环境后同步 CLI 选项到全局配置，避免被 init_env 覆盖
     try:
-        if non_interactive:
-            set_config("JARVIS_NON_INTERACTIVE", True)
         if model_group:
-            set_config("JARVIS_LLM_GROUP", str(model_group))
+            set_config("llm_group", str(model_group))
     except Exception:
         # 静默忽略同步异常，不影响主流程
         pass
@@ -65,7 +61,8 @@ def cli(
         multi_agent = MultiAgent(
             agents_config,
             main_agent_name,
-            common_system_prompt=str(config_data.get("common_system_prompt", "") or "")
+            common_system_prompt=str(config_data.get("common_system_prompt", "") or ""),
+            non_interactive=non_interactive if non_interactive else None,
         )
         final_input = (
             user_input
@@ -81,7 +78,7 @@ def cli(
     except typer.Exit:
         return
     except (ValueError, RuntimeError, yaml.YAMLError) as e:
-        print(f"❌ 错误: {str(e)}")
+        PrettyOutput.auto_print(f"❌ 错误: {str(e)}")
         raise typer.Exit(code=1)