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

- 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
+16 -16
View File
@@ -11,12 +11,12 @@ from app.application.messaging.agent import (
from app.runtime.log import logger
from app.modules import _ModuleBase, _MessageBase
from app.modules.vocechat.vocechat import VoceChat
from app.schemas import MessageChannel, CommingMessage, Notification
from app.schemas import NotificationChannel, IncomingMessage, Message
from app.schemas.types import ModuleType
register_channel_admin_resolver(
MessageChannel.VoceChat,
NotificationChannel.VoceChat,
lambda config: resolve_config_principal_ids(config, "VOCECHAT_ADMINS"),
)
@@ -53,7 +53,7 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
"""
super().init_service(service_name=VoceChat.__name__.lower(),
service_type=VoceChat)
self._channel = MessageChannel.VoceChat
self._channel = NotificationChannel.VoceChat
@staticmethod
def get_name() -> str:
@@ -67,11 +67,11 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
return ModuleType.Notification
@staticmethod
def get_subtype() -> MessageChannel:
def get_subtype() -> NotificationChannel:
"""
获取模块子类型
"""
return MessageChannel.VoceChat
return NotificationChannel.VoceChat
@staticmethod
def get_priority() -> int:
@@ -139,7 +139,7 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
client.send_msg(title="只有管理员才有权限执行此命令", userid=str(userid))
def message_parser(self, source: str, body: Any, form: Any,
args: Any) -> Optional[CommingMessage]:
args: Any) -> Optional[IncomingMessage]:
"""
解析消息内容,返回字典,注意以下约定值:
userid: 用户ID
@@ -215,10 +215,10 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
f"userid={userid}, text={text}, images={len(images) if images else 0}, "
f"audios={len(audio_refs) if audio_refs else 0}, files={len(files) if files else 0}"
)
return CommingMessage(channel=MessageChannel.VoceChat, source=client_config.name,
return IncomingMessage(channel=NotificationChannel.VoceChat, source=client_config.name,
userid=userid, username=userid,
is_channel_admin=matches_channel_admin(
MessageChannel.VoceChat, client_config.config,
NotificationChannel.VoceChat, client_config.config,
from_uid, actor_userid,
), text=text or "",
images=images, audio_refs=audio_refs, files=files)
@@ -229,7 +229,7 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
@classmethod
def _extract_images(
cls, detail: dict
) -> Optional[List[CommingMessage.MessageImage]]:
) -> Optional[List[IncomingMessage.MessageImage]]:
content_type = detail.get("content_type") or ""
if content_type != "vocechat/file":
return None
@@ -262,7 +262,7 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
return None
if isinstance(direct_url, str) and direct_url.startswith("http"):
return [
CommingMessage.MessageImage(
IncomingMessage.MessageImage(
ref=direct_url,
name=properties.get("name") or properties.get("filename"),
mime_type=mime_type or None,
@@ -271,7 +271,7 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
]
if isinstance(file_path, str) and file_path:
return [
CommingMessage.MessageImage(
IncomingMessage.MessageImage(
ref=f"vocechat://file/{quote(file_path, safe='')}",
name=properties.get("name") or properties.get("filename"),
mime_type=mime_type or None,
@@ -314,7 +314,7 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
@classmethod
def _extract_files(
cls, detail: dict
) -> Optional[List[CommingMessage.MessageAttachment]]:
) -> Optional[List[IncomingMessage.MessageAttachment]]:
content_type = detail.get("content_type") or ""
if content_type != "vocechat/file":
return None
@@ -346,7 +346,7 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
if is_image or is_audio or not isinstance(file_path, str) or not file_path:
return None
return [
CommingMessage.MessageAttachment(
IncomingMessage.MessageAttachment(
ref=f"vocechat://file/{quote(file_path, safe='')}",
name=file_name,
mime_type=properties.get("content_type")
@@ -356,7 +356,7 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
)
]
def post_message(self, message: Notification, **kwargs) -> None:
def post_message(self, message: Message, **kwargs) -> None:
"""
发送消息
:param message: 消息内容
@@ -374,7 +374,7 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
client.send_msg(title=message.title, text=message.text,
image=message.image, userid=userid, link=message.link)
def post_medias_message(self, message: Notification, medias: List[MediaInfo]) -> None:
def post_medias_message(self, message: Message, medias: List[MediaInfo]) -> None:
"""
发送媒体信息选择列表
:param message: 消息内容
@@ -390,7 +390,7 @@ class VoceChatModule(_ModuleBase, _MessageBase[VoceChat]):
client.send_medias_msg(title=message.title, medias=medias,
userid=message.userid, link=message.link)
def post_torrents_message(self, message: Notification, torrents: List[Context]) -> None:
def post_torrents_message(self, message: Message, torrents: List[Context]) -> None:
"""
发送种子信息选择列表
:param message: 消息内容