GithubBackup/MoviePilot
1
0
Fork 0
mirror of https://github.com/jxxghp/MoviePilot.git synced 2026-09-05 23:47:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor(schemas): 统一 message/notification 命名边界，旧名收敛至兼容映射表

Browse Source 
- notification 域：渠道能力（MessageChannel→NotificationChannel、ChannelCapability* 迁入 notification.py）
- message 域：消息收发（Notification→Message、NotificationType→MessageType、CommingMessage→IncomingMessage、NotificationHistoryItem→MessageHistoryItem、NotificationClear*→MessageClear*）
- Agent 工具契约：send_notification_message→send_message、notification_callback→message_callback
- 源码不保留旧名物理别名，旧导入经 app/runtime/compat/manifest.py SYMBOL_ALIASES 惰性解析
- API 路径与持久化键冻结不变，前端零改动
- 新增兼容守护测试与 docs/rules/07 命名边界规范
This commit is contained in:
jxxghp
2026-08-16 19:32:20 +08:00
parent 98276a68a8
commit 240a4dffe6
96 changed files with 1975 additions and 1751 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/modules/wechat/__init__.py
+20 -20
View File
@@ -17,7 +17,7 @@ from app.modules import _ModuleBase, _MessageBase
from app.adapters.external.wechat_crypt import WXBizMsgCrypt
from app.modules.wechat.wechat import WeChat
from app.modules.wechat.wechatbot import WeChatBot
from app.schemas import MessageChannel, CommingMessage, Notification, CommandRegisterEventData
from app.schemas import NotificationChannel, IncomingMessage, Message, CommandRegisterEventData
from app.schemas.types import ModuleType, ChainEventType
from app.foundation.dom import DomUtils
from app.foundation.collections import DictUtils
@@ -31,7 +31,7 @@ def _resolve_wechat_admin_ids(config: Optional[dict]) -> set[str]:
return resolve_config_principal_ids(config, *config_keys)
register_channel_admin_resolver(MessageChannel.Wechat, _resolve_wechat_admin_ids)
register_channel_admin_resolver(NotificationChannel.Wechat, _resolve_wechat_admin_ids)
class WechatModule(_ModuleBase, _MessageBase[WeChat]):
@@ -42,7 +42,7 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
"""
super().init_service(service_name=WeChat.__name__.lower(),
service_type=self._create_client)
self._channel = MessageChannel.Wechat
self._channel = NotificationChannel.Wechat
@staticmethod
def get_name() -> str:
@@ -56,11 +56,11 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
return ModuleType.Notification
@staticmethod
def get_subtype() -> MessageChannel:
def get_subtype() -> NotificationChannel:
"""
获取模块的子类型
"""
return MessageChannel.Wechat
return NotificationChannel.Wechat
@staticmethod
def get_priority() -> int:
@@ -104,7 +104,7 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
if not admins:
return False
return not matches_channel_admin(
MessageChannel.Wechat,
NotificationChannel.Wechat,
config,
user_id,
)
@@ -131,7 +131,7 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
pass
def message_parser(self, source: str, body: Any, form: Any,
args: Any) -> Optional[CommingMessage]:
args: Any) -> Optional[IncomingMessage]:
"""
解析消息内容，返回字典，注意以下约定值：
userid: 用户ID
@@ -229,9 +229,9 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
media_id = DomUtils.tag_value(root_node, "MediaId")
pic_url = DomUtils.tag_value(root_node, "PicUrl")
if media_id:
images = [CommingMessage.MessageImage(ref=f"wxwork://media_id/{media_id}")]
images = [IncomingMessage.MessageImage(ref=f"wxwork://media_id/{media_id}")]
elif pic_url:
images = [CommingMessage.MessageImage(ref=pic_url)]
images = [IncomingMessage.MessageImage(ref=pic_url)]
logger.info(
f"收到来自 {client_config.name} 的微信图片消息：userid={user_id}, images={len(images) if images else 0}"
)
@@ -250,7 +250,7 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
file_name = DomUtils.tag_value(root_node, "FileName")
if media_id:
files = [
CommingMessage.MessageAttachment(
IncomingMessage.MessageAttachment(
ref=f"wxwork://file_media_id/{media_id}",
name=file_name,
)
@@ -269,10 +269,10 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
if content or images or audio_refs or files:
# 处理消息内容
return CommingMessage(channel=MessageChannel.Wechat, source=client_config.name,
return IncomingMessage(channel=NotificationChannel.Wechat, source=client_config.name,
userid=user_id, username=user_id,
is_channel_admin=matches_channel_admin(
MessageChannel.Wechat,
NotificationChannel.Wechat,
client_config.config,
user_id,
), text=content or "",
@@ -281,7 +281,7 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
logger.error(f"微信消息处理发生错误：{str(err)}")
return None
def _parse_bot_message(self, source: str, body: Any, client_config) -> Optional[CommingMessage]:
def _parse_bot_message(self, source: str, body: Any, client_config) -> Optional[IncomingMessage]:
try:
if isinstance(body, bytes):
msg_json = json.loads(body)
@@ -314,7 +314,7 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
download_url = file_payload.get("download_url")
if download_url:
files = [
CommingMessage.MessageAttachment(
IncomingMessage.MessageAttachment(
ref=f"wxbot://file/{quote(download_url, safe='')}",
name=file_payload.get("name") or file_payload.get("filename"),
mime_type=file_payload.get("content_type")
@@ -340,13 +340,13 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
f"收到来自 {client_config.name} 的企业微信智能机器人消息："
f"userid={sender}, text={text}, images={len(images) if images else 0}"
)
return CommingMessage(
channel=MessageChannel.Wechat,
return IncomingMessage(
channel=NotificationChannel.Wechat,
source=client_config.name,
userid=sender,
username=sender,
is_channel_admin=matches_channel_admin(
MessageChannel.Wechat,
NotificationChannel.Wechat,
client_config.config,
sender,
),
@@ -356,7 +356,7 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
files=files,
)
def post_message(self, message: Notification, **kwargs) -> None:
def post_message(self, message: Message, **kwargs) -> None:
"""
发送消息
:param message: 消息内容
@@ -425,7 +425,7 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
return client.download_media_bytes(media_id)
return None
def post_medias_message(self, message: Notification, medias: List[MediaInfo]) -> None:
def post_medias_message(self, message: Message, medias: List[MediaInfo]) -> None:
"""
发送媒体信息选择列表
:param message: 消息内容
@@ -442,7 +442,7 @@ class WechatModule(_ModuleBase, _MessageBase[WeChat]):
# 再发送内容
client.send_medias_msg(medias=medias, userid=message.userid)
def post_torrents_message(self, message: Notification, torrents: List[Context]) -> None:
def post_torrents_message(self, message: Message, torrents: List[Context]) -> None:
"""
发送种子信息选择列表
:param message: 消息内容
app/modules/wechat/wechatbot.py
+8 -8
View File
@@ -17,8 +17,8 @@ from app.domain.context import MediaInfo, Context
from app.domain.metainfo import MetaInfo
from app.application.messaging.agent import matches_channel_admin
from app.runtime.log import logger
from app.schemas import CommingMessage
from app.schemas.types import MessageChannel
from app.schemas import IncomingMessage
from app.schemas.types import NotificationChannel
from app.adapters.network.http import RequestUtils
from app.foundation import size as size_tools
@@ -364,8 +364,8 @@ class WeChatBot:
@classmethod
def _extract_images_from_body(
cls, body: dict
) -> Optional[List["CommingMessage.MessageImage"]]:
images: List["CommingMessage.MessageImage"] = []
) -> Optional[List["IncomingMessage.MessageImage"]]:
images: List["IncomingMessage.MessageImage"] = []
msgtype = body.get("msgtype")
if msgtype == "image":
@@ -373,7 +373,7 @@ class WeChatBot:
image_ref = cls._build_image_ref(image_payload)
if image_ref:
images.append(
CommingMessage.MessageImage(
IncomingMessage.MessageImage(
ref=image_ref,
mime_type=image_payload.get("mime_type")
or image_payload.get("content_type"),
@@ -387,7 +387,7 @@ class WeChatBot:
image_ref = cls._build_image_ref(image_payload)
if image_ref:
images.append(
CommingMessage.MessageImage(
IncomingMessage.MessageImage(
ref=image_ref,
mime_type=image_payload.get("mime_type")
or image_payload.get("content_type"),
@@ -400,7 +400,7 @@ class WeChatBot:
image_ref = cls._build_image_ref(image_payload)
if image_ref:
images.append(
CommingMessage.MessageImage(
IncomingMessage.MessageImage(
ref=image_ref,
mime_type=image_payload.get("mime_type")
or image_payload.get("content_type"),
@@ -492,7 +492,7 @@ class WeChatBot:
self._remember_target(sender)
is_channel_admin = matches_channel_admin(
MessageChannel.Wechat,
NotificationChannel.Wechat,
{
"WECHAT_ADMINS": ",".join(self._admins),
"WECHAT_BOT_CHAT_ID": getattr(self, "_default_chat_id", None),