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

jarvis/jarvis_platform_manager/main.py

@@ -1,23 +1,29 @@
-# -*- coding: utf-8 -*-
 """Jarvis平台管理器主模块。
 
 该模块提供了Jarvis平台管理器的主要入口点。
 """
+
 import os
 import sys
-from typing import Any, Dict, List, Optional
+
+from jarvis.jarvis_utils.output import PrettyOutput
+
+# -*- coding: utf-8 -*-
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
 
 import typer
-from jarvis.jarvis_utils.config import (
-    get_normal_platform_name,
-    get_normal_model_name,
-)
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
-from jarvis.jarvis_utils.input import get_multiline_input, get_single_line_input
-from jarvis.jarvis_utils.utils import init_env
 from jarvis.jarvis_platform_manager.service import start_service
+from jarvis.jarvis_utils.config import get_normal_model_name
+from jarvis.jarvis_utils.config import get_normal_platform_name
 from jarvis.jarvis_utils.fzf import fzf_select
+from jarvis.jarvis_utils.input import get_multiline_input
+from jarvis.jarvis_utils.input import get_single_line_input
+from jarvis.jarvis_utils.utils import init_env
 
 app = typer.Typer(help="Jarvis AI 平台")
 
@@ -26,13 +32,13 @@ app = typer.Typer(help="Jarvis AI 平台")
 def list_platforms(
     platform: Optional[str] = typer.Option(
         None, "--platform", "-p", help="指定要查看的平台"
-    )
+    ),
 ) -> None:
     """列出所有支持的平台和模型，或指定平台的详细信息。"""
     registry = PlatformRegistry.get_global_platform_registry()
     platform_names = [platform] if platform else registry.get_available_platforms()
 
-    print("✅ Supported platforms and models")
+    PrettyOutput.auto_print("✅ Supported platforms and models")
 
     for platform_name in platform_names:
         try:
