feat: 增加maim_message自定义logger
parent
bbff5702a5
commit
866637b658
|
|
@ -2,11 +2,12 @@
|
||||||
name = "MaiBotNapcatAdapter"
|
name = "MaiBotNapcatAdapter"
|
||||||
version = "0.5.5"
|
version = "0.5.5"
|
||||||
description = "A MaiBot adapter for Napcat"
|
description = "A MaiBot adapter for Napcat"
|
||||||
|
requires-python = ">=3.10"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aiohttp>=3.13.2",
|
"aiohttp>=3.13.2",
|
||||||
"asyncio>=4.0.0",
|
"asyncio>=4.0.0",
|
||||||
"loguru>=0.7.3",
|
"loguru>=0.7.3",
|
||||||
"maim-message>=0.5.7",
|
# maim-message - 使用本地开发版本,通过uv pip install -e手动安装
|
||||||
"pillow>=12.0.0",
|
"pillow>=12.0.0",
|
||||||
"requests>=2.32.5",
|
"requests>=2.32.5",
|
||||||
"rich>=14.2.0",
|
"rich>=14.2.0",
|
||||||
|
|
|
||||||
|
|
@ -107,10 +107,10 @@ async def _legacy_message_handler_adapter(message: APIMessageBase, metadata: dic
|
||||||
async def mmc_start_com():
|
async def mmc_start_com():
|
||||||
global router
|
global router
|
||||||
config = global_config.maibot_server
|
config = global_config.maibot_server
|
||||||
|
|
||||||
if config.enable_api_server and HAS_MESSAGE_CONVERTER:
|
if config.enable_api_server and HAS_MESSAGE_CONVERTER:
|
||||||
logger.info("使用 API-Server 模式连接 MaiBot")
|
logger.info("使用 API-Server 模式连接 MaiBot")
|
||||||
|
|
||||||
# Create legacy adapter handler
|
# Create legacy adapter handler
|
||||||
# We need to define the on_message callback here to bridge to send_handler
|
# We need to define the on_message callback here to bridge to send_handler
|
||||||
async def on_message_bridge(message: APIMessageBase, metadata: Dict[str, Any]):
|
async def on_message_bridge(message: APIMessageBase, metadata: Dict[str, Any]):
|
||||||
|
|
@ -119,12 +119,12 @@ async def mmc_start_com():
|
||||||
# receiver_info 包含消息接收者信息,需要提取到 group_info/user_info
|
# receiver_info 包含消息接收者信息,需要提取到 group_info/user_info
|
||||||
try:
|
try:
|
||||||
from maim_message import MessageConverter
|
from maim_message import MessageConverter
|
||||||
|
|
||||||
legacy_message = MessageConverter.from_api_send(message)
|
legacy_message = MessageConverter.from_api_send(message)
|
||||||
msg_dict = legacy_message.to_dict()
|
msg_dict = legacy_message.to_dict()
|
||||||
|
|
||||||
await send_handler.handle_message(msg_dict)
|
await send_handler.handle_message(msg_dict)
|
||||||
|
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
logger.error(f"消息桥接转换失败: {e}")
|
logger.error(f"消息桥接转换失败: {e}")
|
||||||
import traceback
|
import traceback
|
||||||
|
|
@ -134,14 +134,15 @@ async def mmc_start_com():
|
||||||
url=config.base_url,
|
url=config.base_url,
|
||||||
api_key=config.api_key,
|
api_key=config.api_key,
|
||||||
platform=config.platform_name,
|
platform=config.platform_name,
|
||||||
on_message=on_message_bridge
|
on_message=on_message_bridge,
|
||||||
|
custom_logger=custom_logger # 传入自定义logger
|
||||||
)
|
)
|
||||||
|
|
||||||
client = WebSocketClient(client_config)
|
client = WebSocketClient(client_config)
|
||||||
router = APIServerWrapper(client)
|
router = APIServerWrapper(client)
|
||||||
message_send_instance.maibot_router = router
|
message_send_instance.maibot_router = router
|
||||||
await router.run()
|
await router.run()
|
||||||
|
|
||||||
else:
|
else:
|
||||||
logger.info("使用 Legacy WebSocket 模式连接 MaiBot")
|
logger.info("使用 Legacy WebSocket 模式连接 MaiBot")
|
||||||
route_config = RouteConfig(
|
route_config = RouteConfig(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue