Losita/mai-bot
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

maim_message强制版本要求；忽略APIServer下乱七八糟的类型注解和Patch

Browse Source
This commit is contained in:
UnCLAS-Prommer
2026-02-05 16:53:48 +08:00
parent 4dbe919cfe
commit 049027a48f
5 changed files with 50 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/chat/message_receive/uni_message_sender.py
View File

@@ -4,7 +4,7 @@ import traceback
from rich.traceback import install from rich.traceback import install
from maim_message import Seg from maim_message import Seg
from src.common.message.api import get_global_api from src.common.message_server.api import get_global_api
from src.common.logger import get_logger from src.common.logger import get_logger
from src.chat.message_receive.message import MessageSending from src.chat.message_receive.message import MessageSending
from src.chat.message_receive.storage import MessageStorage from src.chat.message_receive.storage import MessageStorage

6
src/common/message/__init__.py → src/common/message_server/__init__.py
View File

@@ -1,10 +1,8 @@
"""Maim Message - A message handling library""" """Maim Message - A message handling library"""
__version__ = "0.1.0" __version__ = "0.2.0"
from .api import get_global_api from .api import get_global_api
__all__ = [ __all__ = ["get_global_api"]
"get_global_api",
]

85
src/common/message/api.py → src/common/message_server/api.py
View File

