Merge remote-tracking branch 'upstream/dev' into dev

src/common/crash_logger.py

@@ -4,69 +4,66 @@ import logging
 from pathlib import Path
 from logging.handlers import RotatingFileHandler
 
+
 def setup_crash_logger():
     """设置崩溃日志记录器"""
     # 创建logs/crash目录（如果不存在）
     crash_log_dir = Path("logs/crash")
     crash_log_dir.mkdir(parents=True, exist_ok=True)
-    
+
     # 创建日志记录器
-    crash_logger = logging.getLogger('crash_logger')
+    crash_logger = logging.getLogger("crash_logger")
     crash_logger.setLevel(logging.ERROR)
-    
+
     # 设置日志格式
     formatter = logging.Formatter(
-        '%(asctime)s - %(name)s - %(levelname)s\n'
-        '异常类型: %(exc_info)s\n'
-        '详细信息:\n%(message)s\n'
-        '-------------------\n'
+        "%(asctime)s - %(name)s - %(levelname)s\n异常类型: %(exc_info)s\n详细信息:\n%(message)s\n-------------------\n"
     )
-    
+
     # 创建按大小轮转的文件处理器（最大10MB，保留5个备份）
     log_file = crash_log_dir / "crash.log"
     file_handler = RotatingFileHandler(
         log_file,
-        maxBytes=10*1024*1024,  # 10MB
+        maxBytes=10 * 1024 * 1024,  # 10MB
         backupCount=5,
-        encoding='utf-8'
+        encoding="utf-8",
     )
     file_handler.setFormatter(formatter)
     crash_logger.addHandler(file_handler)
-    
+
     return crash_logger
 
+
 def log_crash(exc_type, exc_value, exc_traceback):
     """记录崩溃信息到日志文件"""
     if exc_type is None:
         return
-        
+
     # 获取崩溃日志记录器
-    crash_logger = logging.getLogger('crash_logger')
-    
+    crash_logger = logging.getLogger("crash_logger")
+
     # 获取完整的异常堆栈信息
-    stack_trace = ''.join(traceback.format_exception(exc_type, exc_value, exc_traceback))
-    
+    stack_trace = "".join(traceback.format_exception(exc_type, exc_value, exc_traceback))
+
     # 记录崩溃信息
-    crash_logger.error(
-        stack_trace,
-        exc_info=(exc_type, exc_value, exc_traceback)
-    )
+    crash_logger.error(stack_trace, exc_info=(exc_type, exc_value, exc_traceback))
+
 
 def install_crash_handler():
     """安装全局异常处理器"""
     # 设置崩溃日志记录器
     setup_crash_logger()
-    
+
     # 保存原始的异常处理器
     original_hook = sys.excepthook
-    
+
     def exception_handler(exc_type, exc_value, exc_traceback):
         """全局异常处理器"""
         # 记录崩溃信息
         log_crash(exc_type, exc_value, exc_traceback)
-        
+
         # 调用原始的异常处理器
         original_hook(exc_type, exc_value, exc_traceback)
-    
+
     # 设置全局异常处理器
-    sys.excepthook = exception_handler 
+    sys.excepthook = exception_handler

src/common/logger.py

@@ -290,6 +290,12 @@ WILLING_STYLE_CONFIG = {
     },
 }
 
+CONFIRM_STYLE_CONFIG = {
+    "console_format": (
+        "<RED>{message}</RED>"
+    ),  # noqa: E501
+    "file_format": ("{time:YYYY-MM-DD HH:mm:ss} | {level: <8} | {extra[module]: <15} | EULA与PRIVACY确认 | {message}"),
+}
 
 # 根据SIMPLE_OUTPUT选择配置
 MEMORY_STYLE_CONFIG = MEMORY_STYLE_CONFIG["simple"] if SIMPLE_OUTPUT else MEMORY_STYLE_CONFIG["advanced"]

src/common/server.py

@@ -0,0 +1,73 @@
+from fastapi import FastAPI, APIRouter
+from typing import Optional
+from uvicorn import Config, Server as UvicornServer
+import os
+
+
+class Server:
+    def __init__(self, host: Optional[str] = None, port: Optional[int] = None, app_name: str = "MaiMCore"):
+        self.app = FastAPI(title=app_name)
+        self._host: str = "127.0.0.1"
+        self._port: int = 8080
+        self._server: Optional[UvicornServer] = None
+        self.set_address(host, port)
+
+    def register_router(self, router: APIRouter, prefix: str = ""):
+        """注册路由
+
+        APIRouter 用于对相关的路由端点进行分组和模块化管理：
+        1. 可以将相关的端点组织在一起，便于管理
+        2. 支持添加统一的路由前缀
+        3. 可以为一组路由添加共同的依赖项、标签等
+
+        示例:
+            router = APIRouter()
+
+            @router.get("/users")
+            def get_users():
+                return {"users": [...]}
+
+            @router.post("/users")
+            def create_user():
+                return {"msg": "user created"}
+
+            # 注册路由，添加前缀 "/api/v1"
+            server.register_router(router, prefix="/api/v1")
+        """
+        self.app.include_router(router, prefix=prefix)
+
+    def set_address(self, host: Optional[str] = None, port: Optional[int] = None):
+        """设置服务器地址和端口"""
+        if host:
+            self._host = host
+        if port:
+            self._port = port
+
+    async def run(self):
+        """启动服务器"""
+        config = Config(app=self.app, host=self._host, port=self._port)
+        self._server = UvicornServer(config=config)
+        try:
+            await self._server.serve()
+        except KeyboardInterrupt:
+            await self.shutdown()
+            raise
+        except Exception as e:
+            await self.shutdown()
+            raise RuntimeError(f"服务器运行错误: {str(e)}") from e
+        finally:
+            await self.shutdown()
+
+    async def shutdown(self):
+        """安全关闭服务器"""
+        if self._server:
+            self._server.should_exit = True
+            await self._server.shutdown()
+            self._server = None
+
+    def get_app(self) -> FastAPI:
+        """获取 FastAPI 实例"""
+        return self.app
+
+
+global_server = Server(host=os.environ["HOST"], port=int(os.environ["PORT"]))