jarvis-ai-assistant 0.3.30__py3-none-any.whl → 0.7.6__py3-none-any.whl

jarvis/jarvis_platform_manager/main.py

@@ -15,7 +15,6 @@ from jarvis.jarvis_utils.config import (
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 from jarvis.jarvis_utils.input import get_multiline_input, get_single_line_input
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_platform_manager.service import start_service
 from jarvis.jarvis_utils.fzf import fzf_select
@@ -33,7 +32,7 @@ def list_platforms(
     registry = PlatformRegistry.get_global_platform_registry()
     platform_names = [platform] if platform else registry.get_available_platforms()
 
-    PrettyOutput.section("Supported platforms and models", OutputType.SUCCESS)
+    print("✅ Supported platforms and models")
 
     for platform_name in platform_names:
         try:
@@ -46,7 +45,7 @@ def list_platforms(
             models = platform_instance.get_model_list()
 
             # Print platform name
-            PrettyOutput.section(f"{platform_name}", OutputType.SUCCESS)
+            print(f"✅ {platform_name}")
 
             output = ""
             # Print model list
@@ -56,12 +55,12 @@ def list_platforms(
                         output += f"  • {model_name} - {description}\n"
                     else:
                         output += f"  • {model_name}\n"
-                PrettyOutput.print(output, OutputType.SUCCESS, lang="markdown")
+                print(f"✅ {output}")
             else:
-                PrettyOutput.print("  • 没有可用的模型信息", OutputType.WARNING)
+                print("⚠️   • 没有可用的模型信息")
 
         except Exception:
-            PrettyOutput.print(f"创建 {platform_name} 平台失败", OutputType.WARNING)
+            print(f"⚠️ 创建 {platform_name} 平台失败")
 
 
 def chat_with_model(
@@ -84,7 +83,7 @@ def chat_with_model(
         platform.set_model_name(model_name)
 
     if not platform:
-        PrettyOutput.print(f"创建平台 {platform_name} 失败", OutputType.WARNING)
+        print(f"⚠️ 创建平台 {platform_name} 失败")
         return
 
     try:
@@ -93,14 +92,11 @@ def chat_with_model(
         if system_prompt:
             platform.set_system_prompt(system_prompt)
         platform.set_suppress_output(False)
-        PrettyOutput.print(
-            f"连接到 {platform_name} 平台 {model_name} 模型", OutputType.SUCCESS
-        )
-        PrettyOutput.print(
-            "可用命令: /bye - 退出, /clear - 清除会话, /upload - 上传文件, "
+        print(f"✅ 连接到 {platform_name} 平台 {model_name} 模型")
+        print(
+            "ℹ️ 可用命令: /bye - 退出, /clear - 清除会话, /upload - 上传文件, "
             "/shell - 执行命令, /save - 保存对话, /saveall - 保存所有对话, "
-            "/save_session - 保存会话状态, /load_session - 加载会话状态",
-            OutputType.INFO,
+            "/save_session - 保存会话状态, /load_session - 加载会话状态"
         )
 
         # Start conversation loop
@@ -110,12 +106,12 @@ def chat_with_model(
 
             # Check if input is cancelled
             if user_input.strip() == "/bye":
-                PrettyOutput.print("再见!", OutputType.SUCCESS)
+                print("✅ 再见!")
                 break
 
             # Check if input is empty
             if not user_input.strip():
-                PrettyOutput.print("检测到空输入，退出聊天", OutputType.INFO)
+                print("ℹ️ 检测到空输入，退出聊天")
                 break
 
             # Parse command and arguments
@@ -130,9 +126,9 @@ def chat_with_model(
                     platform.reset()  # type: ignore[no-untyped-call]  # type: ignore[no-untyped-call]  # type: ignore[no-untyped-call]
                     platform.set_model_name(model_name)  # Reinitialize session
                     conversation_history = []  # 重置对话记录
-                    PrettyOutput.print("会话已清除", OutputType.SUCCESS)
+                    print("✅ 会话已清除")
                 except Exception as exc:
-                    PrettyOutput.print(f"清除会话失败: {str(exc)}", OutputType.ERROR)
+                    print(f"❌ 清除会话失败: {str(exc)}")
                 continue
 
             # Check if it is an upload command
@@ -140,9 +136,8 @@ def chat_with_model(
                 try:
                     file_path = args
                     if not file_path:
-                        PrettyOutput.print(
-                            '请指定要上传的文件路径，例如: /upload /path/to/file 或 /upload "/path/with spaces/file"',
-                            OutputType.WARNING,
+                        print(
+                            '⚠️ 请指定要上传的文件路径，例如: /upload /path/to/file 或 /upload "/path/with spaces/file"'
                         )
                         continue
 
@@ -153,16 +148,16 @@ def chat_with_model(
                         file_path = file_path[1:-1]
 
                     if not platform.support_upload_files():
-                        PrettyOutput.print("平台不支持上传文件", OutputType.ERROR)
+                        print("❌ 平台不支持上传文件")
                         continue
 
-                    PrettyOutput.print(f"正在上传文件: {file_path}", OutputType.INFO)
+                    print(f"ℹ️ 正在上传文件: {file_path}")
                     if platform.upload_files([file_path]):
-                        PrettyOutput.print("文件上传成功", OutputType.SUCCESS)
+                        print("✅ 文件上传成功")
                     else:
-                        PrettyOutput.print("文件上传失败", OutputType.ERROR)
+                        print("❌ 文件上传失败")
                 except Exception as exc:
-                    PrettyOutput.print(f"上传文件失败: {str(exc)}", OutputType.ERROR)
+                    print(f"❌ 上传文件失败: {str(exc)}")
                 continue
 
             # Check if it is a save command
@@ -170,9 +165,8 @@ def chat_with_model(
                 try:
                     file_path = args
                     if not file_path:
-                        PrettyOutput.print(
-                            "请指定保存文件名，例如: /save last_message.txt",
-                            OutputType.WARNING,
+                        print(
+                            "⚠️ 请指定保存文件名，例如: /save last_message.txt"
                         )
                         continue
 
@@ -187,13 +181,13 @@ def chat_with_model(
                         with open(file_path, "w", encoding="utf-8") as file_obj:
                             last_entry = conversation_history[-1]
                             file_obj.write(f"{last_entry['content']}\n")
-                        PrettyOutput.print(
-                            f"最后一条消息内容已保存到 {file_path}", OutputType.SUCCESS
+                        print(
+                            f"✅ 最后一条消息内容已保存到 {file_path}"
                         )
                     else:
-                        PrettyOutput.print("没有可保存的消息", OutputType.WARNING)
+                        print("⚠️ 没有可保存的消息")
                 except Exception as exc:
-                    PrettyOutput.print(f"保存消息失败: {str(exc)}", OutputType.ERROR)
+                    print(f"❌ 保存消息失败: {str(exc)}")
                 continue
 
             # Check if it is a saveall command
@@ -201,9 +195,8 @@ def chat_with_model(
                 try:
                     file_path = args
                     if not file_path:
-                        PrettyOutput.print(
-                            "请指定保存文件名，例如: /saveall all_conversations.txt",
-                            OutputType.WARNING,
+                        print(
+                            "⚠️ 请指定保存文件名，例如: /saveall all_conversations.txt"
                         )
                         continue
 
@@ -218,12 +211,12 @@ def chat_with_model(
                         for entry in conversation_history:
                             file_obj.write(f"{entry['role']}: {entry['content']}\n\n")
 
-                    PrettyOutput.print(
-                        f"所有对话已保存到 {file_path}", OutputType.SUCCESS
+                    print(
+                        f"✅ 所有对话已保存到 {file_path}"
                     )
                 except Exception as exc:
-                    PrettyOutput.print(
-                        f"保存所有对话失败: {str(exc)}", OutputType.ERROR
+                    print(
+                        f"❌ 保存所有对话失败: {str(exc)}"
                     )
                 continue
 
@@ -232,9 +225,8 @@ def chat_with_model(
                 try:
                     file_path = args
                     if not file_path:
-                        PrettyOutput.print(
-                            "请指定保存会话的文件名，例如: /save_session session.json",
-                            OutputType.WARNING,
+                        print(
+                            "⚠️ 请指定保存会话的文件名，例如: /save_session session.json"
                         )
                         continue
 
@@ -245,13 +237,13 @@ def chat_with_model(
                         file_path = file_path[1:-1]
 
                     if platform.save(file_path):
-                        PrettyOutput.print(
-                            f"会话已保存到 {file_path}", OutputType.SUCCESS
+                        print(
+                            f"✅ 会话已保存到 {file_path}"
                         )
                     else:
-                        PrettyOutput.print("保存会话失败", OutputType.ERROR)
+                        print("❌ 保存会话失败")
                 except Exception as exc:
-                    PrettyOutput.print(f"保存会话失败: {str(exc)}", OutputType.ERROR)
+                    print(f"❌ 保存会话失败: {str(exc)}")
                 continue
 
             # Check if it is a load_session command
@@ -259,9 +251,8 @@ def chat_with_model(
                 try:
                     file_path = args
                     if not file_path:
-                        PrettyOutput.print(
-                            "请指定加载会话的文件名，例如: /load_session session.json",
-                            OutputType.WARNING,
+                        print(
+                            "⚠️ 请指定加载会话的文件名，例如: /load_session session.json"
                         )
                         continue
 
@@ -273,13 +264,13 @@ def chat_with_model(
 
                     if platform.restore(file_path):
                         conversation_history = []  # Clear local history after loading
-                        PrettyOutput.print(
-                            f"会话已从 {file_path} 加载", OutputType.SUCCESS
+                        print(
+                            f"✅ 会话已从 {file_path} 加载"
                         )
                     else:
-                        PrettyOutput.print("加载会话失败", OutputType.ERROR)
+                        print("❌ 加载会话失败")
                 except Exception as exc:
-                    PrettyOutput.print(f"加载会话失败: {str(exc)}", OutputType.ERROR)
+                    print(f"❌ 加载会话失败: {str(exc)}")
                 continue
 
             # Check if it is a shell command
@@ -287,22 +278,21 @@ def chat_with_model(
                 try:
                     shell_command = args
                     if not shell_command:
-                        PrettyOutput.print(
-                            "请指定要执行的shell命令，例如: /shell ls -l",
-                            OutputType.WARNING,
+                        print(
+                            "⚠️ 请指定要执行的shell命令，例如: /shell ls -l"
                         )
                         continue
 
-                    PrettyOutput.print(f"执行命令: {shell_command}", OutputType.INFO)
+                    print(f"ℹ️ 执行命令: {shell_command}")
                     return_code = os.system(shell_command)
                     if return_code == 0:
-                        PrettyOutput.print("命令执行完成", OutputType.SUCCESS)
+                        print("✅ 命令执行完成")
                     else:
-                        PrettyOutput.print(
-                            f"命令执行失败(返回码: {return_code})", OutputType.ERROR
+                        print(
+                            f"❌ 命令执行失败(返回码: {return_code})"
                         )
                 except Exception as exc:
-                    PrettyOutput.print(f"执行命令失败: {str(exc)}", OutputType.ERROR)
+                    print(f"❌ 执行命令失败: {str(exc)}")
                 continue
 
             try:
@@ -312,19 +302,19 @@ def chat_with_model(
                 # Send to model and get reply
                 response = platform.chat_until_success(user_input)
                 if not response:
-                    PrettyOutput.print("没有有效的回复", OutputType.WARNING)
+                    print("⚠️ 没有有效的回复")
                 else:
                     conversation_history.append(
                         {"role": "assistant", "content": response}
                     )  # 记录模型回复
 
             except Exception as exc:
-                PrettyOutput.print(f"聊天失败: {str(exc)}", OutputType.ERROR)
+                print(f"❌ 聊天失败: {str(exc)}")
 
     except typer.Exit:
         raise
     except Exception as exc:
-        PrettyOutput.print(f"初始化会话失败: {str(exc)}", OutputType.ERROR)
+        print(f"❌ 初始化会话失败: {str(exc)}")
         sys.exit(1)
     finally:
         # Clean up resources
@@ -345,9 +335,8 @@ def validate_platform_model(platform: Optional[str], model: Optional[str]) -> bo
         bool: 如果平台和模型有效返回True，否则返回False。
     """
     if not platform or not model:
-        PrettyOutput.print(
-            "请指定平台和模型。使用 'jarvis info' 查看可用平台和模型。",
-            OutputType.WARNING,
+        print(
+            "⚠️ 请指定平台和模型。使用 'jarvis info' 查看可用平台和模型。"
         )
         return False
     return True
@@ -404,7 +393,7 @@ def load_role_config(config_path: str) -> Dict[str, Any]:
     import yaml
 
     if not os.path.exists(config_path):
-        PrettyOutput.print(f"角色配置文件 {config_path} 不存在", OutputType.ERROR)
+        print(f"❌ 角色配置文件 {config_path} 不存在")
         return {}
 
     with open(config_path, "r", encoding="utf-8", errors="ignore") as file_obj:
@@ -412,7 +401,7 @@ def load_role_config(config_path: str) -> Dict[str, Any]:
             config = yaml.safe_load(file_obj)
             return config if config else {}
         except yaml.YAMLError as exc:
-            PrettyOutput.print(f"角色配置文件解析失败: {str(exc)}", OutputType.ERROR)
+            print(f"❌ 角色配置文件解析失败: {str(exc)}")
             return {}
 
 
@@ -439,18 +428,18 @@ def role_command(
     config_path = os.path.expanduser(config_file)
     config = load_role_config(config_path)
     if not config or "roles" not in config:
-        PrettyOutput.print("无效的角色配置文件", OutputType.ERROR)
+        print("❌ 无效的角色配置文件")
         return
 
     # 显示可选角色列表
-    PrettyOutput.section("可用角色", OutputType.SUCCESS)
+    print("✅ 可用角色")
     output_str = "\n".join(
         [
             f"{i}. {role['name']} - {role.get('description', '')}"
             for i, role in enumerate(config["roles"], 1)
         ]
     )
-    PrettyOutput.print(output_str, OutputType.INFO)
+    print(f"ℹ️ {output_str}")
 
     # 让用户选择角色（优先 fzf，回退编号输入）
     selected_role = None  # type: ignore[var-annotated]
@@ -471,13 +460,13 @@ def role_command(
     if selected_role is None:
         raw_choice = get_single_line_input("请选择角色(输入编号，直接回车退出): ")
         if not raw_choice.strip():
-            PrettyOutput.print("已取消，退出程序", OutputType.INFO)
+            print("ℹ️ 已取消，退出程序")
             raise typer.Exit(code=0)
         try:
             choice = int(raw_choice)
             selected_role = config["roles"][choice - 1]
         except (ValueError, IndexError):
-            PrettyOutput.print("无效的选择", OutputType.ERROR)
+            print("❌ 无效的选择")
             return
 
 
@@ -509,13 +498,13 @@ def role_command(
     system_prompt = selected_role.get("system_prompt", "")
 
     # 开始对话
-    PrettyOutput.print(f"已选择角色: {selected_role['name']}", OutputType.SUCCESS)
+    print(f"✅ 已选择角色: {selected_role['name']}")
     chat_with_model(platform_name, model_name, system_prompt)
 
 
 def main() -> None:
     """Jarvis平台管理器的主入口点。"""
-    init_env("欢迎使用 Jarvis-PlatformManager，您的平台管理助手已准备就绪！")
+    init_env()
     app()
 
 

jarvis/jarvis_platform_manager/service.py

@@ -20,7 +20,6 @@ from pydantic import BaseModel, Field
 from starlette.responses import JSONResponse, Response
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.output import OutputType, PrettyOutput
 
 
 class ChatMessage(BaseModel):
@@ -97,15 +96,12 @@ def start_service(
 
     registry = PlatformRegistry.get_global_platform_registry()
 
-    PrettyOutput.print(
-        f"Starting Jarvis API server on {host}:{port}", OutputType.SUCCESS
-    )
-    PrettyOutput.print("This server provides an OpenAI-compatible API", OutputType.INFO)
+    print(f"✅ Starting Jarvis API server on {host}:{port}")
+    print("ℹ️ 本服务提供与 OpenAI 兼容的 API")
 
     if default_platform and default_model:
-        PrettyOutput.print(
-            f"Default platform: {default_platform}, model: {default_model}",
-            OutputType.INFO,
+        print(
+            f"ℹ️ Default platform: {default_platform}, model: {default_model}"
         )
 
     # Platform and model cache
@@ -151,7 +147,7 @@ def start_service(
             if response:
                 f.write(f"\nResponse:\n{response}\n")
 
-        PrettyOutput.print(f"Conversation logged to {log_file}", OutputType.INFO)
+        print(f"ℹ️ 会话已记录到 {log_file}")
 
     @app.get("/v1/models")
     async def list_models() -> Dict[str, Any]:
@@ -176,9 +172,8 @@ def start_service(
                                 }
                             )
             except Exception as exc:
-                PrettyOutput.print(
-                    f"Error getting models for {default_platform}: {str(exc)}",
-                    OutputType.ERROR,
+                print(
+                    f"❌ Error getting models for {default_platform}: {str(exc)}"
                 )
 
         # Return model list
@@ -344,7 +339,7 @@ def start_service(
 
             if isinstance(item, dict) and "__error__" in item:
                 error_msg = f"Error during streaming: {item['__error__']}"
-                PrettyOutput.print(error_msg, OutputType.ERROR)
+                print(f"❌ {error_msg}")
 
                 # Send error information in the stream
                 error_chunk = {