@@ -1,63 +1,51 @@
from src.common.server import get_global_server
import os
import importlib.metadata
from maim_message import MessageServer from maim_message import MessageServer
import traceback
import importlib.metadata
from src.common.logger import get_logger from src.common.logger import get_logger
from src.config.config import global_config from src.config.config import global_config
from .server import get_global_server
global_api = None global_api = None
def get_global_api() -> MessageServer: # sourcery skip: extract-method def get_global_api() -> MessageServer: # sourcery skip: extract-method
"""获取全局MessageServer实例""" """获取全局MessageServer实例"""
global global_api global global_api
if global_api is None: if global_api is None:
# 检查maim_message版本 # 检查maim_message版本
try:
maim_message_version = importlib.metadata.version("maim_message") maim_message_version = importlib.metadata.version("maim_message")
version_int = [int(x) for x in maim_message_version.split(".")] version_int = [int(x) for x in maim_message_version.split(".")]
version_compatible = version_int >= [0, 3, 3] if version_int < [0, 6, 2]:
# Check for API Server feature (>= 0.6.0) raise RuntimeError("maim_message 版本过低，请升级到 0.6.2 或更高版本。")
has_api_server_feature = version_int >= [0, 6, 2]
except (importlib.metadata.PackageNotFoundError, ValueError):
version_compatible = False
has_api_server_feature = False
# 读取配置项 # 读取配置项
maim_message_config = global_config.maim_message maim_message_config = global_config.maim_message
# 设置基本参数 (Legacy Server Mode) # 设置基本参数 (Legacy Server Mode)
kwargs = { kwargs = {
"host": os.environ["HOST"], "host": maim_message_config.ws_server_host,
"port": int(os.environ["PORT"]), "port": maim_message_config.ws_server_port,
"app": get_global_server().get_app(), "app": get_global_server().get_app(),
"custom_logger": get_logger("maim_message"),
"enable_custom_uvicorn_logger": False,
} }
# 只有在版本 >= 0.3.0 时才使用高级特性
if version_compatible:
# 添加自定义logger
maim_message_logger = get_logger("maim_message")
kwargs["custom_logger"] = maim_message_logger
# 添加token认证 # 添加token认证
if maim_message_config.auth_token and len(maim_message_config.auth_token) > 0: if maim_message_config.auth_token and len(maim_message_config.auth_token) > 0:
kwargs["enable_token"] = True kwargs["enable_token"] = True
# Removed legacy custom config block (use_custom) as requested.
kwargs["enable_custom_uvicorn_logger"] = False
global_api = MessageServer(**kwargs) global_api = MessageServer(**kwargs)
if version_compatible and maim_message_config.auth_token: if maim_message_config.auth_token:
for token in maim_message_config.auth_token: for token in maim_message_config.auth_token:
global_api.add_valid_token(token) global_api.add_valid_token(token)
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
# Additional API Server Configuration (maim_message >= 6.0) # Additional API Server Configuration
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
enable_api_server = maim_message_config.enable_api_server enable_api_server = maim_message_config.enable_api_server
# 如果版本支持且启用了API Server，则初始化额外服务器 # 如果启用了API Server，则初始化额外服务器
if has_api_server_feature and enable_api_server: if enable_api_server:
try: try:
from maim_message.server import WebSocketServer, ServerConfig from maim_message.server import WebSocketServer, ServerConfig
from maim_message.message import APIMessageBase from maim_message.message import APIMessageBase
@@ -75,7 +63,7 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method
ssl_enabled=use_wss, ssl_enabled=use_wss,
ssl_certfile=maim_message_config.api_server_cert_file if use_wss else None, ssl_certfile=maim_message_config.api_server_cert_file if use_wss else None,
ssl_keyfile=maim_message_config.api_server_key_file if use_wss else None, ssl_keyfile=maim_message_config.api_server_key_file if use_wss else None,
custom_logger=api_logger # 传入自定义logger custom_logger=api_logger, # 传入自定义logger
) )
# 2. Setup Auth Handler # 2. Setup Auth Handler
@@ -92,12 +80,12 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method
api_logger.warning(f"Rejected connection with invalid API Key: {api_key}") api_logger.warning(f"Rejected connection with invalid API Key: {api_key}")
return False return False
server_config.on_auth = auth_handler server_config.on_auth = auth_handler # type: ignore # maim_message库写错类型了
# 3. Setup Message Bridge # 3. Setup Message Bridge
# Initialize refined route map if not exists # Initialize refined route map if not exists
if not hasattr(global_api, "platform_map"): if not hasattr(global_api, "platform_map"):
global_api.platform_map = {} global_api.platform_map = {} # type: ignore # 不知道这是什么神奇写法
async def bridge_message_handler(message: APIMessageBase, metadata: dict): async def bridge_message_handler(message: APIMessageBase, metadata: dict):
# 使用 MessageConverter 转换 APIMessageBase 到 Legacy MessageBase # 使用 MessageConverter 转换 APIMessageBase 到 Legacy MessageBase
@@ -109,19 +97,8 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method
msg_dict = legacy_message.to_dict() msg_dict = legacy_message.to_dict()
# Compatibility Layer: Ensure format_info exists with defaults # Compatibility Layer: Ensure format_info exists with defaults
# MaiMBot's check_types() accesses format_info.accept_format without None check
if "message_info" in msg_dict: if "message_info" in msg_dict:
msg_info = msg_dict["message_info"] msg_info = msg_dict["message_info"]
if "format_info" not in msg_info or msg_info["format_info"] is None:
msg_info["format_info"] = {
"content_format": ["text", "image", "emoji", "voice"],
"accept_format": [
"text", "image", "emoji", "reply", "voice", "command",
"voiceurl", "music", "videourl", "file", "imageurl", "forward", "video"
]
}
# Route Caching Logic: Map platform to API Key (or connection uuid as fallback) # Route Caching Logic: Map platform to API Key (or connection uuid as fallback)
# This allows us to send messages back to the correct API client for this platform # This allows us to send messages back to the correct API client for this platform
try: try:
@@ -131,7 +108,7 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method
api_logger.debug(f"Bridge received: api_key='{api_key}', platform='{platform}'") api_logger.debug(f"Bridge received: api_key='{api_key}', platform='{platform}'")
if platform: if platform:
global_api.platform_map[platform] = api_key global_api.platform_map[platform] = api_key # type: ignore
api_logger.info(f"Updated platform_map: {platform} -> {api_key}") api_logger.info(f"Updated platform_map: {platform} -> {api_key}")
except Exception as e: except Exception as e:
api_logger.warning(f"Failed to update platform map: {e}") api_logger.warning(f"Failed to update platform map: {e}")
@@ -140,21 +117,21 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method
if "raw_message" not in msg_dict: if "raw_message" not in msg_dict:
msg_dict["raw_message"] = None msg_dict["raw_message"] = None
await global_api.process_message(msg_dict) await global_api.process_message(msg_dict) # type: ignore
server_config.on_message = bridge_message_handler server_config.on_message = bridge_message_handler # type: ignore # maim_message库写错类型了
# 3.5. Register custom message handlers (bridge to Legacy handlers) # 3.5. Register custom message handlers (bridge to Legacy handlers)
# message_id_echo: handles message ID echo from adapters # message_id_echo: handles message ID echo from adapters
# 兼容新旧两个版本的 maim_message: # 兼容新旧两个版本的 maim_message:
# - 旧版: handler(payload) # - 旧版: handler(payload)
# - 新版: handler(payload, metadata) # - 新版: handler(payload, metadata)
async def custom_message_id_echo_handler(payload: dict, metadata: dict = None): async def custom_message_id_echo_handler(payload: dict, metadata: dict = None): # type: ignore
# Bridge to the Legacy custom handler registered in main.py # Bridge to the Legacy custom handler registered in main.py
try: try:
# The Legacy handler expects the payload format directly # The Legacy handler expects the payload format directly
if hasattr(global_api, '_custom_message_handlers'): if hasattr(global_api, "_custom_message_handlers"):
handler = global_api._custom_message_handlers.get("message_id_echo") handler = global_api._custom_message_handlers.get("message_id_echo") # type: ignore # 已经不知道这是什么了
if handler: if handler:
await handler(payload) await handler(payload)
api_logger.debug(f"Processed message_id_echo: {payload}") api_logger.debug(f"Processed message_id_echo: {payload}")
@@ -163,7 +140,7 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method
except Exception as e: except Exception as e:
api_logger.warning(f"Failed to process message_id_echo: {e}") api_logger.warning(f"Failed to process message_id_echo: {e}")
server_config.register_custom_handler("message_id_echo", custom_message_id_echo_handler) server_config.register_custom_handler("message_id_echo", custom_message_id_echo_handler) # type: ignore # maim_message库写错类型了
# 4. Initialize Server # 4. Initialize Server
extra_server = WebSocketServer(config=server_config) extra_server = WebSocketServer(config=server_config)
@@ -173,7 +150,9 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method
original_stop = global_api.stop original_stop = global_api.stop
async def patched_run(): async def patched_run():
api_logger.info(f"Starting Additional API Server on {api_server_host}:{api_server_port} (WSS: {use_wss})") api_logger.info(
f"Starting Additional API Server on {api_server_host}:{api_server_port} (WSS: {use_wss})"
)
# Start the extra server (non-blocking start) # Start the extra server (non-blocking start)
await extra_server.start() await extra_server.start()
# Run the original legacy server (this usually keeps running) # Run the original legacy server (this usually keeps running)
@@ -188,14 +167,14 @@ def get_global_api() -> MessageServer: # sourcery skip: extract-method
global_api.stop = patched_stop global_api.stop = patched_stop
# Attach for reference # Attach for reference
global_api.extra_server = extra_server global_api.extra_server = extra_server # type: ignore # 这是什么
except ImportError: except ImportError:
get_logger("maim_message").error("Cannot import maim_message.server components. Is maim_message >= 0.6.0 installed?") get_logger("maim_message").error(
"Cannot import maim_message.server components. Is maim_message >= 0.6.0 installed?"
)
except Exception as e: except Exception as e:
get_logger("maim_message").error(f"Failed to initialize Additional API Server: {e}") get_logger("maim_message").error(f"Failed to initialize Additional API Server: {e}")
import traceback
get_logger("maim_message").debug(traceback.format_exc()) get_logger("maim_message").debug(traceback.format_exc())
return global_api return global_api

0
src/common/server.py → src/common/message_server/server.py
View File

2
src/main.py
View File

@@ -22,7 +22,7 @@ from rich.traceback import install
from src.plugin_system.core.plugin_manager import plugin_manager from src.plugin_system.core.plugin_manager import plugin_manager
# 导入消息API和traceback模块 # 导入消息API和traceback模块
from src.common.message import get_global_api from src.common.message_server import get_global_api
from src.dream.dream_agent import start_dream_scheduler from src.dream.dream_agent import start_dream_scheduler
from src.bw_learner.expression_auto_check_task import ExpressionAutoCheckTask from src.bw_learner.expression_auto_check_task import ExpressionAutoCheckTask