@@ -45,7 +51,7 @@ def list_platforms(
             models = platform_instance.get_model_list()
 
             # Print platform name
-            print(f"✅ {platform_name}")
+            PrettyOutput.auto_print(f"✅ {platform_name}")
 
             output = ""
             # Print model list
@@ -55,17 +61,15 @@ def list_platforms(
                         output += f"  • {model_name} - {description}\n"
                     else:
                         output += f"  • {model_name}\n"
-                print(f"✅ {output}")
+                PrettyOutput.auto_print(f"✅ {output}")
             else:
-                print("⚠️   • 没有可用的模型信息")
+                PrettyOutput.auto_print("⚠️   • 没有可用的模型信息")
 
         except Exception:
-            print(f"⚠️ 创建 {platform_name} 平台失败")
+            PrettyOutput.auto_print(f"⚠️ 创建 {platform_name} 平台失败")
 
 
-def chat_with_model(
-    platform_name: str, model_name: str, system_prompt: str
-) -> None:
+def chat_with_model(platform_name: str, model_name: str, system_prompt: str) -> None:
     """与指定平台和模型进行对话。
 
     参数:
@@ -83,7 +87,7 @@ def chat_with_model(
         platform.set_model_name(model_name)
 
     if not platform:
-        print(f"⚠️ 创建平台 {platform_name} 失败")
+        PrettyOutput.auto_print(f"⚠️ 创建平台 {platform_name} 失败")
         return
 
     try:
@@ -92,8 +96,8 @@ def chat_with_model(
         if system_prompt:
             platform.set_system_prompt(system_prompt)
         platform.set_suppress_output(False)
-        print(f"✅ 连接到 {platform_name} 平台 {model_name} 模型")
-        print(
+        PrettyOutput.auto_print(f"✅ 连接到 {platform_name} 平台 {model_name} 模型")
+        PrettyOutput.auto_print(
             "ℹ️ 可用命令: /bye - 退出, /clear - 清除会话, /upload - 上传文件, "
             "/shell - 执行命令, /save - 保存对话, /saveall - 保存所有对话, "
             "/save_session - 保存会话状态, /load_session - 加载会话状态"
@@ -106,12 +110,12 @@ def chat_with_model(
 
             # Check if input is cancelled
             if user_input.strip() == "/bye":
-                print("✅ 再见!")
+                PrettyOutput.auto_print("✅ 再见!")
                 break
 
             # Check if input is empty
             if not user_input.strip():
-                print("ℹ️ 检测到空输入，退出聊天")
+                PrettyOutput.auto_print("ℹ️ 检测到空输入，退出聊天")
                 break
 
             # Parse command and arguments
@@ -123,12 +127,12 @@ def chat_with_model(
             # Check if it is a clear session command
             if command == "/clear":
                 try:
-                    platform.reset()  # type: ignore[no-untyped-call]  # type: ignore[no-untyped-call]  # type: ignore[no-untyped-call]
+                    platform.reset()
                     platform.set_model_name(model_name)  # Reinitialize session
                     conversation_history = []  # 重置对话记录
-                    print("✅ 会话已清除")
+                    PrettyOutput.auto_print("✅ 会话已清除")
                 except Exception as exc:
-                    print(f"❌ 清除会话失败: {str(exc)}")
+                    PrettyOutput.auto_print(f"❌ 清除会话失败: {str(exc)}")
                 continue
 
             # Check if it is an upload command
@@ -136,7 +140,7 @@ def chat_with_model(
                 try:
                     file_path = args
                     if not file_path:
-                        print(
+                        PrettyOutput.auto_print(
                             '⚠️ 请指定要上传的文件路径，例如: /upload /path/to/file 或 /upload "/path/with spaces/file"'
                         )
                         continue
@@ -148,16 +152,16 @@ def chat_with_model(
                         file_path = file_path[1:-1]
 
                     if not platform.support_upload_files():
-                        print("❌ 平台不支持上传文件")
+                        PrettyOutput.auto_print("❌ 平台不支持上传文件")
                         continue
 
-                    print(f"ℹ️ 正在上传文件: {file_path}")
+                    PrettyOutput.auto_print(f"ℹ️ 正在上传文件: {file_path}")
                     if platform.upload_files([file_path]):
-                        print("✅ 文件上传成功")
+                        PrettyOutput.auto_print("✅ 文件上传成功")
                     else:
-                        print("❌ 文件上传失败")
+                        PrettyOutput.auto_print("❌ 文件上传失败")
                 except Exception as exc:
-                    print(f"❌ 上传文件失败: {str(exc)}")
+                    PrettyOutput.auto_print(f"❌ 上传文件失败: {str(exc)}")
                 continue
 
             # Check if it is a save command
@@ -165,7 +169,7 @@ def chat_with_model(
                 try:
                     file_path = args
                     if not file_path:
-                        print(
+                        PrettyOutput.auto_print(
                             "⚠️ 请指定保存文件名，例如: /save last_message.txt"
                         )
                         continue
@@ -181,13 +185,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")
-                        print(
+                        PrettyOutput.auto_print(
                             f"✅ 最后一条消息内容已保存到 {file_path}"
                         )
                     else:
-                        print("⚠️ 没有可保存的消息")
+                        PrettyOutput.auto_print("⚠️ 没有可保存的消息")
                 except Exception as exc:
-                    print(f"❌ 保存消息失败: {str(exc)}")
+                    PrettyOutput.auto_print(f"❌ 保存消息失败: {str(exc)}")
                 continue
 
             # Check if it is a saveall command
@@ -195,7 +199,7 @@ def chat_with_model(
                 try:
                     file_path = args
                     if not file_path:
-                        print(
+                        PrettyOutput.auto_print(
                             "⚠️ 请指定保存文件名，例如: /saveall all_conversations.txt"
                         )
                         continue
@@ -211,13 +215,9 @@ def chat_with_model(
                         for entry in conversation_history:
                             file_obj.write(f"{entry['role']}: {entry['content']}\n\n")
 
-                    print(
-                        f"✅ 所有对话已保存到 {file_path}"
-                    )
+                    PrettyOutput.auto_print(f"✅ 所有对话已保存到 {file_path}")
                 except Exception as exc:
-                    print(
-                        f"❌ 保存所有对话失败: {str(exc)}"
-                    )
+                    PrettyOutput.auto_print(f"❌ 保存所有对话失败: {str(exc)}")
                 continue
 
             # Check if it is a save_session command
@@ -225,7 +225,7 @@ def chat_with_model(
                 try:
                     file_path = args
                     if not file_path:
-                        print(
+                        PrettyOutput.auto_print(
                             "⚠️ 请指定保存会话的文件名，例如: /save_session session.json"
                         )
                         continue
@@ -237,13 +237,11 @@ def chat_with_model(
                         file_path = file_path[1:-1]
 
                     if platform.save(file_path):
-                        print(
-                            f"✅ 会话已保存到 {file_path}"
-                        )
+                        PrettyOutput.auto_print(f"✅ 会话已保存到 {file_path}")
                     else:
-                        print("❌ 保存会话失败")
+                        PrettyOutput.auto_print("❌ 保存会话失败")
                 except Exception as exc:
-                    print(f"❌ 保存会话失败: {str(exc)}")
+                    PrettyOutput.auto_print(f"❌ 保存会话失败: {str(exc)}")
                 continue
 
             # Check if it is a load_session command
@@ -251,7 +249,7 @@ def chat_with_model(
                 try:
                     file_path = args
                     if not file_path:
-                        print(
+                        PrettyOutput.auto_print(
                             "⚠️ 请指定加载会话的文件名，例如: /load_session session.json"
                         )
                         continue
@@ -264,13 +262,11 @@ def chat_with_model(
 
                     if platform.restore(file_path):
                         conversation_history = []  # Clear local history after loading
-                        print(
-                            f"✅ 会话已从 {file_path} 加载"
-                        )
+                        PrettyOutput.auto_print(f"✅ 会话已从 {file_path} 加载")
                     else:
-                        print("❌ 加载会话失败")
+                        PrettyOutput.auto_print("❌ 加载会话失败")
                 except Exception as exc:
-                    print(f"❌ 加载会话失败: {str(exc)}")
+                    PrettyOutput.auto_print(f"❌ 加载会话失败: {str(exc)}")
                 continue
 
             # Check if it is a shell command
@@ -278,21 +274,21 @@ def chat_with_model(
                 try:
                     shell_command = args
                     if not shell_command:
-                        print(
+                        PrettyOutput.auto_print(
                             "⚠️ 请指定要执行的shell命令，例如: /shell ls -l"
                         )
                         continue
 
-                    print(f"ℹ️ 执行命令: {shell_command}")
+                    PrettyOutput.auto_print(f"ℹ️ 执行命令: {shell_command}")
                     return_code = os.system(shell_command)
                     if return_code == 0:
-                        print("✅ 命令执行完成")
+                        pass  # 命令执行成功，不显示提示
                     else:
-                        print(
+                        PrettyOutput.auto_print(
                             f"❌ 命令执行失败(返回码: {return_code})"
                         )
                 except Exception as exc:
-                    print(f"❌ 执行命令失败: {str(exc)}")
+                    PrettyOutput.auto_print(f"❌ 执行命令失败: {str(exc)}")
                 continue
 
             try:
@@ -302,19 +298,19 @@ def chat_with_model(
                 # Send to model and get reply
                 response = platform.chat_until_success(user_input)
                 if not response:
-                    print("⚠️ 没有有效的回复")
+                    PrettyOutput.auto_print("⚠️ 没有有效的回复")
                 else:
                     conversation_history.append(
                         {"role": "assistant", "content": response}
                     )  # 记录模型回复
 
             except Exception as exc:
-                print(f"❌ 聊天失败: {str(exc)}")
+                PrettyOutput.auto_print(f"❌ 聊天失败: {str(exc)}")
 
     except typer.Exit:
         raise
     except Exception as exc:
-        print(f"❌ 初始化会话失败: {str(exc)}")
+        PrettyOutput.auto_print(f"❌ 初始化会话失败: {str(exc)}")
         sys.exit(1)
     finally:
         # Clean up resources
@@ -335,7 +331,7 @@ def validate_platform_model(platform: Optional[str], model: Optional[str]) -> bo
         bool: 如果平台和模型有效返回True，否则返回False。
     """
     if not platform or not model:
-        print(
+        PrettyOutput.auto_print(
             "⚠️ 请指定平台和模型。使用 'jarvis info' 查看可用平台和模型。"
         )
         return False
@@ -348,7 +344,6 @@ def chat_command(
         None, "--platform", "-p", help="指定要使用的平台"
     ),
     model: Optional[str] = typer.Option(None, "--model", "-m", help="指定要使用的模型"),
-
     llm_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
@@ -393,7 +388,7 @@ def load_role_config(config_path: str) -> Dict[str, Any]:
     import yaml
 
     if not os.path.exists(config_path):
-        print(f"❌ 角色配置文件 {config_path} 不存在")
+        PrettyOutput.auto_print(f"❌ 角色配置文件 {config_path} 不存在")
         return {}
 
     with open(config_path, "r", encoding="utf-8", errors="ignore") as file_obj:
@@ -401,7 +396,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:
-            print(f"❌ 角色配置文件解析失败: {str(exc)}")
+            PrettyOutput.auto_print(f"❌ 角色配置文件解析失败: {str(exc)}")
             return {}
 
 
@@ -419,7 +414,6 @@ def role_command(
     model: Optional[str] = typer.Option(
         None, "--model", "-m", help="指定要使用的模型，覆盖角色配置"
     ),
-
     llm_group: Optional[str] = typer.Option(
         None, "-g", "--llm-group", help="使用的模型组，覆盖配置文件中的设置"
     ),
@@ -428,21 +422,21 @@ def role_command(
     config_path = os.path.expanduser(config_file)
     config = load_role_config(config_path)
     if not config or "roles" not in config:
-        print("❌ 无效的角色配置文件")
+        PrettyOutput.auto_print("❌ 无效的角色配置文件")
         return
 
     # 显示可选角色列表
-    print("✅ 可用角色")
+    PrettyOutput.auto_print("✅ 可用角色")
     output_str = "\n".join(
         [
             f"{i}. {role['name']} - {role.get('description', '')}"
             for i, role in enumerate(config["roles"], 1)
         ]
     )
-    print(f"ℹ️ {output_str}")
+    PrettyOutput.auto_print(f"ℹ️ {output_str}")
 
     # 让用户选择角色（优先 fzf，回退编号输入）
-    selected_role = None  # type: ignore[var-annotated]
+    selected_role = None
     fzf_options = [
         f"{i:>3} | {role['name']} - {role.get('description', '')}"
         for i, role in enumerate(config["roles"], 1)
@@ -460,17 +454,15 @@ def role_command(
     if selected_role is None:
         raw_choice = get_single_line_input("请选择角色(输入编号，直接回车退出): ")
         if not raw_choice.strip():
-            print("ℹ️ 已取消，退出程序")
+            PrettyOutput.auto_print("ℹ️ 已取消，退出程序")
             raise typer.Exit(code=0)
         try:
             choice = int(raw_choice)
             selected_role = config["roles"][choice - 1]
         except (ValueError, IndexError):
-            print("❌ 无效的选择")
+            PrettyOutput.auto_print("❌ 无效的选择")
             return
 
-
-
     # 初始化平台和模型
     # 如果提供了platform或model参数，优先使用命令行参数
     # 否则，如果提供了 llm_group，则从配置中获取
@@ -498,7 +490,7 @@ def role_command(
     system_prompt = selected_role.get("system_prompt", "")
 
     # 开始对话
-    print(f"✅ 已选择角色: {selected_role['name']}")
+    PrettyOutput.auto_print(f"✅ 已选择角色: {selected_role['name']}")
     chat_with_model(platform_name, model_name, system_prompt)
 
 

jarvis/jarvis_platform_manager/service.py

@@ -1,23 +1,33 @@
-# -*- coding: utf-8 -*-
 """Jarvis Platform Manager Service Module.
 
 This module provides an OpenAI-compatible API service for the Jarvis platform.
 """
+
 import asyncio
 import json
+
+from jarvis.jarvis_utils.output import PrettyOutput
+
+# -*- coding: utf-8 -*-
 import os
-import time
 import threading
+import time
 import uuid
 from datetime import datetime
-from typing import Any, Dict, List, Optional
+from typing import Any
+from typing import Dict
+from typing import List
+from typing import Optional
 
 import uvicorn
-from fastapi import FastAPI, HTTPException
+from fastapi import FastAPI
+from fastapi import HTTPException
 from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import StreamingResponse
-from pydantic import BaseModel, Field
-from starlette.responses import JSONResponse, Response
+from pydantic import BaseModel
+from pydantic import Field
+from starlette.responses import JSONResponse
+from starlette.responses import Response
 
 from jarvis.jarvis_platform.registry import PlatformRegistry
 
@@ -73,7 +83,7 @@ def start_service(
     """Start OpenAI-compatible API server."""
     # Create logs directory if it doesn't exist
     # Prefer environment variable, then user directory, fall back to CWD
-    logs_dir = os.environ.get("JARVIS_LOG_DIR")
+    logs_dir = os.environ.get("log_dir")
     if not logs_dir:
         logs_dir = os.path.join(os.path.expanduser("~"), ".jarvis", "logs")
     try:
@@ -96,11 +106,11 @@ def start_service(
 
     registry = PlatformRegistry.get_global_platform_registry()
 
-    print(f"✅ Starting Jarvis API server on {host}:{port}")
-    print("ℹ️ 本服务提供与 OpenAI 兼容的 API")
+    PrettyOutput.auto_print(f"✅ Starting Jarvis API server on {host}:{port}")
+    PrettyOutput.auto_print("ℹ️ 本服务提供与 OpenAI 兼容的 API")
 
     if default_platform and default_model:
-        print(
+        PrettyOutput.auto_print(
             f"ℹ️ Default platform: {default_platform}, model: {default_model}"
         )
 
@@ -147,7 +157,7 @@ def start_service(
             if response:
                 f.write(f"\nResponse:\n{response}\n")
 
-        print(f"ℹ️ 会话已记录到 {log_file}")
+        PrettyOutput.auto_print(f"ℹ️ 会话已记录到 {log_file}")
 
     @app.get("/v1/models")
     async def list_models() -> Dict[str, Any]:
@@ -172,7 +182,7 @@ def start_service(
                                 }
                             )
             except Exception as exc:
-                print(
+                PrettyOutput.auto_print(
                     f"❌ Error getting models for {default_platform}: {str(exc)}"
                 )
 
@@ -238,7 +248,7 @@ def start_service(
         if stream:
             # Return streaming response
             return StreamingResponse(
-                stream_chat_response(platform, message_text, model),  # type: ignore
+                stream_chat_response(platform, message_text, model),
                 media_type="text/event-stream",
                 headers={"Cache-Control": "no-cache", "Connection": "keep-alive"},
             )
@@ -339,7 +349,7 @@ def start_service(
 
             if isinstance(item, dict) and "__error__" in item:
                 error_msg = f"Error during streaming: {item['__error__']}"
-                print(f"❌ {error_msg}")
+                PrettyOutput.auto_print(f"❌ {error_msg}")
 
                 # Send error information in the stream
                 error_chunk = {