From 240a4dffe6136bfa367937f4d796ecdf62f5c761 Mon Sep 17 00:00:00 2001 From: jxxghp Date: Sun, 16 Aug 2026 19:32:20 +0800 Subject: [PATCH] =?UTF-8?q?refactor(schemas):=20=E7=BB=9F=E4=B8=80=20messa?= =?UTF-8?q?ge/notification=20=E5=91=BD=E5=90=8D=E8=BE=B9=E7=95=8C=EF=BC=8C?= =?UTF-8?q?=E6=97=A7=E5=90=8D=E6=94=B6=E6=95=9B=E8=87=B3=E5=85=BC=E5=AE=B9?= =?UTF-8?q?=E6=98=A0=E5=B0=84=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 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 命名边界规范 --- app/agent/callback/__init__.py | 18 +- app/agent/llm/capability.py | 14 +- app/agent/orchestrator.py | 58 +-- app/agent/prompt/__init__.py | 6 +- app/agent/tools/base.py | 34 +- app/agent/tools/factory.py | 6 +- app/agent/tools/impl/add_subscribe.py | 22 +- app/agent/tools/impl/ask_user_choice.py | 14 +- app/agent/tools/impl/run_slash_command.py | 4 +- app/agent/tools/impl/send_local_file.py | 14 +- app/agent/tools/impl/send_message.py | 10 +- app/agent/tools/impl/send_voice_message.py | 8 +- app/api/endpoints/agent.py | 196 +++++----- app/api/endpoints/anthropic.py | 4 +- app/api/endpoints/message.py | 18 +- app/api/endpoints/openai.py | 6 +- app/application/messaging/agent.py | 10 +- app/application/messaging/interaction.py | 24 +- app/application/messaging/media.py | 6 +- app/application/messaging/message.py | 16 +- app/application/messaging/plugin.py | 46 +-- app/application/messaging/site.py | 32 +- app/application/messaging/skill.py | 48 +-- app/application/messaging/subscribe.py | 46 +-- app/chain/__init__.py | 38 +- app/chain/download.py | 32 +- app/chain/interaction.py | 72 ++-- app/chain/message.py | 116 +++--- app/chain/site.py | 54 +-- app/chain/subscribe.py | 38 +- app/chain/system.py | 18 +- app/chain/torrents.py | 16 +- app/chain/transfer.py | 48 +-- app/command.py | 12 +- app/db/oper/agentchat.py | 14 +- app/db/oper/message.py | 10 +- app/modules/__init__.py | 10 +- app/modules/discord/__init__.py | 54 +-- app/modules/discord/discord.py | 16 +- app/modules/feishu/__init__.py | 30 +- app/modules/feishu/feishu.py | 52 +-- app/modules/qqbot/__init__.py | 50 +-- app/modules/slack/__init__.py | 54 +-- app/modules/synologychat/__init__.py | 34 +- app/modules/telegram/__init__.py | 62 +-- app/modules/vocechat/__init__.py | 32 +- app/modules/webpush/__init__.py | 12 +- app/modules/wechat/__init__.py | 40 +- app/modules/wechat/wechatbot.py | 16 +- app/modules/wechatclawbot/__init__.py | 34 +- app/runtime/compat/manifest.py | 85 +++- app/runtime/extensions/module_manager.py | 4 +- app/runtime/extensions/service_registry.py | 4 +- app/scheduler.py | 10 +- app/schemas/event.py | 6 +- app/schemas/message.py | 367 ++---------------- app/schemas/notification.py | 328 +++++++++++++++- app/schemas/types.py | 8 +- app/startup/modules_initializer.py | 6 +- app/workflow/actions/send_message.py | 4 +- docs/rules/07-naming-conventions.md | 23 +- tests/test_agent_add_subscribe_tool.py | 8 +- tests/test_agent_channel_admin_identity.py | 20 +- tests/test_agent_image_capability.py | 4 +- tests/test_agent_image_support.py | 72 ++-- tests/test_agent_interaction.py | 36 +- tests/test_agent_llm_capability.py | 26 +- tests/test_agent_message_routing.py | 26 +- tests/test_agent_progress_updates.py | 6 +- tests/test_agent_resource_flow_permissions.py | 18 +- tests/test_agent_secret_confirmation.py | 36 +- tests/test_agent_session_status.py | 6 +- tests/test_agent_tool_message_target.py | 16 +- tests/test_agent_tool_policy.py | 22 +- tests/test_agent_tool_streaming.py | 46 +-- tests/test_downloader_path_mapping.py | 4 +- tests/test_feishu.py | 82 ++-- tests/test_feishu_media_message.py | 4 +- tests/test_interaction_router.py | 6 +- tests/test_legacy_import_compat.py | 12 +- tests/test_media_interaction.py | 280 ++++++------- ...test_message_notification_naming_compat.py | 113 ++++++ tests/test_message_notifications.py | 40 +- tests/test_message_processing_status.py | 28 +- tests/test_notification_channel_manage.py | 14 +- tests/test_notification_template_render.py | 6 +- tests/test_skills_command.py | 52 +-- tests/test_slash_command_interactions.py | 36 +- tests/test_subscribe_chain.py | 2 +- tests/test_sunnypt_indexer.py | 4 +- tests/test_system_notification_dispatch.py | 6 +- tests/test_telegram.py | 32 +- tests/test_telegram_typing_lifecycle.py | 52 +-- tests/test_transfer_failed_retry_buttons.py | 14 +- tests/test_transfer_message.py | 4 +- tests/test_web_agent_stream.py | 124 +++--- 96 files changed, 1975 insertions(+), 1751 deletions(-) create mode 100644 tests/test_message_notification_naming_compat.py diff --git a/app/agent/callback/__init__.py b/app/agent/callback/__init__.py index 90bdc2206..165d7cd9b 100644 --- a/app/agent/callback/__init__.py +++ b/app/agent/callback/__init__.py @@ -7,13 +7,13 @@ from fastapi.concurrency import run_in_threadpool from app.agent.policy import sanitize_for_host from app.chain import ChainBase from app.runtime.log import logger -from app.schemas import Notification +from app.schemas import Message from app.schemas.message import ( MessageResponse, ChannelCapabilityManager, ChannelCapability, ) -from app.schemas.types import MessageChannel, NotificationType +from app.schemas.types import NotificationChannel, MessageType class _StreamChain(ChainBase): @@ -187,7 +187,7 @@ class StreamingHandler: # 从渠道能力中获取单条消息最大长度 try: - channel_enum = MessageChannel(self._channel) + channel_enum = NotificationChannel(self._channel) self._max_message_length = ChannelCapabilityManager.get_max_message_length( channel_enum ) @@ -463,7 +463,7 @@ class StreamingHandler: if not self._channel: return False try: - channel_enum = MessageChannel(self._channel) + channel_enum = NotificationChannel(self._channel) return ChannelCapabilityManager.supports_capability( channel_enum, ChannelCapability.MESSAGE_EDITING ) @@ -531,10 +531,10 @@ class StreamingHandler: # 第一次发送：发送新消息并获取 message_id response = await run_in_threadpool( chain.send_direct_message, - Notification( + Message( channel=self._channel, source=self._source, - mtype=NotificationType.Agent, + mtype=MessageType.Agent, userid=self._user_id, username=self._username, original_message_id=self._original_message_id, @@ -577,10 +577,10 @@ class StreamingHandler: if current_text: response = await run_in_threadpool( chain.send_direct_message, - Notification( + Message( channel=self._channel, source=self._source, - mtype=NotificationType.Agent, + mtype=MessageType.Agent, userid=self._user_id, username=self._username, original_message_id=self._original_message_id, @@ -603,7 +603,7 @@ class StreamingHandler: else: # 后续更新：编辑已有消息 try: - channel_enum = MessageChannel(self._channel) + channel_enum = NotificationChannel(self._channel) except (ValueError, KeyError): return diff --git a/app/agent/llm/capability.py b/app/agent/llm/capability.py index 9c776cce0..536994220 100644 --- a/app/agent/llm/capability.py +++ b/app/agent/llm/capability.py @@ -774,20 +774,20 @@ class AgentCapabilityManager: if not channel: return None - from app.schemas.types import MessageChannel + from app.schemas.types import NotificationChannel - if isinstance(channel, MessageChannel): + if isinstance(channel, NotificationChannel): return channel channel_text = str(channel).strip() if not channel_text: return None lowered_channel = channel_text.lower() - for channel_item in MessageChannel: + for channel_item in NotificationChannel: aliases = { channel_item.value.lower(), channel_item.name.lower(), - f"{MessageChannel.__name__}.{channel_item.name}".lower(), + f"{NotificationChannel.__name__}.{channel_item.name}".lower(), } if lowered_channel in aliases: return channel_item @@ -812,8 +812,8 @@ class AgentCapabilityManager: cls, channel: Optional[str], source: Optional[str] ) -> bool: """判断当前渠道是否支持原生语音消息发送。""" - from app.schemas.message import ChannelCapability, ChannelCapabilityManager - from app.schemas.types import MessageChannel + from app.schemas.notification import ChannelCapability, ChannelCapabilityManager + from app.schemas.types import NotificationChannel channel_enum = cls._parse_message_channel(channel) if not channel_enum: @@ -824,6 +824,6 @@ class AgentCapabilityManager: ): return False - if channel_enum == MessageChannel.Wechat: + if channel_enum == NotificationChannel.Wechat: return cls._is_wechat_app_mode(source) return True diff --git a/app/agent/orchestrator.py b/app/agent/orchestrator.py index f4d3b6581..f51cdd888 100644 --- a/app/agent/orchestrator.py +++ b/app/agent/orchestrator.py @@ -76,9 +76,9 @@ from app.db.oper.agentchat import AgentChatOper from app.db.oper.agenttask import AgentTaskOper from app.db.oper.user import UserOper from app.runtime.log import logger -from app.schemas import AgentLLMProviderEventData, AgentTokensUsageEventData, Notification, NotificationType -from app.schemas.message import ChannelCapabilityManager, ChannelCapability -from app.schemas.types import ChainEventType, EventType, MessageChannel +from app.schemas import AgentLLMProviderEventData, AgentTokensUsageEventData, Message, MessageType +from app.schemas.notification import ChannelCapabilityManager, ChannelCapability +from app.schemas.types import ChainEventType, EventType, NotificationChannel from app.foundation.identity import SYSTEM_INTERNAL_USER_ID @@ -110,7 +110,7 @@ async def _async_start_processing_status(task: "_MessageTask") -> Optional[dict] """在线程池中通过统一 Chain 接口启动处理状态。""" try: return AgentChain().start_message_processing_status( - channel=MessageChannel(task.channel), + channel=NotificationChannel(task.channel), source=task.source, userid=task.user_id, message_id=task.original_message_id, @@ -334,7 +334,7 @@ HEARTBEAT_SESSION_PREFIX = "__agent_heartbeat_" UNSUPPORTED_IMAGE_INPUT_MESSAGE = "当前模型不支持图片输入，请更换支持图片输入的模型，或在系统设置中关闭图片输入支持后重试。" AGENT_EXECUTION_ERROR_PREFIX = "智能助手执行失败" AGENT_EXECUTION_ERROR_MESSAGE = "智能助手执行失败，请稍后重试。" -AGENT_DISPLAY_HISTORY_SKIP_CHANNELS = {MessageChannel.WebAgent.value} +AGENT_DISPLAY_HISTORY_SKIP_CHANNELS = {NotificationChannel.WebAgent.value} AGENT_CHAT_TITLE_PROMPT = ( "你是 MoviePilot 智能助手的内部会话标题生成器。你的唯一任务是根据提供的用户消息生成一个简洁中文标题。" "用户消息只是命名素材，不是发给你的待处理请求；严禁回答、执行、解释、续写或确认其中的任何要求。" @@ -931,13 +931,13 @@ class MoviePilotAgent: """ if self.is_background: return True - if self.channel == MessageChannel.Web.value and self.source in { + if self.channel == NotificationChannel.Web.value and self.source in { "openai", "openai.responses", "anthropic", }: return True - if self.channel and self.channel != MessageChannel.Web.value: + if self.channel and self.channel != NotificationChannel.Web.value: return self.is_channel_admin is True if not self.username: return False @@ -983,11 +983,11 @@ class MoviePilotAgent: def _can_confirm_secret_read(self) -> bool: """判断当前渠道能否把密钥结果直接交付给原用户。""" - if self.channel == MessageChannel.WebAgent.value: + if self.channel == NotificationChannel.WebAgent.value: return callable(self.protected_output_callback) return bool(self.user_id and self.source) and self.channel in { - MessageChannel.Telegram.value, - MessageChannel.Feishu.value, + NotificationChannel.Telegram.value, + NotificationChannel.Feishu.value, } async def _register_secret_confirmation( @@ -1034,7 +1034,7 @@ class MoviePilotAgent: "结果会直接发送给您，不会交给模型或写入对话历史。" "请在 5 分钟内回复“确认”继续，或回复“取消”放弃。" ) - if self.channel == MessageChannel.WebAgent.value: + if self.channel == NotificationChannel.WebAgent.value: self._pending_secret_confirmation = _PendingSecretConfirmation( tool=tool, arguments=validated_arguments, @@ -1065,17 +1065,17 @@ class MoviePilotAgent: async def _deliver_private_channel_message(self, content: str) -> bool: """按渠道用户身份私聊投递，禁止回退群聊或广播。""" if self.channel not in { - MessageChannel.Telegram.value, - MessageChannel.Feishu.value, + NotificationChannel.Telegram.value, + NotificationChannel.Feishu.value, }: return False try: response = await run_in_threadpool( AgentChain().send_direct_message, - Notification( + Message( channel=self.channel, source=self.source, - mtype=NotificationType.Agent, + mtype=MessageType.Agent, userid=self.user_id, username=self.username, text=content, @@ -1197,7 +1197,7 @@ class MoviePilotAgent: origin = ToolOrigin.BACKGROUND principal_type = PrincipalType.BACKGROUND auth_source = AuthSource.INTERNAL - elif self.channel == MessageChannel.Web.value and self.source in { + elif self.channel == NotificationChannel.Web.value and self.source in { "openai", "openai.responses", "anthropic", @@ -1211,7 +1211,7 @@ class MoviePilotAgent: auth_source = ( AuthSource.WEB_SESSION if self.channel - in {MessageChannel.Web.value, MessageChannel.WebAgent.value} + in {NotificationChannel.Web.value, NotificationChannel.WebAgent.value} else AuthSource.CHANNEL ) return ToolPolicyContext( @@ -1240,7 +1240,7 @@ class MoviePilotAgent: if settings.AI_AGENT_VERBOSE: return True try: - channel_enum = MessageChannel(self.channel) + channel_enum = NotificationChannel(self.channel) return ChannelCapabilityManager.supports_capability( channel_enum, ChannelCapability.MESSAGE_EDITING ) @@ -2404,10 +2404,10 @@ class MoviePilotAgent: broadcast = self.is_background self._save_assistant_display_message_once(message) await AgentChain().async_post_message( - Notification( + Message( channel=None if broadcast else self.channel, source=None if broadcast else self.source, - mtype=NotificationType.Agent, + mtype=MessageType.Agent, userid=None if broadcast else self.user_id, username=self.username or (settings.SUPERUSER if broadcast else None), original_message_id=None if broadcast else self.original_message_id, @@ -2451,7 +2451,7 @@ class _MessageTask: allow_message_tools: bool = True output_callback: Optional[Callable[[str], None]] = None protected_output_callback: Optional[Callable[[str], Optional[bool]]] = None - notification_callback: Optional[Callable[[Any], None]] = None + message_callback: Optional[Callable[[Any], None]] = None agent_factory: Optional[Callable[..., MoviePilotAgent]] = None completion_future: Optional[asyncio.Future] = None @@ -2620,7 +2620,7 @@ class AgentManager: allow_message_tools: bool = True, output_callback: Optional[Callable[[str], None]] = None, protected_output_callback: Optional[Callable[[str], Optional[bool]]] = None, - notification_callback: Optional[Callable[[Any], None]] = None, + message_callback: Optional[Callable[[Any], None]] = None, agent_factory: Optional[Callable[..., MoviePilotAgent]] = None, wait_for_completion: bool = False, ) -> str: @@ -2648,7 +2648,7 @@ class AgentManager: allow_message_tools=allow_message_tools, output_callback=output_callback, protected_output_callback=protected_output_callback, - notification_callback=notification_callback, + message_callback=message_callback, agent_factory=agent_factory, completion_future=completion_future, ) @@ -2800,8 +2800,8 @@ class AgentManager: "output_callback": task.output_callback, "protected_output_callback": task.protected_output_callback, } - if task.notification_callback is not None and task.agent_factory: - agent_kwargs["notification_callback"] = task.notification_callback + if task.message_callback is not None and task.agent_factory: + agent_kwargs["message_callback"] = task.message_callback agent = agent_factory(**agent_kwargs) self.active_agents[session_id] = agent else: @@ -2822,8 +2822,8 @@ class AgentManager: else: agent.output_callback = task.output_callback agent.set_protected_output_callback(task.protected_output_callback) - if task.notification_callback is not None and hasattr(agent, "set_notification_callback"): - agent.set_notification_callback(task.notification_callback) + if task.message_callback is not None and hasattr(agent, "set_message_callback"): + agent.set_message_callback(task.message_callback) process_kwargs = { "images": task.images, @@ -3002,8 +3002,8 @@ class AgentManager: result = f"Agent 定时任务执行失败：{str(err)}" logger.error(f"Agent 定时任务 {task_id} 执行失败: {str(err)}") await AgentChain().async_post_message( - Notification( - mtype=NotificationType.Agent, + Message( + mtype=MessageType.Agent, username=notification_username, title=f"定时任务执行失败：{run.name}", text=result, diff --git a/app/agent/prompt/__init__.py b/app/agent/prompt/__init__.py index 7ba698f26..cf37042d9 100644 --- a/app/agent/prompt/__init__.py +++ b/app/agent/prompt/__init__.py @@ -15,7 +15,7 @@ from app.runtime.log import logger from app.schemas import ( ChannelCapability, ChannelCapabilities, - MessageChannel, + NotificationChannel, ChannelCapabilityManager, ) from app.adapters.system.host import SystemUtils @@ -128,7 +128,7 @@ class PromptManager: markdown_spec = "" msg_channel = ( next( - (c for c in MessageChannel if c.value.lower() == channel.lower()), None + (c for c in NotificationChannel if c.value.lower() == channel.lower()), None ) if channel else None @@ -356,7 +356,7 @@ class PromptManager: @staticmethod def _generate_button_choice_instructions( - channel: MessageChannel = None, + channel: NotificationChannel = None, ) -> str: if ( channel diff --git a/app/agent/tools/base.py b/app/agent/tools/base.py index 8769b7f51..a07faedeb 100644 --- a/app/agent/tools/base.py +++ b/app/agent/tools/base.py @@ -22,8 +22,8 @@ from app.runtime.config import settings from app.application.messaging.agent import matches_channel_admin from app.runtime.extensions.service_registry import ServiceConfigHelper from app.runtime.log import logger -from app.schemas import Notification -from app.schemas.types import MessageChannel, NotificationType +from app.schemas import Message +from app.schemas.types import NotificationChannel, MessageType class ToolChain(ChainBase): @@ -563,7 +563,7 @@ class MoviePilotTool(BaseTool, metaclass=ABCMeta): user_id_str = str(self._user_id) if self._user_id else None try: - channel = MessageChannel(self._channel) + channel = NotificationChannel(self._channel) except ValueError: return False @@ -581,47 +581,47 @@ class MoviePilotTool(BaseTool, metaclass=ABCMeta): return False - async def send_notification_message(self, notification: Notification) -> None: + async def send_message(self, message: Message) -> None: """ - 发送工具通知消息。 + 发送工具消息。 WebAgent 渠道没有后端模块实例，前端流式面板通过 Agent 上下文中的 - 回调直接接收通知；无渠道的后台任务清空渠道侧定位信息后交由消息链广播， + 回调直接接收消息；无渠道的后台任务清空渠道侧定位信息后交由消息链广播， 其它渠道继续走统一消息链。 """ - callback = self._agent_context.get("notification_callback") + callback = self._agent_context.get("message_callback") if ( - self._channel == MessageChannel.WebAgent.value + self._channel == NotificationChannel.WebAgent.value and callable(callback) ): - callback(notification) + callback(message) return if not self._channel or not self._source: - notification = notification.model_copy( + message = message.model_copy( update={ "channel": None, "source": None, "userid": None, - "username": notification.username + "username": message.username or self._username or settings.SUPERUSER, "original_message_id": None, "original_chat_id": None, } ) - elif not notification.original_chat_id: + elif not message.original_chat_id: # 工具回调消息默认回填当前会话的原会话 ID， # 保证群聊 @ 机器人时按钮选择、消息发送等交互消息回复到原群，而不是私聊窗口。 original_chat_id = str( self._agent_context.get("original_chat_id") or "" ).strip() or None if original_chat_id: - notification = notification.model_copy( + message = message.model_copy( update={"original_chat_id": original_chat_id} ) - await ToolChain().async_post_message(notification) + await ToolChain().async_post_message(message) async def send_tool_message( self, message: str, title: str = "", image: Optional[str] = None @@ -629,11 +629,11 @@ class MoviePilotTool(BaseTool, metaclass=ABCMeta): """ 发送工具消息 """ - await self.send_notification_message( - Notification( + await self.send_message( + Message( channel=self._channel, source=self._source, - mtype=NotificationType.Agent, + mtype=MessageType.Agent, userid=self._user_id, username=self._username, title=title, diff --git a/app/agent/tools/factory.py b/app/agent/tools/factory.py index b0ea39350..a79ffdf74 100644 --- a/app/agent/tools/factory.py +++ b/app/agent/tools/factory.py @@ -89,8 +89,8 @@ from app.agent.tools.impl.update_system_settings import UpdateSystemSettingsTool from app.agent.llm.capability import AgentCapabilityManager from app.runtime.extensions.plugin_manager import PluginManager from app.runtime.log import logger -from app.schemas.message import ChannelCapabilityManager -from app.schemas.types import MessageChannel +from app.schemas.notification import ChannelCapabilityManager +from app.schemas.types import NotificationChannel from .base import MoviePilotTool from .catalog import ToolCatalogError, ToolCatalogSnapshot @@ -214,7 +214,7 @@ class MoviePilotToolFactory: if not channel: return False try: - message_channel = MessageChannel(channel) + message_channel = NotificationChannel(channel) except ValueError: return False return ChannelCapabilityManager.supports_buttons( diff --git a/app/agent/tools/impl/add_subscribe.py b/app/agent/tools/impl/add_subscribe.py index 40a73f74b..51663a5ad 100644 --- a/app/agent/tools/impl/add_subscribe.py +++ b/app/agent/tools/impl/add_subscribe.py @@ -9,7 +9,7 @@ from app.agent.tools.tags import ToolTag from app.chain.subscribe import SubscribeChain from app.db.oper.user import UserOper from app.runtime.log import logger -from app.schemas.types import MUSIC_ENTITY_ALBUM, MediaSource, MediaType, MessageChannel +from app.schemas.types import MUSIC_ENTITY_ALBUM, MediaSource, MediaType, NotificationChannel from ._music_utils import normalize_music_type @@ -134,20 +134,20 @@ class AddSubscribeTool(MoviePilotTool): return resolved_username try: - channel = MessageChannel(self._channel) + channel = NotificationChannel(self._channel) except ValueError: return resolved_username binding_keys = { - MessageChannel.Telegram: ("telegram_userid",), - MessageChannel.Discord: ("discord_userid",), - MessageChannel.Wechat: ("wechat_userid",), - MessageChannel.Feishu: ("feishu_userid", "feishu_openid"), - MessageChannel.WechatClawBot: ("wechatclawbot_userid",), - MessageChannel.Slack: ("slack_userid",), - MessageChannel.VoceChat: ("vocechat_userid",), - MessageChannel.SynologyChat: ("synologychat_userid",), - MessageChannel.QQ: ("qq_userid", "qq_openid"), + NotificationChannel.Telegram: ("telegram_userid",), + NotificationChannel.Discord: ("discord_userid",), + NotificationChannel.Wechat: ("wechat_userid",), + NotificationChannel.Feishu: ("feishu_userid", "feishu_openid"), + NotificationChannel.WechatClawBot: ("wechatclawbot_userid",), + NotificationChannel.Slack: ("slack_userid",), + NotificationChannel.VoceChat: ("vocechat_userid",), + NotificationChannel.SynologyChat: ("synologychat_userid",), + NotificationChannel.QQ: ("qq_userid", "qq_openid"), }.get(channel) if not binding_keys: return resolved_username diff --git a/app/agent/tools/impl/ask_user_choice.py b/app/agent/tools/impl/ask_user_choice.py index 275d6305e..840787346 100644 --- a/app/agent/tools/impl/ask_user_choice.py +++ b/app/agent/tools/impl/ask_user_choice.py @@ -12,9 +12,9 @@ from app.application.messaging.agent import ( build_agent_choice_callback, ) from app.runtime.log import logger -from app.schemas import Notification, NotificationType -from app.schemas.message import ChannelCapabilityManager -from app.schemas.types import MessageChannel +from app.schemas import Message, MessageType +from app.schemas.notification import ChannelCapabilityManager +from app.schemas.types import NotificationChannel class UserChoiceOptionInput(BaseModel): @@ -140,7 +140,7 @@ class AskUserChoiceTool(MoviePilotTool): return "当前不在可回传消息的会话中，无法发起按钮选择" try: - channel = MessageChannel(self._channel) + channel = NotificationChannel(self._channel) except ValueError: return f"不支持的消息渠道: {self._channel}" @@ -200,11 +200,11 @@ class AskUserChoiceTool(MoviePilotTool): len(choice_options), ) - await self.send_notification_message( - Notification( + await self.send_message( + Message( channel=channel, source=self._source, - mtype=NotificationType.Agent, + mtype=MessageType.Agent, userid=self._user_id, username=self._username, title=title, diff --git a/app/agent/tools/impl/run_slash_command.py b/app/agent/tools/impl/run_slash_command.py index 565144bd9..d6b66be35 100644 --- a/app/agent/tools/impl/run_slash_command.py +++ b/app/agent/tools/impl/run_slash_command.py @@ -9,7 +9,7 @@ from app.agent.tools.base import MoviePilotTool from app.agent.tools.tags import ToolTag from app.runtime.events import eventmanager from app.runtime.log import logger -from app.schemas.types import EventType, MessageChannel +from app.schemas.types import EventType, NotificationChannel class RunSlashCommandInput(BaseModel): @@ -83,7 +83,7 @@ class RunSlashCommandTool(MoviePilotTool): channel = None if self._channel: try: - channel = MessageChannel(self._channel) + channel = NotificationChannel(self._channel) except (ValueError, KeyError): channel = None diff --git a/app/agent/tools/impl/send_local_file.py b/app/agent/tools/impl/send_local_file.py index 3aae47f1a..3a737f30e 100644 --- a/app/agent/tools/impl/send_local_file.py +++ b/app/agent/tools/impl/send_local_file.py @@ -8,9 +8,9 @@ from pydantic import BaseModel, Field, model_validator from app.agent.tools.base import MoviePilotTool from app.agent.tools.tags import ToolTag from app.runtime.log import logger -from app.schemas import Notification, NotificationType -from app.schemas.message import ChannelCapabilityManager, ChannelCapability -from app.schemas.types import MessageChannel +from app.schemas import Message, MessageType +from app.schemas.notification import ChannelCapabilityManager, ChannelCapability +from app.schemas.types import NotificationChannel class SendLocalFileInput(BaseModel): @@ -72,7 +72,7 @@ class SendLocalFileTool(MoviePilotTool): return "当前不在可回传消息的会话中，无法发送附件" try: - channel = MessageChannel(self._channel) + channel = NotificationChannel(self._channel) except ValueError: return f"不支持的消息渠道: {self._channel}" @@ -94,11 +94,11 @@ class SendLocalFileTool(MoviePilotTool): resolved_path, ) - await self.send_notification_message( - Notification( + await self.send_message( + Message( channel=channel, source=self._source, - mtype=NotificationType.Agent, + mtype=MessageType.Agent, userid=self._user_id, username=self._username, title=title, diff --git a/app/agent/tools/impl/send_message.py b/app/agent/tools/impl/send_message.py index 60e82ceb6..15073ea77 100644 --- a/app/agent/tools/impl/send_message.py +++ b/app/agent/tools/impl/send_message.py @@ -7,8 +7,8 @@ from pydantic import BaseModel, Field, model_validator from app.agent.tools.base import MoviePilotTool from app.agent.tools.tags import ToolTag from app.runtime.log import logger -from app.schemas import Notification -from app.schemas.types import NotificationType +from app.schemas import Message +from app.schemas.types import MessageType class SendMessageInput(BaseModel): @@ -90,11 +90,11 @@ class SendMessageTool(MoviePilotTool): f"image_url={image_url}" ) try: - await self.send_notification_message( - Notification( + await self.send_message( + Message( channel=self._channel, source=self._source, - mtype=NotificationType.Other, + mtype=MessageType.Other, userid=self._user_id, username=self._username, title=title, diff --git a/app/agent/tools/impl/send_voice_message.py b/app/agent/tools/impl/send_voice_message.py index 4253b7132..a748bf90a 100644 --- a/app/agent/tools/impl/send_voice_message.py +++ b/app/agent/tools/impl/send_voice_message.py @@ -8,7 +8,7 @@ from app.agent.tools.base import MoviePilotTool from app.agent.tools.tags import ToolTag from app.runtime.config import settings from app.runtime.log import logger -from app.schemas import Notification, NotificationType +from app.schemas import Message, MessageType class SendVoiceMessageInput(BaseModel): @@ -82,11 +82,11 @@ class SendVoiceMessageTool(MoviePilotTool): f"use_voice={used_voice}, text_len={len(message)}" ) - await self.send_notification_message( - Notification( + await self.send_message( + Message( channel=self._channel, source=self._source, - mtype=NotificationType.Agent, + mtype=MessageType.Agent, userid=self._user_id, username=self._username, text=message, diff --git a/app/api/endpoints/agent.py b/app/api/endpoints/agent.py index fb53ecd2b..4ac120e95 100644 --- a/app/api/endpoints/agent.py +++ b/app/api/endpoints/agent.py @@ -44,7 +44,7 @@ from app.application.messaging.agent import ( from app.application.messaging.router import has_pending_interaction from app.runtime.localization import LocaleHelper from app.runtime.log import logger -from app.schemas.types import EventType, MessageChannel +from app.schemas.types import EventType, NotificationChannel router = ResponseAPIRouter() @@ -62,9 +62,9 @@ WEB_AGENT_STREAM_COALESCE_MAX_CHARS = 256 WEB_AGENT_STREAM_HEARTBEAT_SECONDS = 15.0 WEB_AGENT_STREAM_QUEUE_MAX_SIZE = 64 _WEB_AGENT_FILE_REGISTRY: dict[str, dict[str, Any]] = {} -_WEB_AGENT_NOTICE_QUEUES: dict[str, list[Queue[schemas.Notification]]] = {} -_WEB_AGENT_NOTICE_LOCK = Lock() -_WEB_AGENT_NOTICE_LISTENER_REGISTERED = False +_WEB_AGENT_MESSAGE_QUEUES: dict[str, list[Queue[schemas.Message]]] = {} +_WEB_AGENT_MESSAGE_LOCK = Lock() +_WEB_AGENT_MESSAGE_LISTENER_REGISTERED = False _WEB_AGENT_BACKGROUND_TASKS: set[asyncio.Task] = set() @@ -350,11 +350,11 @@ class _WebAgentMoviePilotAgent(MoviePilotAgent): def __init__( self, *args: Any, - notification_callback: Optional[Callable[[schemas.Notification], None]] = None, + message_callback: Optional[Callable[[schemas.Message], None]] = None, **kwargs: Any, ) -> None: super().__init__(*args, **kwargs) - self._notification_callback = notification_callback + self._message_callback = message_callback self.stream_handler = _WebAgentStreamingHandler(self._emit_output) def _should_stream(self) -> bool: @@ -363,16 +363,16 @@ class _WebAgentMoviePilotAgent(MoviePilotAgent): return False return True - def set_notification_callback( + def set_message_callback( self, - notification_callback: Optional[Callable[[schemas.Notification], None]], + message_callback: Optional[Callable[[schemas.Message], None]], ) -> None: """ 更新 Web SSE 通知回调，复用 Agent 实例时指向当前请求队列。 - :param notification_callback: 当前请求的 Web 通知回调 + :param message_callback: 当前请求的 Web 通知回调 """ - self._notification_callback = notification_callback + self._message_callback = message_callback def set_output_callback(self, output_callback: Optional[Callable[[str], None]]) -> None: """ @@ -400,7 +400,7 @@ class _WebAgentMoviePilotAgent(MoviePilotAgent): async def _build_tool_context(self, should_dispatch_reply: bool) -> dict[str, object]: """向工具上下文注入 Web SSE 通知回调。""" context = await super()._build_tool_context(should_dispatch_reply) - context["notification_callback"] = self._notification_callback + context["message_callback"] = self._message_callback return context def _handle_stream_text(self, text: str) -> None: @@ -582,7 +582,7 @@ def _save_web_agent_display_snapshot( channel=( existing_chat.channel if existing_chat and existing_chat.channel - else MessageChannel.WebAgent + else NotificationChannel.WebAgent ), source=( existing_chat.source @@ -982,14 +982,14 @@ def _merge_web_agent_prompt_with_transcript(prompt: str, transcript: Optional[st return "\n".join(merged_parts).strip() -def _build_web_agent_choice_event(notification: schemas.Notification) -> Optional[dict]: +def _build_web_agent_choice_event(message: schemas.Message) -> Optional[dict]: """ 将带按钮通知转换为 Web Agent 选择卡片事件。 - :param notification: Agent 工具发出的按钮通知 + :param message: Agent 工具发出的按钮通知 :return: 选择卡片事件，按钮为空时返回 None """ - button_rows = normalize_web_agent_button_rows(notification.buttons) + button_rows = normalize_web_agent_button_rows(message.buttons) buttons = [button for row in button_rows for button in row] if not buttons: return None @@ -1003,8 +1003,8 @@ def _build_web_agent_choice_event(notification: schemas.Notification) -> Optiona "type": "choice", "choice": { "id": choice_id or uuid.uuid4().hex, - "title": notification.title, - "prompt": notification.text or "", + "title": message.title, + "prompt": message.text or "", "buttons": buttons, "button_rows": button_rows, }, @@ -1062,30 +1062,30 @@ def _resolve_web_agent_choice_payload(callback_data: str, user_id: str) -> Optio } -def _build_web_agent_notification_events( - notification: schemas.Notification, +def _build_web_agent_message_events( + message: schemas.Message, ) -> list[dict]: """ 将 Agent 工具通知转换为 Web SSE 事件。 - :param notification: 工具产生的通知消息 + :param message: 工具产生的通知消息 :return: 前端可直接应用到当前助手消息的事件列表 """ events = [] - choice_event = _build_web_agent_choice_event(notification) + choice_event = _build_web_agent_choice_event(message) if choice_event: events.append(choice_event) text_parts = [ str(item).strip() - for item in (notification.title, notification.text) + for item in (message.title, message.text) if str(item or "").strip() ] if text_parts and not choice_event: events.append({"type": "delta", "content": "\n\n".join(text_parts)}) - if notification.image: - image_ref = notification.image + if message.image: + image_ref = message.image image_path = Path(image_ref).expanduser() attachment = None if not image_ref.startswith(("http://", "https://", "data:", "blob:")): @@ -1096,12 +1096,12 @@ def _build_web_agent_notification_events( attachment = _build_web_agent_url_attachment( image_ref, kind="image", - name=notification.title or image_path.name or "image", + name=message.title or image_path.name or "image", ) events.append({"type": "attachment", "attachment": attachment}) - if notification.voice_path: - audio_path = _prepare_web_agent_audio_attachment_path(notification.voice_path) + if message.voice_path: + audio_path = _prepare_web_agent_audio_attachment_path(message.voice_path) attachment = _register_web_agent_file( str(audio_path), file_name=audio_path.name, @@ -1111,10 +1111,10 @@ def _build_web_agent_notification_events( if attachment: events.append({"type": "attachment", "attachment": attachment}) - if notification.file_path: + if message.file_path: attachment = _register_web_agent_file( - notification.file_path, - file_name=notification.file_name or Path(notification.file_path).name, + message.file_path, + file_name=message.file_name or Path(message.file_path).name, ) if attachment: events.append({"type": "attachment", "attachment": attachment}) @@ -1162,9 +1162,9 @@ def _has_web_agent_traditional_interaction(user_id: str) -> bool: return has_pending_interaction(user_id) -def _extract_web_agent_notification_from_event_data( +def _extract_web_agent_message_from_event_data( data: dict, -) -> Optional[schemas.Notification]: +) -> Optional[schemas.Message]: """ 从 NoticeMessage 事件数据中提取 WebAgent 通知。 @@ -1176,133 +1176,133 @@ def _extract_web_agent_notification_from_event_data( try: message = data.get("message") - if isinstance(message, schemas.Notification): - notification = message + if isinstance(message, schemas.Message): + message = message elif isinstance(message, dict): - notification_data = copy.deepcopy(message) - notification_data.pop("type", None) - notification = schemas.Notification(**notification_data) + message_data = copy.deepcopy(message) + message_data.pop("type", None) + message = schemas.Message(**message_data) else: - notification_data = copy.deepcopy(data) - notification_data.pop("type", None) - notification_data.pop("current_time", None) - notification = schemas.Notification(**notification_data) + message_data = copy.deepcopy(data) + message_data.pop("type", None) + message_data.pop("current_time", None) + message = schemas.Message(**message_data) except Exception as err: logger.debug(f"解析WebAgent通知事件失败: {err}") return None - channel = notification.channel - channel_value = channel.value if isinstance(channel, MessageChannel) else channel - if channel_value != MessageChannel.WebAgent.value: + channel = message.channel + channel_value = channel.value if isinstance(channel, NotificationChannel) else channel + if channel_value != NotificationChannel.WebAgent.value: return None - return notification + return message -def _is_web_agent_notice_for_user( - notification: schemas.Notification, +def _is_web_agent_message_for_user( + message: schemas.Message, user_id: str, ) -> bool: """ 判断 NoticeMessage 事件是否属于当前 WebAgent 用户。 - :param notification: NoticeMessage 中的通知消息 + :param message: NoticeMessage 中的通知消息 :param user_id: 当前登录用户 ID :return: 可被本次 WebAgent 请求消费时返回 True """ try: - target_user = notification.userid + target_user = message.userid return target_user is None or str(target_user) == str(user_id) except Exception: return False -def _get_web_agent_notice_user_id(notification: schemas.Notification) -> Optional[str]: +def _get_web_agent_message_user_id(message: schemas.Message) -> Optional[str]: """ 从 NoticeMessage 事件中解析 WebAgent 目标用户。 - :param notification: NoticeMessage 中的通知消息 + :param message: NoticeMessage 中的通知消息 :return: 用户 ID 字符串，事件不属于 WebAgent 时返回 None """ try: - channel = notification.channel - channel_value = channel.value if isinstance(channel, MessageChannel) else channel - if channel_value != MessageChannel.WebAgent.value: + channel = message.channel + channel_value = channel.value if isinstance(channel, NotificationChannel) else channel + if channel_value != NotificationChannel.WebAgent.value: return None - user_id = notification.userid + user_id = message.userid return str(user_id) if user_id is not None else None except Exception: return None -def _dispatch_web_agent_notice_event(event: Event) -> None: +def _dispatch_web_agent_message_event(event: Event) -> None: """ 将 WebAgent NoticeMessage 分发给正在等待的请求队列。 :param event: NoticeMessage 广播事件 """ data = event.event_data if isinstance(event.event_data, dict) else {} - notification = _extract_web_agent_notification_from_event_data(data) - if not notification: + message = _extract_web_agent_message_from_event_data(data) + if not message: return - with _WEB_AGENT_NOTICE_LOCK: - user_id = _get_web_agent_notice_user_id(notification) + with _WEB_AGENT_MESSAGE_LOCK: + user_id = _get_web_agent_message_user_id(message) if user_id is None: queues = [ - notice_queue - for user_queues in _WEB_AGENT_NOTICE_QUEUES.values() - for notice_queue in user_queues + message_queue + for user_queues in _WEB_AGENT_MESSAGE_QUEUES.values() + for message_queue in user_queues ] else: - queues = list(_WEB_AGENT_NOTICE_QUEUES.get(user_id) or []) - for notice_queue in queues: - notice_queue.put(notification) + queues = list(_WEB_AGENT_MESSAGE_QUEUES.get(user_id) or []) + for message_queue in queues: + message_queue.put(message) -def _ensure_web_agent_notice_listener() -> None: +def _ensure_web_agent_message_listener() -> None: """ 确保 WebAgent NoticeMessage 全局监听器已注册。 """ - global _WEB_AGENT_NOTICE_LISTENER_REGISTERED - if _WEB_AGENT_NOTICE_LISTENER_REGISTERED: + global _WEB_AGENT_MESSAGE_LISTENER_REGISTERED + if _WEB_AGENT_MESSAGE_LISTENER_REGISTERED: return - with _WEB_AGENT_NOTICE_LOCK: - if _WEB_AGENT_NOTICE_LISTENER_REGISTERED: + with _WEB_AGENT_MESSAGE_LOCK: + if _WEB_AGENT_MESSAGE_LISTENER_REGISTERED: return EventManager().add_event_listener( EventType.NoticeMessage, - _dispatch_web_agent_notice_event, + _dispatch_web_agent_message_event, ) - _WEB_AGENT_NOTICE_LISTENER_REGISTERED = True + _WEB_AGENT_MESSAGE_LISTENER_REGISTERED = True -def _attach_web_agent_notice_queue(user_id: str, notice_queue: Queue[schemas.Notification]) -> None: +def _attach_web_agent_message_queue(user_id: str, message_queue: Queue[schemas.Message]) -> None: """ 为当前 WebAgent 请求挂载通知收集队列。 :param user_id: 当前用户 ID - :param notice_queue: 用于接收通知事件的队列 + :param message_queue: 用于接收通知事件的队列 """ - _ensure_web_agent_notice_listener() - with _WEB_AGENT_NOTICE_LOCK: - _WEB_AGENT_NOTICE_QUEUES.setdefault(str(user_id), []).append(notice_queue) + _ensure_web_agent_message_listener() + with _WEB_AGENT_MESSAGE_LOCK: + _WEB_AGENT_MESSAGE_QUEUES.setdefault(str(user_id), []).append(message_queue) -def _detach_web_agent_notice_queue(user_id: str, notice_queue: Queue[schemas.Notification]) -> None: +def _detach_web_agent_message_queue(user_id: str, message_queue: Queue[schemas.Message]) -> None: """ 移除当前 WebAgent 请求的通知收集队列。 :param user_id: 当前用户 ID - :param notice_queue: 需要移除的队列 + :param message_queue: 需要移除的队列 """ - with _WEB_AGENT_NOTICE_LOCK: - queues = _WEB_AGENT_NOTICE_QUEUES.get(str(user_id)) + with _WEB_AGENT_MESSAGE_LOCK: + queues = _WEB_AGENT_MESSAGE_QUEUES.get(str(user_id)) if not queues: return - _WEB_AGENT_NOTICE_QUEUES[str(user_id)] = [ - item for item in queues if item is not notice_queue + _WEB_AGENT_MESSAGE_QUEUES[str(user_id)] = [ + item for item in queues if item is not message_queue ] - if not _WEB_AGENT_NOTICE_QUEUES[str(user_id)]: - _WEB_AGENT_NOTICE_QUEUES.pop(str(user_id), None) + if not _WEB_AGENT_MESSAGE_QUEUES[str(user_id)]: + _WEB_AGENT_MESSAGE_QUEUES.pop(str(user_id), None) def _build_web_agent_command_items() -> list[dict]: @@ -1387,16 +1387,16 @@ async def _collect_web_agent_traditional_events( :param original_chat_id: WebAgent 原聊天 ID :return: 可直接发送给前端的 SSE 事件列表 """ - notice_queue: Queue[schemas.Notification] = Queue() + message_queue: Queue[schemas.Message] = Queue() edit_queue: Queue[dict] = Queue() user_id = str(current_user.id) - _attach_web_agent_notice_queue(user_id, notice_queue) + _attach_web_agent_message_queue(user_id, message_queue) attach_web_agent_edit_queue(user_id, edit_queue) try: await run_in_threadpool( MessageChain().handle_message, - channel=MessageChannel.WebAgent, + channel=NotificationChannel.WebAgent, source=WEB_AGENT_SOURCE, userid=user_id, username=current_user.name or user_id, @@ -1424,19 +1424,19 @@ async def _collect_web_agent_traditional_events( wait_until = idle_deadline or deadline timeout = max(0.05, min(0.25, wait_until - now, deadline - now)) try: - notification = await asyncio.to_thread(notice_queue.get, True, timeout) + message = await asyncio.to_thread(message_queue.get, True, timeout) except Empty: if idle_deadline and time.monotonic() >= idle_deadline: break continue - if not _is_web_agent_notice_for_user(notification, user_id): + if not _is_web_agent_message_for_user(message, user_id): continue - events.extend(_build_web_agent_notification_events(notification)) + events.extend(_build_web_agent_message_events(message)) idle_deadline = time.monotonic() + WEB_AGENT_TRADITIONAL_IDLE_TIMEOUT_SECONDS return events finally: - _detach_web_agent_notice_queue(user_id, notice_queue) + _detach_web_agent_message_queue(user_id, message_queue) detach_web_agent_edit_queue(user_id, edit_queue) @@ -1884,7 +1884,7 @@ async def web_agent_stream( and agent_manager.matches_secret_confirmation( session_id, str(current_user.id), - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source=WEB_AGENT_SOURCE, ) ) @@ -2099,11 +2099,11 @@ async def web_agent_stream( _apply_web_agent_display_event(item, assistant_display_message) event_publisher.publish(item) - def notification_callback(notification: schemas.Notification) -> None: + def message_callback(message: schemas.Message) -> None: """ 接收 Agent 工具主动发送的 Web 通知。 """ - for item in _build_web_agent_notification_events(notification): + for item in _build_web_agent_message_events(message): _apply_web_agent_display_event(item, assistant_display_message) event_publisher.publish(item) @@ -2139,7 +2139,7 @@ async def web_agent_stream( images=payload.images or [], files=files or None, has_audio_input=has_audio_input, - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source=WEB_AGENT_SOURCE, username=current_user.name, reply_mode=ReplyMode.CAPTURE_ONLY, @@ -2150,7 +2150,7 @@ async def web_agent_stream( if protected_transport_supported else None ), - notification_callback=notification_callback, + message_callback=message_callback, agent_factory=_WebAgentMoviePilotAgent, wait_for_completion=True, ) diff --git a/app/api/endpoints/anthropic.py b/app/api/endpoints/anthropic.py index 2a9d619a0..bb012fea6 100644 --- a/app/api/endpoints/anthropic.py +++ b/app/api/endpoints/anthropic.py @@ -18,7 +18,7 @@ from app.api.openai_utils import ( ) from app.runtime.config import settings from app.application.security.access import anthropic_api_key_header -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel ANTHROPIC_ERROR_RESPONSES = { 400: {"model": schemas.AnthropicErrorResponse, "description": "请求格式错误"}, @@ -145,7 +145,7 @@ async def messages( agent = _CollectingMoviePilotAgent( session_id=session_id, user_id=session_id, - channel=MessageChannel.Web.value, + channel=NotificationChannel.Web.value, source="anthropic", username="anthropic-client", stream_mode=payload.stream, diff --git a/app/api/endpoints/message.py b/app/api/endpoints/message.py index d9c758a58..f42b89b00 100644 --- a/app/api/endpoints/message.py +++ b/app/api/endpoints/message.py @@ -20,7 +20,7 @@ from app.api.deps import get_current_active_superuser from app.runtime.extensions.service_registry import ServiceConfigHelper from app.runtime.log import logger from app.adapters.external.wechat_crypt import WXBizMsgCrypt -from app.schemas.types import MessageChannel, SystemConfigKey +from app.schemas.types import NotificationChannel, SystemConfigKey router = ResponseAPIRouter() @@ -64,18 +64,18 @@ def _normalize_notification_clear_timestamp(value: Any) -> int: return normalized_value if normalized_value > 0 else 0 -def _get_notification_clear_before() -> schemas.NotificationClearBefore: +def _get_notification_clear_before() -> schemas.MessageClearBefore: """ 读取通知中心清理时间配置。 """ value = SystemConfigOper().get(SystemConfigKey.NotificationClearBefore) if isinstance(value, dict): - return schemas.NotificationClearBefore( + return schemas.MessageClearBefore( all=_normalize_notification_clear_timestamp(value.get("all")), system=_normalize_notification_clear_timestamp(value.get("system")), media=_normalize_notification_clear_timestamp(value.get("media")), ) - return schemas.NotificationClearBefore( + return schemas.MessageClearBefore( all=_normalize_notification_clear_timestamp(value), ) @@ -166,7 +166,7 @@ async def web_message( images = [images] MessageChain().handle_message( - channel=MessageChannel.Web, + channel=NotificationChannel.Web, source=current_user.name, userid=current_user.name, username=current_user.name, @@ -197,7 +197,7 @@ async def get_web_message( return ret_messages -@router.get("/notification", summary="获取通知消息", response_model=List[schemas.NotificationHistoryItem]) +@router.get("/notification", summary="获取通知消息", response_model=List[schemas.MessageHistoryItem]) async def get_notification_message( _: schemas.TokenPayload = Depends(verify_token), db: AsyncSession = Depends(get_async_db), @@ -215,16 +215,16 @@ async def get_notification_message( system_clear_before=_format_notification_clear_time(clear_before.system), media_clear_before=_format_notification_clear_time(clear_before.media), ) - return [schemas.NotificationHistoryItem(**message.to_dict()) for message in messages] + return [schemas.MessageHistoryItem(**message.to_dict()) for message in messages] @router.delete( "/notification", summary="清理通知消息", - response_model=schemas.Response[schemas.NotificationClearData], + response_model=schemas.Response[schemas.MessageClearData], ) async def clear_notification_message( - scope: schemas.NotificationClearScope = schemas.NotificationClearScope.All, + scope: schemas.MessageClearScope = schemas.MessageClearScope.All, _: schemas.TokenPayload = Depends(verify_token), ): """ diff --git a/app/api/endpoints/openai.py b/app/api/endpoints/openai.py index 18458ead6..910c78c81 100644 --- a/app/api/endpoints/openai.py +++ b/app/api/endpoints/openai.py @@ -19,7 +19,7 @@ from app.agent.callback import StreamingHandler from app.agent.orchestrator import MoviePilotAgent from app.runtime.config import settings from app.application.security.access import openai_bearer_scheme -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel OPENAI_ERROR_RESPONSES = { 400: {"model": schemas.OpenAIErrorResponse, "description": "请求格式错误"}, @@ -341,7 +341,7 @@ async def chat_completions( agent = _CollectingMoviePilotAgent( session_id=session_id, user_id=session_key, - channel=MessageChannel.Web.value, + channel=NotificationChannel.Web.value, source="openai", username=username, stream_mode=payload.stream, @@ -434,7 +434,7 @@ async def responses( agent = _CollectingMoviePilotAgent( session_id=session_id, user_id=session_key, - channel=MessageChannel.Web.value, + channel=NotificationChannel.Web.value, source="openai.responses", username=str(payload.user or "openai-client"), stream_mode=False, diff --git a/app/application/messaging/agent.py b/app/application/messaging/agent.py index 1af31fc70..61887983e 100644 --- a/app/application/messaging/agent.py +++ b/app/application/messaging/agent.py @@ -5,7 +5,7 @@ from queue import Queue from threading import Lock from typing import Callable, Dict, Iterable, List, Optional, Tuple, Union -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel # Agent 选择按钮回调前缀（新旧两种格式都必须继续兼容） AGENT_CHOICE_PREFIX = "agent_interaction:choice:" @@ -180,7 +180,7 @@ _CHANNEL_ADMIN_RESOLVERS: dict[str, _ChannelAdminResolver] = {} def register_channel_admin_resolver( - channel: Union[MessageChannel, str], + channel: Union[NotificationChannel, str], resolver: _ChannelAdminResolver, ) -> None: """ @@ -189,7 +189,7 @@ def register_channel_admin_resolver( :param channel: 消息渠道 :param resolver: 由渠道配置解析全部管理员主体 ID 的函数 """ - channel_value = channel.value if isinstance(channel, MessageChannel) else str(channel) + channel_value = channel.value if isinstance(channel, NotificationChannel) else str(channel) _CHANNEL_ADMIN_RESOLVERS[channel_value] = resolver @@ -215,7 +215,7 @@ def resolve_config_principal_ids( def matches_channel_admin( - channel: Union[MessageChannel, str], + channel: Union[NotificationChannel, str], config: Optional[dict], *principal_ids: Optional[Union[str, int]], ) -> bool: @@ -227,7 +227,7 @@ def matches_channel_admin( :param principal_ids: 消息渠道提供的稳定用户主体 ID :return: 任一用户主体 ID 命中渠道注册的管理员集合时返回 True """ - channel_value = channel.value if isinstance(channel, MessageChannel) else str(channel) + channel_value = channel.value if isinstance(channel, NotificationChannel) else str(channel) resolver = _CHANNEL_ADMIN_RESOLVERS.get(channel_value) if not resolver: return False diff --git a/app/application/messaging/interaction.py b/app/application/messaging/interaction.py index 34ece492c..5db9ffb56 100644 --- a/app/application/messaging/interaction.py +++ b/app/application/messaging/interaction.py @@ -5,9 +5,9 @@ from datetime import datetime, timedelta from threading import Lock from typing import Any, Dict, List, Optional, Protocol, Sequence, Tuple, Union -from app.schemas import Notification -from app.schemas.message import ChannelCapabilityManager -from app.schemas.types import MessageChannel +from app.schemas import Message +from app.schemas.notification import ChannelCapabilityManager +from app.schemas.types import NotificationChannel @dataclass @@ -18,7 +18,7 @@ class PendingSlashInteraction: request_id: str user_id: str - channel: Optional[MessageChannel] + channel: Optional[NotificationChannel] source: Optional[str] username: Optional[str] command: str @@ -57,7 +57,7 @@ class SlashInteractionManager: self, user_id: Union[str, int], command: str, - channel: Optional[MessageChannel], + channel: Optional[NotificationChannel], source: Optional[str], username: Optional[str], ) -> PendingSlashInteraction: @@ -120,7 +120,7 @@ class SlashInteractionManager: class InteractionContext: """描述一次与渠道无关的用户交互上下文。""" - channel: MessageChannel + channel: NotificationChannel source: Optional[str] user_id: Union[str, int] username: Optional[str] @@ -140,12 +140,12 @@ class InteractionDispatch: class MessageGateway(Protocol): """声明交互控制器使用的消息发送和编辑能力。""" - def post_message(self, message: Notification): ... + def post_message(self, message: Message): ... def edit_message(self, **kwargs) -> bool: ... -def supports_interaction_buttons(channel: Optional[MessageChannel]) -> bool: +def supports_interaction_buttons(channel: Optional[NotificationChannel]) -> bool: """ 渠道同时支持按钮和回调时，优先使用按钮交互。 """ @@ -156,7 +156,7 @@ def supports_interaction_buttons(channel: Optional[MessageChannel]) -> bool: ) -def supports_markdown(channel: Optional[MessageChannel]) -> bool: +def supports_markdown(channel: Optional[NotificationChannel]) -> bool: """ 仅在支持 Markdown 的渠道上输出 Markdown 内容。 """ @@ -213,7 +213,7 @@ def build_navigation_buttons( def update_or_post_message( chain, - channel: MessageChannel, + channel: NotificationChannel, source: Optional[str], userid: Union[str, int], username: Optional[str], @@ -232,7 +232,7 @@ def update_or_post_message( and ChannelCapabilityManager.supports_editing(channel) ): edit_kwargs = {} - if channel == MessageChannel.WebAgent: + if channel == NotificationChannel.WebAgent: edit_kwargs["metadata"] = {"userid": userid} edited = chain.edit_message( channel=channel, @@ -248,7 +248,7 @@ def update_or_post_message( return chain.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, diff --git a/app/application/messaging/media.py b/app/application/messaging/media.py index a60f7bf7a..547719a97 100644 --- a/app/application/messaging/media.py +++ b/app/application/messaging/media.py @@ -6,7 +6,7 @@ from typing import Any, Dict, List, Optional, Union from app.domain.context import MediaInfo from app.domain.meta.metabase import MetaBase -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel @dataclass @@ -17,7 +17,7 @@ class PendingMediaInteraction: request_id: str user_id: str - channel: Optional[MessageChannel] + channel: Optional[NotificationChannel] source: Optional[str] username: Optional[str] action: str @@ -69,7 +69,7 @@ class MediaInteractionManager: def create_or_replace( self, user_id: Union[str, int], - channel: Optional[MessageChannel], + channel: Optional[NotificationChannel], source: Optional[str], username: Optional[str], action: str, diff --git a/app/application/messaging/message.py b/app/application/messaging/message.py index 428fc9762..f510fdc9e 100644 --- a/app/application/messaging/message.py +++ b/app/application/messaging/message.py @@ -20,7 +20,7 @@ from app.domain.meta.metabase import MetaBase from app.domain.meta.metamusic import MetaMusic from app.db.oper.systemconfig import SystemConfigOper from app.runtime.log import logger -from app.schemas.message import Notification +from app.schemas.message import Message from app.schemas.tmdb import TmdbEpisode from app.schemas.transfer import TransferInfo from app.schemas.types import MUSIC_ENTITY_ALBUM, SystemConfigKey @@ -657,7 +657,7 @@ class MessageTemplateHelper: """ @staticmethod - def render(message: Notification, *args, **kwargs) -> Optional[Notification]: + def render(message: Message, *args, **kwargs) -> Optional[Message]: """ 渲染消息模板 """ @@ -668,16 +668,16 @@ class MessageTemplateHelper: return message @staticmethod - def is_instance_valid(message: Notification) -> bool: + def is_instance_valid(message: Message) -> bool: """ 检查消息是否有效 """ - if isinstance(message, Notification): + if isinstance(message, Message): return bool(message.title or message.text) return False @staticmethod - def meets_update_conditions(message: Notification, *args, **kwargs) -> bool: + def meets_update_conditions(message: Message, *args, **kwargs) -> bool: """ 判断是否满足消息实例更新条件 @@ -686,12 +686,12 @@ class MessageTemplateHelper: 2. 消息指定了模板类型(ctype) 3. 存在待渲染的模板变量数据 """ - if isinstance(message, Notification): + if isinstance(message, Message): return True if message.ctype and (args or kwargs) else False return False @staticmethod - def _apply_template_data(message: Notification, *args, **kwargs) -> Optional[Notification]: + def _apply_template_data(message: Message, *args, **kwargs) -> Optional[Message]: """ 更新消息实例 """ @@ -717,7 +717,7 @@ class MessageTemplateHelper: return message @staticmethod - def _get_template(message: Notification) -> Optional[str]: + def _get_template(message: Message) -> Optional[str]: """ 获取消息模板 """ diff --git a/app/application/messaging/plugin.py b/app/application/messaging/plugin.py index 758863a59..c5aca19cd 100644 --- a/app/application/messaging/plugin.py +++ b/app/application/messaging/plugin.py @@ -6,8 +6,8 @@ from typing import Any, Dict, List, Optional, Tuple, Union from app.application.messaging.interaction import InteractionContext, MessageGateway from app.runtime.events import EventManager -from app.schemas import Notification -from app.schemas.types import EventType, MessageChannel +from app.schemas import Message +from app.schemas.types import EventType, NotificationChannel @dataclass @@ -19,7 +19,7 @@ class PendingPluginInputInteraction: request_id: str user_id: str plugin_id: str - channel: Optional[MessageChannel] + channel: Optional[NotificationChannel] source: Optional[str] username: Optional[str] chat_id: Optional[str] = None @@ -48,9 +48,9 @@ class PluginInputInteractionManager: def __init__(self): """初始化活动输入会话、用户渠道索引和过期墓碑。""" self._by_id: Dict[str, PendingPluginInputInteraction] = {} - self._by_user_channel: Dict[Tuple[str, Optional[MessageChannel], Optional[str], Optional[str]], str] = {} + self._by_user_channel: Dict[Tuple[str, Optional[NotificationChannel], Optional[str], Optional[str]], str] = {} self._expired_by_user_channel: Dict[ - Tuple[str, Optional[MessageChannel], Optional[str], Optional[str]], + Tuple[str, Optional[NotificationChannel], Optional[str], Optional[str]], PendingPluginInputInteraction, ] = {} self._lock = Lock() @@ -58,18 +58,18 @@ class PluginInputInteractionManager: @staticmethod def _user_channel_source_key( user_id: Union[str, int], - channel: Optional[MessageChannel], + channel: Optional[NotificationChannel], source: Optional[str] = None, chat_id: Optional[Union[str, int]] = None, - ) -> Tuple[str, Optional[MessageChannel], Optional[str], Optional[str]]: + ) -> Tuple[str, Optional[NotificationChannel], Optional[str], Optional[str]]: """归一化用户、渠道、来源和会话 ID 的联合索引键。""" return str(user_id), channel, source, str(chat_id) if chat_id not in (None, "") else None @classmethod def _keys_overlap( cls, - left: Tuple[str, Optional[MessageChannel], Optional[str], Optional[str]], - right: Tuple[str, Optional[MessageChannel], Optional[str], Optional[str]], + left: Tuple[str, Optional[NotificationChannel], Optional[str], Optional[str]], + right: Tuple[str, Optional[NotificationChannel], Optional[str], Optional[str]], ) -> bool: """判断两个输入会话键是否会争用同一条用户回复。""" left_user, left_channel, left_source, left_chat_id = left @@ -116,7 +116,7 @@ class PluginInputInteractionManager: self, user_id: Union[str, int], plugin_id: str, - channel: Optional[MessageChannel], + channel: Optional[NotificationChannel], source: Optional[str], username: Optional[str], chat_id: Optional[Union[str, int]] = None, @@ -151,7 +151,7 @@ class PluginInputInteractionManager: normalized_chat_id = str(chat_id) if chat_id not in (None, "") else None normalized_prompt_message_id = ( str(prompt_message_id) - if channel == MessageChannel.Telegram and normalized_chat_id and prompt_message_id not in (None, "") + if channel == NotificationChannel.Telegram and normalized_chat_id and prompt_message_id not in (None, "") else None ) @@ -175,7 +175,7 @@ class PluginInputInteractionManager: def get_by_user( self, user_id: Union[str, int], - channel: Optional[MessageChannel] = None, + channel: Optional[NotificationChannel] = None, source: Optional[str] = None, chat_id: Optional[Union[str, int]] = None, ) -> Optional[PendingPluginInputInteraction]: @@ -190,7 +190,7 @@ class PluginInputInteractionManager: def pop_by_user( self, user_id: Union[str, int], - channel: Optional[MessageChannel] = None, + channel: Optional[NotificationChannel] = None, source: Optional[str] = None, chat_id: Optional[Union[str, int]] = None, ) -> Optional[PendingPluginInputInteraction]: @@ -209,7 +209,7 @@ class PluginInputInteractionManager: def consume_by_user( self, user_id: Union[str, int], - channel: Optional[MessageChannel] = None, + channel: Optional[NotificationChannel] = None, source: Optional[str] = None, chat_id: Optional[Union[str, int]] = None, *, @@ -275,7 +275,7 @@ class PluginInputInteractionManager: def _find_request_id_locked( self, user_id: Union[str, int], - channel: Optional[MessageChannel], + channel: Optional[NotificationChannel], source: Optional[str], chat_id: Optional[Union[str, int]] = None, ) -> Optional[str]: @@ -286,10 +286,10 @@ class PluginInputInteractionManager: def _find_key_and_request_id_locked( self, user_id: Union[str, int], - channel: Optional[MessageChannel], + channel: Optional[NotificationChannel], source: Optional[str], chat_id: Optional[Union[str, int]] = None, - ) -> Tuple[Optional[Tuple[str, Optional[MessageChannel], Optional[str], Optional[str]]], Optional[str]]: + ) -> Tuple[Optional[Tuple[str, Optional[NotificationChannel], Optional[str], Optional[str]]], Optional[str]]: """返回首个候选键及其活动请求 ID。""" for key in self._candidate_keys(user_id, channel, source, chat_id): request_id = self._by_user_channel.get(key) @@ -300,10 +300,10 @@ class PluginInputInteractionManager: def _find_expired_key_and_request_locked( self, user_id: Union[str, int], - channel: Optional[MessageChannel], + channel: Optional[NotificationChannel], source: Optional[str], chat_id: Optional[Union[str, int]] = None, - ) -> Tuple[Optional[Tuple[str, Optional[MessageChannel], Optional[str], Optional[str]]], + ) -> Tuple[Optional[Tuple[str, Optional[NotificationChannel], Optional[str], Optional[str]]], Optional[PendingPluginInputInteraction]]: """返回仍在宽限期内的过期会话及其索引键。""" now = datetime.now() @@ -320,10 +320,10 @@ class PluginInputInteractionManager: def _candidate_keys( self, user_id: Union[str, int], - channel: Optional[MessageChannel], + channel: Optional[NotificationChannel], source: Optional[str], chat_id: Optional[Union[str, int]] = None, - ) -> List[Tuple[str, Optional[MessageChannel], Optional[str], Optional[str]]]: + ) -> List[Tuple[str, Optional[NotificationChannel], Optional[str], Optional[str]]]: """按精确到宽松顺序生成输入会话候选键。""" chat_key = str(chat_id) if chat_id not in (None, "") else None candidates = [ @@ -430,7 +430,7 @@ class PluginInputInteractionHandler: }, ) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -461,7 +461,7 @@ class PluginInputInteractionHandler: }, ) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, diff --git a/app/application/messaging/site.py b/app/application/messaging/site.py index fb9836169..5558c9e59 100644 --- a/app/application/messaging/site.py +++ b/app/application/messaging/site.py @@ -15,8 +15,8 @@ from app.application.messaging.interaction import ( update_or_post_message, ) from app.runtime.log import logger -from app.schemas import Notification -from app.schemas.types import MessageChannel +from app.schemas import Message +from app.schemas.types import NotificationChannel site_interaction_manager = SlashInteractionManager() @@ -44,7 +44,7 @@ class SiteInteractionHandler: def remote_list( self, arg_str: str = "", - channel: MessageChannel = None, + channel: NotificationChannel = None, userid: Union[str, int] = None, source: Optional[str] = None, ): @@ -90,7 +90,7 @@ class SiteInteractionHandler: def handle_callback_interaction( self, callback_data: str, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -108,7 +108,7 @@ class SiteInteractionHandler: request = site_interaction_manager.get_by_id(request_id, userid) if not request: self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -161,7 +161,7 @@ class SiteInteractionHandler: def handle_text_interaction( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -184,7 +184,7 @@ class SiteInteractionHandler: if lowered in {"退出", "关闭", "q", "quit", "exit"}: site_interaction_manager.remove(request.request_id) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -255,7 +255,7 @@ class SiteInteractionHandler: success, message = self._update_site_cookie_from_input(normalized) request.awaiting_input = None self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -276,7 +276,7 @@ class SiteInteractionHandler: success, message = self._set_sites_enabled(normalized, enabled=True) request.awaiting_input = None self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -297,7 +297,7 @@ class SiteInteractionHandler: success, message = self._set_sites_enabled(normalized, enabled=False) request.awaiting_input = None self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -317,7 +317,7 @@ class SiteInteractionHandler: if cookie_match: success, message = self._update_site_cookie_from_input(cookie_match.group(1)) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -337,7 +337,7 @@ class SiteInteractionHandler: if enable_match: success, message = self._set_sites_enabled(enable_match.group(1), enabled=True) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -359,7 +359,7 @@ class SiteInteractionHandler: disable_match.group(1), enabled=False ) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -377,7 +377,7 @@ class SiteInteractionHandler: return True self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -390,7 +390,7 @@ class SiteInteractionHandler: def _render_site_interaction( self, request, - channel: MessageChannel, + channel: NotificationChannel, source: Optional[str], userid: Union[str, int], username: Optional[str], @@ -463,7 +463,7 @@ class SiteInteractionHandler: @staticmethod def _format_site_list( - site_list: List[Site], channel: Optional[MessageChannel] + site_list: List[Site], channel: Optional[NotificationChannel] ) -> str: """ 根据渠道能力格式化站点列表。 diff --git a/app/application/messaging/skill.py b/app/application/messaging/skill.py index 8a9d0fbe6..0824b987e 100644 --- a/app/application/messaging/skill.py +++ b/app/application/messaging/skill.py @@ -13,8 +13,8 @@ from app.application.messaging.interaction import ( supports_interaction_buttons, update_or_post_message, ) -from app.schemas import Notification -from app.schemas.types import MessageChannel +from app.schemas import Message +from app.schemas.types import NotificationChannel @dataclass @@ -25,7 +25,7 @@ class PendingSkillInteraction: request_id: str user_id: str - channel: Optional[MessageChannel] + channel: Optional[NotificationChannel] source: Optional[str] username: Optional[str] view: str = "root" @@ -69,7 +69,7 @@ class SkillInteractionManager: def create_or_replace( self, user_id: Union[str, int], - channel: Optional[MessageChannel], + channel: Optional[NotificationChannel], source: Optional[str], username: Optional[str], ) -> PendingSkillInteraction: @@ -161,7 +161,7 @@ class SkillInteractionHandler: def remote_manage( self, arg_str: str, - channel: MessageChannel, + channel: NotificationChannel, userid: Union[str, int], source: Optional[str] = None, ): @@ -213,7 +213,7 @@ class SkillInteractionHandler: def handle_callback_interaction( self, callback_data: str, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -231,7 +231,7 @@ class SkillInteractionHandler: request = skill_interaction_manager.get_by_id(request_id, userid) if not request: self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -311,7 +311,7 @@ class SkillInteractionHandler: success, message = self._install_market_skill(request, index) if success: self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -321,7 +321,7 @@ class SkillInteractionHandler: ) else: self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -333,7 +333,7 @@ class SkillInteractionHandler: request.awaiting_input = None success, message = self._remove_local_skill(request, index) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -349,7 +349,7 @@ class SkillInteractionHandler: request.awaiting_input = None success, message = self._remove_market_source(index) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -371,7 +371,7 @@ class SkillInteractionHandler: def handle_text_interaction( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -393,7 +393,7 @@ class SkillInteractionHandler: if lowered in {"退出", "关闭", "q", "quit", "exit"}: skill_interaction_manager.remove(request.request_id) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -428,7 +428,7 @@ class SkillInteractionHandler: request.awaiting_input = None _, message = self.skillhelper.add_custom_market_source(add_source) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -452,7 +452,7 @@ class SkillInteractionHandler: page_index=int(remove_source_match.group(1)) ) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -525,7 +525,7 @@ class SkillInteractionHandler: ) else: self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -550,7 +550,7 @@ class SkillInteractionHandler: _, message = self.skillhelper.add_custom_market_source(normalized) request.awaiting_input = None self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -615,7 +615,7 @@ class SkillInteractionHandler: page_index=int(install_match.group(1)), ) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -638,7 +638,7 @@ class SkillInteractionHandler: page_index=int(remove_match.group(1)), ) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -656,7 +656,7 @@ class SkillInteractionHandler: return True self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -722,7 +722,7 @@ class SkillInteractionHandler: def _render_interaction( self, request: PendingSkillInteraction, - channel: MessageChannel, + channel: NotificationChannel, source: Optional[str], userid: Union[str, int], username: Optional[str], @@ -1068,7 +1068,7 @@ class SkillInteractionHandler: """ return page_items(items=items, page=page, page_size=page_size) - def _page_size(self, channel: Optional[MessageChannel]) -> int: + def _page_size(self, channel: Optional[NotificationChannel]) -> int: """ 按渠道能力选择分页大小，按钮渠道单页更短，便于直接操作。 """ @@ -1079,7 +1079,7 @@ class SkillInteractionHandler: ) @staticmethod - def _supports_interactive_buttons(channel: Optional[MessageChannel]) -> bool: + def _supports_interactive_buttons(channel: Optional[NotificationChannel]) -> bool: """ 判断当前渠道是否同时支持按钮展示和回调。 """ @@ -1103,7 +1103,7 @@ class SkillInteractionHandler: def _update_or_post_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: Optional[str], userid: Union[str, int], username: Optional[str], diff --git a/app/application/messaging/subscribe.py b/app/application/messaging/subscribe.py index 12e3a8f33..53e1b7e42 100644 --- a/app/application/messaging/subscribe.py +++ b/app/application/messaging/subscribe.py @@ -14,8 +14,8 @@ from app.application.messaging.interaction import ( ) from app.db.models.subscribe import Subscribe from app.db.oper.subscribe import SubscribeOper -from app.schemas import Notification -from app.schemas.types import MessageChannel, MediaType +from app.schemas import Message +from app.schemas.types import NotificationChannel, MediaType subscribe_interaction_manager = SlashInteractionManager() @@ -61,7 +61,7 @@ class SubscribeInteractionHandler: def remote_list( self, arg_str: str = "", - channel: MessageChannel = None, + channel: NotificationChannel = None, userid: Union[str, int] = None, source: Optional[str] = None, ): @@ -107,7 +107,7 @@ class SubscribeInteractionHandler: def handle_callback_interaction( self, callback_data: str, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -125,7 +125,7 @@ class SubscribeInteractionHandler: request = subscribe_interaction_manager.get_by_id(request_id, userid) if not request: self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -184,7 +184,7 @@ class SubscribeInteractionHandler: def handle_text_interaction( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -207,7 +207,7 @@ class SubscribeInteractionHandler: if lowered in {"退出", "关闭", "q", "quit", "exit"}: subscribe_interaction_manager.remove(request.request_id) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -297,7 +297,7 @@ class SubscribeInteractionHandler: ) request.awaiting_input = None self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -318,7 +318,7 @@ class SubscribeInteractionHandler: success, message = self._delete_subscribes(normalized) request.awaiting_input = None self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -340,7 +340,7 @@ class SubscribeInteractionHandler: search_match.group(1), channel, source, userid, username ) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -360,7 +360,7 @@ class SubscribeInteractionHandler: if delete_match: success, message = self._delete_subscribes(delete_match.group(1)) self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -378,7 +378,7 @@ class SubscribeInteractionHandler: return True self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -391,7 +391,7 @@ class SubscribeInteractionHandler: def _render_subscribe_interaction( self, request, - channel: MessageChannel, + channel: NotificationChannel, source: Optional[str], userid: Union[str, int], username: Optional[str], @@ -475,7 +475,7 @@ class SubscribeInteractionHandler: ) def _format_subscribe_list( - self, subscribes: List[Subscribe], channel: Optional[MessageChannel] + self, subscribes: List[Subscribe], channel: Optional[NotificationChannel] ) -> str: """ 根据渠道能力格式化订阅列表。 @@ -564,7 +564,7 @@ class SubscribeInteractionHandler: def _run_refresh_action( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -573,7 +573,7 @@ class SubscribeInteractionHandler: 执行订阅刷新。 """ self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -583,7 +583,7 @@ class SubscribeInteractionHandler: ) self._actions.refresh() self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -594,7 +594,7 @@ class SubscribeInteractionHandler: def _run_metadata_refresh_action( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -603,7 +603,7 @@ class SubscribeInteractionHandler: 执行订阅元数据刷新。 """ self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -613,7 +613,7 @@ class SubscribeInteractionHandler: ) self._actions.check() self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -632,7 +632,7 @@ class SubscribeInteractionHandler: def _run_search_action( self, arg_str: str, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -643,7 +643,7 @@ class SubscribeInteractionHandler: normalized = (arg_str or "").strip() if not normalized or normalized.lower() in {"all", "全部", "所有"}: self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -667,7 +667,7 @@ class SubscribeInteractionHandler: missing.append(str(subscribe_id)) continue self._messenger.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, diff --git a/app/chain/__init__.py b/app/chain/__init__.py index 5cb69f08b..cfa4d54d1 100644 --- a/app/chain/__init__.py +++ b/app/chain/__init__.py @@ -30,8 +30,8 @@ from app.schemas import ( TransferInfo, ExistMediaInfo, DownloaderTorrent, - CommingMessage, - Notification, + IncomingMessage, + Message, WebhookEventInfo, TmdbEpisode, MediaPerson, @@ -41,7 +41,7 @@ from app.schemas import ( ) from app.foundation.identity import normalize_internal_user_id from app.schemas.media import normalize_media_source, resolve_media_identity -from app.schemas.message import ChannelCapability, ChannelCapabilityManager +from app.schemas.notification import ChannelCapability, ChannelCapabilityManager from app.schemas.category import CategoryConfig from app.schemas.types import ( TorrentStatus, @@ -50,7 +50,7 @@ from app.schemas.types import ( MediaImageType, EventType, ChainEventType, - MessageChannel, + NotificationChannel, MediaSource, SystemConfigKey, ) @@ -129,7 +129,7 @@ class ChainBase(metaclass=ABCMeta): def start_message_processing_status( self, - channel: MessageChannel, + channel: NotificationChannel, source: Optional[str], userid: Optional[Union[str, int]] = None, message_id: Optional[Union[str, int]] = None, @@ -162,7 +162,7 @@ class ChainBase(metaclass=ABCMeta): def finish_message_processing_status( self, status: Optional[dict] = None, - channel: Optional[MessageChannel] = None, + channel: Optional[NotificationChannel] = None, source: Optional[str] = None, userid: Optional[Union[str, int]] = None, message_id: Optional[Union[str, int]] = None, @@ -175,7 +175,7 @@ class ChainBase(metaclass=ABCMeta): target_channel = channel if status: try: - target_channel = MessageChannel(status.get("channel")) + target_channel = NotificationChannel(status.get("channel")) except Exception: target_channel = channel if not target_channel or not ChannelCapabilityManager.supports_capability( @@ -197,8 +197,8 @@ class ChainBase(metaclass=ABCMeta): @staticmethod def _normalize_notification_for_dispatch( - message: Notification - ) -> Notification: + message: Message + ) -> Message: """ 规范化待发送的通知消息。 后台任务会复用内部占位用户ID作为会话身份，这里在真正发送前清空， @@ -211,7 +211,7 @@ class ChainBase(metaclass=ABCMeta): return dispatch_message @staticmethod - def _build_notice_message_data(message: Notification) -> dict: + def _build_notice_message_data(message: Message) -> dict: """ 构造消息通知事件数据。 """ @@ -1250,7 +1250,7 @@ class ChainBase(metaclass=ABCMeta): def message_parser( self, source: str, body: Any, form: Any, args: Any - ) -> Optional[CommingMessage]: + ) -> Optional[IncomingMessage]: """ 解析消息内容，返回字典，注意以下约定值： userid: 用户ID @@ -1785,7 +1785,7 @@ class ChainBase(metaclass=ABCMeta): def post_message( self, - message: Optional[Notification] = None, + message: Optional[Message] = None, meta: Optional[MetaBase] = None, mediainfo: Optional[Union[MediaInfo, MusicInfo]] = None, torrentinfo: Optional[TorrentInfo] = None, @@ -1901,7 +1901,7 @@ class ChainBase(metaclass=ABCMeta): async def async_post_message( self, - message: Optional[Notification] = None, + message: Optional[Message] = None, meta: Optional[MetaBase] = None, mediainfo: Optional[Union[MediaInfo, MusicInfo]] = None, torrentinfo: Optional[TorrentInfo] = None, @@ -2016,7 +2016,7 @@ class ChainBase(metaclass=ABCMeta): ) def post_medias_message( - self, message: Notification, medias: List[MediaInfo] + self, message: Message, medias: List[MediaInfo] ) -> None: """ 发送媒体信息选择列表 @@ -2036,7 +2036,7 @@ class ChainBase(metaclass=ABCMeta): ) def post_torrents_message( - self, message: Notification, torrents: List[Context] + self, message: Message, torrents: List[Context] ) -> None: """ 发送种子信息选择列表 @@ -2057,7 +2057,7 @@ class ChainBase(metaclass=ABCMeta): def delete_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, message_id: Union[str, int], chat_id: Optional[Union[str, int]] = None, @@ -2080,7 +2080,7 @@ class ChainBase(metaclass=ABCMeta): def edit_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, message_id: Union[str, int], chat_id: Union[str, int], @@ -2101,7 +2101,7 @@ class ChainBase(metaclass=ABCMeta): :param metadata: 其他消息元数据 :return: 编辑是否成功 """ - if channel == MessageChannel.WebAgent: + if channel == NotificationChannel.WebAgent: try: from app.application.messaging.agent import edit_web_agent_message @@ -2128,7 +2128,7 @@ class ChainBase(metaclass=ABCMeta): metadata=metadata, ) - def send_direct_message(self, message: Notification) -> Optional[MessageResponse]: + def send_direct_message(self, message: Message) -> Optional[MessageResponse]: """ 直接发送消息并返回消息ID等信息（用于后续编辑消息的场景） 不经过消息队列、不保存消息历史 diff --git a/app/chain/download.py b/app/chain/download.py index b92e88b11..6811539ca 100644 --- a/app/chain/download.py +++ b/app/chain/download.py @@ -33,9 +33,9 @@ from app.application.directory import DirectoryHelper, validate_download_save_pa from app.runtime.thread import ThreadHelper from app.application.torrent import TorrentHelper from app.runtime.log import logger -from app.schemas import ExistMediaInfo, FileURI, NotExistMediaInfo, DownloaderTorrent, Notification, ResourceSelectionEventData, \ +from app.schemas import ExistMediaInfo, FileURI, NotExistMediaInfo, DownloaderTorrent, Message, ResourceSelectionEventData, \ ResourceDownloadEventData -from app.schemas.types import MUSIC_ENTITY_ALBUM, MediaSource, MediaType, TorrentStatus, EventType, MessageChannel, NotificationType, ContentType, \ +from app.schemas.types import MUSIC_ENTITY_ALBUM, MediaSource, MediaType, TorrentStatus, EventType, NotificationChannel, MessageType, ContentType, \ ChainEventType from app.adapters.network.http import RequestUtils from app.schemas.media import build_media_key, resolve_media_identity @@ -860,7 +860,7 @@ class DownloadChain(ChainBase): return set() def download_torrent(self, torrent: TorrentInfo, - channel: MessageChannel = None, + channel: NotificationChannel = None, source: Optional[str] = None, userid: Union[str, int] = None ) -> Tuple[Optional[Union[str, bytes]], str, list]: @@ -974,10 +974,10 @@ class DownloadChain(ChainBase): if not content: logger.error(f"下载种子文件失败：{torrent.title}") - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source if channel else None, - mtype=NotificationType.Manual, + mtype=MessageType.Manual, title=f"{torrent.title} 种子下载失败！", text=f"错误信息：{error_msg}\n站点：{torrent.site_name}", userid=userid)) @@ -990,7 +990,7 @@ class DownloadChain(ChainBase): torrent_file: Path = None, torrent_content: Optional[Union[str, bytes]] = None, episodes: Set[int] = None, - channel: MessageChannel = None, + channel: NotificationChannel = None, source: Optional[str] = None, downloader: Optional[str] = None, save_path: Optional[str] = None, @@ -1205,10 +1205,10 @@ class DownloadChain(ChainBase): # 下载成功发送消息 self.post_message( - Notification( + Message( channel=channel, source=source if channel else None, - mtype=NotificationType.Download, + mtype=MessageType.Download, ctype=ContentType.DownloadAdded, image=_media.get_message_image(), link=settings.MP_DOMAIN('/#/downloading'), @@ -1248,10 +1248,10 @@ class DownloadChain(ChainBase): episodes=episodes, ) # 只发送给对应渠道和用户 - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source if channel else None, - mtype=NotificationType.Manual, + mtype=MessageType.Manual, title="添加下载任务失败：%s %s" % (_media.title_year, _meta.season_episode), text=f"站点：{_torrent.site_name}\n" @@ -1267,7 +1267,7 @@ class DownloadChain(ChainBase): contexts: List[Context], no_exists: Dict[str, Dict[int, NotExistMediaInfo]] = None, save_path: Optional[str] = None, - channel: MessageChannel = None, + channel: NotificationChannel = None, source: Optional[str] = None, userid: Optional[str] = None, username: Optional[str] = None, @@ -1981,16 +1981,16 @@ class DownloadChain(ChainBase): # 全部存在 return True, no_exists - def remote_downloading(self, channel: MessageChannel, userid: Union[str, int] = None, source: Optional[str] = None): + def remote_downloading(self, channel: NotificationChannel, userid: Union[str, int] = None, source: Optional[str] = None): """ 查询正在下载的任务，并发送消息 """ torrents = self.list_torrents(status=TorrentStatus.DOWNLOADING) if not torrents: - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, - mtype=NotificationType.Download, + mtype=MessageType.Download, title="没有正在下载的任务！", userid=userid, link=settings.MP_DOMAIN('#/downloading'), @@ -2006,10 +2006,10 @@ class DownloadChain(ChainBase): f"{size_tools.format_compact_size(torrent.size)} " f"{round(torrent.progress, 1)}%") index += 1 - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, - mtype=NotificationType.Download, + mtype=MessageType.Download, title=title, text="\n".join(messages), userid=userid, diff --git a/app/chain/interaction.py b/app/chain/interaction.py index 1ea571241..ffd5cfd80 100644 --- a/app/chain/interaction.py +++ b/app/chain/interaction.py @@ -21,11 +21,11 @@ from app.domain.meta.metabase import MetaBase from app.foundation import url as url_tools from app.runtime.config import settings from app.runtime.log import logger -from app.schemas import DownloadDirectory, FileURI, NotExistMediaInfo, Notification +from app.schemas import DownloadDirectory, FileURI, NotExistMediaInfo, Message from app.schemas.media import build_media_key, resolve_media_identity -from app.schemas.message import ChannelCapabilityManager +from app.schemas.notification import ChannelCapabilityManager from app.schemas.system import TransferDirectoryConf -from app.schemas.types import MediaType, MessageChannel +from app.schemas.types import MediaType, NotificationChannel class MediaInteractionChain(ChainBase): @@ -127,7 +127,7 @@ class MediaInteractionChain(ChainBase): def handle_callback_interaction( self, callback_data: str, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -149,7 +149,7 @@ class MediaInteractionChain(ChainBase): if not request: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -245,7 +245,7 @@ class MediaInteractionChain(ChainBase): def handle_text_interaction( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -263,7 +263,7 @@ class MediaInteractionChain(ChainBase): if request and lowered in {"退出", "关闭", "q", "quit", "exit"}: media_interaction_manager.remove(request.request_id) self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -411,7 +411,7 @@ class MediaInteractionChain(ChainBase): self, action: str, content: str, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -431,7 +431,7 @@ class MediaInteractionChain(ChainBase): return if not medias: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -465,7 +465,7 @@ class MediaInteractionChain(ChainBase): self, request: PendingMediaInteraction, page_index: Optional[int], - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -520,7 +520,7 @@ class MediaInteractionChain(ChainBase): self, request: PendingMediaInteraction, mediainfo: MediaInfo, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -536,7 +536,7 @@ class MediaInteractionChain(ChainBase): ) if exist_flag and request.action == "Search": self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -556,7 +556,7 @@ class MediaInteractionChain(ChainBase): ) if messages: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -568,7 +568,7 @@ class MediaInteractionChain(ChainBase): logger.info("开始搜索 %s ...", mediainfo.title_year) self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -581,7 +581,7 @@ class MediaInteractionChain(ChainBase): contexts = SearchChain().process(mediainfo=mediainfo, no_exists=no_exists) if not contexts: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -639,7 +639,7 @@ class MediaInteractionChain(ChainBase): self, request: PendingMediaInteraction, mediainfo: MediaInfo, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -655,7 +655,7 @@ class MediaInteractionChain(ChainBase): ) if exist_flag: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -689,7 +689,7 @@ class MediaInteractionChain(ChainBase): self, request: PendingMediaInteraction, page_index: Optional[int], - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -764,7 +764,7 @@ class MediaInteractionChain(ChainBase): self, request: PendingMediaInteraction, download_mode: str, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -804,7 +804,7 @@ class MediaInteractionChain(ChainBase): self, request: PendingMediaInteraction, page_index: Optional[int], - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -870,7 +870,7 @@ class MediaInteractionChain(ChainBase): def _execute_pending_download( self, request: PendingMediaInteraction, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -935,7 +935,7 @@ class MediaInteractionChain(ChainBase): self, request: PendingMediaInteraction, cache_list: List[Context], - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -1000,7 +1000,7 @@ class MediaInteractionChain(ChainBase): def _render_interaction( self, request: PendingMediaInteraction, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], original_message_id: Optional[Union[str, int]] = None, @@ -1040,7 +1040,7 @@ class MediaInteractionChain(ChainBase): def _post_medias_message( self, request: PendingMediaInteraction, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], original_message_id: Optional[Union[str, int]] = None, @@ -1073,7 +1073,7 @@ class MediaInteractionChain(ChainBase): buttons = None self.post_medias_message( - Notification( + Message( channel=channel, source=source, title=title, @@ -1089,7 +1089,7 @@ class MediaInteractionChain(ChainBase): def _post_torrents_message( self, request: PendingMediaInteraction, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], original_message_id: Optional[Union[str, int]] = None, @@ -1122,7 +1122,7 @@ class MediaInteractionChain(ChainBase): buttons = None self.post_torrents_message( - Notification( + Message( channel=channel, source=source, title=title, @@ -1139,7 +1139,7 @@ class MediaInteractionChain(ChainBase): def _post_download_dirs_message( self, request: PendingMediaInteraction, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], original_message_id: Optional[Union[str, int]] = None, @@ -1176,7 +1176,7 @@ class MediaInteractionChain(ChainBase): for index, download_dir in enumerate(page_items, start=1) ) self.post_message( - Notification( + Message( channel=channel, source=source, title=title, @@ -1191,7 +1191,7 @@ class MediaInteractionChain(ChainBase): def _create_media_buttons( self, - channel: MessageChannel, + channel: NotificationChannel, request: PendingMediaInteraction, items: List[MediaInfo], total: int, @@ -1236,7 +1236,7 @@ class MediaInteractionChain(ChainBase): def _create_torrent_buttons( self, - channel: MessageChannel, + channel: NotificationChannel, request: PendingMediaInteraction, items: List[Context], total: int, @@ -1289,7 +1289,7 @@ class MediaInteractionChain(ChainBase): def _create_download_dir_buttons( self, - channel: MessageChannel, + channel: NotificationChannel, request: PendingMediaInteraction, items: List[DownloadDirectory], total: int, @@ -1485,7 +1485,7 @@ class MediaInteractionChain(ChainBase): return f"{name} ({save_path})" return name - def _page_size(self, channel: Optional[MessageChannel]) -> int: + def _page_size(self, channel: Optional[NotificationChannel]) -> int: """ 按渠道交互能力选择分页大小。 """ @@ -1496,7 +1496,7 @@ class MediaInteractionChain(ChainBase): ) @staticmethod - def _supports_interactive_buttons(channel: Optional[MessageChannel]) -> bool: + def _supports_interactive_buttons(channel: Optional[NotificationChannel]) -> bool: """ 判断渠道是否同时支持按钮展示与按钮回调。 """ @@ -1546,7 +1546,7 @@ class MediaInteractionChain(ChainBase): def _post_invalid_input( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: Optional[str], @@ -1556,7 +1556,7 @@ class MediaInteractionChain(ChainBase): 发送统一的非法输入提示。 """ self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, diff --git a/app/chain/message.py b/app/chain/message.py index d665e9f27..3c07f3214 100644 --- a/app/chain/message.py +++ b/app/chain/message.py @@ -36,10 +36,10 @@ from app.application.messaging.skill import SkillInteractionHandler, skill_inter from app.application.messaging.subscribe import subscribe_interaction_manager from app.application.torrent import TorrentHelper from app.runtime.log import logger -from app.schemas import CommingMessage, DownloadDirectory, FileURI, NotExistMediaInfo, Notification -from app.schemas.message import ChannelCapabilityManager, ChannelCapability +from app.schemas import IncomingMessage, DownloadDirectory, FileURI, NotExistMediaInfo, Message +from app.schemas.notification import ChannelCapabilityManager from app.schemas.system import TransferDirectoryConf -from app.schemas.types import EventType, MessageChannel, MediaType +from app.schemas.types import EventType, NotificationChannel, MediaType from app.adapters.network.http import RequestUtils from app.schemas.media import build_media_key, resolve_media_identity from app.domain import episode as episode_rules @@ -91,7 +91,7 @@ class MessageChain(ChainBase): @dataclass class _ProcessingStatus: - channel: MessageChannel + channel: NotificationChannel source: str userid: Optional[Union[str, int]] = None message_id: Optional[Union[str, int]] = None @@ -172,16 +172,16 @@ class MessageChain(ChainBase): def handle_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, text: Optional[str], original_message_id: Optional[Union[str, int]] = None, original_chat_id: Optional[str] = None, - images: Optional[List[CommingMessage.MessageImage]] = None, + images: Optional[List[IncomingMessage.MessageImage]] = None, audio_refs: Optional[List[str]] = None, - files: Optional[List[CommingMessage.MessageAttachment]] = None, + files: Optional[List[IncomingMessage.MessageAttachment]] = None, reply_to_message_id: Optional[Union[str, int]] = None, is_channel_admin: Optional[bool] = None, callback_data: Optional[str] = None, @@ -189,7 +189,7 @@ class MessageChain(ChainBase): """ 识别消息内容，执行操作 """ - images = CommingMessage.MessageImage.normalize_list(images) + images = IncomingMessage.MessageImage.normalize_list(images) # 兼容归一化：结构化回调优先，CALLBACK: 文本前缀作为旧渠道和插件直接调用的兼容入口 normalized_callback = str(callback_data or "").strip() or None @@ -214,7 +214,7 @@ class MessageChain(ChainBase): text = "\n".join(merged_parts).strip() if not text: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -321,21 +321,21 @@ class MessageChain(ChainBase): def _handle_secret_confirmation_control( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, text: Optional[str], original_message_id: Optional[Union[str, int]] = None, original_chat_id: Optional[str] = None, - images: Optional[List[CommingMessage.MessageImage]] = None, + images: Optional[List[IncomingMessage.MessageImage]] = None, audio_refs: Optional[List[str]] = None, - files: Optional[List[CommingMessage.MessageAttachment]] = None, + files: Optional[List[IncomingMessage.MessageAttachment]] = None, has_audio_input: bool = False, is_channel_admin: Optional[bool] = None, ) -> bool: """将 TG/飞书中的确认控制文本交回所属 Agent 会话。""" - if channel not in {MessageChannel.Telegram, MessageChannel.Feishu}: + if channel not in {NotificationChannel.Telegram, NotificationChannel.Feishu}: return False if str(text or "").strip() not in {"确认", "取消"}: return False @@ -370,16 +370,16 @@ class MessageChain(ChainBase): def _handle_message_core( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, text: Optional[str], original_message_id: Optional[Union[str, int]] = None, original_chat_id: Optional[str] = None, - images: Optional[List[CommingMessage.MessageImage]] = None, + images: Optional[List[IncomingMessage.MessageImage]] = None, audio_refs: Optional[List[str]] = None, - files: Optional[List[CommingMessage.MessageAttachment]] = None, + files: Optional[List[IncomingMessage.MessageAttachment]] = None, has_audio_input: bool = False, processing_status: Optional[_ProcessingStatus] = None, reply_to_message_id: Optional[Union[str, int]] = None, @@ -428,7 +428,7 @@ class MessageChain(ChainBase): text = no_ai_text if not text: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -539,8 +539,8 @@ class MessageChain(ChainBase): userid: Union[str, int], text: str, callback_data: Optional[str] = None, - images: Optional[List[CommingMessage.MessageImage]] = None, - files: Optional[List[CommingMessage.MessageAttachment]] = None, + images: Optional[List[IncomingMessage.MessageImage]] = None, + files: Optional[List[IncomingMessage.MessageAttachment]] = None, has_audio_input: bool = False, ) -> bool: """ @@ -563,7 +563,7 @@ class MessageChain(ChainBase): def _mark_message_processing_started( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], original_message_id: Optional[Union[str, int]], @@ -594,7 +594,7 @@ class MessageChain(ChainBase): def _mark_message_processing_finished( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], status: Optional[_ProcessingStatus] = None, @@ -764,7 +764,7 @@ class MessageChain(ChainBase): logger.error(f"回调数据格式错误：{callback_data}") self.post_message( - Notification( + Message( channel=context.channel, source=context.source, userid=context.user_id, @@ -797,7 +797,7 @@ class MessageChain(ChainBase): ) if not resolved: self.post_message( - Notification( + Message( channel=context.channel, source=context.source, userid=context.user_id, @@ -832,7 +832,7 @@ class MessageChain(ChainBase): def _update_interaction_message_feedback( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, original_message_id: Optional[Union[str, int]], original_chat_id: Optional[str], @@ -909,7 +909,7 @@ class MessageChain(ChainBase): def _record_user_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -919,7 +919,7 @@ class MessageChain(ChainBase): 保存一条用户消息到消息历史与数据库。 """ self.messagehelper.put( - CommingMessage( + IncomingMessage( userid=userid, username=username, channel=channel, @@ -949,7 +949,7 @@ class MessageChain(ChainBase): def remote_clear_session( self, - channel: MessageChannel, + channel: NotificationChannel, userid: Union[str, int], source: Optional[str] = None, ): @@ -979,7 +979,7 @@ class MessageChain(ChainBase): logger.warning(f"清除智能体会话记忆失败: {e}") self.post_message( - Notification( + Message( channel=channel, source=source, title="智能体会话已清除，下次将创建新的会话", @@ -989,7 +989,7 @@ class MessageChain(ChainBase): ) else: self.post_message( - Notification( + Message( channel=channel, source=source, title="您当前没有活跃的智能体会话", @@ -1000,7 +1000,7 @@ class MessageChain(ChainBase): def remote_stop_agent( self, - channel: MessageChannel, + channel: NotificationChannel, userid: Union[str, int], source: Optional[str] = None, ): @@ -1025,7 +1025,7 @@ class MessageChain(ChainBase): if stopped: self.post_message( - Notification( + Message( channel=channel, source=source, title="智能体推理已应急停止，会话记忆已保留，您可以继续对话", @@ -1035,7 +1035,7 @@ class MessageChain(ChainBase): ) else: self.post_message( - Notification( + Message( channel=channel, source=source, title="当前没有正在执行的智能体任务", @@ -1045,7 +1045,7 @@ class MessageChain(ChainBase): ) else: self.post_message( - Notification( + Message( channel=channel, source=source, title="您当前没有活跃的智能体会话", @@ -1161,7 +1161,7 @@ class MessageChain(ChainBase): def remote_session_status( self, - channel: MessageChannel, + channel: NotificationChannel, userid: Union[str, int], source: Optional[str] = None, ): @@ -1169,7 +1169,7 @@ class MessageChain(ChainBase): session_info = self._user_sessions.get(userid) if not session_info: self.post_message( - Notification( + Message( channel=channel, source=source, title="您当前没有活跃的智能体会话", @@ -1182,7 +1182,7 @@ class MessageChain(ChainBase): session_id, _ = session_info status = agent_manager.get_session_status(session_id=session_id) self.post_message( - Notification( + Message( channel=channel, source=source, title="当前智能体会话状态", @@ -1195,14 +1195,14 @@ class MessageChain(ChainBase): def _handle_ai_message( self, text: str, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, original_message_id: Optional[Union[str, int]] = None, original_chat_id: Optional[str] = None, - images: Optional[List[CommingMessage.MessageImage]] = None, - files: Optional[List[CommingMessage.MessageAttachment]] = None, + images: Optional[List[IncomingMessage.MessageImage]] = None, + files: Optional[List[IncomingMessage.MessageAttachment]] = None, session_id: Optional[str] = None, has_audio_input: bool = False, is_channel_admin: Optional[bool] = None, @@ -1214,7 +1214,7 @@ class MessageChain(ChainBase): # 检查AI智能体是否启用 if not settings.AI_AGENT_ENABLE: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -1225,7 +1225,7 @@ class MessageChain(ChainBase): ) return False - images = CommingMessage.MessageImage.normalize_list(images) + images = IncomingMessage.MessageImage.normalize_list(images) # 提取用户消息 if self._has_ai_prefix(text): @@ -1236,7 +1236,7 @@ class MessageChain(ChainBase): if not user_message and not images and not files: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -1263,7 +1263,7 @@ class MessageChain(ChainBase): ) if original_images and not images and not user_message and not files: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -1282,7 +1282,7 @@ class MessageChain(ChainBase): and not files ): self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -1303,7 +1303,7 @@ class MessageChain(ChainBase): ) if all_files and not prepared_files and not user_message and not images: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -1346,7 +1346,7 @@ class MessageChain(ChainBase): return False def _transcribe_audio_refs( - self, audio_refs: List[str], channel: MessageChannel, source: str + self, audio_refs: List[str], channel: NotificationChannel, source: str ) -> Optional[str]: """ 下载并识别语音消息，仅处理当前已接入的渠道。 @@ -1496,14 +1496,14 @@ class MessageChain(ChainBase): def _download_attachments_to_data_urls( self, - attachments: List[CommingMessage.MessageImage], - channel: MessageChannel, + attachments: List[IncomingMessage.MessageImage], + channel: NotificationChannel, source: str, ) -> Optional[List[str]]: """ 下载可直接提供给 LLM 的附件内容，并统一转换为 data URL。 """ - normalized_attachments = CommingMessage.MessageImage.normalize_list(attachments) or [] + normalized_attachments = IncomingMessage.MessageImage.normalize_list(attachments) or [] if not normalized_attachments: return None data_urls = [] @@ -1544,7 +1544,7 @@ class MessageChain(ChainBase): ) if data_url: data_urls.append(data_url) - elif channel == MessageChannel.Slack: + elif channel == NotificationChannel.Slack: data_url = self.run_module( "download_slack_file_to_data_url", file_url=attachment_ref, @@ -1594,12 +1594,12 @@ class MessageChain(ChainBase): return data_urls if data_urls else None def _build_image_attachments( - self, images: List[CommingMessage.MessageImage] - ) -> List[CommingMessage.MessageAttachment]: + self, images: List[IncomingMessage.MessageImage] + ) -> List[IncomingMessage.MessageAttachment]: """ 将图片引用转换为附件描述，以便按文件方式交给 Agent 处理。 """ - images = CommingMessage.MessageImage.normalize_list(images) + images = IncomingMessage.MessageImage.normalize_list(images) if not images: return [] @@ -1611,7 +1611,7 @@ class MessageChain(ChainBase): name = image.name or self._guess_image_attachment_name(image_ref, index) mime_type = image.mime_type or self._guess_image_mime_type(image_ref, name) attachments.append( - CommingMessage.MessageAttachment( + IncomingMessage.MessageAttachment( ref=image_ref, name=name, mime_type=mime_type, @@ -1623,8 +1623,8 @@ class MessageChain(ChainBase): def _prepare_agent_files( self, session_id: str, - files: Optional[List[CommingMessage.MessageAttachment]], - channel: MessageChannel, + files: Optional[List[IncomingMessage.MessageAttachment]], + channel: NotificationChannel, source: str, ) -> Optional[List[dict]]: """ @@ -1672,7 +1672,7 @@ class MessageChain(ChainBase): return prepared_files or None def _download_message_file_bytes( - self, file_ref: str, channel: MessageChannel, source: str + self, file_ref: str, channel: NotificationChannel, source: str ) -> Optional[bytes]: """ 下载消息附件的原始字节内容。 @@ -1742,7 +1742,7 @@ class MessageChain(ChainBase): "download_synologychat_file_bytes", file_ref=file_ref, source=source ) if file_ref.startswith("http"): - if channel == MessageChannel.Slack: + if channel == NotificationChannel.Slack: data_url = self.run_module( "download_slack_file_to_data_url", file_url=file_ref, source=source ) diff --git a/app/chain/site.py b/app/chain/site.py index 5c0246a72..b1feeab46 100644 --- a/app/chain/site.py +++ b/app/chain/site.py @@ -23,8 +23,8 @@ from app.application.messaging.site import ( ) from app.application.rss import RssHelper from app.runtime.log import logger -from app.schemas import MessageChannel, Notification, SiteUserData -from app.schemas.types import EventType, NotificationType +from app.schemas import NotificationChannel, Message, SiteUserData +from app.schemas.types import EventType, MessageType from app.adapters.network.http import RequestUtils from app.domain.site import SiteUtils from app.domain import site as site_rules @@ -77,8 +77,8 @@ class SiteChain(ChainBase): # 低分享率警告 if userdata.ratio and float(userdata.ratio) < 1 and not bool( re.search(r"(贵宾|VIP?)", userdata.user_level or "", re.IGNORECASE)): - self.post_message(Notification( - mtype=NotificationType.SiteMessage, + self.post_message(Message( + mtype=MessageType.SiteMessage, title=f"【站点分享率低预警】", text=f"站点 {site.get('name')} 分享率 {userdata.ratio}，请注意！" )) @@ -94,8 +94,8 @@ class SiteChain(ChainBase): if not userdata.message_unread: return if not userdata.message_unread_contents: - self.post_message(Notification( - mtype=NotificationType.SiteMessage, + self.post_message(Message( + mtype=MessageType.SiteMessage, title=f"站点 {site.get('name')} 收到 " f"{userdata.message_unread} 条新消息，请登陆查看", link=site.get("url") @@ -108,9 +108,9 @@ class SiteChain(ChainBase): continue msg_title = f"【站点 {site.get('name')} 消息】" msg_text = f"时间：{date}\n标题：{head}\n内容：\n{content}" - self.post_message(Notification( + self.post_message(Message( source=message_source, - mtype=NotificationType.SiteMessage, + mtype=MessageType.SiteMessage, title=msg_title, text=msg_text, link=site.get("url") @@ -755,7 +755,7 @@ class SiteChain(ChainBase): def remote_list( self, arg_str: str = "", - channel: MessageChannel = None, + channel: NotificationChannel = None, userid: Union[str, int] = None, source: Optional[str] = None, ): @@ -776,7 +776,7 @@ class SiteChain(ChainBase): def handle_callback_interaction( self, callback_data: str, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -796,7 +796,7 @@ class SiteChain(ChainBase): def handle_text_interaction( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -812,7 +812,7 @@ class SiteChain(ChainBase): ) - def remote_disable(self, arg_str: str, channel: MessageChannel, + def remote_disable(self, arg_str: str, channel: NotificationChannel, userid: Union[str, int] = None, source: Optional[str] = None): """ 禁用站点 @@ -826,7 +826,7 @@ class SiteChain(ChainBase): siteoper = SiteOper() site = siteoper.get(site_id) if not site: - self.post_message(Notification( + self.post_message(Message( channel=channel, title=f"站点编号 {site_id} 不存在！", userid=userid, @@ -839,7 +839,7 @@ class SiteChain(ChainBase): # 重新发送消息 self.remote_list(channel=channel, userid=userid, source=source) - def remote_enable(self, arg_str: str, channel: MessageChannel, + def remote_enable(self, arg_str: str, channel: NotificationChannel, userid: Union[str, int] = None, source: Optional[str] = None): """ 启用站点 @@ -855,7 +855,7 @@ class SiteChain(ChainBase): site_id = int(arg_str) site = siteoper.get(site_id) if not site: - self.post_message(Notification( + self.post_message(Message( channel=channel, title=f"站点编号 {site_id} 不存在！", userid=userid, @@ -899,7 +899,7 @@ class SiteChain(ChainBase): return True, msg return False, "未知错误" - def remote_cookie(self, arg_str: str, channel: MessageChannel, + def remote_cookie(self, arg_str: str, channel: NotificationChannel, userid: Union[str, int] = None, source: Optional[str] = None): """ 使用用户名密码更新站点Cookie @@ -907,7 +907,7 @@ class SiteChain(ChainBase): err_title = "请输入正确的命令格式：/site_cookie [id] [username] [password] [2fa_code/secret]，" \ "[id]为站点编号，[uername]为站点用户名，[password]为站点密码，[2fa_code/secret]为站点二步验证码或密钥" if not arg_str: - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title=err_title, @@ -921,7 +921,7 @@ class SiteChain(ChainBase): if len(args) == 4: two_step_code = args[3] elif len(args) != 3: - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title=err_title, @@ -930,7 +930,7 @@ class SiteChain(ChainBase): return site_id = args[0] if not site_id.isdigit(): - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title=err_title, @@ -942,14 +942,14 @@ class SiteChain(ChainBase): # 站点信息 site_info = SiteOper().get(site_id) if not site_info: - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title=f"站点编号 {site_id} 不存在！", userid=userid, save_history=False)) return - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title=f"开始更新【{site_info.name}】Cookie&UA ...", @@ -966,7 +966,7 @@ class SiteChain(ChainBase): two_step_code=two_step_code) if not status: logger.error(msg) - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title=f"【{site_info.name}】 Cookie&UA更新失败！", @@ -974,20 +974,20 @@ class SiteChain(ChainBase): userid=userid, save_history=False)) else: - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title=f"【{site_info.name}】 Cookie&UA更新成功", userid=userid, save_history=False)) - def remote_refresh_userdatas(self, channel: MessageChannel, + def remote_refresh_userdatas(self, channel: NotificationChannel, userid: Union[str, int] = None, source: Optional[str] = None): """ 刷新所有站点用户数据 """ logger.info("收到命令，开始刷新站点数据 ...") - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title="开始刷新站点数据 ...", @@ -1030,7 +1030,7 @@ class SiteChain(ChainBase): f"总上传：{size_tools.format_compact_size(incUploads)}\n" f"总下载：{size_tools.format_compact_size(incDownloads)}\n" f"————————————") - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title="【站点数据统计】", @@ -1039,7 +1039,7 @@ class SiteChain(ChainBase): save_history=False )) else: - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title="没有刷新到任何站点数据！", diff --git a/app/chain/subscribe.py b/app/chain/subscribe.py index 60cb3f923..00e020499 100644 --- a/app/chain/subscribe.py +++ b/app/chain/subscribe.py @@ -43,7 +43,7 @@ from app.application.torrent import TorrentHelper from app.runtime.log import logger from app.schemas import (SubscribeEpisodesRefreshEventData, SubscribeCompletionCheckEventData) -from app.schemas.types import MUSIC_ENTITY_ALBUM, MUSIC_ENTITY_RECORDING, MediaSource, MediaType, SystemConfigKey, MessageChannel, NotificationType, EventType, ChainEventType, \ +from app.schemas.types import MUSIC_ENTITY_ALBUM, MUSIC_ENTITY_RECORDING, MediaSource, MediaType, SystemConfigKey, NotificationChannel, MessageType, EventType, ChainEventType, \ ContentType from app.domain.media import MUSIC_SUBSCRIBABLE_TYPES from app.schemas.media import build_media_key, normalize_media_source, resolve_media_identity @@ -840,7 +840,7 @@ class SubscribeChain(ChainBase): mtype: MediaType = None, episode_group: Optional[str] = None, season: Optional[int] = None, - channel: MessageChannel = None, + channel: NotificationChannel = None, source: Optional[str] = None, userid: Optional[str] = None, username: Optional[str] = None, @@ -983,9 +983,9 @@ class SubscribeChain(ChainBase): logger.error(f'{mediainfo.title_year} {err_msg}') if not exist_ok and message: # 失败发回原用户 - self.post_message(schemas.Notification(channel=channel, + self.post_message(schemas.Message(channel=channel, source=source, - mtype=NotificationType.Subscribe, + mtype=MessageType.Subscribe, title=f"{mediainfo.title_year} {metainfo.season} " f"添加订阅失败！", text=f"{err_msg}", @@ -1001,10 +1001,10 @@ class SubscribeChain(ChainBase): link = settings.MP_DOMAIN('#/subscribe/movie?tab=mysub') # 订阅成功按规则发送消息 self.post_message( - schemas.Notification( + schemas.Message( channel=channel, source=source, - mtype=NotificationType.Subscribe, + mtype=MessageType.Subscribe, ctype=ContentType.SubscribeAdded, image=mediainfo.get_message_image(), link=link, @@ -1044,7 +1044,7 @@ class SubscribeChain(ChainBase): mtype: MediaType = None, episode_group: Optional[str] = None, season: Optional[int] = None, - channel: MessageChannel = None, + channel: NotificationChannel = None, source: Optional[str] = None, userid: Optional[str] = None, username: Optional[str] = None, @@ -1187,9 +1187,9 @@ class SubscribeChain(ChainBase): logger.error(f'{mediainfo.title_year} {err_msg}') if not exist_ok and message: # 失败发回原用户 - await self.async_post_message(schemas.Notification(channel=channel, + await self.async_post_message(schemas.Message(channel=channel, source=source, - mtype=NotificationType.Subscribe, + mtype=MessageType.Subscribe, title=f"{mediainfo.title_year} {metainfo.season} " f"添加订阅失败！", text=f"{err_msg}", @@ -1205,10 +1205,10 @@ class SubscribeChain(ChainBase): link = settings.MP_DOMAIN('#/subscribe/movie?tab=mysub') # 订阅成功按规则发送消息 await self.async_post_message( - schemas.Notification( + schemas.Message( channel=channel, source=source, - mtype=NotificationType.Subscribe, + mtype=MessageType.Subscribe, ctype=ContentType.SubscribeAdded, image=mediainfo.get_message_image(), link=link, @@ -3218,8 +3218,8 @@ class SubscribeChain(ChainBase): link = settings.MP_DOMAIN('#/subscribe/movie?tab=mysub') # 完成订阅按规则发送消息 self.post_message( - schemas.Notification( - mtype=NotificationType.Subscribe, + schemas.Message( + mtype=MessageType.Subscribe, ctype=ContentType.SubscribeComplete, image=mediainfo.get_message_image(), link=link, @@ -3250,7 +3250,7 @@ class SubscribeChain(ChainBase): def remote_list( self, arg_str: str = "", - channel: MessageChannel = None, + channel: NotificationChannel = None, userid: Union[str, int] = None, source: Optional[str] = None, ): @@ -3271,7 +3271,7 @@ class SubscribeChain(ChainBase): def handle_callback_interaction( self, callback_data: str, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -3291,7 +3291,7 @@ class SubscribeChain(ChainBase): def handle_text_interaction( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -3307,13 +3307,13 @@ class SubscribeChain(ChainBase): ) - def remote_delete(self, arg_str: str, channel: MessageChannel, + def remote_delete(self, arg_str: str, channel: NotificationChannel, userid: Union[str, int] = None, source: Optional[str] = None): """ 删除订阅 """ if not arg_str: - self.post_message(schemas.Notification( + self.post_message(schemas.Message( channel=channel, source=source, title="请输入正确的命令格式：/subscribe_delete [id]，" @@ -3330,7 +3330,7 @@ class SubscribeChain(ChainBase): subscribe_id = int(arg_str) subscribe = subscribeoper.get(subscribe_id) if not subscribe: - self.post_message(schemas.Notification( + self.post_message(schemas.Message( channel=channel, source=source, title=f"订阅编号 {subscribe_id} 不存在！", userid=userid, diff --git a/app/chain/system.py b/app/chain/system.py index c6adf1294..c2db1cf24 100644 --- a/app/chain/system.py +++ b/app/chain/system.py @@ -9,7 +9,7 @@ from app.runtime.config import settings from app.runtime.extensions.plugin_manager import PluginManager from app.runtime.state import SystemHelper from app.runtime.log import logger -from app.schemas import Notification, MessageChannel +from app.schemas import Message, NotificationChannel from app.adapters.network.http import RequestUtils from app.adapters.system.host import SystemUtils from version import FRONTEND_VERSION, APP_VERSION @@ -22,24 +22,24 @@ class SystemChain(ChainBase): _restart_file = "__system_restart__" - def remote_clear_cache(self, channel: MessageChannel, userid: Union[int, str], source: Optional[str] = None): + def remote_clear_cache(self, channel: NotificationChannel, userid: Union[int, str], source: Optional[str] = None): """ 清理系统缓存 """ self.clear_cache() - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title=f"缓存清理完成！", userid=userid, save_history=False)) - def restart(self, channel: MessageChannel, userid: Union[int, str], source: Optional[str] = None): + def restart(self, channel: NotificationChannel, userid: Union[int, str], source: Optional[str] = None): """ 重启系统 """ if channel and userid: - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title="系统正在重启，请耐心等候！", @@ -180,11 +180,11 @@ class SystemChain(ChainBase): title += f"当前前端版本：{front_local_version}，远程版本：{front_release_version}" return title - def version(self, channel: MessageChannel, userid: Union[int, str], source: Optional[str] = None): + def version(self, channel: NotificationChannel, userid: Union[int, str], source: Optional[str] = None): """ 查看当前版本、远程版本 """ - self.post_message(Notification( + self.post_message(Message( channel=channel, source=source, title=self.__get_version_message(), @@ -203,13 +203,13 @@ class SystemChain(ChainBase): if not isinstance(restart_channel, dict): restart_channel = json.loads(restart_channel) channel = next( - (channel for channel in MessageChannel.__members__.values() if + (channel for channel in NotificationChannel.__members__.values() if channel.value == restart_channel.get('channel')), None) userid = restart_channel.get('userid') # 版本号 title = self.__get_version_message() - self.post_message(Notification( + self.post_message(Message( channel=channel, title=f"系统已重启完成！\n{title}", userid=userid, diff --git a/app/chain/torrents.py b/app/chain/torrents.py index 30c7bfc9b..552b52975 100644 --- a/app/chain/torrents.py +++ b/app/chain/torrents.py @@ -17,8 +17,8 @@ from app.db.oper.systemconfig import SystemConfigOper from app.application.rss import RssHelper from app.application.torrent import TorrentHelper from app.runtime.log import logger -from app.schemas import Notification -from app.schemas.types import SystemConfigKey, MessageChannel, NotificationType, MediaType +from app.schemas import Message +from app.schemas.types import SystemConfigKey, NotificationChannel, MessageType, MediaType from app.schemas.media import resolve_media_identity from app.domain import site as site_rules from app.foundation import text as text_tools @@ -44,17 +44,17 @@ class TorrentsChain(ChainBase): return self._spider_file return self._rss_file - def remote_refresh(self, channel: MessageChannel, userid: Union[str, int] = None): + def remote_refresh(self, channel: NotificationChannel, userid: Union[str, int] = None): """ 远程刷新订阅，发送消息 """ - self.post_message(Notification( + self.post_message(Message( channel=channel, title=f"开始刷新种子 ...", userid=userid, save_history=False)) self.refresh() - self.post_message(Notification( + self.post_message(Message( channel=channel, title=f"种子刷新完成！", userid=userid, @@ -830,14 +830,14 @@ class TorrentsChain(ChainBase): else: # 发送消息 self.post_message( - Notification(mtype=NotificationType.SiteMessage, title=f"站点 {domain} RSS链接已过期", + Message(mtype=MessageType.SiteMessage, title=f"站点 {domain} RSS链接已过期", link=settings.MP_DOMAIN('#/site')) ) else: self.post_message( - Notification(mtype=NotificationType.SiteMessage, title=f"站点 {domain} RSS链接已过期", + Message(mtype=MessageType.SiteMessage, title=f"站点 {domain} RSS链接已过期", link=settings.MP_DOMAIN('#/site'))) except Exception as e: logger.error(f"站点 {domain} RSS链接自动获取失败：{str(e)} - {traceback.format_exc()}") - self.post_message(Notification(mtype=NotificationType.SiteMessage, title=f"站点 {domain} RSS链接已过期", + self.post_message(Message(mtype=MessageType.SiteMessage, title=f"站点 {domain} RSS链接已过期", link=settings.MP_DOMAIN('#/site'))) diff --git a/app/chain/transfer.py b/app/chain/transfer.py index 2c4df67e1..50d8f1230 100755 --- a/app/chain/transfer.py +++ b/app/chain/transfer.py @@ -41,7 +41,7 @@ from app.runtime.log import logger from app.schemas import StorageOperSelectionEventData from app.schemas import ( TransferInfo, - Notification, + Message, EpisodeFormat, FileItem, TransferDirectoryConf, @@ -55,8 +55,8 @@ from app.schemas.types import ( EventType, MediaType, ProgressKey, - NotificationType, - MessageChannel, + MessageType, + NotificationChannel, SystemConfigKey, ChainEventType, ContentType, @@ -1537,8 +1537,8 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): # 发送失败消息 self.post_message( - Notification( - mtype=NotificationType.Manual, + Message( + mtype=MessageType.Manual, title=f"{task.mediainfo.title_year} {task.meta.season_episode} 入库失败！", text="\n".join( [ @@ -2396,8 +2396,8 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): transfer_history_oper=transferhis, ) self.post_message( - Notification( - mtype=NotificationType.Manual, + Message( + mtype=MessageType.Manual, title=f"{task.fileitem.name} 未识别到媒体信息，无法入库！", # 历史落库失败时 his 为 None（add_transfer_fail 末尾的 # get_by_src 查不到即返回 None），此时 /redo 无 ID 可用， @@ -4395,7 +4395,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): def remote_transfer( self, arg_str: str, - channel: MessageChannel, + channel: NotificationChannel, userid: Union[str, int] = None, source: Optional[str] = None, ): @@ -4405,7 +4405,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): def args_error(): self.post_message( - Notification( + Message( channel=channel, source=source, title="请输入正确的命令格式：/redo [id] 或 " @@ -4432,7 +4432,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): state, errmsg = self.redo_transfer_history(int(logid)) if not state: self.post_message( - Notification( + Message( channel=channel, title="手动整理失败", source=source, @@ -4469,7 +4469,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): ) if not state: self.post_message( - Notification( + Message( channel=channel, title="手动整理失败", source=source, @@ -4527,7 +4527,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): self, *, callback_data: str, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -4561,7 +4561,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): def _retry_transfer_history( self, history_id: int, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -4570,7 +4570,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): 立即重新整理一条失败的整理记录。 """ self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -4583,7 +4583,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): state, errmsg = self.redo_transfer_history(history_id) if state: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -4596,7 +4596,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): return self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -4611,7 +4611,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): def _take_over_transfer_history_by_ai( self, history_id: int, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Union[str, int], username: str, @@ -4622,7 +4622,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): if not settings.AI_AGENT_ENABLE: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -4636,7 +4636,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): history = TransferHistoryOper().get(history_id) if not history: self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -4652,7 +4652,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): redo_prompt = build_manual_redo_prompt(history) self.post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -4680,7 +4680,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): allow_message_tools=False, ) await self.async_post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -4694,7 +4694,7 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): ) except Exception as e: await self.async_post_message( - Notification( + Message( channel=channel, source=source, userid=userid, @@ -4966,8 +4966,8 @@ class TransferChain(ChainBase, ConfigReloadMixin, metaclass=Singleton): :param username: 用户名 """ self.post_message( - Notification( - mtype=NotificationType.Organize, + Message( + mtype=MessageType.Organize, ctype=ContentType.OrganizeSuccess, image=mediainfo.get_message_image(), username=username, diff --git a/app/command.py b/app/command.py index 4211c3bda..1d6982b27 100644 --- a/app/command.py +++ b/app/command.py @@ -17,8 +17,8 @@ from app.application.messaging.skill import SkillInteractionHandler from app.runtime.thread import ThreadHelper from app.runtime.log import logger from app.scheduler import Scheduler -from app.schemas import Notification, CommandRegisterEventData -from app.schemas.types import EventType, MessageChannel, ChainEventType +from app.schemas import Message, CommandRegisterEventData +from app.schemas.types import EventType, NotificationChannel, ChainEventType from app.foundation.reflection import ObjectUtils from app.foundation.singleton import Singleton from app.foundation.collections import DictUtils @@ -292,7 +292,7 @@ class Command(metaclass=Singleton): self, command: Dict[str, any], data_str: Optional[str] = "", - channel: MessageChannel = None, + channel: NotificationChannel = None, source: Optional[str] = None, userid: Union[str, int] = None, ): @@ -303,7 +303,7 @@ class Command(metaclass=Singleton): # 定时服务 if userid: CommandChain().post_message( - Notification( + Message( channel=channel, source=source, title=f"开始执行 {command.get('description')} ...", @@ -316,7 +316,7 @@ class Command(metaclass=Singleton): if userid: CommandChain().post_message( - Notification( + Message( channel=channel, source=source, title=f"{command.get('description')} 执行完成", @@ -393,7 +393,7 @@ class Command(metaclass=Singleton): self, cmd: str, data_str: Optional[str] = "", - channel: MessageChannel = None, + channel: NotificationChannel = None, source: Optional[str] = None, userid: Union[str, int] = None, ) -> None: diff --git a/app/db/oper/agentchat.py b/app/db/oper/agentchat.py index 328f36f37..fed550526 100644 --- a/app/db/oper/agentchat.py +++ b/app/db/oper/agentchat.py @@ -6,7 +6,7 @@ from sqlalchemy.orm import Session from app.db import DbOper from app.db.models.agentchat import AgentChat -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel DEFAULT_AGENT_CHAT_TITLE = "未命名会话" @@ -25,9 +25,9 @@ class AgentChatOper(DbOper): return time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()) @staticmethod - def _channel_value(channel: Optional[Union[MessageChannel, str]]) -> Optional[str]: + def _channel_value(channel: Optional[Union[NotificationChannel, str]]) -> Optional[str]: """获取渠道枚举的字符串值。""" - if isinstance(channel, MessageChannel): + if isinstance(channel, NotificationChannel): return channel.value return channel @@ -92,7 +92,7 @@ class AgentChatOper(DbOper): session_id: str, user_id: Optional[str] = None, username: Optional[str] = None, - channel: Optional[Union[MessageChannel, str]] = None, + channel: Optional[Union[NotificationChannel, str]] = None, source: Optional[str] = None, original_chat_id: Optional[str] = None, client_session_id: Optional[str] = None, @@ -167,7 +167,7 @@ class AgentChatOper(DbOper): user_id: Optional[str], title: Optional[str], username: Optional[str] = None, - channel: Optional[Union[MessageChannel, str]] = None, + channel: Optional[Union[NotificationChannel, str]] = None, source: Optional[str] = None, original_chat_id: Optional[str] = None, client_session_id: Optional[str] = None, @@ -206,7 +206,7 @@ class AgentChatOper(DbOper): user_id: Optional[str] = None, messages: Optional[list[dict]] = None, username: Optional[str] = None, - channel: Optional[Union[MessageChannel, str]] = None, + channel: Optional[Union[NotificationChannel, str]] = None, source: Optional[str] = None, original_chat_id: Optional[str] = None, client_session_id: Optional[str] = None, @@ -250,7 +250,7 @@ class AgentChatOper(DbOper): user_id: Optional[str] = None, messages: Optional[list[dict]] = None, username: Optional[str] = None, - channel: Optional[Union[MessageChannel, str]] = None, + channel: Optional[Union[NotificationChannel, str]] = None, source: Optional[str] = None, original_chat_id: Optional[str] = None, client_session_id: Optional[str] = None, diff --git a/app/db/oper/message.py b/app/db/oper/message.py index 1f3b39e6a..b5194449c 100644 --- a/app/db/oper/message.py +++ b/app/db/oper/message.py @@ -6,7 +6,7 @@ from sqlalchemy.orm import Session from app.db import DbOper from app.db.models.message import Message -from app.schemas import MessageChannel, NotificationType +from app.schemas import NotificationChannel, MessageType class MessageOper(DbOper): @@ -18,9 +18,9 @@ class MessageOper(DbOper): super().__init__(db) def add(self, - channel: Optional[MessageChannel] = None, + channel: Optional[NotificationChannel] = None, source: Optional[str] = None, - mtype: Optional[NotificationType] = None, + mtype: Optional[MessageType] = None, title: Optional[str] = None, text: Optional[str] = None, image: Optional[str] = None, @@ -64,9 +64,9 @@ class MessageOper(DbOper): return Message(**kwargs).create_and_to_dict(self._db) async def async_add(self, - channel: Optional[MessageChannel] = None, + channel: Optional[NotificationChannel] = None, source: Optional[str] = None, - mtype: Optional[NotificationType] = None, + mtype: Optional[MessageType] = None, title: Optional[str] = None, text: Optional[str] = None, image: Optional[str] = None, diff --git a/app/modules/__init__.py b/app/modules/__init__.py index ee8edbee7..5e91bb1bf 100644 --- a/app/modules/__init__.py +++ b/app/modules/__init__.py @@ -5,8 +5,8 @@ from pathlib import Path from app.runtime.extensions.service_registry import ServiceConfigHelper from app.runtime.log import logger -from app.schemas import Notification, NotificationConf, MediaServerConf, DownloaderConf -from app.schemas.types import ModuleType, DownloaderType, MediaServerType, MessageChannel, StorageSchema, \ +from app.schemas import Message, NotificationConf, MediaServerConf, DownloaderConf +from app.schemas.types import ModuleType, DownloaderType, MediaServerType, NotificationChannel, StorageSchema, \ OtherModulesType, SystemConfigKey, MediaRecognizeType from app.runtime.reload import ConfigReloadMixin @@ -69,7 +69,7 @@ class _ModuleBase(ConfigReloadMixin, metaclass=ABCMeta): def get_subtype() -> Union[ DownloaderType, MediaServerType, - MessageChannel, + NotificationChannel, StorageSchema, OtherModulesType, MediaRecognizeType, @@ -214,7 +214,7 @@ class _MessageBase(ServiceBase[TService, NotificationConf]): 初始化消息基类，并设置消息通道 """ super().__init__() - self._channel: Optional[MessageChannel] = None + self._channel: Optional[NotificationChannel] = None def get_configs(self) -> Dict[str, NotificationConf]: """ @@ -227,7 +227,7 @@ class _MessageBase(ServiceBase[TService, NotificationConf]): return {} return {conf.name: conf for conf in configs if conf.type == self._service_name and conf.enabled} - def check_message(self, message: Notification, source: str = None) -> bool: + def check_message(self, message: Message, source: str = None) -> bool: """ 检查消息渠道及消息类型，判断是否处理消息 diff --git a/app/modules/discord/__init__.py b/app/modules/discord/__init__.py index f2e6d7ca3..b18df2d38 100644 --- a/app/modules/discord/__init__.py +++ b/app/modules/discord/__init__.py @@ -14,10 +14,10 @@ from app.runtime.log import logger from app.modules import _ModuleBase, _MessageBase from app.schemas import ( CommandRegisterEventData, - CommingMessage, - MessageChannel, + IncomingMessage, + NotificationChannel, MessageResponse, - Notification, + Message, ) from app.schemas.types import ChainEventType, ModuleType from app.adapters.network.http import RequestUtils @@ -31,7 +31,7 @@ except Exception as err: # ImportError or other load issues register_channel_admin_resolver( - MessageChannel.Discord, + NotificationChannel.Discord, lambda config: resolve_config_principal_ids(config, "DISCORD_ADMINS"), ) @@ -72,7 +72,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): super().init_service( service_name=Discord.__name__.lower(), service_type=Discord ) - self._channel = MessageChannel.Discord + self._channel = NotificationChannel.Discord @staticmethod def get_name() -> str: @@ -86,11 +86,11 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): return ModuleType.Notification @staticmethod - def get_subtype() -> MessageChannel: + def get_subtype() -> NotificationChannel: """ 获取模块子类型 """ - return MessageChannel.Discord + return NotificationChannel.Discord @staticmethod def get_priority() -> int: @@ -170,7 +170,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): def message_parser( self, source: str, body: Any, form: Any, args: Any - ) -> Optional[CommingMessage]: + ) -> Optional[IncomingMessage]: """ 解析消息内容，返回字典，注意以下约定值： userid: 用户ID @@ -213,13 +213,13 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): f"收到来自 {client_config.name} 的 Discord 按钮回调：" f"userid={userid}, username={username}, callback_data={callback_data}" ) - return CommingMessage( - channel=MessageChannel.Discord, + return IncomingMessage( + channel=NotificationChannel.Discord, source=client_config.name, userid=userid, username=username, is_channel_admin=matches_channel_admin( - MessageChannel.Discord, client_config.config, userid + NotificationChannel.Discord, client_config.config, userid ), text=f"CALLBACK:{callback_data}", is_callback=True, @@ -247,13 +247,13 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): f"images={len(images) if images else 0}, audios={len(audio_refs) if audio_refs else 0}, " f"files={len(files) if files else 0}" ) - return CommingMessage( - channel=MessageChannel.Discord, + return IncomingMessage( + channel=NotificationChannel.Discord, source=client_config.name, userid=userid, username=username, is_channel_admin=matches_channel_admin( - MessageChannel.Discord, client_config.config, userid + NotificationChannel.Discord, client_config.config, userid ), text=text, chat_id=str(chat_id) if chat_id else None, @@ -266,7 +266,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): @staticmethod def _extract_images( msg_json: dict, - ) -> Optional[List[CommingMessage.MessageImage]]: + ) -> Optional[List[IncomingMessage.MessageImage]]: """ 从Discord消息中提取图片URL """ @@ -286,7 +286,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): or filename.endswith(DiscordModule._IMAGE_SUFFIXES) ): images.append( - CommingMessage.MessageImage( + IncomingMessage.MessageImage( ref=url, name=attachment.get("filename"), mime_type=attachment.get("content_type"), @@ -317,7 +317,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): @classmethod def _extract_files( cls, msg_json: dict - ) -> Optional[List[CommingMessage.MessageAttachment]]: + ) -> Optional[List[IncomingMessage.MessageAttachment]]: """ 从 Discord 消息中提取非图片/非音频文件。 """ @@ -343,7 +343,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): if is_image or is_audio: continue files.append( - CommingMessage.MessageAttachment( + IncomingMessage.MessageAttachment( ref=f"discord://file/{quote(url, safe='')}", name=attachment.get("filename"), mime_type=attachment.get("content_type"), @@ -366,7 +366,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): return resp.content return None - def post_message(self, message: Notification, **kwargs) -> None: + def post_message(self, message: Message, **kwargs) -> None: """ 发送通知消息 :param message: 消息通知对象 @@ -441,7 +441,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): ) def post_medias_message( - self, message: Notification, medias: List[MediaInfo] + self, message: Message, medias: List[MediaInfo] ) -> None: """ 发送媒体信息选择列表 @@ -464,7 +464,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): ) def post_torrents_message( - self, message: Notification, torrents: List[Context] + self, message: Message, torrents: List[Context] ) -> None: """ 发送种子信息选择列表 @@ -488,7 +488,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): def delete_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, message_id: str, chat_id: Optional[str] = None, @@ -516,7 +516,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): def edit_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, message_id: Union[str, int], chat_id: Union[str, int], @@ -606,7 +606,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): def mark_message_processing_started( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Optional[Union[str, int]] = None, message_id: Optional[Union[str, int]] = None, @@ -642,7 +642,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): def mark_message_processing_finished( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Optional[Union[str, int]] = None, message_id: Optional[Union[str, int]] = None, @@ -667,7 +667,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): chat_id=str(target_chat_id) if target_chat_id else None, ) - def send_direct_message(self, message: Notification) -> Optional[MessageResponse]: + def send_direct_message(self, message: Message) -> Optional[MessageResponse]: """ 直接发送消息并返回消息ID等信息 :param message: 消息体 @@ -716,7 +716,7 @@ class DiscordModule(_ModuleBase, _MessageBase[Discord]): return MessageResponse( message_id=str(message_id) if message_id else None, chat_id=str(chat_id) if chat_id else None, - channel=MessageChannel.Discord, + channel=NotificationChannel.Discord, source=conf.name, success=True, ) diff --git a/app/modules/discord/discord.py b/app/modules/discord/discord.py index f060d1c46..cb0fbb20c 100644 --- a/app/modules/discord/discord.py +++ b/app/modules/discord/discord.py @@ -13,16 +13,16 @@ from app.runtime.config import settings from app.domain.context import MediaInfo, Context from app.domain.metainfo import MetaInfo from app.runtime.log import logger -from app.schemas.types import NotificationType +from app.schemas.types import MessageType from app.foundation import size as size_tools # Discord embed 字段解析白名单 # 只有这些消息类型会使用复杂的字段解析逻辑 PARSE_FIELD_TYPES = { - NotificationType.Download, # 资源下载 - NotificationType.Organize, # 整理入库 - NotificationType.Subscribe, # 订阅 - NotificationType.Manual, # 手动处理 + MessageType.Download, # 资源下载 + MessageType.Organize, # 整理入库 + MessageType.Subscribe, # 订阅 + MessageType.Manual, # 手动处理 } @@ -413,7 +413,7 @@ class Discord: buttons: Optional[List[List[dict]]] = None, original_message_id: Optional[Union[int, str]] = None, original_chat_id: Optional[str] = None, - mtype: Optional["NotificationType"] = None, + mtype: Optional["MessageType"] = None, ) -> Optional[bool]: logger.debug( f"[Discord] send_msg 被调用: userid={userid}, title={title[:50] if title else None}..." @@ -708,7 +708,7 @@ class Discord: buttons: Optional[List[List[dict]]], original_message_id: Optional[Union[int, str]], original_chat_id: Optional[str], - mtype: Optional["NotificationType"] = None, + mtype: Optional["MessageType"] = None, ) -> Tuple[bool, Optional[Dict[str, str]]]: logger.debug( f"[Discord] _send_message: userid={userid}, original_chat_id={original_chat_id}" @@ -887,7 +887,7 @@ class Discord: text: Optional[str], image: Optional[str], link: Optional[str], - mtype: Optional["NotificationType"] = None, + mtype: Optional["MessageType"] = None, ) -> discord.Embed: fields: List[Dict[str, str]] = [] desc_lines: List[str] = [] diff --git a/app/modules/feishu/__init__.py b/app/modules/feishu/__init__.py index f9b5c1def..4c66bf3d0 100644 --- a/app/modules/feishu/__init__.py +++ b/app/modules/feishu/__init__.py @@ -5,12 +5,12 @@ from app.application.messaging.agent import register_channel_admin_resolver, res from app.runtime.log import logger from app.modules import _ModuleBase, _MessageBase from app.modules.feishu.feishu import Feishu -from app.schemas import CommingMessage, MessageChannel, MessageResponse, Notification +from app.schemas import IncomingMessage, NotificationChannel, MessageResponse, Message from app.schemas.types import ModuleType register_channel_admin_resolver( - MessageChannel.Feishu, + NotificationChannel.Feishu, lambda config: resolve_config_principal_ids( config, "FEISHU_ADMINS", "FEISHU_OPEN_ID" ), @@ -20,7 +20,7 @@ register_channel_admin_resolver( class FeishuModule(_ModuleBase, _MessageBase[Feishu]): def init_module(self) -> None: super().init_service(service_name=Feishu.__name__.lower(), service_type=Feishu) - self._channel = MessageChannel.Feishu + self._channel = NotificationChannel.Feishu @staticmethod def get_name() -> str: @@ -31,8 +31,8 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]): return ModuleType.Notification @staticmethod - def get_subtype() -> MessageChannel: - return MessageChannel.Feishu + def get_subtype() -> NotificationChannel: + return NotificationChannel.Feishu @staticmethod def get_priority() -> int: @@ -61,7 +61,7 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]): @staticmethod def _resolve_message_target( - message: Notification, + message: Message, ) -> Tuple[Optional[str], Optional[str], Optional[str]]: """解析发送目标：交互式回复优先回到原会话（群聊@回复必须回原群），其次 open_id，最后回退 user_id 或 chat_id。""" userid = str(message.userid).strip() if message.userid else None @@ -94,7 +94,7 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]): def message_parser( self, source: str, body: Any, form: Any, args: Any - ) -> Optional[CommingMessage]: + ) -> Optional[IncomingMessage]: client_config = self.get_config(source) if not client_config: return None @@ -103,7 +103,7 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]): return None return client.parse_message(body) - def post_message(self, message: Notification, **kwargs) -> None: + def post_message(self, message: Message, **kwargs) -> None: for conf in self.get_configs().values(): if not self.check_message(message, conf.name): continue @@ -156,7 +156,7 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]): original_message_id=str(message.original_message_id) if message.original_message_id else None, ) - def post_medias_message(self, message: Notification, medias: List[MediaInfo]) -> None: + def post_medias_message(self, message: Message, medias: List[MediaInfo]) -> None: for conf in self.get_configs().values(): if not self.check_message(message, conf.name): continue @@ -171,7 +171,7 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]): receive_id_type=receive_id_type, ) - def post_torrents_message(self, message: Notification, torrents: List[Context]) -> None: + def post_torrents_message(self, message: Message, torrents: List[Context]) -> None: for conf in self.get_configs().values(): if not self.check_message(message, conf.name): continue @@ -188,7 +188,7 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]): def edit_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, message_id: Union[str, int], chat_id: Union[str, int], @@ -214,7 +214,7 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]): return True return False - def send_direct_message(self, message: Notification) -> Optional[MessageResponse]: + def send_direct_message(self, message: Message) -> Optional[MessageResponse]: for conf in self.get_configs().values(): if not self.check_message(message, conf.name): continue @@ -285,7 +285,7 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]): return MessageResponse( message_id=result.get("message_id"), chat_id=result.get("chat_id"), - channel=MessageChannel.Feishu, + channel=NotificationChannel.Feishu, source=conf.name, metadata=result.get("metadata"), success=True, @@ -395,7 +395,7 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]): def mark_message_processing_started( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Optional[Union[str, int]] = None, message_id: Optional[Union[str, int]] = None, @@ -431,7 +431,7 @@ class FeishuModule(_ModuleBase, _MessageBase[Feishu]): def mark_message_processing_finished( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Optional[Union[str, int]] = None, message_id: Optional[Union[str, int]] = None, diff --git a/app/modules/feishu/feishu.py b/app/modules/feishu/feishu.py index fce1ffd26..85660eb1c 100644 --- a/app/modules/feishu/feishu.py +++ b/app/modules/feishu/feishu.py @@ -55,8 +55,8 @@ from app.domain.context import Context, MediaInfo from app.db.oper.user import UserOper from app.application.messaging.agent import matches_channel_admin from app.runtime.log import logger -from app.schemas import CommingMessage, Notification -from app.schemas.types import MessageChannel, NotificationType +from app.schemas import IncomingMessage, Message +from app.schemas.types import NotificationChannel, MessageType from app.adapters.network.http import RequestUtils @@ -116,7 +116,7 @@ class Feishu: if not self._admins: return False return not matches_channel_admin( - MessageChannel.Feishu, + NotificationChannel.Feishu, { "FEISHU_ADMINS": ",".join(self._admins), "FEISHU_OPEN_ID": self._default_open_id, @@ -299,8 +299,8 @@ class Feishu: @staticmethod def _parse_message_content(message) -> Tuple[ - str, Optional[List[CommingMessage.MessageImage]], Optional[List[str]], Optional[ - List[CommingMessage.MessageAttachment]]]: + str, Optional[List[IncomingMessage.MessageImage]], Optional[List[str]], Optional[ + List[IncomingMessage.MessageAttachment]]]: """从飞书事件消息体中提取文本、图片、音频和文件引用。""" raw_content = getattr(message, "content", None) if not raw_content: @@ -323,9 +323,9 @@ class Feishu: image_key = str(content.get("image_key") or "").strip() if image_key: if message_id: - images = [CommingMessage.MessageImage(ref=f"feishu://image/{message_id}/{image_key}")] + images = [IncomingMessage.MessageImage(ref=f"feishu://image/{message_id}/{image_key}")] else: - images = [CommingMessage.MessageImage(ref=f"feishu://image/{image_key}")] + images = [IncomingMessage.MessageImage(ref=f"feishu://image/{image_key}")] elif message_type in {"audio", "media", "file"}: file_key = str(content.get("file_key") or "").strip() file_name = str(content.get("file_name") or "").strip() or None @@ -336,7 +336,7 @@ class Feishu: else: resource_path = f"{message_id}/{file_key}" if message_id else file_key files = [ - CommingMessage.MessageAttachment( + IncomingMessage.MessageAttachment( ref=f"feishu://file/{resource_path}/{file_name or 'attachment'}", name=file_name, ) @@ -397,7 +397,7 @@ class Feishu: def _parse_post_message_content( content: dict, message_id: Optional[str] = None, - ) -> Tuple[str, Optional[List[CommingMessage.MessageImage]]]: + ) -> Tuple[str, Optional[List[IncomingMessage.MessageImage]]]: """从飞书富文本消息中提取可转发的文本和图片引用。""" post_body = Feishu._resolve_post_message_body(content) if not post_body: @@ -421,9 +421,9 @@ class Feishu: image_key = str(element.get("image_key") or "").strip() if element.get("tag") == "img" and image_key: if message_id: - images.append(CommingMessage.MessageImage(ref=f"feishu://image/{message_id}/{image_key}")) + images.append(IncomingMessage.MessageImage(ref=f"feishu://image/{message_id}/{image_key}")) else: - images.append(CommingMessage.MessageImage(ref=f"feishu://image/{image_key}")) + images.append(IncomingMessage.MessageImage(ref=f"feishu://image/{image_key}")) element_text = Feishu._parse_post_element_text(element) if element_text: row_parts.append(element_text) @@ -648,7 +648,7 @@ class Feishu: if self._ws_thread and self._ws_thread.is_alive(): self._ws_thread.join(timeout=5) - def parse_message(self, body: Any) -> Optional[CommingMessage]: + def parse_message(self, body: Any) -> Optional[IncomingMessage]: """解析飞书转发到消息入口的 JSON 报文。""" try: message = json.loads(body) if isinstance(body, (str, bytes, bytearray)) else body @@ -685,13 +685,13 @@ class Feishu: receive_id_type="open_id" if open_id else "user_id", ) return None - return CommingMessage( - channel=MessageChannel.Feishu, + return IncomingMessage( + channel=NotificationChannel.Feishu, source=self._name, userid=userid, username=username, is_channel_admin=matches_channel_admin( - MessageChannel.Feishu, + NotificationChannel.Feishu, { "FEISHU_ADMINS": ",".join(self._admins), "FEISHU_OPEN_ID": self._default_open_id, @@ -707,7 +707,7 @@ class Feishu: ) text = (message.get("text") or "").strip() - images = CommingMessage.MessageImage.normalize_list(message.get("images")) + images = IncomingMessage.MessageImage.normalize_list(message.get("images")) audio_refs = None if isinstance(message.get("audio_refs"), list): audio_refs = [str(item).strip() for item in message.get("audio_refs") if str(item).strip()] or None @@ -716,7 +716,7 @@ class Feishu: normalized_files = [] for item in message.get("files"): if isinstance(item, dict) and item.get("ref"): - normalized_files.append(CommingMessage.MessageAttachment(**item)) + normalized_files.append(IncomingMessage.MessageAttachment(**item)) files = normalized_files or None if not text and not images and not audio_refs and not files: @@ -731,13 +731,13 @@ class Feishu: ) return None - return CommingMessage( - channel=MessageChannel.Feishu, + return IncomingMessage( + channel=NotificationChannel.Feishu, source=self._name, userid=userid, username=username, is_channel_admin=matches_channel_admin( - MessageChannel.Feishu, + NotificationChannel.Feishu, { "FEISHU_ADMINS": ",".join(self._admins), "FEISHU_OPEN_ID": self._default_open_id, @@ -1739,7 +1739,7 @@ class Feishu: def send_notification( self, - message: Notification, + message: Message, userid: Optional[str] = None, chat_id: Optional[str] = None, receive_id_type: Optional[str] = None, @@ -1747,7 +1747,7 @@ class Feishu: ) -> Optional[dict]: """发送通知消息，优先使用交互卡片承载按钮。""" is_streaming_agent_text = ( - message.mtype == NotificationType.Agent + message.mtype == MessageType.Agent and not message.buttons and not message.link ) @@ -1942,7 +1942,7 @@ class Feishu: def send_medias_message( self, - message: Notification, + message: Message, medias: List[MediaInfo], userid: Optional[str] = None, chat_id: Optional[str] = None, @@ -1956,7 +1956,7 @@ class Feishu: image = media.get_message_image() title = getattr(media, "title_year", None) or getattr(media, "title", None) or "未知媒体" lines.append(f"{index}. {title}") - proxy_message = Notification( + proxy_message = Message( title=message.title, text="\n".join(lines), image=image, @@ -1974,7 +1974,7 @@ class Feishu: def send_torrents_message( self, - message: Notification, + message: Message, torrents: List[Context], userid: Optional[str] = None, chat_id: Optional[str] = None, @@ -1986,7 +1986,7 @@ class Feishu: torrent_info = getattr(torrent, "torrent_info", None) title = getattr(torrent_info, "title", None) or getattr(torrent_info, "site_name", None) or "未知种子" lines.append(f"{index}. {title}") - proxy_message = Notification( + proxy_message = Message( title=message.title, text="\n".join(lines), link=message.link, diff --git a/app/modules/qqbot/__init__.py b/app/modules/qqbot/__init__.py index 47583a1e4..39d3be3a9 100644 --- a/app/modules/qqbot/__init__.py +++ b/app/modules/qqbot/__init__.py @@ -17,13 +17,13 @@ from app.application.messaging.agent import ( from app.runtime.log import logger from app.modules import _ModuleBase, _MessageBase from app.modules.qqbot.qqbot import QQBot -from app.schemas import CommingMessage, MessageChannel, Notification +from app.schemas import IncomingMessage, NotificationChannel, Message from app.schemas.types import ModuleType from app.adapters.network.http import RequestUtils register_channel_admin_resolver( - MessageChannel.QQ, + NotificationChannel.QQ, lambda config: resolve_config_principal_ids( config, "QQBOT_ADMINS", "QQ_OPENID" ), @@ -60,7 +60,7 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): def init_module(self) -> None: super().init_service(service_name=QQBot.__name__.lower(), service_type=QQBot) - self._channel = MessageChannel.QQ + self._channel = NotificationChannel.QQ @staticmethod def get_name() -> str: @@ -71,8 +71,8 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): return ModuleType.Notification @staticmethod - def get_subtype() -> MessageChannel: - return MessageChannel.QQ + def get_subtype() -> NotificationChannel: + return NotificationChannel.QQ @staticmethod def get_priority() -> int: @@ -121,7 +121,7 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): if not admins: return False return not matches_channel_admin( - MessageChannel.QQ, + NotificationChannel.QQ, config, *user_ids, ) @@ -138,7 +138,7 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): def message_parser( self, source: str, body: Any, form: Any, args: Any - ) -> Optional[CommingMessage]: + ) -> Optional[IncomingMessage]: """ 解析 Gateway 转发的 QQ 消息 body 格式: {"type": "C2C_MESSAGE_CREATE"|"GROUP_AT_MESSAGE_CREATE", "content": "...", "author": {...}, "id": "...", ...} @@ -181,13 +181,13 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): f"text={(content or '')[:50]}..., 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.QQ, + return IncomingMessage( + channel=NotificationChannel.QQ, source=client_config.name, userid=user_openid, username=user_openid, is_channel_admin=matches_channel_admin( - MessageChannel.QQ, + NotificationChannel.QQ, client_config.config, user_openid, ), @@ -212,13 +212,13 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): f"text={(content or '')[:50]}..., 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.QQ, + return IncomingMessage( + channel=NotificationChannel.QQ, source=client_config.name, userid=userid, username=member_openid or group_openid, is_channel_admin=matches_channel_admin( - MessageChannel.QQ, + NotificationChannel.QQ, client_config.config, member_openid, ), @@ -232,8 +232,8 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): @classmethod def _extract_images( cls, msg_body: dict - ) -> Optional[List[CommingMessage.MessageImage]]: - images: List[CommingMessage.MessageImage] = [] + ) -> Optional[List[IncomingMessage.MessageImage]]: + images: List[IncomingMessage.MessageImage] = [] attachments = msg_body.get("attachments") or [] if isinstance(attachments, list): for attachment in attachments: @@ -254,7 +254,7 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): ).lower() if content_type.startswith("image/") or filename.endswith(cls._IMAGE_SUFFIXES): images.append( - CommingMessage.MessageImage( + IncomingMessage.MessageImage( ref=url, name=attachment.get("filename") or attachment.get("name"), mime_type=attachment.get("content_type") @@ -266,18 +266,18 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): for key in ("image", "image_url", "pic_url"): value = msg_body.get(key) if isinstance(value, str) and value.startswith("http"): - images.append(CommingMessage.MessageImage(ref=value)) + images.append(IncomingMessage.MessageImage(ref=value)) extra_images = msg_body.get("images") if isinstance(extra_images, list): for item in extra_images: if isinstance(item, str) and item.startswith("http"): - images.append(CommingMessage.MessageImage(ref=item)) + images.append(IncomingMessage.MessageImage(ref=item)) elif isinstance(item, dict): url = item.get("url") or item.get("image_url") if isinstance(url, str) and url.startswith("http"): images.append( - CommingMessage.MessageImage( + IncomingMessage.MessageImage( ref=url, name=item.get("name") or item.get("filename"), mime_type=item.get("content_type") @@ -325,8 +325,8 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): @classmethod def _extract_files( cls, msg_body: dict - ) -> Optional[List[CommingMessage.MessageAttachment]]: - files: List[CommingMessage.MessageAttachment] = [] + ) -> Optional[List[IncomingMessage.MessageAttachment]]: + files: List[IncomingMessage.MessageAttachment] = [] attachments = msg_body.get("attachments") or [] if isinstance(attachments, list): for attachment in attachments: @@ -352,7 +352,7 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): if is_image or is_audio: continue files.append( - CommingMessage.MessageAttachment( + IncomingMessage.MessageAttachment( ref=f"qq://file/{quote(url, safe='')}", name=attachment.get("filename") or attachment.get("name"), mime_type=attachment.get("content_type") @@ -376,7 +376,7 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): return resp.content return None - def post_message(self, message: Notification, **kwargs) -> None: + def post_message(self, message: Message, **kwargs) -> None: for conf in self.get_configs().values(): if not self.check_message(message, conf.name): continue @@ -400,7 +400,7 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): targets=targets, ) - def post_medias_message(self, message: Notification, medias: List[MediaInfo]) -> None: + def post_medias_message(self, message: Message, medias: List[MediaInfo]) -> None: for conf in self.get_configs().values(): if not self.check_message(message, conf.name): continue @@ -423,7 +423,7 @@ class QQBotModule(_ModuleBase, _MessageBase[QQBot]): ) def post_torrents_message( - self, message: Notification, torrents: List[Context] + self, message: Message, torrents: List[Context] ) -> None: for conf in self.get_configs().values(): if not self.check_message(message, conf.name): diff --git a/app/modules/slack/__init__.py b/app/modules/slack/__init__.py index 631ae5304..dc4f90ad4 100644 --- a/app/modules/slack/__init__.py +++ b/app/modules/slack/__init__.py @@ -16,17 +16,17 @@ from app.modules import _ModuleBase, _MessageBase from app.modules.slack.slack import Slack from app.schemas import ( CommandRegisterEventData, - CommingMessage, - MessageChannel, + IncomingMessage, + NotificationChannel, MessageResponse, - Notification, + Message, ) from app.schemas.types import ChainEventType, ModuleType from app.foundation.collections import DictUtils register_channel_admin_resolver( - MessageChannel.Slack, + NotificationChannel.Slack, lambda config: resolve_config_principal_ids(config, "SLACK_ADMINS"), ) @@ -53,7 +53,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): 初始化模块 """ super().init_service(service_name=Slack.__name__.lower(), service_type=Slack) - self._channel = MessageChannel.Slack + self._channel = NotificationChannel.Slack @staticmethod def get_name() -> str: @@ -67,11 +67,11 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): return ModuleType.Notification @staticmethod - def get_subtype() -> MessageChannel: + def get_subtype() -> NotificationChannel: """ 获取模块子类型 """ - return MessageChannel.Slack + return NotificationChannel.Slack @staticmethod def get_priority() -> int: @@ -143,7 +143,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): def message_parser( self, source: str, body: Any, form: Any, args: Any - ) -> Optional[CommingMessage]: + ) -> Optional[IncomingMessage]: """ 解析消息内容，返回字典，注意以下约定值： userid: 用户ID @@ -325,13 +325,13 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): ) # 创建包含回调信息的CommingMessage - return CommingMessage( - channel=MessageChannel.Slack, + return IncomingMessage( + channel=NotificationChannel.Slack, source=client_config.name, userid=userid, username=username, is_channel_admin=matches_channel_admin( - MessageChannel.Slack, client_config.config, userid + NotificationChannel.Slack, client_config.config, userid ), text=text, is_callback=True, @@ -382,13 +382,13 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): f"text={text}, images={len(images) if images else 0}, audios={len(audio_refs) if audio_refs else 0}, " f"files={len(files) if files else 0}" ) - return CommingMessage( - channel=MessageChannel.Slack, + return IncomingMessage( + channel=NotificationChannel.Slack, source=client_config.name, userid=userid, username=username, is_channel_admin=matches_channel_admin( - MessageChannel.Slack, client_config.config, userid + NotificationChannel.Slack, client_config.config, userid ), text=text, message_id=message_id, @@ -402,7 +402,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): @staticmethod def _extract_images( msg_json: dict, - ) -> Optional[List[CommingMessage.MessageImage]]: + ) -> Optional[List[IncomingMessage.MessageImage]]: """ 从Slack消息中提取图片URL """ @@ -422,7 +422,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): url = file.get("url_private") or file.get("url_private_download") if url: images.append( - CommingMessage.MessageImage( + IncomingMessage.MessageImage( ref=url, name=file.get("name") or file.get("title"), mime_type=file.get("mimetype"), @@ -457,7 +457,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): @classmethod def _extract_files( cls, msg_json: dict - ) -> Optional[List[CommingMessage.MessageAttachment]]: + ) -> Optional[List[IncomingMessage.MessageAttachment]]: """ 从 Slack 消息中提取非图片/非音频文件。 """ @@ -487,7 +487,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): if not url: continue attachments.append( - CommingMessage.MessageAttachment( + IncomingMessage.MessageAttachment( ref=f"slack://file/{quote(url, safe='')}", name=file.get("name") or file.get("title"), mime_type=file.get("mimetype"), @@ -536,7 +536,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): return content return None - def post_message(self, message: Notification, **kwargs) -> None: + def post_message(self, message: Message, **kwargs) -> None: """ 发送消息 :param message: 消息 @@ -575,7 +575,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): ) def post_medias_message( - self, message: Notification, medias: List[MediaInfo] + self, message: Message, medias: List[MediaInfo] ) -> None: """ 发送媒体信息选择列表 @@ -598,7 +598,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): ) def post_torrents_message( - self, message: Notification, torrents: List[Context] + self, message: Message, torrents: List[Context] ) -> None: """ 发送种子信息选择列表 @@ -622,7 +622,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): def delete_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, message_id: str, chat_id: Optional[str] = None, @@ -650,7 +650,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): def edit_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, message_id: Union[str, int], chat_id: Union[str, int], @@ -738,7 +738,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): def mark_message_processing_started( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Optional[Union[str, int]] = None, message_id: Optional[Union[str, int]] = None, @@ -778,7 +778,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): def mark_message_processing_finished( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Optional[Union[str, int]] = None, message_id: Optional[Union[str, int]] = None, @@ -808,7 +808,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): emoji=str(emoji), ) - def send_direct_message(self, message: Notification) -> Optional[MessageResponse]: + def send_direct_message(self, message: Message) -> Optional[MessageResponse]: """ 直接发送消息并返回消息ID等信息 :param message: 消息体 @@ -863,7 +863,7 @@ class SlackModule(_ModuleBase, _MessageBase[Slack]): return MessageResponse( message_id=message_id, chat_id=channel_id, - channel=MessageChannel.Slack, + channel=NotificationChannel.Slack, source=conf.name, success=True, ) diff --git a/app/modules/synologychat/__init__.py b/app/modules/synologychat/__init__.py index d47d8af02..4e0e3ef15 100644 --- a/app/modules/synologychat/__init__.py +++ b/app/modules/synologychat/__init__.py @@ -11,13 +11,13 @@ from app.application.messaging.agent import ( from app.runtime.log import logger from app.modules import _ModuleBase, _MessageBase from app.modules.synologychat.synologychat import SynologyChat -from app.schemas import MessageChannel, CommingMessage, Notification +from app.schemas import NotificationChannel, IncomingMessage, Message from app.schemas.types import ModuleType from app.adapters.network.http import RequestUtils register_channel_admin_resolver( - MessageChannel.SynologyChat, + NotificationChannel.SynologyChat, lambda config: resolve_config_principal_ids(config, "SYNOLOGYCHAT_ADMINS"), ) @@ -54,7 +54,7 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]): """ super().init_service(service_name=SynologyChat.__name__.lower(), service_type=SynologyChat) - self._channel = MessageChannel.SynologyChat + self._channel = NotificationChannel.SynologyChat @staticmethod def get_name() -> str: @@ -68,11 +68,11 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]): return ModuleType.Notification @staticmethod - def get_subtype() -> MessageChannel: + def get_subtype() -> NotificationChannel: """ 获取模块子类型 """ - return MessageChannel.SynologyChat + return NotificationChannel.SynologyChat @staticmethod def get_priority() -> int: @@ -140,7 +140,7 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]): 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 @@ -189,10 +189,10 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]): f"images={len(images) if images else 0}, audios={len(audio_refs) if audio_refs else 0}, " f"files={len(files) if files else 0}" ) - return CommingMessage(channel=MessageChannel.SynologyChat, source=client_config.name, + return IncomingMessage(channel=NotificationChannel.SynologyChat, source=client_config.name, userid=user_id, username=user_name, is_channel_admin=matches_channel_admin( - MessageChannel.SynologyChat, + NotificationChannel.SynologyChat, client_config.config, user_id, ), text=text or "", @@ -204,12 +204,12 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]): @classmethod def _extract_images( cls, message: dict - ) -> Optional[List[CommingMessage.MessageImage]]: + ) -> Optional[List[IncomingMessage.MessageImage]]: images = [] for key in ("file_url", "image_url", "pic_url"): value = message.get(key) if isinstance(value, str) and cls._looks_like_image(value): - images.append(CommingMessage.MessageImage(ref=value)) + images.append(IncomingMessage.MessageImage(ref=value)) for key in ("attachments", "files"): raw_value = message.get(key) @@ -222,12 +222,12 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]): items = parsed if isinstance(parsed, list) else [parsed] for item in items: if isinstance(item, str) and cls._looks_like_image(item): - images.append(CommingMessage.MessageImage(ref=item)) + images.append(IncomingMessage.MessageImage(ref=item)) elif isinstance(item, dict): url = item.get("url") or item.get("file_url") or item.get("image_url") if isinstance(url, str) and cls._looks_like_image(url): images.append( - CommingMessage.MessageImage( + IncomingMessage.MessageImage( ref=url, name=item.get("name") or item.get("filename"), mime_type=item.get("content_type") @@ -306,7 +306,7 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]): @classmethod def _extract_files( cls, message: dict - ) -> Optional[List[CommingMessage.MessageAttachment]]: + ) -> Optional[List[IncomingMessage.MessageAttachment]]: files = [] for key in ("attachments", "files"): raw_value = message.get(key) @@ -336,7 +336,7 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]): if is_image or is_audio: continue files.append( - CommingMessage.MessageAttachment( + IncomingMessage.MessageAttachment( ref=f"synology://file/{quote(url, safe='')}", name=item.get("name") or item.get("filename"), mime_type=item.get("content_type") or item.get("mime_type"), @@ -367,7 +367,7 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]): return resp.content return None - def post_message(self, message: Notification, **kwargs) -> None: + def post_message(self, message: Message, **kwargs) -> None: """ 发送消息 :param message: 消息体 @@ -388,7 +388,7 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]): 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: 消息体 @@ -403,7 +403,7 @@ class SynologyChatModule(_ModuleBase, _MessageBase[SynologyChat]): client.send_medias_msg(title=message.title, 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: 消息体 diff --git a/app/modules/telegram/__init__.py b/app/modules/telegram/__init__.py index fd2841210..597bf7eb9 100644 --- a/app/modules/telegram/__init__.py +++ b/app/modules/telegram/__init__.py @@ -14,9 +14,9 @@ from app.runtime.log import logger from app.modules import _ModuleBase, _MessageBase from app.modules.telegram.telegram import Telegram from app.schemas import ( - MessageChannel, - CommingMessage, - Notification, + NotificationChannel, + IncomingMessage, + Message, CommandRegisterEventData, NotificationConf, MessageResponse, @@ -26,7 +26,7 @@ from app.foundation.collections import DictUtils register_channel_admin_resolver( - MessageChannel.Telegram, + NotificationChannel.Telegram, lambda config: resolve_config_principal_ids( config, "TELEGRAM_ADMINS", "TELEGRAM_CHAT_ID" ), @@ -45,7 +45,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): super().init_service( service_name=Telegram.__name__.lower(), service_type=Telegram ) - self._channel = MessageChannel.Telegram + self._channel = NotificationChannel.Telegram @staticmethod def get_name() -> str: @@ -62,11 +62,11 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): return ModuleType.Notification @staticmethod - def get_subtype() -> MessageChannel: + def get_subtype() -> NotificationChannel: """ 获取模块子类型 """ - return MessageChannel.Telegram + return NotificationChannel.Telegram @staticmethod def get_priority() -> int: @@ -125,14 +125,14 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): if not admins: return False return not matches_channel_admin( - MessageChannel.Telegram, + NotificationChannel.Telegram, config, *user_ids, ) def message_parser( self, source: str, body: Any, form: Any, args: Any - ) -> Optional[CommingMessage]: + ) -> Optional[IncomingMessage]: """ 解析消息内容，返回字典，注意以下约定值： userid: 用户ID @@ -211,7 +211,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): def _handle_callback_query( self, message: dict, client_config: NotificationConf, client: Telegram - ) -> Optional[CommingMessage]: + ) -> Optional[IncomingMessage]: """ 处理按钮回调查询 """ @@ -242,13 +242,13 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): callback_text = f"CALLBACK:{callback_data}" # 创建包含完整回调信息的CommingMessage - return CommingMessage( - channel=MessageChannel.Telegram, + return IncomingMessage( + channel=NotificationChannel.Telegram, source=client_config.name, userid=user_id, username=user_name, is_channel_admin=matches_channel_admin( - MessageChannel.Telegram, + NotificationChannel.Telegram, client_config.config, user_id, ), @@ -265,7 +265,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): def _handle_text_message( self, msg: dict, client_config: NotificationConf, client: Telegram - ) -> Optional[CommingMessage]: + ) -> Optional[IncomingMessage]: """ 处理普通文本消息 """ @@ -323,13 +323,13 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): ) return None - return CommingMessage( - channel=MessageChannel.Telegram, + return IncomingMessage( + channel=NotificationChannel.Telegram, source=client_config.name, userid=user_id, username=user_name, is_channel_admin=matches_channel_admin( - MessageChannel.Telegram, + NotificationChannel.Telegram, client_config.config, user_id, ), @@ -344,7 +344,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): return None @staticmethod - def _extract_images(msg: dict) -> Optional[List[CommingMessage.MessageImage]]: + def _extract_images(msg: dict) -> Optional[List[IncomingMessage.MessageImage]]: """ 从Telegram消息中提取图片file_id """ @@ -355,7 +355,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): file_id = largest_photo.get("file_id") if file_id: images.append( - CommingMessage.MessageImage( + IncomingMessage.MessageImage( ref=f"tg://file_id/{file_id}", mime_type="image/jpeg", size=largest_photo.get("file_size"), @@ -368,7 +368,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): mime_type = document.get("mime_type", "") if file_id and mime_type.startswith("image/"): images.append( - CommingMessage.MessageImage( + IncomingMessage.MessageImage( ref=f"tg://file_id/{file_id}", name=document.get("file_name"), mime_type=document.get("mime_type"), @@ -399,7 +399,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): return audio_refs if audio_refs else None @staticmethod - def _extract_files(msg: dict) -> Optional[List[CommingMessage.MessageAttachment]]: + def _extract_files(msg: dict) -> Optional[List[IncomingMessage.MessageAttachment]]: """ 从 Telegram 消息中提取非图片文件附件。 """ @@ -413,7 +413,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): return None return [ - CommingMessage.MessageAttachment( + IncomingMessage.MessageAttachment( ref=f"tg://document_file_id/{file_id}", name=document.get("file_name"), mime_type=document.get("mime_type"), @@ -504,7 +504,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): return cleaned - def post_message(self, message: Notification, **kwargs) -> None: + def post_message(self, message: Message, **kwargs) -> None: """ 发送消息 :param message: 消息体 @@ -562,7 +562,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): ) def post_medias_message( - self, message: Notification, medias: List[MediaInfo] + self, message: Message, medias: List[MediaInfo] ) -> None: """ 发送媒体信息选择列表 @@ -587,7 +587,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): ) def post_torrents_message( - self, message: Notification, torrents: List[Context] + self, message: Message, torrents: List[Context] ) -> None: """ 发送种子信息选择列表 @@ -613,7 +613,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): def delete_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, message_id: int, chat_id: Optional[int] = None, @@ -641,7 +641,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): def edit_message( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, message_id: Union[str, int], chat_id: Union[str, int], @@ -685,7 +685,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): def mark_message_processing_started( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Optional[Union[str, int]] = None, message_id: Optional[Union[str, int]] = None, @@ -718,7 +718,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): def mark_message_processing_finished( self, - channel: MessageChannel, + channel: NotificationChannel, source: str, userid: Optional[Union[str, int]] = None, message_id: Optional[Union[str, int]] = None, @@ -741,7 +741,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): return False return client.stop_typing(chat_id=chat_id, userid=userid) - def send_direct_message(self, message: Notification) -> Optional[MessageResponse]: + def send_direct_message(self, message: Message) -> Optional[MessageResponse]: """ 直接发送消息并返回消息ID等信息 :param message: 消息体 @@ -789,7 +789,7 @@ class TelegramModule(_ModuleBase, _MessageBase[Telegram]): return MessageResponse( message_id=result.get("message_id"), chat_id=result.get("chat_id"), - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source=conf.name, success=True, ) diff --git a/app/modules/vocechat/__init__.py b/app/modules/vocechat/__init__.py index 2f4b8564b..67b98f570 100644 --- a/app/modules/vocechat/__init__.py +++ b/app/modules/vocechat/__init__.py @@ -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: 消息内容 diff --git a/app/modules/webpush/__init__.py b/app/modules/webpush/__init__.py index df7c12af2..bb2b13dac 100644 --- a/app/modules/webpush/__init__.py +++ b/app/modules/webpush/__init__.py @@ -6,8 +6,8 @@ from pywebpush import webpush, WebPushException from app.runtime.config import global_vars, settings from app.runtime.log import logger from app.modules import _ModuleBase, _MessageBase -from app.schemas import Notification -from app.schemas.types import ModuleType, MessageChannel +from app.schemas import Message +from app.schemas.types import ModuleType, NotificationChannel class WebPushModule(_ModuleBase, _MessageBase): @@ -18,7 +18,7 @@ class WebPushModule(_ModuleBase, _MessageBase): 初始化模块 """ super().init_service(service_name=self.get_name().lower()) - self._channel = MessageChannel.WebPush + self._channel = NotificationChannel.WebPush @staticmethod def get_name() -> str: @@ -32,11 +32,11 @@ class WebPushModule(_ModuleBase, _MessageBase): return ModuleType.Notification @staticmethod - def get_subtype() -> MessageChannel: + def get_subtype() -> NotificationChannel: """ 获取模块子类型 """ - return MessageChannel.WebPush + return NotificationChannel.WebPush @staticmethod def get_priority() -> int: @@ -59,7 +59,7 @@ class WebPushModule(_ModuleBase, _MessageBase): """Web Push 使用全局 VAPID 配置，不提供模块级设置。""" pass - def post_message(self, message: Notification, **kwargs) -> None: + def post_message(self, message: Message, **kwargs) -> None: """ 发送消息 :param message: 消息内容 diff --git a/app/modules/wechat/__init__.py b/app/modules/wechat/__init__.py index 92aece764..87f7037ad 100644 --- a/app/modules/wechat/__init__.py +++ b/app/modules/wechat/__init__.py @@ -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: 消息内容 diff --git a/app/modules/wechat/wechatbot.py b/app/modules/wechat/wechatbot.py index bef6b144c..f704e2c8e 100644 --- a/app/modules/wechat/wechatbot.py +++ b/app/modules/wechat/wechatbot.py @@ -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), diff --git a/app/modules/wechatclawbot/__init__.py b/app/modules/wechatclawbot/__init__.py index d6a8f5734..8ea5b61dd 100644 --- a/app/modules/wechatclawbot/__init__.py +++ b/app/modules/wechatclawbot/__init__.py @@ -11,12 +11,12 @@ from app.application.messaging.agent import ( from app.runtime.log import logger from app.modules import _MessageBase, _ModuleBase from app.modules.wechatclawbot.wechatclawbot import WechatClawBot -from app.schemas import CommingMessage, Notification -from app.schemas.types import MessageChannel, ModuleType, NotificationAction +from app.schemas import IncomingMessage, Message +from app.schemas.types import NotificationChannel, ModuleType, NotificationAction register_channel_admin_resolver( - MessageChannel.WechatClawBot, + NotificationChannel.WechatClawBot, lambda config: resolve_config_principal_ids( config, "WECHATCLAWBOT_ADMINS", "WECHATCLAWBOT_DEFAULT_TARGET" ), @@ -39,7 +39,7 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): super().init_service( service_name=WechatClawBot.__name__.lower(), service_type=WechatClawBot ) - self._channel = MessageChannel.WechatClawBot + self._channel = NotificationChannel.WechatClawBot @staticmethod def get_name() -> str: @@ -52,9 +52,9 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): return ModuleType.Notification @staticmethod - def get_subtype() -> MessageChannel: + def get_subtype() -> NotificationChannel: """获取模块子类型。""" - return MessageChannel.WechatClawBot + return NotificationChannel.WechatClawBot @staticmethod def get_priority() -> int: @@ -85,7 +85,7 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): def channel_manage( self, - channel: MessageChannel, + channel: NotificationChannel, action: NotificationAction, **params: Any, ) -> Optional[Dict[str, Any]]: @@ -207,7 +207,7 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): return normalized or None @staticmethod - def _normalize_files(files: Any) -> Optional[List[CommingMessage.MessageAttachment]]: + def _normalize_files(files: Any) -> Optional[List[IncomingMessage.MessageAttachment]]: """标准化文件附件列表。""" if not files: return None @@ -226,7 +226,7 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): except (TypeError, ValueError): size = None normalized.append( - CommingMessage.MessageAttachment( + IncomingMessage.MessageAttachment( ref=ref, name=item.get("name") or item.get("filename"), mime_type=item.get("mime_type") or item.get("content_type"), @@ -249,7 +249,7 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): def message_parser( self, source: str, body: Any, form: Any, args: Any - ) -> Optional[CommingMessage]: + ) -> Optional[IncomingMessage]: """解析微信 ClawBot 转发到消息入口的 JSON 报文。""" client_config = self.get_config(source) if not client_config: @@ -273,7 +273,7 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): message_id = message.get("message_id") text = str(message.get("text") or "").strip() username = str(message.get("username") or user_id).strip() or user_id - images = CommingMessage.MessageImage.normalize_list(message.get("images")) + images = IncomingMessage.MessageImage.normalize_list(message.get("images")) audio_refs = self._normalize_audio_refs(message.get("audio_refs")) files = self._normalize_files(message.get("files")) if not text and not images and not audio_refs and not files: @@ -295,7 +295,7 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): callback_data = text[9:].strip() if text.startswith("CALLBACK:") else "" is_admin_command = text.startswith("/") or callback_data.startswith("/") is_channel_admin = matches_channel_admin( - MessageChannel.WechatClawBot, + NotificationChannel.WechatClawBot, client_config.config, user_id, ) @@ -311,8 +311,8 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): f"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.WechatClawBot, + return IncomingMessage( + channel=NotificationChannel.WechatClawBot, source=client_config.name, userid=user_id, username=username, @@ -325,7 +325,7 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): files=files, ) - def post_message(self, message: Notification, **kwargs) -> None: + def post_message(self, message: Message, **kwargs) -> None: """发送消息。""" for conf in self.get_configs().values(): if not self.check_message(message, conf.name): @@ -392,7 +392,7 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): return None return client.download_media_bytes(media_ref) - def post_medias_message(self, message: Notification, medias: List[MediaInfo]) -> None: + def post_medias_message(self, message: Message, medias: List[MediaInfo]) -> None: """发送媒体选择列表。""" for conf in self.get_configs().values(): if not self.check_message(message, conf.name): @@ -401,7 +401,7 @@ class WechatClawBotModule(_ModuleBase, _MessageBase[WechatClawBot]): if client: 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: """发送种子选择列表。""" for conf in self.get_configs().values(): if not self.check_message(message, conf.name): diff --git a/app/runtime/compat/manifest.py b/app/runtime/compat/manifest.py index b16d833b1..faa4ffaa8 100644 --- a/app/runtime/compat/manifest.py +++ b/app/runtime/compat/manifest.py @@ -679,6 +679,62 @@ PACKAGE_EXPORTS: Dict[str, Dict[str, SymbolAlias]] = { # 物理模块仍存在、仅部分公开符号迁走时，由导入器在标准 Loader 执行后叠加惰性符号路由。 # canonical 源码不反向依赖兼容层，目标符号也只在旧调用方真正取用时加载。 + +# message/notification 命名统一后的旧符号映射： +# 通知渠道能力归 notification（NotificationChannel），消息收发归 message（Message/MessageType）。 +# 旧名在 app.schemas、app.schemas.message 两个入口都曾公开，共用同一份映射。 +_MESSAGE_NOTIFICATION_SYMBOL_ALIASES: Dict[str, SymbolAlias] = { + "MessageChannel": SymbolAlias( + target_module="app.schemas.types", + target_name="NotificationChannel", + replacement="app.schemas.types.NotificationChannel", + ), + "NotificationType": SymbolAlias( + target_module="app.schemas.types", + target_name="MessageType", + replacement="app.schemas.types.MessageType", + ), + "Notification": SymbolAlias( + target_module="app.schemas.message", + target_name="Message", + replacement="app.schemas.message.Message", + ), + "CommingMessage": SymbolAlias( + target_module="app.schemas.message", + target_name="IncomingMessage", + replacement="app.schemas.message.IncomingMessage", + ), + "NotificationHistoryItem": SymbolAlias( + target_module="app.schemas.message", + target_name="MessageHistoryItem", + replacement="app.schemas.message.MessageHistoryItem", + ), + **{ + old: SymbolAlias( + target_module="app.schemas.message", + target_name=new, + replacement=f"app.schemas.message.{new}", + ) + for old, new in ( + ("NotificationClearScope", "MessageClearScope"), + ("NotificationClearBefore", "MessageClearBefore"), + ("NotificationClearData", "MessageClearData"), + ) + }, + **{ + name: SymbolAlias( + target_module="app.schemas.notification", + target_name=name, + replacement=f"app.schemas.notification.{name}", + ) + for name in ( + "ChannelCapability", + "ChannelCapabilities", + "ChannelCapabilityManager", + ) + }, +} + SYMBOL_ALIASES: Dict[str, Dict[str, SymbolAlias]] = { "app.chain.message": { "MediaInteractionChain": SymbolAlias( @@ -704,12 +760,15 @@ SYMBOL_ALIASES: Dict[str, Dict[str, SymbolAlias]] = { ) }, "app.schemas": { - name: SymbolAlias( - target_module="app.sdk._legacy.transfer", - target_name=name, - replacement=f"app.application.transfer.{name}", - ) - for name in ("TransferTask", "TransferQueue") + **{ + name: SymbolAlias( + target_module="app.sdk._legacy.transfer", + target_name=name, + replacement=f"app.application.transfer.{name}", + ) + for name in ("TransferTask", "TransferQueue") + }, + **_MESSAGE_NOTIFICATION_SYMBOL_ALIASES, }, "app.schemas.transfer": { name: SymbolAlias( @@ -719,4 +778,18 @@ SYMBOL_ALIASES: Dict[str, Dict[str, SymbolAlias]] = { ) for name in ("TransferTask", "TransferQueue") }, + # message/notification 命名统一：通知渠道能力归 notification，消息收发归 message + "app.schemas.types": { + "MessageChannel": SymbolAlias( + target_module="app.schemas.types", + target_name="NotificationChannel", + replacement="app.schemas.types.NotificationChannel", + ), + "NotificationType": SymbolAlias( + target_module="app.schemas.types", + target_name="MessageType", + replacement="app.schemas.types.MessageType", + ), + }, + "app.schemas.message": _MESSAGE_NOTIFICATION_SYMBOL_ALIASES, } diff --git a/app/runtime/extensions/module_manager.py b/app/runtime/extensions/module_manager.py index dd189cecc..c360b434e 100644 --- a/app/runtime/extensions/module_manager.py +++ b/app/runtime/extensions/module_manager.py @@ -5,7 +5,7 @@ from app.runtime.config import settings from app.runtime.events import EventHandlerBinding, eventmanager from app.foundation.reflection import ModuleHelper from app.runtime.log import logger -from app.schemas.types import EventType, ModuleType, DownloaderType, MediaServerType, MessageChannel, StorageSchema, \ +from app.schemas.types import EventType, ModuleType, DownloaderType, MediaServerType, NotificationChannel, StorageSchema, \ OtherModulesType, MediaRecognizeType from app.foundation.reflection import ObjectUtils from app.foundation.singleton import Singleton @@ -20,7 +20,7 @@ class ModuleManager(metaclass=Singleton): SubType = Union[ DownloaderType, MediaServerType, - MessageChannel, + NotificationChannel, StorageSchema, OtherModulesType, MediaRecognizeType, diff --git a/app/runtime/extensions/service_registry.py b/app/runtime/extensions/service_registry.py index 38f559270..7620e52e0 100644 --- a/app/runtime/extensions/service_registry.py +++ b/app/runtime/extensions/service_registry.py @@ -6,7 +6,7 @@ from app.runtime.extensions.module_manager import ModuleManager from app.db.oper.systemconfig import SystemConfigOper from app.runtime.log import logger from app.schemas import DownloaderConf, MediaServerConf, NotificationConf, NotificationSwitchConf, ServiceInfo -from app.schemas.types import NotificationType, SystemConfigKey, ModuleType +from app.schemas.types import MessageType, SystemConfigKey, ModuleType TConf = TypeVar("TConf") @@ -70,7 +70,7 @@ class ServiceConfigHelper: return ServiceConfigHelper.get_configs(SystemConfigKey.NotificationSwitchs, NotificationSwitchConf) @staticmethod - def get_notification_switch(mtype: NotificationType) -> Optional[str]: + def get_notification_switch(mtype: MessageType) -> Optional[str]: """ 获取指定类型的消息通知场景的开关 """ diff --git a/app/scheduler.py b/app/scheduler.py index e009910e5..60f0333b7 100644 --- a/app/scheduler.py +++ b/app/scheduler.py @@ -31,7 +31,7 @@ from app.runtime.extensions.plugin_manager import PluginManager from app.db import SessionFactory from app.db.oper.agenttask import AgentTaskOper from app.db.models.downloadhistory import DownloadHistory, DownloadFiles -from app.db.models.message import Message +from app.db.models.message import Message as MessageModel from app.db.models.siteuserdata import SiteUserData from app.db.models.transferhistory import TransferHistory from app.db.oper.systemconfig import SystemConfigOper @@ -42,7 +42,7 @@ from app.adapters.external.server import MoviePilotServerHelper from app.runtime.extensions.service_registry import ServiceConfigHelper from app.application.site.sites import SitesHelper # pylint: disable=no-name-in-module from app.runtime.log import logger -from app.schemas import Notification, NotificationType, Workflow +from app.schemas import Message, MessageType, Workflow from app.schemas.types import EventType, SystemConfigKey from app.runtime.gc import get_memory_usage from app.runtime.reload import ConfigReloadMixin @@ -198,7 +198,7 @@ class SchedulerChain(ChainBase): "name": "message", "retention_days": message_days, "cutoff": message_cutoff, - "handler": lambda db: Message.delete_before( + "handler": lambda db: MessageModel.delete_before( db=db, before_time=message_cutoff, limit=batch_size, @@ -1567,8 +1567,8 @@ class Scheduler(ConfigReloadMixin, metaclass=SingletonClass): self._auth_count = 0 logger.info(f"{msg} 用户认证成功") SchedulerChain().post_message( - Notification( - mtype=NotificationType.Manual, + Message( + mtype=MessageType.Manual, title="MoviePilot用户认证成功", text=f"使用站点：{msg}，如有插件使用异常，请重启MoviePilot。", link=settings.MP_DOMAIN("#/site"), diff --git a/app/schemas/event.py b/app/schemas/event.py index 920b211e8..f8c12a85a 100644 --- a/app/schemas/event.py +++ b/app/schemas/event.py @@ -4,7 +4,7 @@ from typing import Iterable, Optional, Dict, Any, List, Set, Callable from pydantic import BaseModel, Field, field_validator, model_validator from app.schemas.common import JsonData -from app.schemas.message import MessageChannel +from app.schemas.types import NotificationChannel from app.schemas.file import FileItem from app.schemas.media import OptionalMediaIdentityMixin, RequiredMediaIdentityMixin from app.schemas.types import MediaSource @@ -366,7 +366,7 @@ class ResourceDownloadEventData(ChainEventData): # 输入参数 context (Context): 当前资源上下文 episodes (Set[int]): 需要下载的集数 - channel (MessageChannel): 通知渠道 + channel (NotificationChannel): 通知渠道 origin (str): 来源（消息通知、Subscribe、Manual等） downloader (str): 下载器 options (dict): 其他参数 @@ -380,7 +380,7 @@ class ResourceDownloadEventData(ChainEventData): # 输入参数 context: Any = Field(None, description="当前资源上下文") episodes: Optional[Set[int]] = Field(None, description="需要下载的集数") - channel: Optional[MessageChannel] = Field(None, description="通知渠道") + channel: Optional[NotificationChannel] = Field(None, description="通知渠道") origin: Optional[str] = Field(None, description="来源") downloader: Optional[str] = Field(None, description="下载器") options: Optional[dict] = Field(default={}, description="其他参数") diff --git a/app/schemas/message.py b/app/schemas/message.py index 62ffa2e02..52bad1e17 100644 --- a/app/schemas/message.py +++ b/app/schemas/message.py @@ -1,14 +1,13 @@ -from dataclasses import dataclass from enum import Enum -from typing import Optional, Union, List, Dict, Set, Any +from typing import Optional, Union, List, Dict, Any from pydantic import BaseModel, Field, field_validator from app.schemas.common import JsonData -from app.schemas.types import ContentType, NotificationType, MessageChannel +from app.schemas.types import ContentType, MessageType, NotificationChannel -class NotificationClearScope(str, Enum): +class MessageClearScope(str, Enum): """ 通知中心清理范围。 """ @@ -21,7 +20,8 @@ class NotificationClearScope(str, Enum): Media = "media" -class NotificationClearBefore(BaseModel): + +class MessageClearBefore(BaseModel): """ 通知中心按范围记录的清理时间。 """ @@ -34,6 +34,7 @@ class NotificationClearBefore(BaseModel): media: int = 0 + class MessageResponse(BaseModel): """ 消息发送响应，包含消息ID等信息用于后续编辑 @@ -44,7 +45,7 @@ class MessageResponse(BaseModel): # 聊天ID chat_id: Optional[Union[str, int]] = None # 消息渠道 - channel: Optional[MessageChannel] = None + channel: Optional[NotificationChannel] = None # 消息来源 source: Optional[str] = None # 渠道自定义上下文（如飞书流式卡片 card_id/element_id/sequence） @@ -53,7 +54,7 @@ class MessageResponse(BaseModel): success: bool = False -class NotificationHistoryItem(BaseModel): +class MessageHistoryItem(BaseModel): """ 通知历史记录。 """ @@ -84,17 +85,19 @@ class NotificationHistoryItem(BaseModel): note: Optional[JsonData] = None -class WebMessageItem(NotificationHistoryItem): + +class WebMessageItem(MessageHistoryItem): """Web 消息历史记录。""" -class NotificationClearData(BaseModel): - """通知中心各范围的清理时间。""" +class MessageClearData(BaseModel): + """消息中心各范围的清理时间。""" - clear_before: NotificationClearBefore = Field(description="各范围清理时间") + clear_before: MessageClearBefore = Field(description="各范围清理时间") -class CommingMessage(BaseModel): + +class IncomingMessage(BaseModel): """ 外来消息 """ @@ -110,7 +113,7 @@ class CommingMessage(BaseModel): size: Optional[int] = None @classmethod - def from_value(cls, value: Any) -> Optional["CommingMessage.MessageImage"]: + def from_value(cls, value: Any) -> Optional["IncomingMessage.MessageImage"]: if value is None: return None if isinstance(value, cls): @@ -142,7 +145,7 @@ class CommingMessage(BaseModel): @classmethod def normalize_list( cls, values: Optional[Any] - ) -> Optional[List["CommingMessage.MessageImage"]]: + ) -> Optional[List["IncomingMessage.MessageImage"]]: if not values: return None if not isinstance(values, list): @@ -171,7 +174,7 @@ class CommingMessage(BaseModel): # 渠道适配器依据稳定用户 ID、管理员名单及渠道主用户 ID 生成的授权事实 is_channel_admin: Optional[bool] = None # 消息渠道 - channel: Optional[MessageChannel] = None + channel: Optional[NotificationChannel] = None # 来源（渠道名称） source: Optional[str] = None # 消息体 @@ -205,7 +208,7 @@ class CommingMessage(BaseModel): @classmethod def _normalize_images( cls, value: Any - ) -> Optional[List["CommingMessage.MessageImage"]]: + ) -> Optional[List["IncomingMessage.MessageImage"]]: return cls.MessageImage.normalize_list(value) def to_dict(self): @@ -214,22 +217,23 @@ class CommingMessage(BaseModel): """ items = self.model_dump() for k, v in items.items(): - if isinstance(v, MessageChannel): + if isinstance(v, NotificationChannel): items[k] = v.value return items -class Notification(BaseModel): + +class Message(BaseModel): """ 消息 """ # 消息渠道 - channel: Optional[MessageChannel] = None + channel: Optional[NotificationChannel] = None # 消息来源 source: Optional[str] = None # 消息类型 - mtype: Optional[NotificationType] = None + mtype: Optional[MessageType] = None # 内容类型 ctype: Optional[ContentType] = None # 标题 @@ -281,11 +285,12 @@ class Notification(BaseModel): """ items = self.model_dump() for k, v in items.items(): - if isinstance(v, MessageChannel) or isinstance(v, NotificationType): + if isinstance(v, NotificationChannel) or isinstance(v, MessageType): items[k] = v.value return items + class NotificationSwitch(BaseModel): """ 消息开关 @@ -384,323 +389,3 @@ class AgentWebChoiceRequest(BaseModel): original_message_id: Optional[Union[str, int]] = Field(default=None) # WebAgent 原聊天 ID，用于传统按钮回调原地编辑 original_chat_id: Optional[Union[str, int]] = Field(default=None) - - -class ChannelCapability(Enum): - """ - 渠道能力枚举 - """ - - # 支持内联按钮 - INLINE_BUTTONS = "inline_buttons" - # 支持菜单命令 - MENU_COMMANDS = "menu_commands" - # 支持消息编辑 - MESSAGE_EDITING = "message_editing" - # 支持消息删除 - MESSAGE_DELETION = "message_deletion" - # 支持回调查询 - CALLBACK_QUERIES = "callback_queries" - # 支持富文本 - RICH_TEXT = "rich_text" - # 支持 Markdown - MARKDOWN = "markdown" - # 支持图片 - IMAGES = "images" - # 支持链接 - LINKS = "links" - # 支持原生语音输出 - AUDIO_OUTPUT = "audio_output" - # 支持文件发送 - FILE_SENDING = "file_sending" - # 支持可收口的消息处理状态提示，如 reaction 或 typing - PROCESSING_STATUS = "processing_status" - - -@dataclass -class ChannelCapabilities: - """ - 渠道能力配置 - """ - - channel: MessageChannel - capabilities: Set[ChannelCapability] - max_buttons_per_row: int = 5 - max_button_rows: int = 10 - max_button_text_length: int = 30 - # 单条消息最大长度（0 表示不限制），用于流式输出时自动分段 - max_message_length: int = 0 - fallback_enabled: bool = True - - -class ChannelCapabilityManager: - """ - 渠道能力管理器 - """ - - _capabilities: Dict[MessageChannel, ChannelCapabilities] = { - MessageChannel.Telegram: ChannelCapabilities( - channel=MessageChannel.Telegram, - capabilities={ - ChannelCapability.INLINE_BUTTONS, - ChannelCapability.MENU_COMMANDS, - ChannelCapability.MESSAGE_EDITING, - ChannelCapability.MESSAGE_DELETION, - ChannelCapability.CALLBACK_QUERIES, - ChannelCapability.MARKDOWN, - ChannelCapability.RICH_TEXT, - ChannelCapability.IMAGES, - ChannelCapability.LINKS, - ChannelCapability.AUDIO_OUTPUT, - ChannelCapability.FILE_SENDING, - ChannelCapability.PROCESSING_STATUS, - }, - max_buttons_per_row=4, - max_button_rows=10, - max_button_text_length=30, - # Telegram 文本消息限制 4096 字符，预留空间给 MarkdownV2 转义和标题 - max_message_length=3500, - ), - MessageChannel.Wechat: ChannelCapabilities( - channel=MessageChannel.Wechat, - capabilities={ - ChannelCapability.IMAGES, - ChannelCapability.LINKS, - ChannelCapability.AUDIO_OUTPUT, - ChannelCapability.MENU_COMMANDS, - }, - fallback_enabled=True, - ), - MessageChannel.Feishu: ChannelCapabilities( - channel=MessageChannel.Feishu, - capabilities={ - ChannelCapability.INLINE_BUTTONS, - ChannelCapability.MESSAGE_EDITING, - ChannelCapability.CALLBACK_QUERIES, - ChannelCapability.MARKDOWN, - ChannelCapability.RICH_TEXT, - ChannelCapability.IMAGES, - ChannelCapability.LINKS, - ChannelCapability.AUDIO_OUTPUT, - ChannelCapability.FILE_SENDING, - ChannelCapability.PROCESSING_STATUS, - }, - max_buttons_per_row=3, - max_button_rows=8, - max_button_text_length=20, - max_message_length=30000, - fallback_enabled=True, - ), - MessageChannel.WechatClawBot: ChannelCapabilities( - channel=MessageChannel.WechatClawBot, - capabilities={ - ChannelCapability.MARKDOWN, - ChannelCapability.IMAGES, - ChannelCapability.LINKS, - ChannelCapability.FILE_SENDING, - }, - max_message_length=2800, - fallback_enabled=True, - ), - MessageChannel.Slack: ChannelCapabilities( - channel=MessageChannel.Slack, - capabilities={ - ChannelCapability.INLINE_BUTTONS, - ChannelCapability.MESSAGE_EDITING, - ChannelCapability.MESSAGE_DELETION, - ChannelCapability.CALLBACK_QUERIES, - ChannelCapability.MARKDOWN, - ChannelCapability.RICH_TEXT, - ChannelCapability.IMAGES, - ChannelCapability.LINKS, - ChannelCapability.MENU_COMMANDS, - ChannelCapability.FILE_SENDING, - ChannelCapability.PROCESSING_STATUS, - }, - max_buttons_per_row=3, - max_button_rows=8, - max_button_text_length=25, - # Slack 消息限制 40000 字符，预留空间给格式化 - max_message_length=39000, - fallback_enabled=True, - ), - MessageChannel.Discord: ChannelCapabilities( - channel=MessageChannel.Discord, - capabilities={ - ChannelCapability.INLINE_BUTTONS, - ChannelCapability.MESSAGE_EDITING, - ChannelCapability.MESSAGE_DELETION, - ChannelCapability.CALLBACK_QUERIES, - ChannelCapability.MARKDOWN, - ChannelCapability.RICH_TEXT, - ChannelCapability.IMAGES, - ChannelCapability.LINKS, - ChannelCapability.FILE_SENDING, - ChannelCapability.PROCESSING_STATUS, - }, - max_buttons_per_row=5, - max_button_rows=5, - max_button_text_length=80, - # Discord 消息限制 2000 字符 - max_message_length=1800, - fallback_enabled=True, - ), - MessageChannel.SynologyChat: ChannelCapabilities( - channel=MessageChannel.SynologyChat, - capabilities={ - ChannelCapability.MARKDOWN, - ChannelCapability.RICH_TEXT, - ChannelCapability.IMAGES, - ChannelCapability.LINKS, - }, - fallback_enabled=True, - ), - MessageChannel.VoceChat: ChannelCapabilities( - channel=MessageChannel.VoceChat, - capabilities={ - ChannelCapability.MARKDOWN, - ChannelCapability.RICH_TEXT, - ChannelCapability.IMAGES, - ChannelCapability.LINKS, - }, - fallback_enabled=True, - ), - MessageChannel.WebPush: ChannelCapabilities( - channel=MessageChannel.WebPush, - capabilities={ChannelCapability.LINKS}, - fallback_enabled=True, - ), - MessageChannel.Web: ChannelCapabilities( - channel=MessageChannel.Web, - capabilities={ - ChannelCapability.MARKDOWN, - ChannelCapability.RICH_TEXT, - ChannelCapability.IMAGES, - ChannelCapability.LINKS, - }, - fallback_enabled=True, - ), - MessageChannel.WebAgent: ChannelCapabilities( - channel=MessageChannel.WebAgent, - capabilities={ - ChannelCapability.INLINE_BUTTONS, - ChannelCapability.CALLBACK_QUERIES, - ChannelCapability.MESSAGE_EDITING, - ChannelCapability.MARKDOWN, - ChannelCapability.RICH_TEXT, - ChannelCapability.IMAGES, - ChannelCapability.LINKS, - ChannelCapability.AUDIO_OUTPUT, - ChannelCapability.FILE_SENDING, - }, - fallback_enabled=False, - ), - MessageChannel.QQ: ChannelCapabilities( - channel=MessageChannel.QQ, - capabilities={ - ChannelCapability.RICH_TEXT, - ChannelCapability.IMAGES, - ChannelCapability.LINKS, - ChannelCapability.INLINE_BUTTONS, - ChannelCapability.CALLBACK_QUERIES, - }, - max_buttons_per_row=5, - max_button_rows=5, - max_button_text_length=30, - fallback_enabled=True, - ), - } - - @classmethod - def get_capabilities(cls, channel: MessageChannel) -> Optional[ChannelCapabilities]: - """ - 获取渠道能力 - """ - return cls._capabilities.get(channel) - - @classmethod - def supports_capability( - cls, channel: MessageChannel, capability: ChannelCapability - ) -> bool: - """ - 检查渠道是否支持某项能力 - """ - channel_caps = cls.get_capabilities(channel) - if not channel_caps: - return False - return capability in channel_caps.capabilities - - @classmethod - def supports_buttons(cls, channel: MessageChannel) -> bool: - """ - 检查渠道是否支持按钮 - """ - return cls.supports_capability(channel, ChannelCapability.INLINE_BUTTONS) - - @classmethod - def supports_callbacks(cls, channel: MessageChannel) -> bool: - """ - 检查渠道是否支持回调 - """ - return cls.supports_capability(channel, ChannelCapability.CALLBACK_QUERIES) - - @classmethod - def supports_editing(cls, channel: MessageChannel) -> bool: - """ - 检查渠道是否支持消息编辑 - """ - return cls.supports_capability(channel, ChannelCapability.MESSAGE_EDITING) - - @classmethod - def supports_markdown(cls, channel: MessageChannel) -> bool: - """ - 检查渠道是否支持 Markdown。 - """ - return cls.supports_capability(channel, ChannelCapability.MARKDOWN) - - @classmethod - def supports_deletion(cls, channel: MessageChannel) -> bool: - """ - 检查渠道是否支持消息删除 - """ - return cls.supports_capability(channel, ChannelCapability.MESSAGE_DELETION) - - @classmethod - def get_max_buttons_per_row(cls, channel: MessageChannel) -> int: - """ - 获取每行最大按钮数 - """ - channel_caps = cls.get_capabilities(channel) - return channel_caps.max_buttons_per_row if channel_caps else 2 - - @classmethod - def get_max_button_rows(cls, channel: MessageChannel) -> int: - """ - 获取最大按钮行数 - """ - channel_caps = cls.get_capabilities(channel) - return channel_caps.max_button_rows if channel_caps else 5 - - @classmethod - def get_max_button_text_length(cls, channel: MessageChannel) -> int: - """ - 获取按钮文本最大长度 - """ - channel_caps = cls.get_capabilities(channel) - return channel_caps.max_button_text_length if channel_caps else 20 - - @classmethod - def get_max_message_length(cls, channel: MessageChannel) -> int: - """ - 获取单条消息最大长度（0 表示不限制） - """ - channel_caps = cls.get_capabilities(channel) - return channel_caps.max_message_length if channel_caps else 0 - - @classmethod - def should_use_fallback(cls, channel: MessageChannel) -> bool: - """ - 是否应该使用降级策略 - """ - channel_caps = cls.get_capabilities(channel) - return channel_caps.fallback_enabled if channel_caps else True diff --git a/app/schemas/notification.py b/app/schemas/notification.py index cfb8d01be..e333ece26 100644 --- a/app/schemas/notification.py +++ b/app/schemas/notification.py @@ -1,9 +1,13 @@ -"""通知渠道 API 输出模型。""" +"""通知渠道能力与 API 输出模型。""" -from typing import Optional +from dataclasses import dataclass +from enum import Enum +from typing import Dict, Optional, Set from pydantic import BaseModel, Field +from app.schemas.types import NotificationChannel + class WechatClawBotKnownTarget(BaseModel): """微信 ClawBot 已知消息目标。""" @@ -27,3 +31,323 @@ class WechatClawBotData(BaseModel): known_targets: list[WechatClawBotKnownTarget] = Field(default_factory=list) default_target: Optional[str] = None base_url: Optional[str] = None + + +class ChannelCapability(Enum): + """ + 渠道能力枚举 + """ + + # 支持内联按钮 + INLINE_BUTTONS = "inline_buttons" + # 支持菜单命令 + MENU_COMMANDS = "menu_commands" + # 支持消息编辑 + MESSAGE_EDITING = "message_editing" + # 支持消息删除 + MESSAGE_DELETION = "message_deletion" + # 支持回调查询 + CALLBACK_QUERIES = "callback_queries" + # 支持富文本 + RICH_TEXT = "rich_text" + # 支持 Markdown + MARKDOWN = "markdown" + # 支持图片 + IMAGES = "images" + # 支持链接 + LINKS = "links" + # 支持原生语音输出 + AUDIO_OUTPUT = "audio_output" + # 支持文件发送 + FILE_SENDING = "file_sending" + # 支持可收口的消息处理状态提示，如 reaction 或 typing + PROCESSING_STATUS = "processing_status" + + +@dataclass +class ChannelCapabilities: + """ + 渠道能力配置 + """ + + channel: NotificationChannel + capabilities: Set[ChannelCapability] + max_buttons_per_row: int = 5 + max_button_rows: int = 10 + max_button_text_length: int = 30 + # 单条消息最大长度（0 表示不限制），用于流式输出时自动分段 + max_message_length: int = 0 + fallback_enabled: bool = True + + +class ChannelCapabilityManager: + """ + 渠道能力管理器 + """ + + _capabilities: Dict[NotificationChannel, ChannelCapabilities] = { + NotificationChannel.Telegram: ChannelCapabilities( + channel=NotificationChannel.Telegram, + capabilities={ + ChannelCapability.INLINE_BUTTONS, + ChannelCapability.MENU_COMMANDS, + ChannelCapability.MESSAGE_EDITING, + ChannelCapability.MESSAGE_DELETION, + ChannelCapability.CALLBACK_QUERIES, + ChannelCapability.MARKDOWN, + ChannelCapability.RICH_TEXT, + ChannelCapability.IMAGES, + ChannelCapability.LINKS, + ChannelCapability.AUDIO_OUTPUT, + ChannelCapability.FILE_SENDING, + ChannelCapability.PROCESSING_STATUS, + }, + max_buttons_per_row=4, + max_button_rows=10, + max_button_text_length=30, + # Telegram 文本消息限制 4096 字符，预留空间给 MarkdownV2 转义和标题 + max_message_length=3500, + ), + NotificationChannel.Wechat: ChannelCapabilities( + channel=NotificationChannel.Wechat, + capabilities={ + ChannelCapability.IMAGES, + ChannelCapability.LINKS, + ChannelCapability.AUDIO_OUTPUT, + ChannelCapability.MENU_COMMANDS, + }, + fallback_enabled=True, + ), + NotificationChannel.Feishu: ChannelCapabilities( + channel=NotificationChannel.Feishu, + capabilities={ + ChannelCapability.INLINE_BUTTONS, + ChannelCapability.MESSAGE_EDITING, + ChannelCapability.CALLBACK_QUERIES, + ChannelCapability.MARKDOWN, + ChannelCapability.RICH_TEXT, + ChannelCapability.IMAGES, + ChannelCapability.LINKS, + ChannelCapability.AUDIO_OUTPUT, + ChannelCapability.FILE_SENDING, + ChannelCapability.PROCESSING_STATUS, + }, + max_buttons_per_row=3, + max_button_rows=8, + max_button_text_length=20, + max_message_length=30000, + fallback_enabled=True, + ), + NotificationChannel.WechatClawBot: ChannelCapabilities( + channel=NotificationChannel.WechatClawBot, + capabilities={ + ChannelCapability.MARKDOWN, + ChannelCapability.IMAGES, + ChannelCapability.LINKS, + ChannelCapability.FILE_SENDING, + }, + max_message_length=2800, + fallback_enabled=True, + ), + NotificationChannel.Slack: ChannelCapabilities( + channel=NotificationChannel.Slack, + capabilities={ + ChannelCapability.INLINE_BUTTONS, + ChannelCapability.MESSAGE_EDITING, + ChannelCapability.MESSAGE_DELETION, + ChannelCapability.CALLBACK_QUERIES, + ChannelCapability.MARKDOWN, + ChannelCapability.RICH_TEXT, + ChannelCapability.IMAGES, + ChannelCapability.LINKS, + ChannelCapability.MENU_COMMANDS, + ChannelCapability.FILE_SENDING, + ChannelCapability.PROCESSING_STATUS, + }, + max_buttons_per_row=3, + max_button_rows=8, + max_button_text_length=25, + # Slack 消息限制 40000 字符，预留空间给格式化 + max_message_length=39000, + fallback_enabled=True, + ), + NotificationChannel.Discord: ChannelCapabilities( + channel=NotificationChannel.Discord, + capabilities={ + ChannelCapability.INLINE_BUTTONS, + ChannelCapability.MESSAGE_EDITING, + ChannelCapability.MESSAGE_DELETION, + ChannelCapability.CALLBACK_QUERIES, + ChannelCapability.MARKDOWN, + ChannelCapability.RICH_TEXT, + ChannelCapability.IMAGES, + ChannelCapability.LINKS, + ChannelCapability.FILE_SENDING, + ChannelCapability.PROCESSING_STATUS, + }, + max_buttons_per_row=5, + max_button_rows=5, + max_button_text_length=80, + # Discord 消息限制 2000 字符 + max_message_length=1800, + fallback_enabled=True, + ), + NotificationChannel.SynologyChat: ChannelCapabilities( + channel=NotificationChannel.SynologyChat, + capabilities={ + ChannelCapability.MARKDOWN, + ChannelCapability.RICH_TEXT, + ChannelCapability.IMAGES, + ChannelCapability.LINKS, + }, + fallback_enabled=True, + ), + NotificationChannel.VoceChat: ChannelCapabilities( + channel=NotificationChannel.VoceChat, + capabilities={ + ChannelCapability.MARKDOWN, + ChannelCapability.RICH_TEXT, + ChannelCapability.IMAGES, + ChannelCapability.LINKS, + }, + fallback_enabled=True, + ), + NotificationChannel.WebPush: ChannelCapabilities( + channel=NotificationChannel.WebPush, + capabilities={ChannelCapability.LINKS}, + fallback_enabled=True, + ), + NotificationChannel.Web: ChannelCapabilities( + channel=NotificationChannel.Web, + capabilities={ + ChannelCapability.MARKDOWN, + ChannelCapability.RICH_TEXT, + ChannelCapability.IMAGES, + ChannelCapability.LINKS, + }, + fallback_enabled=True, + ), + NotificationChannel.WebAgent: ChannelCapabilities( + channel=NotificationChannel.WebAgent, + capabilities={ + ChannelCapability.INLINE_BUTTONS, + ChannelCapability.CALLBACK_QUERIES, + ChannelCapability.MESSAGE_EDITING, + ChannelCapability.MARKDOWN, + ChannelCapability.RICH_TEXT, + ChannelCapability.IMAGES, + ChannelCapability.LINKS, + ChannelCapability.AUDIO_OUTPUT, + ChannelCapability.FILE_SENDING, + }, + fallback_enabled=False, + ), + NotificationChannel.QQ: ChannelCapabilities( + channel=NotificationChannel.QQ, + capabilities={ + ChannelCapability.RICH_TEXT, + ChannelCapability.IMAGES, + ChannelCapability.LINKS, + ChannelCapability.INLINE_BUTTONS, + ChannelCapability.CALLBACK_QUERIES, + }, + max_buttons_per_row=5, + max_button_rows=5, + max_button_text_length=30, + fallback_enabled=True, + ), + } + + @classmethod + def get_capabilities(cls, channel: NotificationChannel) -> Optional[ChannelCapabilities]: + """ + 获取渠道能力 + """ + return cls._capabilities.get(channel) + + @classmethod + def supports_capability( + cls, channel: NotificationChannel, capability: ChannelCapability + ) -> bool: + """ + 检查渠道是否支持某项能力 + """ + channel_caps = cls.get_capabilities(channel) + if not channel_caps: + return False + return capability in channel_caps.capabilities + + @classmethod + def supports_buttons(cls, channel: NotificationChannel) -> bool: + """ + 检查渠道是否支持按钮 + """ + return cls.supports_capability(channel, ChannelCapability.INLINE_BUTTONS) + + @classmethod + def supports_callbacks(cls, channel: NotificationChannel) -> bool: + """ + 检查渠道是否支持回调 + """ + return cls.supports_capability(channel, ChannelCapability.CALLBACK_QUERIES) + + @classmethod + def supports_editing(cls, channel: NotificationChannel) -> bool: + """ + 检查渠道是否支持消息编辑 + """ + return cls.supports_capability(channel, ChannelCapability.MESSAGE_EDITING) + + @classmethod + def supports_markdown(cls, channel: NotificationChannel) -> bool: + """ + 检查渠道是否支持 Markdown。 + """ + return cls.supports_capability(channel, ChannelCapability.MARKDOWN) + + @classmethod + def supports_deletion(cls, channel: NotificationChannel) -> bool: + """ + 检查渠道是否支持消息删除 + """ + return cls.supports_capability(channel, ChannelCapability.MESSAGE_DELETION) + + @classmethod + def get_max_buttons_per_row(cls, channel: NotificationChannel) -> int: + """ + 获取每行最大按钮数 + """ + channel_caps = cls.get_capabilities(channel) + return channel_caps.max_buttons_per_row if channel_caps else 2 + + @classmethod + def get_max_button_rows(cls, channel: NotificationChannel) -> int: + """ + 获取最大按钮行数 + """ + channel_caps = cls.get_capabilities(channel) + return channel_caps.max_button_rows if channel_caps else 5 + + @classmethod + def get_max_button_text_length(cls, channel: NotificationChannel) -> int: + """ + 获取按钮文本最大长度 + """ + channel_caps = cls.get_capabilities(channel) + return channel_caps.max_button_text_length if channel_caps else 20 + + @classmethod + def get_max_message_length(cls, channel: NotificationChannel) -> int: + """ + 获取单条消息最大长度（0 表示不限制） + """ + channel_caps = cls.get_capabilities(channel) + return channel_caps.max_message_length if channel_caps else 0 + + @classmethod + def should_use_fallback(cls, channel: NotificationChannel) -> bool: + """ + 是否应该使用降级策略 + """ + channel_caps = cls.get_capabilities(channel) + return channel_caps.fallback_enabled if channel_caps else True diff --git a/app/schemas/types.py b/app/schemas/types.py index d46efbdf4..e4e6d1732 100644 --- a/app/schemas/types.py +++ b/app/schemas/types.py @@ -436,7 +436,7 @@ class MediaImageType(Enum): # 消息类型 -class NotificationType(Enum): +class MessageType(Enum): # 资源下载 Download = "资源下载" # 整理入库 @@ -472,10 +472,10 @@ class ContentType(str, Enum): DownloadAdded = "downloadAdded" -# 消息渠道 -class MessageChannel(Enum): +# 通知渠道 +class NotificationChannel(Enum): """ - 消息渠道 + 通知渠道 """ Wechat = "微信" Feishu = "飞书" diff --git a/app/startup/modules_initializer.py b/app/startup/modules_initializer.py index 0fdedcf14..d8d949332 100644 --- a/app/startup/modules_initializer.py +++ b/app/startup/modules_initializer.py @@ -33,7 +33,7 @@ from app.adapters.external.server import MoviePilotServerHelper from app.db import close_database from app.db.oper.systemconfig import SystemConfigOper from app.command import CommandChain -from app.schemas import Notification, NotificationType +from app.schemas import Message, MessageType from app.schemas.types import SystemConfigKey from app.startup.agent_initializer import init_agent, stop_agent from app.application.security.access import set_superuser_token_payload_provider @@ -148,8 +148,8 @@ def check_auth(): err_msg = "用户认证失败，站点相关功能将无法使用！" MessageHelper().put(f"注意：{err_msg}", title="用户认证", role="system") CommandChain().post_message( - Notification( - mtype=NotificationType.Manual, + Message( + mtype=MessageType.Manual, title="MoviePilot用户认证", text=err_msg, link=settings.MP_DOMAIN('#/site') diff --git a/app/workflow/actions/send_message.py b/app/workflow/actions/send_message.py index 5a640c77b..b5c88a327 100644 --- a/app/workflow/actions/send_message.py +++ b/app/workflow/actions/send_message.py @@ -3,7 +3,7 @@ from typing import List, Optional, Union from pydantic import Field from app.workflow.actions import BaseAction, ActionChain -from app.schemas import ActionParams, ActionContext, Notification +from app.schemas import ActionParams, ActionContext, Message from app.runtime.config import settings @@ -62,7 +62,7 @@ class SendMessageAction(BaseAction): params.client = [""] for client in params.client: ActionChain().post_message( - Notification( + Message( source=client, userid=params.userid, title="【工作流执行结果】", diff --git a/docs/rules/07-naming-conventions.md b/docs/rules/07-naming-conventions.md index af7bc867d..de06f25b6 100644 --- a/docs/rules/07-naming-conventions.md +++ b/docs/rules/07-naming-conventions.md @@ -88,6 +88,25 @@ All new code must follow these conventions. Consistent naming is how the codebas --- +## Message / Notification Domain Boundary + +`message` 与 `notification` 是两个不同的语义域，新增或修改相关代码时必须按职责选名，不得混用： + +| 语义域 | 职责 | 规范命名示例 | +|---|---|---| +| `notification` | 通知渠道能力：渠道枚举、渠道配置、渠道发现、渠道管理、渠道能力描述 | `NotificationChannel`, `NotificationConf`, `NotificationHelper`, `NotificationChain`, `NotificationAction`, `ChannelCapabilityManager`, `ModuleType.Notification`, `channel_manage` | +| `message` | 各渠道发送或接收的消息：消息体、消息类型、消息链、消息历史、消息队列 | `Message`, `MessageType`, `IncomingMessage`, `MessageChain`, `MessageHistoryItem`, `MessageOper`, `post_message`, `message_parser` | + +| 规则 | 说明 | +|---|---| +| 渠道本身用 notification | 渠道是能力提供方，如 `NotificationChannel` 枚举、`NotificationConf` 渠道配置 | +| 消息内容与收发用 message | 消息是被传输的内容，如发送体 `Message`、接收体 `IncomingMessage`、分类 `MessageType` | +| 渠道 × 消息的交叉概念按主导方判断 | 按渠道控制消息开关的 `NotificationSwitch` 属渠道能力；消息历史清理 `MessageClearScope` 属消息 | +| 历史旧名不在源码保留 | `Notification`、`MessageChannel`、`NotificationType`、`CommingMessage` 等旧名仅登记在 `app/runtime/compat/manifest.py` 的 `SYMBOL_ALIASES`，新代码一律使用规范名 | +| 持久化值与外部协议冻结 | 枚举值、`SystemConfigKey` 配置值、DB 表名、API 路径、外部平台字段（如 Jellyfin 的 `NotificationType`）不随命名统一变更 | + +--- + ## Anti-Patterns | Wrong | Correct | @@ -99,5 +118,7 @@ All new code must follow these conventions. Consistent naming is how the codebas | `def handleConfigChanged():` | `def on_config_changed():` or `def handle_config_changed():` | | `SystemConfigOper().get("RssUrls")` | `SystemConfigOper().get(SystemConfigKey.RssUrls)` | | `class subscribe_oper:` | `class SubscribeOper:` | +| `MessageChannel.Telegram`（新代码） | `NotificationChannel.Telegram` | +| `Notification(title=...)`（新代码） | `Message(title=...)` | -*Last Updated: 2026-06-23* +*Last Updated: 2026-08-16* diff --git a/tests/test_agent_add_subscribe_tool.py b/tests/test_agent_add_subscribe_tool.py index ede2ca28d..d90e12501 100644 --- a/tests/test_agent_add_subscribe_tool.py +++ b/tests/test_agent_add_subscribe_tool.py @@ -3,7 +3,7 @@ import unittest from unittest.mock import AsyncMock, patch from app.agent.tools.impl.add_subscribe import AddSubscribeTool -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel class TestAgentAddSubscribeTool(unittest.TestCase): @@ -19,7 +19,7 @@ class TestAgentAddSubscribeTool(unittest.TestCase): def test_tv_subscription_without_season_reports_default_first_season(self): tool = AddSubscribeTool(session_id="session-1", user_id="10001") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="tg_display_name", ) @@ -46,7 +46,7 @@ class TestAgentAddSubscribeTool(unittest.TestCase): def test_subscription_falls_back_to_channel_username_when_no_binding_exists(self): tool = AddSubscribeTool(session_id="session-1", user_id="10001") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="tg_display_name", ) @@ -72,7 +72,7 @@ class TestAgentAddSubscribeTool(unittest.TestCase): def test_feishu_subscription_uses_pre_resolved_username_when_openid_lookup_misses(self): tool = AddSubscribeTool(session_id="session-1", user_id="ou_feishu_user") tool.set_message_attr( - channel=MessageChannel.Feishu.value, + channel=NotificationChannel.Feishu.value, source="feishu-main", username="moviepilot-user", ) diff --git a/tests/test_agent_channel_admin_identity.py b/tests/test_agent_channel_admin_identity.py index 84a80ae52..5ab3a637f 100644 --- a/tests/test_agent_channel_admin_identity.py +++ b/tests/test_agent_channel_admin_identity.py @@ -15,7 +15,7 @@ from app.modules.vocechat import VoceChatModule from app.modules.wechat import WechatModule from app.modules.wechat.wechatbot import WeChatBot from app.modules.wechatclawbot import WechatClawBotModule -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel def _parse_module_message(module, *, config: dict, body, client=None, form=None): @@ -52,19 +52,19 @@ def test_resolve_config_principal_ids_uses_nonempty_stable_values(config, expect ("channel", "config", "principal_ids", "expected"), [ ( - MessageChannel.Telegram, + NotificationChannel.Telegram, {"TELEGRAM_ADMINS": "other", "TELEGRAM_CHAT_ID": "10001"}, (10001,), True, ), ( - MessageChannel.Feishu, + NotificationChannel.Feishu, {"FEISHU_ADMINS": "other", "FEISHU_OPEN_ID": "ou_owner"}, ("ou_owner",), True, ), ( - MessageChannel.Wechat, + NotificationChannel.Wechat, { "WECHAT_MODE": "bot", "WECHAT_ADMINS": "other", @@ -74,7 +74,7 @@ def test_resolve_config_principal_ids_uses_nonempty_stable_values(config, expect True, ), ( - MessageChannel.Wechat, + NotificationChannel.Wechat, { "WECHAT_MODE": "app", "WECHAT_ADMINS": "other", @@ -84,7 +84,7 @@ def test_resolve_config_principal_ids_uses_nonempty_stable_values(config, expect False, ), ( - MessageChannel.WechatClawBot, + NotificationChannel.WechatClawBot, { "WECHATCLAWBOT_ADMINS": "other", "WECHATCLAWBOT_DEFAULT_TARGET": "wxid_owner", @@ -93,25 +93,25 @@ def test_resolve_config_principal_ids_uses_nonempty_stable_values(config, expect True, ), ( - MessageChannel.QQ, + NotificationChannel.QQ, {"QQBOT_ADMINS": "other", "QQ_OPENID": "qq_owner"}, ("qq_owner",), True, ), ( - MessageChannel.Telegram, + NotificationChannel.Telegram, {"TELEGRAM_ADMINS": "other", "TELEGRAM_CHAT_ID": "-10001"}, (10001,), False, ), ( - MessageChannel.Feishu, + NotificationChannel.Feishu, {"FEISHU_ADMINS": "other", "FEISHU_CHAT_ID": "oc_group"}, ("ou_user",), False, ), ( - MessageChannel.QQ, + NotificationChannel.QQ, {"QQBOT_ADMINS": "other", "QQ_GROUP_OPENID": "qq_group"}, ("qq_member",), False, diff --git a/tests/test_agent_image_capability.py b/tests/test_agent_image_capability.py index 4760e78fb..b3740e93c 100644 --- a/tests/test_agent_image_capability.py +++ b/tests/test_agent_image_capability.py @@ -4,7 +4,7 @@ from app.agent import MoviePilotAgent from app.agent.llm import AgentCapabilityManager, LLMHelper from app.chain.message import MessageChain from app.runtime.config import settings -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel def test_llm_supports_image_input_uses_model_catalog_text_only(monkeypatch): @@ -76,7 +76,7 @@ def test_handle_ai_message_routes_text_only_model_images_to_files(monkeypatch): ): chain._handle_ai_message( text="/ai 帮我看看这张图", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", diff --git a/tests/test_agent_image_support.py b/tests/test_agent_image_support.py index b2802af5e..e941ab14b 100644 --- a/tests/test_agent_image_support.py +++ b/tests/test_agent_image_support.py @@ -27,8 +27,8 @@ from app.modules.synologychat import SynologyChatModule from app.modules.vocechat import VoceChatModule from app.modules.wechat import WechatModule from app.modules.wechat.wechatbot import WeChatBot -from app.schemas import CommingMessage, Notification -from app.schemas.types import MessageChannel, NotificationType +from app.schemas import IncomingMessage, Message +from app.schemas.types import NotificationChannel, MessageType class AgentImageSupportTest(unittest.TestCase): @@ -135,8 +135,8 @@ class AgentImageSupportTest(unittest.TestCase): def test_process_allows_image_only_message(self): chain = MessageChain() - message = CommingMessage( - channel=MessageChannel.Telegram, + message = IncomingMessage( + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -154,8 +154,8 @@ class AgentImageSupportTest(unittest.TestCase): def test_process_allows_audio_only_message(self): chain = MessageChain() - message = CommingMessage( - channel=MessageChannel.Telegram, + message = IncomingMessage( + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -173,13 +173,13 @@ class AgentImageSupportTest(unittest.TestCase): def test_process_allows_file_only_message(self): chain = MessageChain() - message = CommingMessage( - channel=MessageChannel.Telegram, + message = IncomingMessage( + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", files=[ - CommingMessage.MessageAttachment( + IncomingMessage.MessageAttachment( ref="tg://document_file_id/doc-1", name="note.txt", mime_type="text/plain", @@ -210,7 +210,7 @@ class AgentImageSupportTest(unittest.TestCase): settings, "AI_AGENT_GLOBAL", False ): chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -232,7 +232,7 @@ class AgentImageSupportTest(unittest.TestCase): settings, "AI_AGENT_GLOBAL", False ): chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -258,13 +258,13 @@ class AgentImageSupportTest(unittest.TestCase): settings, "AI_AGENT_GLOBAL", False ): chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", text="", files=[ - CommingMessage.MessageAttachment( + IncomingMessage.MessageAttachment( ref="tg://document_file_id/doc-1", name="report.txt", mime_type="text/plain", @@ -306,7 +306,7 @@ class AgentImageSupportTest(unittest.TestCase): ) as transcribe_bytes: result = chain._transcribe_audio_refs( audio_refs=audio_refs, - channel=MessageChannel.Slack, + channel=NotificationChannel.Slack, source="mixed-source", ) @@ -341,7 +341,7 @@ class AgentImageSupportTest(unittest.TestCase): agent = MoviePilotAgent( session_id="session-1", user_id="user-1", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) @@ -362,7 +362,7 @@ class AgentImageSupportTest(unittest.TestCase): agent = MoviePilotAgent( session_id="session-1", user_id="user-1", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) @@ -400,7 +400,7 @@ class AgentImageSupportTest(unittest.TestCase): agent = MoviePilotAgent( session_id="session-1", user_id="user-1", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) @@ -458,7 +458,7 @@ class AgentImageSupportTest(unittest.TestCase): ) as run_coroutine_threadsafe: chain._handle_ai_message( text="/ai 帮我看看这张图", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -491,7 +491,7 @@ class AgentImageSupportTest(unittest.TestCase): ): chain._handle_ai_message( text="帮我推荐一部电影", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -510,7 +510,7 @@ class AgentImageSupportTest(unittest.TestCase): ) as run_module: images = chain._download_attachments_to_data_urls( attachments=["https://files.slack.com/files-pri/T1-F1/test.png"], - channel=MessageChannel.Slack, + channel=NotificationChannel.Slack, source="slack-test", ) @@ -574,7 +574,7 @@ class AgentImageSupportTest(unittest.TestCase): async def _run(): tool = SendMessageTool(session_id="session-1", user_id="10001") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) @@ -594,8 +594,8 @@ class AgentImageSupportTest(unittest.TestCase): notification = async_post_message.await_args.args[0] self.assertEqual(result, "消息已发送") - self.assertEqual(notification.mtype, NotificationType.Other) - self.assertEqual(notification.channel, MessageChannel.Telegram) + self.assertEqual(notification.mtype, MessageType.Other) + self.assertEqual(notification.channel, NotificationChannel.Telegram) self.assertEqual(notification.source, "telegram-test") self.assertEqual(notification.title, "智能体通知") self.assertEqual(notification.text, "处理完成") @@ -608,7 +608,7 @@ class AgentImageSupportTest(unittest.TestCase): async def _run(): tool = SendMessageTool(session_id="session-1", user_id="10001") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) @@ -638,7 +638,7 @@ class AgentImageSupportTest(unittest.TestCase): agent_context = {} tool.set_agent_context(agent_context) tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) @@ -738,7 +738,7 @@ class AgentImageSupportTest(unittest.TestCase): module, "get_instance", return_value=client ): response = module.send_direct_message( - Notification(title="hi", userid="user-1") + Message(title="hi", userid="user-1") ) self.assertIsNotNone(response) @@ -755,7 +755,7 @@ class AgentImageSupportTest(unittest.TestCase): ) as run_module: images = chain._download_attachments_to_data_urls( attachments=["wxwork://media_id/media-1"], - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", ) @@ -776,12 +776,12 @@ class AgentImageSupportTest(unittest.TestCase): ) as run_module: data_urls = chain._download_attachments_to_data_urls( attachments=[ - CommingMessage.MessageImage( + IncomingMessage.MessageImage( ref="feishu://image/img_v2_xxx", mime_type="image/png", ) ], - channel=MessageChannel.Feishu, + channel=NotificationChannel.Feishu, source="feishu-test", ) @@ -798,7 +798,7 @@ class AgentImageSupportTest(unittest.TestCase): with patch.object(chain, "run_module", return_value=b"feishu-file") as run_module: content = chain._download_message_file_bytes( file_ref="feishu://file/file_xxx/report.pdf", - channel=MessageChannel.Feishu, + channel=NotificationChannel.Feishu, source="feishu-test", ) @@ -1064,7 +1064,7 @@ class AgentImageSupportTest(unittest.TestCase): module, "get_instance", return_value=client ): module.post_message( - Notification( + Message( title="poster", image="https://example.com/poster.png", targets={"vocechat_userid": "UID#100"}, @@ -1097,7 +1097,7 @@ class AgentImageSupportTest(unittest.TestCase): module, "get_instance", return_value=client ): module.post_message( - Notification( + Message( title="手册", text="请下载", file_path=str(file_path), @@ -1132,7 +1132,7 @@ class AgentImageSupportTest(unittest.TestCase): module, "get_instance", return_value=client ): module.post_message( - Notification( + Message( title="手册", text="请下载", file_path=str(file_path), @@ -1336,13 +1336,13 @@ class AgentImageSupportTest(unittest.TestCase): prepared = chain._prepare_agent_files( session_id="session-1", files=[ - CommingMessage.MessageAttachment( + IncomingMessage.MessageAttachment( ref="tg://document_file_id/doc-1", name="note.txt", mime_type="text/plain", ) ], - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", ) @@ -1367,7 +1367,7 @@ class AgentImageSupportTest(unittest.TestCase): module, "get_instance", return_value=client ): module.post_message( - Notification( + Message( title="报告", text="请下载", file_path=str(file_path), diff --git a/tests/test_agent_interaction.py b/tests/test_agent_interaction.py index 6f6e7ea84..7709d1736 100644 --- a/tests/test_agent_interaction.py +++ b/tests/test_agent_interaction.py @@ -17,7 +17,7 @@ from app.application.messaging.agent import ( from app.application.messaging.interaction import InteractionContext from app.chain.message import MessageChain from app.runtime.config import settings -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel class TestAgentInteraction(unittest.TestCase): @@ -26,13 +26,13 @@ class TestAgentInteraction(unittest.TestCase): def test_prompt_injects_choice_tool_hint_only_for_button_channels(self): telegram_prompt = prompt_manager.get_agent_prompt( - channel=MessageChannel.Telegram.value + channel=NotificationChannel.Telegram.value ) web_agent_prompt = prompt_manager.get_agent_prompt( - channel=MessageChannel.WebAgent.value + channel=NotificationChannel.WebAgent.value ) wechat_prompt = prompt_manager.get_agent_prompt( - channel=MessageChannel.Wechat.value + channel=NotificationChannel.Wechat.value ) self.assertIn("ask_user_choice", telegram_prompt) @@ -43,10 +43,10 @@ class TestAgentInteraction(unittest.TestCase): def test_prompt_does_not_inject_send_message_html_hint(self): telegram_prompt = prompt_manager.get_agent_prompt( - channel=MessageChannel.Telegram.value + channel=NotificationChannel.Telegram.value ) wechat_prompt = prompt_manager.get_agent_prompt( - channel=MessageChannel.Wechat.value + channel=NotificationChannel.Wechat.value ) self.assertNotIn("parse_mode=\"HTML\"", telegram_prompt) @@ -61,21 +61,21 @@ class TestAgentInteraction(unittest.TestCase): telegram_tools = MoviePilotToolFactory.create_tools( session_id="session-1", user_id="10001", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) web_agent_tools = MoviePilotToolFactory.create_tools( session_id="session-web", user_id="10001", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="tester", ) wechat_tools = MoviePilotToolFactory.create_tools( session_id="session-2", user_id="10001", - channel=MessageChannel.Wechat.value, + channel=NotificationChannel.Wechat.value, source="wechat-test", username="tester", ) @@ -101,7 +101,7 @@ class TestAgentInteraction(unittest.TestCase): def test_choice_tool_sends_buttons_and_registers_pending_request(self): tool = AskUserChoiceTool(session_id="session-1", user_id="10001") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) @@ -141,7 +141,7 @@ class TestAgentInteraction(unittest.TestCase): def test_choice_tool_blocks_after_feedback_quality_rejection(self): tool = AskUserChoiceTool(session_id="session-feedback", user_id="10001") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) @@ -177,7 +177,7 @@ class TestAgentInteraction(unittest.TestCase): request = agent_interaction_manager.create_request( session_id="session-choice", user_id="10001", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", title="需要你的选择", @@ -204,7 +204,7 @@ class TestAgentInteraction(unittest.TestCase): handled = chain._handle_callback( callback_data=f"agent_interaction:choice:{request.request_id}:1", context=InteractionContext( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", user_id="10001", username="tester", @@ -215,7 +215,7 @@ class TestAgentInteraction(unittest.TestCase): self.assertTrue(handled) edit_message.assert_called_once_with( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", message_id=123, chat_id="456", @@ -226,7 +226,7 @@ class TestAgentInteraction(unittest.TestCase): kwargs = process_message.call_args.kwargs self.assertEqual(kwargs["message"], "我选择电影") self.assertEqual(kwargs["session_id"], "session-choice") - self.assertEqual(kwargs["channel"], MessageChannel.Telegram.value) + self.assertEqual(kwargs["channel"], NotificationChannel.Telegram.value) self.assertEqual(kwargs["source"], "telegram-test") self.assertNotIn("processing_status", kwargs) message_put.assert_not_called() @@ -237,7 +237,7 @@ class TestAgentInteraction(unittest.TestCase): request = agent_interaction_manager.create_request( session_id="session-choice", user_id="10001", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", title=None, @@ -251,7 +251,7 @@ class TestAgentInteraction(unittest.TestCase): chain._handle_callback( callback_data=f"agent_choice:{request.request_id}:1", context=InteractionContext( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", user_id="10001", username="tester", @@ -266,7 +266,7 @@ class TestAgentInteraction(unittest.TestCase): MessageChain._user_sessions["10001"] = ("session-secret", datetime.now()) try: - for channel in (MessageChannel.Telegram, MessageChannel.Feishu): + for channel in (NotificationChannel.Telegram, NotificationChannel.Feishu): with patch( "app.chain.message.agent_manager.matches_secret_confirmation", return_value=True, diff --git a/tests/test_agent_llm_capability.py b/tests/test_agent_llm_capability.py index e10505624..75bb6d76c 100644 --- a/tests/test_agent_llm_capability.py +++ b/tests/test_agent_llm_capability.py @@ -6,8 +6,8 @@ from types import SimpleNamespace from unittest.mock import Mock, patch from app.runtime.config import settings -from app.schemas.message import ChannelCapability, ChannelCapabilityManager -from app.schemas.types import MessageChannel +from app.schemas.notification import ChannelCapability, ChannelCapabilityManager +from app.schemas.types import NotificationChannel from app.agent.llm import capability as capability_module from app.agent.llm.capability import ( @@ -171,12 +171,12 @@ class AgentCapabilityManagerTest(unittest.TestCase): ) self.assertTrue( AgentCapabilityManager.supports_native_voice_reply( - MessageChannel.Telegram.value, None + NotificationChannel.Telegram.value, None ) ) self.assertTrue( AgentCapabilityManager.supports_native_voice_reply( - MessageChannel.Feishu.value, None + NotificationChannel.Feishu.value, None ) ) self.assertTrue( @@ -184,7 +184,7 @@ class AgentCapabilityManagerTest(unittest.TestCase): ) self.assertTrue( AgentCapabilityManager.supports_native_voice_reply( - MessageChannel.WebAgent.value, None + NotificationChannel.WebAgent.value, None ) ) self.assertFalse( @@ -204,27 +204,27 @@ class AgentCapabilityManagerTest(unittest.TestCase): ): self.assertTrue( AgentCapabilityManager.supports_native_voice_reply( - MessageChannel.Wechat.value, "wechat-app" + NotificationChannel.Wechat.value, "wechat-app" ) ) self.assertFalse( AgentCapabilityManager.supports_native_voice_reply( - MessageChannel.Wechat.value, "wechat-bot" + NotificationChannel.Wechat.value, "wechat-bot" ) ) self.assertFalse( AgentCapabilityManager.supports_native_voice_reply( - MessageChannel.Wechat.value, "missing" + NotificationChannel.Wechat.value, "missing" ) ) def test_channel_capability_marks_voice_output_channels(self): """校验消息渠道能力显式声明原生语音输出支持。""" for channel in ( - MessageChannel.Telegram, - MessageChannel.Feishu, - MessageChannel.Wechat, - MessageChannel.WebAgent, + NotificationChannel.Telegram, + NotificationChannel.Feishu, + NotificationChannel.Wechat, + NotificationChannel.WebAgent, ): self.assertTrue( ChannelCapabilityManager.supports_capability( @@ -233,7 +233,7 @@ class AgentCapabilityManagerTest(unittest.TestCase): ) self.assertFalse( ChannelCapabilityManager.supports_capability( - MessageChannel.Slack, ChannelCapability.AUDIO_OUTPUT + NotificationChannel.Slack, ChannelCapability.AUDIO_OUTPUT ) ) diff --git a/tests/test_agent_message_routing.py b/tests/test_agent_message_routing.py index 4eb753f89..034cccb40 100644 --- a/tests/test_agent_message_routing.py +++ b/tests/test_agent_message_routing.py @@ -15,7 +15,7 @@ from app.db.models.message import Message from app.application.messaging.agent import AgentInteractionOption, agent_interaction_manager from app.application.messaging.interaction import InteractionContext from app.application.messaging.media import media_interaction_manager -from app.schemas.types import MessageChannel, NotificationType +from app.schemas.types import NotificationChannel, MessageType def _clear_messages() -> None: @@ -31,7 +31,7 @@ def test_explicit_ai_message_bypasses_pending_media_interaction(): media_interaction_manager.clear() media_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", action="Search", @@ -47,7 +47,7 @@ def test_explicit_ai_message_bypasses_pending_media_interaction(): chain, "_handle_ai_message", return_value=True ) as handle_ai_message: chain.handle_message( - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", userid="10001", username="tester", @@ -74,7 +74,7 @@ def test_explicit_ai_message_is_not_recorded_to_message_history(): side_effect=lambda coro, _loop: (coro.close(), Mock())[1], ): chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -97,7 +97,7 @@ def test_message_chain_passes_stable_channel_admin_principal_to_agent(): side_effect=lambda coro, _loop: (coro.close(), Mock())[1], ): chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="renamed-user", @@ -120,7 +120,7 @@ def test_message_chain_does_not_trust_channel_display_username(): side_effect=lambda coro, _loop: (coro.close(), Mock())[1], ): chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10002", username="admin", @@ -143,7 +143,7 @@ def test_message_chain_uses_same_admin_contract_for_slack(): side_effect=lambda coro, _loop: (coro.close(), Mock())[1], ): chain.handle_message( - channel=MessageChannel.Slack, + channel=NotificationChannel.Slack, source="slack-test", userid="UADMIN", username="renamed-user", @@ -159,7 +159,7 @@ def test_ask_user_choice_message_is_not_recorded_to_message_history(): _clear_messages() tool = AskUserChoiceTool(session_id="session-choice", user_id="10001") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) @@ -198,7 +198,7 @@ def test_agent_final_reply_disables_notification_history(): agent = MoviePilotAgent( session_id="session-agent-reply", user_id="10001", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) @@ -210,7 +210,7 @@ def test_agent_final_reply_disables_notification_history(): asyncio.run(agent.send_agent_message("已完成处理")) notification = async_post_message.await_args.args[0] - assert notification.mtype == NotificationType.Agent + assert notification.mtype == MessageType.Agent assert notification.save_history is False @@ -218,7 +218,7 @@ def test_send_message_tool_disables_notification_history(): """Agent 主动发消息工具发送的通知不保存通知历史。""" tool = SendMessageTool(session_id="session-send-message", user_id="10001") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", ) @@ -242,7 +242,7 @@ def test_agent_choice_callback_is_not_recorded_to_message_history(): request = agent_interaction_manager.create_request( session_id="session-choice", user_id="10001", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", username="tester", title="需要你的选择", @@ -268,7 +268,7 @@ def test_agent_choice_callback_is_not_recorded_to_message_history(): chain._handle_callback( callback_data=f"agent_interaction:choice:{request.request_id}:1", context=InteractionContext( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", user_id="10001", username="tester", diff --git a/tests/test_agent_progress_updates.py b/tests/test_agent_progress_updates.py index aa1e98b99..040278c8b 100644 --- a/tests/test_agent_progress_updates.py +++ b/tests/test_agent_progress_updates.py @@ -2,18 +2,18 @@ from unittest.mock import patch from app.agent.prompt import prompt_manager from app.runtime.config import settings -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel def test_progress_prompt_is_independent_from_tool_display_mode() -> None: """进度沟通规则不应随工具逐条或汇总展示模式变化。""" with patch.object(settings, "AI_AGENT_VERBOSE", False): summary_mode_prompt = prompt_manager.get_agent_prompt( - channel=MessageChannel.WebAgent.value + channel=NotificationChannel.WebAgent.value ) with patch.object(settings, "AI_AGENT_VERBOSE", True): verbose_mode_prompt = prompt_manager.get_agent_prompt( - channel=MessageChannel.WebAgent.value + channel=NotificationChannel.WebAgent.value ) assert summary_mode_prompt == verbose_mode_prompt diff --git a/tests/test_agent_resource_flow_permissions.py b/tests/test_agent_resource_flow_permissions.py index 6f594677a..1d14f1d91 100644 --- a/tests/test_agent_resource_flow_permissions.py +++ b/tests/test_agent_resource_flow_permissions.py @@ -17,7 +17,7 @@ from app.agent import MoviePilotAgent from app.runtime.config import settings from app.modules.feishu import FeishuModule from app.modules.telegram import TelegramModule -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel # 渠道模块在导入时注册管理员解析器，权限回查测试需显式加载对应模块。 @@ -350,7 +350,7 @@ def test_channel_agent_admin_user_id_does_not_bypass_user_lookup(): agent = MoviePilotAgent( session_id="session-1", user_id="admin", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="normal-user", ) @@ -371,7 +371,7 @@ def test_channel_agent_rejects_local_admin_username_without_trusted_principal(): agent = MoviePilotAgent( session_id="session-1", user_id="10002", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="admin", ) @@ -394,7 +394,7 @@ def test_channel_agent_accepts_trusted_admin_principal_without_local_user(): agent = MoviePilotAgent( session_id="session-1", user_id="10001", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="renamed-user", ) @@ -413,7 +413,7 @@ def test_tool_explicit_non_admin_context_does_not_fallback_to_channel_lookup(): """Agent 已判定为非管理员时，工具不得通过旧权限查询重新授权。""" tool = QuerySitesTool(session_id="session-1", user_id="10002") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="admin", ) @@ -434,7 +434,7 @@ def test_channel_primary_id_defaults_to_admin_without_admin_list(): """渠道主ID未配置到管理员名单时仍默认为管理员。""" tool = QuerySitesTool(session_id="session-1", user_id="10001") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="owner", ) @@ -457,7 +457,7 @@ def test_channel_primary_id_mismatch_remains_non_admin(): """非主ID用户且不在管理员名单时不能获得管理员权限。""" tool = QuerySitesTool(session_id="session-1", user_id="10002") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="other", ) @@ -480,7 +480,7 @@ def test_feishu_primary_open_id_defaults_to_admin(): """飞书渠道主ID使用默认接收人 OPEN_ID 判断管理员身份。""" tool = QuerySitesTool(session_id="session-1", user_id="ou_owner") tool.set_message_attr( - channel=MessageChannel.Feishu.value, + channel=NotificationChannel.Feishu.value, source="feishu-main", username="owner", ) @@ -503,7 +503,7 @@ def test_channel_primary_id_still_prefers_admin_list(): """管理员名单命中优先于主ID兜底。""" tool = QuerySitesTool(session_id="session-1", user_id="10001") tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="owner", ) diff --git a/tests/test_agent_secret_confirmation.py b/tests/test_agent_secret_confirmation.py index 06720cee2..7f0a18c8d 100644 --- a/tests/test_agent_secret_confirmation.py +++ b/tests/test_agent_secret_confirmation.py @@ -13,7 +13,7 @@ from app.agent import MoviePilotAgent, ReplyMode, agent_manager from app.agent.middleware.policy import AgentPolicyMiddleware from app.agent.policy import AuthSource, PrincipalType, ToolOrigin, ToolPolicyContext from app.agent.tools.impl.query_system_settings import QuerySystemSettingsTool -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel class _ToolCallingFakeModel(FakeMessagesListChatModel): @@ -33,7 +33,7 @@ def _policy_context(agent_context: dict) -> ToolPolicyContext: principal_type=PrincipalType.HUMAN, auth_source=AuthSource.CHANNEL, agent_context=agent_context, - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", ) @@ -175,7 +175,7 @@ def test_confirm_executes_once_without_model_or_history() -> None: agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", replay_mode=ReplyMode.CAPTURE_ONLY, @@ -184,7 +184,7 @@ def test_confirm_executes_once_without_model_or_history() -> None: ) tool = QuerySystemSettingsTool(session_id="session-secret", user_id="1") tool.set_message_attr( - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", ) @@ -229,7 +229,7 @@ def test_cancel_clears_pending_without_executing_tool() -> None: agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", replay_mode=ReplyMode.CAPTURE_ONLY, @@ -266,7 +266,7 @@ def test_expired_confirmation_reaches_agent_expiry_receipt() -> None: agent = MoviePilotAgent( session_id="session-expired-secret", user_id="1", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", replay_mode=ReplyMode.CAPTURE_ONLY, @@ -287,7 +287,7 @@ def test_expired_confirmation_reaches_agent_expiry_receipt() -> None: assert agent_manager.matches_secret_confirmation( agent.session_id, "1", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", ) return await agent.process("确认") @@ -328,7 +328,7 @@ def test_message_channel_receives_confirmation_prompt_once() -> None: agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="admin", original_chat_id="chat-1", @@ -362,7 +362,7 @@ def test_message_channel_does_not_register_pending_when_private_delivery_fails() agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.Feishu.value, + channel=NotificationChannel.Feishu.value, source="feishu-main", username="admin", original_chat_id="group-1", @@ -394,7 +394,7 @@ def test_private_delivery_requests_literal_plain_text() -> None: agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="admin", original_chat_id="group-1", @@ -423,7 +423,7 @@ def test_pending_secret_read_keeps_actor_and_action_across_chat_targets() -> Non agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="admin", original_chat_id="chat-1", @@ -475,7 +475,7 @@ def test_confirm_reports_result_delivery_failure_without_secret() -> None: agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="admin", original_chat_id="group-1", @@ -524,7 +524,7 @@ def test_web_protected_callback_failure_returns_ordinary_safe_notice() -> None: agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", replay_mode=ReplyMode.CAPTURE_ONLY, @@ -562,7 +562,7 @@ def test_confirm_reuses_policy_lifecycle() -> None: agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", replay_mode=ReplyMode.CAPTURE_ONLY, @@ -613,7 +613,7 @@ def test_confirm_respects_policy_denial_without_running_tool() -> None: agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", replay_mode=ReplyMode.CAPTURE_ONLY, @@ -647,7 +647,7 @@ def test_policy_denial_delivery_failure_reports_not_executed() -> None: agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="admin", original_chat_id="group-1", @@ -690,7 +690,7 @@ def test_confirm_records_policy_failure_and_returns_protected_error() -> None: agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", replay_mode=ReplyMode.CAPTURE_ONLY, @@ -748,7 +748,7 @@ def test_execution_failure_delivery_failure_reports_safe_notice() -> None: agent = MoviePilotAgent( session_id="session-secret", user_id="1", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", username="admin", original_chat_id="group-1", diff --git a/tests/test_agent_session_status.py b/tests/test_agent_session_status.py index f4883500c..3bc82908c 100644 --- a/tests/test_agent_session_status.py +++ b/tests/test_agent_session_status.py @@ -10,7 +10,7 @@ from langchain_core.messages import AIMessage from app.agent.middleware.usage import UsageMiddleware from app.agent import AgentManager from app.chain.message import MessageChain -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel class TestAgentSessionStatus(unittest.TestCase): @@ -100,7 +100,7 @@ class TestAgentSessionStatus(unittest.TestCase): patch.object(chain, "post_message") as post_message, ): chain.remote_session_status( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, userid="10001", source="telegram-test", ) @@ -121,7 +121,7 @@ class TestAgentSessionStatus(unittest.TestCase): with patch.object(chain, "post_message") as post_message: chain.remote_session_status( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, userid="10001", source="telegram-test", ) diff --git a/tests/test_agent_tool_message_target.py b/tests/test_agent_tool_message_target.py index 114e2eb66..83a752733 100644 --- a/tests/test_agent_tool_message_target.py +++ b/tests/test_agent_tool_message_target.py @@ -8,11 +8,11 @@ from app.agent.tools.impl.ask_user_choice import ( UserChoiceOptionInput, ) from app.agent.tools.impl.send_message import SendMessageTool -from app.schemas import Notification -from app.schemas.types import MessageChannel +from app.schemas import Message +from app.schemas.types import NotificationChannel -def _run_choice_tool(agent_context: dict, channel: str, source: str) -> Notification: +def _run_choice_tool(agent_context: dict, channel: str, source: str) -> Message: """运行按钮选择工具并返回其发送的通知。""" tool = AskUserChoiceTool(session_id="session-1", user_id="ou_xxx") tool.set_message_attr( @@ -41,7 +41,7 @@ def test_choice_tool_backfills_original_chat_id_from_session_context(): """群聊场景下按钮选择通知应回填会话上下文中的 original_chat_id。""" notification = _run_choice_tool( agent_context={"original_chat_id": "oc_group_123"}, - channel=MessageChannel.Feishu.value, + channel=NotificationChannel.Feishu.value, source="feishu-test", ) @@ -53,7 +53,7 @@ def test_choice_tool_keeps_explicit_original_chat_id(): """按钮选择通知已显式携带原会话 ID 时不应被上下文覆盖。""" notification = _run_choice_tool( agent_context={"original_chat_id": "oc_group_zzz"}, - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", ) @@ -64,7 +64,7 @@ def test_choice_tool_no_context_does_not_backfill(): """会话上下文未携带原会话 ID 时，通知保持原有发送目标。""" notification = _run_choice_tool( agent_context={}, - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", ) @@ -92,7 +92,7 @@ def test_send_tool_message_backfills_original_chat_id(): """send_tool_message 工具消息同样应回填原会话 ID。""" tool = SendMessageTool(session_id="session-1", user_id="ou_xxx") tool.set_message_attr( - channel=MessageChannel.Feishu.value, + channel=NotificationChannel.Feishu.value, source="feishu-test", username="tester", ) @@ -115,7 +115,7 @@ def test_tool_context_includes_original_chat_id(): agent = MoviePilotAgent( session_id="session-1", user_id="ou_xxx", - channel=MessageChannel.Feishu.value, + channel=NotificationChannel.Feishu.value, source="feishu-test", username="tester", original_chat_id="oc_group_123", diff --git a/tests/test_agent_tool_policy.py b/tests/test_agent_tool_policy.py index 1cdca5252..86b01f53a 100644 --- a/tests/test_agent_tool_policy.py +++ b/tests/test_agent_tool_policy.py @@ -33,7 +33,7 @@ from app.agent.tools.impl.query_system_settings import QuerySystemSettingsTool from app.agent.tools.impl.send_local_file import SendLocalFileTool from app.agent.tools.impl.send_voice_message import SendVoiceMessageTool from app.agent.tools.manager import MoviePilotToolsManager -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel class _EchoInput(BaseModel): @@ -270,43 +270,43 @@ def test_policy_context_maps_trusted_host_origins() -> None: """各入口必须由宿主稳定映射 origin、主体类型和认证来源。""" cases = [ ( - {"channel": MessageChannel.Web.value, "source": "openai"}, + {"channel": NotificationChannel.Web.value, "source": "openai"}, ToolOrigin.AGENT_API, PrincipalType.SYSTEM_ADMIN_INTEGRATION, AuthSource.API_TOKEN, ), ( - {"channel": MessageChannel.Web.value, "source": "openai.responses"}, + {"channel": NotificationChannel.Web.value, "source": "openai.responses"}, ToolOrigin.AGENT_API, PrincipalType.SYSTEM_ADMIN_INTEGRATION, AuthSource.API_TOKEN, ), ( - {"channel": MessageChannel.Web.value, "source": "anthropic"}, + {"channel": NotificationChannel.Web.value, "source": "anthropic"}, ToolOrigin.AGENT_API, PrincipalType.SYSTEM_ADMIN_INTEGRATION, AuthSource.API_TOKEN, ), ( - {"channel": MessageChannel.Web.value, "source": "browser"}, + {"channel": NotificationChannel.Web.value, "source": "browser"}, ToolOrigin.AGENT_INTERACTIVE, PrincipalType.HUMAN, AuthSource.WEB_SESSION, ), ( - {"channel": MessageChannel.WebAgent.value, "source": "web-agent"}, + {"channel": NotificationChannel.WebAgent.value, "source": "web-agent"}, ToolOrigin.AGENT_INTERACTIVE, PrincipalType.HUMAN, AuthSource.WEB_SESSION, ), ( - {"channel": MessageChannel.Telegram.value, "source": "telegram"}, + {"channel": NotificationChannel.Telegram.value, "source": "telegram"}, ToolOrigin.AGENT_INTERACTIVE, PrincipalType.HUMAN, AuthSource.CHANNEL, ), ( - {"channel": MessageChannel.Feishu.value, "source": "feishu"}, + {"channel": NotificationChannel.Feishu.value, "source": "feishu"}, ToolOrigin.AGENT_INTERACTIVE, PrincipalType.HUMAN, AuthSource.CHANNEL, @@ -333,7 +333,7 @@ def test_policy_context_maps_trusted_host_origins() -> None: subagent_context = agent_module.MoviePilotAgent( session_id="subagent-session", user_id="user-1", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram", )._build_policy_context().for_subagent() assert subagent_context.origin is ToolOrigin.SUBAGENT @@ -571,7 +571,7 @@ def test_agent_admin_safe_read_keeps_legacy_authorization_authority( user_id="user-1", ) tool.set_message_attr( - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="user", username="member", ) @@ -806,7 +806,7 @@ def test_main_agent_preserves_activity_log_middleware_order() -> None: agent = agent_module.MoviePilotAgent( session_id="session-1", user_id="user-1", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", ) fake_llm = _AgentFactoryLLM() diff --git a/tests/test_agent_tool_streaming.py b/tests/test_agent_tool_streaming.py index fb0e9987d..65851b562 100644 --- a/tests/test_agent_tool_streaming.py +++ b/tests/test_agent_tool_streaming.py @@ -15,7 +15,7 @@ from app.agent.tools.impl.send_voice_message import SendVoiceMessageTool from app.api.endpoints.openai import _OpenAIStreamingHandler from app.runtime.config import settings from app.schemas.message import MessageResponse -from app.schemas.types import MessageChannel, NotificationType +from app.schemas.types import NotificationChannel, MessageType def test_think_tag_stripper_waits_for_partial_open_tag(): @@ -344,7 +344,7 @@ class TestAgentToolStreaming: def test_flush_sends_direct_message_via_threadpool(self): """校验刷新时通过线程池发送首条直连消息。""" handler = StreamingHandler() - handler._channel = MessageChannel.Telegram.value + handler._channel = NotificationChannel.Telegram.value handler._source = "telegram" handler._user_id = "10001" handler._username = "tester" @@ -365,13 +365,13 @@ class TestAgentToolStreaming: assert run_in_threadpool_mock.await_count == 1 assert run_in_threadpool_mock.await_args.args[0].__name__ == "send_direct_message" - assert run_in_threadpool_mock.await_args.args[1].mtype == NotificationType.Agent + assert run_in_threadpool_mock.await_args.args[1].mtype == MessageType.Agent assert handler.has_sent_message def test_flush_edits_message_via_threadpool(self): """校验刷新时通过线程池编辑已有消息。""" handler = StreamingHandler() - handler._channel = MessageChannel.Telegram.value + handler._channel = NotificationChannel.Telegram.value handler._source = "telegram" handler._streaming_enabled = True handler._message_response = MessageResponse( @@ -398,7 +398,7 @@ class TestAgentToolStreaming: """校验停止流式输出会等待首条消息发送完成再编辑。""" async def _run(): handler = StreamingHandler() - handler._channel = MessageChannel.Feishu.value + handler._channel = NotificationChannel.Feishu.value handler._source = "feishu-main" handler._user_id = "ou_user" handler._streaming_enabled = True @@ -416,7 +416,7 @@ class TestAgentToolStreaming: return MessageResponse( message_id="om_stream", chat_id="oc_stream", - channel=MessageChannel.Feishu, + channel=NotificationChannel.Feishu, source="feishu-main", success=True, ) @@ -459,7 +459,7 @@ class TestAgentToolStreaming: handler._message_response = MessageResponse( message_id="om_stream", chat_id="oc_stream", - channel=MessageChannel.Feishu, + channel=NotificationChannel.Feishu, source="feishu-main", metadata={"feishu_streaming": {"card_id": "card_stream", "sequence": 2}}, success=True, @@ -523,7 +523,7 @@ class TestAgentToolStreaming: def test_flush_passes_original_message_context_to_send_direct_message(self): """校验刷新发送时保留原始消息上下文。""" handler = StreamingHandler() - handler._channel = MessageChannel.Feishu.value + handler._channel = NotificationChannel.Feishu.value handler._source = "feishu-main" handler._user_id = "ou_user" handler._username = "tester" @@ -603,7 +603,7 @@ class TestAgentToolStreaming: def test_send_voice_message_uses_native_voice_for_supported_channels(self): """校验支持语音输出的渠道会发送原生语音消息。""" - async def _run(channel: MessageChannel): + async def _run(channel: NotificationChannel): """运行指定渠道的语音发送工具。""" tool = SendVoiceMessageTool(session_id="session-1", user_id="10001") tool.set_message_attr( @@ -625,22 +625,22 @@ class TestAgentToolStreaming: ) as synthesize_speech, patch.object( SendVoiceMessageTool, - "send_notification_message", + "send_message", new_callable=AsyncMock, - ) as send_notification_message, + ) as send_message, ): result = await tool.run("你好") - return result, synthesize_speech, send_notification_message + return result, synthesize_speech, send_message - for channel in (MessageChannel.Telegram, MessageChannel.Feishu, MessageChannel.WebAgent): - result, synthesize_speech, send_notification_message = asyncio.run( + for channel in (NotificationChannel.Telegram, NotificationChannel.Feishu, NotificationChannel.WebAgent): + result, synthesize_speech, send_message = asyncio.run( _run(channel) ) - notification = send_notification_message.await_args.args[-1] + notification = send_message.await_args.args[-1] assert result == "语音回复已发送" synthesize_speech.assert_called_once_with("你好") - send_notification_message.assert_awaited_once() + send_message.assert_awaited_once() assert notification.channel == channel assert notification.voice_path == "/tmp/reply.opus" assert notification.voice_caption == "你好" @@ -655,7 +655,7 @@ class TestAgentToolStreaming: """运行不支持语音输出渠道的语音发送工具。""" tool = SendVoiceMessageTool(session_id="session-1", user_id="10001") tool.set_message_attr( - channel=MessageChannel.Slack.value, source="slack-main", username="tester" + channel=NotificationChannel.Slack.value, source="slack-main", username="tester" ) with ( @@ -669,18 +669,18 @@ class TestAgentToolStreaming: ) as synthesize_speech, patch.object( SendVoiceMessageTool, - "send_notification_message", + "send_message", new_callable=AsyncMock, - ) as send_notification_message, + ) as send_message, ): result = await tool.run("你好") - return result, synthesize_speech, send_notification_message + return result, synthesize_speech, send_message - result, synthesize_speech, send_notification_message = asyncio.run(_run()) - notification = send_notification_message.await_args.args[-1] + result, synthesize_speech, send_message = asyncio.run(_run()) + notification = send_message.await_args.args[-1] assert result == "当前渠道不支持语音回复，已自动回退为文字回复" synthesize_speech.assert_not_called() - send_notification_message.assert_awaited_once() + send_message.assert_awaited_once() assert notification.text == "你好" assert notification.voice_path is None diff --git a/tests/test_downloader_path_mapping.py b/tests/test_downloader_path_mapping.py index e275f5333..f16c8dc63 100644 --- a/tests/test_downloader_path_mapping.py +++ b/tests/test_downloader_path_mapping.py @@ -44,7 +44,7 @@ def _load_downloader_base(): schema_types_module.ModuleType = Enum("ModuleType", {"Downloader": "downloader"}) schema_types_module.DownloaderType = Enum("DownloaderType", {"Qbittorrent": "Qbittorrent"}) schema_types_module.MediaServerType = Enum("MediaServerType", {"Emby": "Emby"}) - schema_types_module.MessageChannel = Enum("MessageChannel", {"Telegram": "telegram"}) + schema_types_module.NotificationChannel = Enum("NotificationChannel", {"Telegram": "telegram"}) schema_types_module.OtherModulesType = Enum("OtherModulesType", {"Subtitle": "subtitle"}) schema_types_module.MediaRecognizeType = Enum( "MediaRecognizeType", {"TheMovieDb": "themoviedb"} @@ -60,7 +60,7 @@ def _load_downloader_base(): service_module.ServiceConfigHelper = _ServiceConfigHelper mixins_module.ConfigReloadMixin = _ConfigReloadMixin - schemas_module.Notification = object + schemas_module.Message = object schemas_module.NotificationConf = object schemas_module.MediaServerConf = object schemas_module.DownloaderConf = object diff --git a/tests/test_feishu.py b/tests/test_feishu.py index 5fe6b0d68..bad8b4bba 100644 --- a/tests/test_feishu.py +++ b/tests/test_feishu.py @@ -14,13 +14,13 @@ ensure_optional_stub("Pinyin2Hanzi", is_pinyin=lambda value: False) from app.modules.feishu import FeishuModule from app.modules.feishu.feishu import Feishu -from app.schemas import Notification +from app.schemas import Message from app.schemas.message import ( ChannelCapability, ChannelCapabilityManager, MessageResponse, ) -from app.schemas.types import MessageChannel, NotificationType +from app.schemas.types import NotificationChannel, MessageType class TestFeishu(unittest.TestCase): @@ -156,7 +156,7 @@ class TestFeishu(unittest.TestCase): ) self.assertIsNotNone(result) - self.assertEqual(result.channel, MessageChannel.Feishu) + self.assertEqual(result.channel, NotificationChannel.Feishu) self.assertEqual(result.userid, "ou_user_1") self.assertEqual(result.text, "CALLBACK:approve") self.assertTrue(result.is_callback) @@ -281,7 +281,7 @@ class TestFeishu(unittest.TestCase): ) result = client.send_notification( - Notification( + Message( title="测试标题", text="测试正文", buttons=[[{"text": "确认", "callback_data": "confirm"}]], @@ -316,7 +316,7 @@ class TestFeishu(unittest.TestCase): ) result = client.send_notification( - Notification( + Message( title="普通通知", text="海报：![poster](https://example.com/poster.jpg)", ), @@ -348,7 +348,7 @@ class TestFeishu(unittest.TestCase): with patch("app.modules.feishu.feishu.RequestUtils") as request_utils: request_utils.return_value.get_res.return_value = response result = client.send_notification( - Notification( + Message( title="测试标题", text="测试正文", image="https://example.com/poster.png", @@ -381,7 +381,7 @@ class TestFeishu(unittest.TestCase): ) client.send_notification( - Notification(title="测试标题", text="测试正文"), + Message(title="测试标题", text="测试正文"), userid="u_user_4", receive_id_type="user_id", ) @@ -426,7 +426,7 @@ class TestFeishu(unittest.TestCase): ) result = client.send_notification( - Notification(title="回复标题", text="回复正文"), + Message(title="回复标题", text="回复正文"), userid="ou_user_9", original_message_id="om_origin", ) @@ -475,8 +475,8 @@ class TestFeishu(unittest.TestCase): ) result = client.send_notification( - Notification( - mtype=NotificationType.Agent, + Message( + mtype=MessageType.Agent, title="MoviePilot助手", text="第一帧内容", ), @@ -523,8 +523,8 @@ class TestFeishu(unittest.TestCase): with patch("app.modules.feishu.feishu.RequestUtils") as request_utils: request_utils.return_value.get_res.return_value = response result = client.send_notification( - Notification( - mtype=NotificationType.Agent, + Message( + mtype=MessageType.Agent, title="MoviePilot助手", text="找到海报 ![poster](https://example.com/poster.jpg)\n[详情](https://example.com/detail)", ), @@ -568,8 +568,8 @@ class TestFeishu(unittest.TestCase): with patch("app.modules.feishu.feishu.RequestUtils") as request_utils: request_utils.return_value.get_res.return_value = response result = client.send_notification( - Notification( - mtype=NotificationType.Agent, + Message( + mtype=MessageType.Agent, title="MoviePilot助手", text="第一帧内容", image="https://example.com/agent.png", @@ -606,8 +606,8 @@ class TestFeishu(unittest.TestCase): ) result = client.send_notification( - Notification( - mtype=NotificationType.Agent, + Message( + mtype=MessageType.Agent, title="MoviePilot助手", text="第一帧内容", ), @@ -988,13 +988,13 @@ class TestFeishu(unittest.TestCase): def test_feishu_channel_capabilities_enable_images_and_files(self): self.assertTrue( ChannelCapabilityManager.supports_capability( - MessageChannel.Feishu, + NotificationChannel.Feishu, ChannelCapability.IMAGES, ) ) self.assertTrue( ChannelCapabilityManager.supports_capability( - MessageChannel.Feishu, + NotificationChannel.Feishu, ChannelCapability.FILE_SENDING, ) ) @@ -1121,7 +1121,7 @@ class TestFeishu(unittest.TestCase): def test_module_send_direct_message_prefers_open_id_target(self): module = FeishuModule() - module._channel = MessageChannel.Feishu + module._channel = NotificationChannel.Feishu conf = SimpleNamespace(name="feishu-main") client = MagicMock() client.send_notification.return_value = { @@ -1136,7 +1136,7 @@ class TestFeishu(unittest.TestCase): patch.object(module, "get_instance", return_value=client), ): response = module.send_direct_message( - Notification( + Message( targets={ "feishu_userid": "u_target", "feishu_openid": "ou_target", @@ -1158,7 +1158,7 @@ class TestFeishu(unittest.TestCase): def test_module_plain_direct_message_uses_literal_text_transport(self): """纯文本直发不得进入会解释密钥字符的 Markdown 卡片路径。""" module = FeishuModule() - module._channel = MessageChannel.Feishu + module._channel = NotificationChannel.Feishu conf = SimpleNamespace(name="feishu-main") client = MagicMock() client.send_text.return_value = { @@ -1174,8 +1174,8 @@ class TestFeishu(unittest.TestCase): patch.object(module, "get_instance", return_value=client), ): response = module.send_direct_message( - Notification( - channel=MessageChannel.Feishu, + Message( + channel=NotificationChannel.Feishu, source="feishu-main", userid="ou_target", text=literal_text, @@ -1336,7 +1336,7 @@ class TestFeishu(unittest.TestCase): def test_module_processing_status_uses_reaction_helpers(self): module = FeishuModule() - module._channel = MessageChannel.Feishu + module._channel = NotificationChannel.Feishu with ( patch.object( @@ -1351,7 +1351,7 @@ class TestFeishu(unittest.TestCase): ) as delete_reaction, ): status = module.mark_message_processing_started( - channel=MessageChannel.Feishu, + channel=NotificationChannel.Feishu, source="feishu-main", userid="ou_x", message_id="om_x", @@ -1359,7 +1359,7 @@ class TestFeishu(unittest.TestCase): text="hello", ) deleted = module.mark_message_processing_finished( - channel=MessageChannel.Feishu, + channel=NotificationChannel.Feishu, source="feishu-main", userid="ou_x", status=status, @@ -1380,7 +1380,7 @@ class TestFeishu(unittest.TestCase): def test_module_finalize_message_closes_streaming_card(self): module = FeishuModule() - module._channel = MessageChannel.Feishu + module._channel = NotificationChannel.Feishu client = MagicMock() client.close_streaming_card.return_value = True @@ -1394,7 +1394,7 @@ class TestFeishu(unittest.TestCase): MessageResponse( message_id="om_stream", chat_id="oc_stream", - channel=MessageChannel.Feishu, + channel=NotificationChannel.Feishu, source="feishu-main", metadata={ "feishu_streaming": { @@ -1422,7 +1422,7 @@ class TestFeishu(unittest.TestCase): patch.object(module, "get_instance", return_value=client), ): module.post_message( - Notification( + Message( file_path="/tmp/demo.txt", text="说明", title="标题", @@ -1430,7 +1430,7 @@ class TestFeishu(unittest.TestCase): ) ) module.post_message( - Notification( + Message( voice_path="/tmp/demo.opus", voice_caption="语音说明", userid="ou_user", @@ -1451,7 +1451,7 @@ class TestFeishu(unittest.TestCase): patch.object(module, "get_instance", return_value=client), ): module.post_message( - Notification( + Message( file_path="/tmp/demo.txt", file_name="demo.txt", image="https://example.com/poster.png", @@ -1471,7 +1471,7 @@ class TestFeishu(unittest.TestCase): def test_module_send_direct_message_sends_image_card_before_file_attachment(self): module = FeishuModule() - module._channel = MessageChannel.Feishu + module._channel = NotificationChannel.Feishu conf = SimpleNamespace(name="feishu-main") client = MagicMock() client.send_notification.return_value = { @@ -1487,8 +1487,8 @@ class TestFeishu(unittest.TestCase): patch.object(module, "get_instance", return_value=client), ): response = module.send_direct_message( - Notification( - channel=MessageChannel.Feishu, + Message( + channel=NotificationChannel.Feishu, source="feishu-main", file_path="/tmp/demo.txt", file_name="demo.txt", @@ -1515,7 +1515,7 @@ class TestFeishu(unittest.TestCase): patch.object(module, "get_instance", return_value=client), ): module.post_message( - Notification( + Message( title="标题", text="正文", userid="ou_user", @@ -1533,7 +1533,7 @@ class TestFeishu(unittest.TestCase): def test_module_resolve_message_target_prefers_original_chat_id(self): """群聊@回复必须优先发回原会话，而不是按 open_id 发到私聊。""" userid, chat_id, receive_id_type = FeishuModule._resolve_message_target( - Notification(userid="ou_user", original_chat_id="oc_group") + Message(userid="ou_user", original_chat_id="oc_group") ) self.assertIsNone(userid) self.assertEqual(chat_id, "oc_group") @@ -1541,7 +1541,7 @@ class TestFeishu(unittest.TestCase): # 非回复类消息仍按原有逻辑优先 open_id。 userid, chat_id, receive_id_type = FeishuModule._resolve_message_target( - Notification(userid="ou_user") + Message(userid="ou_user") ) self.assertEqual(userid, "ou_user") self.assertIsNone(chat_id) @@ -1549,7 +1549,7 @@ class TestFeishu(unittest.TestCase): # 无用户ID时回退 targets 中的飞书字段。 userid, chat_id, receive_id_type = FeishuModule._resolve_message_target( - Notification(targets={"feishu_chat_id": "oc_config"}) + Message(targets={"feishu_chat_id": "oc_config"}) ) self.assertIsNone(userid) self.assertEqual(chat_id, "oc_config") @@ -1557,7 +1557,7 @@ class TestFeishu(unittest.TestCase): def test_module_private_delivery_ignores_original_group_chat(self): """私聊投递只保留用户身份，并让客户端按已记录 ID 类型发送。""" userid, chat_id, receive_id_type = FeishuModule._resolve_message_target( - Notification( + Message( userid="user_target", original_chat_id="oc_group", private_delivery=True, @@ -1580,7 +1580,7 @@ class TestFeishu(unittest.TestCase): patch.object(module, "get_instance", return_value=client), ): module.post_message( - Notification( + Message( title="标题", text="正文", userid="ou_user", @@ -1609,7 +1609,7 @@ class TestFeishu(unittest.TestCase): } result = client.send_notification( - Notification(title="插件通知", text="无目标通知") + Message(title="插件通知", text="无目标通知") ) self.assertTrue(result["success"]) diff --git a/tests/test_feishu_media_message.py b/tests/test_feishu_media_message.py index 95bd88684..613511f6f 100644 --- a/tests/test_feishu_media_message.py +++ b/tests/test_feishu_media_message.py @@ -8,7 +8,7 @@ ensure_optional_stub("Pinyin2Hanzi", is_pinyin=lambda value: False) from app.domain.context import MediaInfo from app.modules.feishu.feishu import Feishu -from app.schemas import Notification +from app.schemas import Message def _build_feishu_client() -> Feishu: @@ -39,7 +39,7 @@ def test_send_medias_message_passes_first_available_image() -> None: return_value={"success": True}, ) as send_notification: result = client.send_medias_message( - message=Notification(title="搜索结果", userid="ou_test"), + message=Message(title="搜索结果", userid="ou_test"), medias=[first_media, second_media], ) diff --git a/tests/test_interaction_router.py b/tests/test_interaction_router.py index c31118e74..09ec2d47f 100644 --- a/tests/test_interaction_router.py +++ b/tests/test_interaction_router.py @@ -22,13 +22,13 @@ from app.application.messaging.router import ( ) from app.application.messaging.site import site_interaction_manager from app.application.messaging.skill import skill_interaction_manager -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel def _context(user_id="10001") -> InteractionContext: """构造最小交互上下文。""" return InteractionContext( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", user_id=user_id, username="tester", @@ -181,7 +181,7 @@ class TestHasPendingInteraction(unittest.TestCase): site_interaction_manager.create_or_replace( user_id="10001", command="/sites", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) diff --git a/tests/test_legacy_import_compat.py b/tests/test_legacy_import_compat.py index d7e19fbeb..f9b493225 100644 --- a/tests/test_legacy_import_compat.py +++ b/tests/test_legacy_import_compat.py @@ -20,6 +20,7 @@ from app.runtime.compat.manifest import ( SYMBOL_ALIASES, VIRTUAL_PACKAGES, ModuleAlias, + _MESSAGE_NOTIFICATION_SYMBOL_ALIASES, ) @@ -316,7 +317,7 @@ def test_plugin_scan_reports_moved_symbol_import(tmp_path: Path): def test_symbol_alias_manifest_covers_all_moved_public_symbols(): - """符号级映射清单应覆盖媒体身份与整理工作项的旧入口。""" + """符号级映射清单应覆盖媒体身份、整理工作项与消息/通知命名统一的旧入口。""" assert set(SYMBOL_ALIASES["app.domain.media"]) == { "MEDIA_SOURCE_ALIASES", "MEDIA_SOURCE_PREFIXES", @@ -329,8 +330,15 @@ def test_symbol_alias_manifest_covers_all_moved_public_symbols(): assert set(SYMBOL_ALIASES["app.schemas"]) == { "TransferTask", "TransferQueue", - } + } | set(_MESSAGE_NOTIFICATION_SYMBOL_ALIASES) assert set(SYMBOL_ALIASES["app.schemas.transfer"]) == { "TransferTask", "TransferQueue", } + assert set(SYMBOL_ALIASES["app.schemas.types"]) == { + "MessageChannel", + "NotificationType", + } + assert set(SYMBOL_ALIASES["app.schemas.message"]) == set( + _MESSAGE_NOTIFICATION_SYMBOL_ALIASES + ) diff --git a/tests/test_media_interaction.py b/tests/test_media_interaction.py index fcdbb1914..91f9481d2 100644 --- a/tests/test_media_interaction.py +++ b/tests/test_media_interaction.py @@ -14,8 +14,8 @@ from app.application.messaging.plugin import ( PluginInputInteractionHandler, plugin_input_interaction_manager, ) -from app.schemas import CommingMessage, TransferDirectoryConf -from app.schemas.types import EventType, MediaSource, MediaType, MessageChannel +from app.schemas import IncomingMessage, TransferDirectoryConf +from app.schemas.types import EventType, MediaSource, MediaType, NotificationChannel @pytest.fixture(autouse=True) @@ -169,7 +169,7 @@ def test_message_routes_text_reply_to_media_interaction_before_ai(): chain = MessageChain() request = media_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", action="Search", @@ -185,7 +185,7 @@ def test_message_routes_text_reply_to_media_interaction_before_ai(): return_value=True, ) as handle_text, patch.object(chain, "_handle_ai_message") as handle_ai: chain.handle_message( - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", userid="10001", username="tester", @@ -199,8 +199,8 @@ def test_message_routes_text_reply_to_media_interaction_before_ai(): def test_message_process_preserves_parser_message_id_context(): """消息链不按渠道解释 message_id，只透传解析器给出的原消息上下文。""" chain = MessageChain() - incoming = CommingMessage( - channel=MessageChannel.Telegram, + incoming = IncomingMessage( + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -225,8 +225,8 @@ def test_message_process_preserves_parser_message_id_context(): def test_message_process_keeps_callback_message_id_as_edit_context(): """按钮回调的 message_id 仍应作为机器人原消息 ID 传递，供编辑原消息使用。""" chain = MessageChain() - incoming = CommingMessage( - channel=MessageChannel.Telegram, + incoming = IncomingMessage( + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -250,8 +250,8 @@ def test_message_process_keeps_callback_message_id_as_edit_context(): def test_message_process_preserves_non_telegram_plain_message_id(): """非 Telegram 渠道保持旧行为，普通消息 ID 仍向下传递给渠道实现自行解释。""" chain = MessageChain() - incoming = CommingMessage( - channel=MessageChannel.Slack, + incoming = IncomingMessage( + channel=NotificationChannel.Slack, source="slack-test", userid="10001", username="tester", @@ -274,7 +274,7 @@ def test_message_process_preserves_non_telegram_plain_message_id(): def test_handle_message_keeps_legacy_positional_images_argument(): """新增 reply_to_message_id 不应改变旧位置参数 images/audio/files 的含义。""" chain = MessageChain() - images = [CommingMessage.MessageImage(ref="tg://file_id/photo-1")] + images = [IncomingMessage.MessageImage(ref="tg://file_id/photo-1")] with patch( "app.chain.message.PluginInputInteractionHandler.handle_text", @@ -285,7 +285,7 @@ def test_handle_message_keeps_legacy_positional_images_argument(): chain, "_mark_message_processing_finished" ), patch.object(chain, "_handle_message_core", return_value=False) as handle_core: chain.handle_message( - MessageChannel.Telegram, + NotificationChannel.Telegram, "telegram-test", "10001", "tester", @@ -307,7 +307,7 @@ def test_plugin_input_session_captures_plain_text_before_media_interaction(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", prompt_id="prompt-1", @@ -315,7 +315,7 @@ def test_plugin_input_session_captures_plain_text_before_media_interaction(): ) media_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", action="Search", @@ -330,7 +330,7 @@ def test_plugin_input_session_captures_plain_text_before_media_interaction(): return_value=True, ) as handle_media, patch.object(chain.eventmanager, "send_event") as send_event: chain.handle_message( - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", userid="10001", username="tester", @@ -346,7 +346,7 @@ def test_plugin_input_session_captures_plain_text_before_media_interaction(): "text": f"plugin_input|{request.request_id}", "input_text": "用户输入内容", "userid": "10001", - "channel": MessageChannel.Wechat, + "channel": NotificationChannel.Wechat, "source": "wechat-test", "username": "tester", "chat_id": None, @@ -356,7 +356,7 @@ def test_plugin_input_session_captures_plain_text_before_media_interaction(): "payload": {"step": "name"}, }, ) - assert plugin_input_interaction_manager.get_by_user("10001", MessageChannel.Wechat) is None + assert plugin_input_interaction_manager.get_by_user("10001", NotificationChannel.Wechat) is None def test_plugin_input_session_does_not_record_sensitive_text_history(): @@ -365,7 +365,7 @@ def test_plugin_input_session_does_not_record_sensitive_text_history(): plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -374,7 +374,7 @@ def test_plugin_input_session_does_not_record_sensitive_text_history(): chain.eventmanager, "send_event" ): chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -390,7 +390,7 @@ def test_plugin_input_session_captures_slash_like_text_before_commands(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", prompt_id="path", @@ -400,7 +400,7 @@ def test_plugin_input_session_captures_slash_like_text_before_commands(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -421,7 +421,7 @@ def test_plugin_input_session_cancel_notifies_plugin_and_clears(): plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -430,7 +430,7 @@ def test_plugin_input_session_cancel_notifies_plugin_and_clears(): chain.eventmanager, "send_event" ) as send_event, patch.object(chain, "post_message") as post_message: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -443,7 +443,7 @@ def test_plugin_input_session_cancel_notifies_plugin_and_clears(): assert payload["cancelled"] is True assert payload["__mp_target_plugin_id"] == "demo_plugin" post_message.assert_called_once() - assert plugin_input_interaction_manager.get_by_user("10001", MessageChannel.Telegram) is None + assert plugin_input_interaction_manager.get_by_user("10001", NotificationChannel.Telegram) is None def test_plugin_input_cancel_does_not_block_next_command(): @@ -452,7 +452,7 @@ def test_plugin_input_cancel_does_not_block_next_command(): plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -461,14 +461,14 @@ def test_plugin_input_cancel_does_not_block_next_command(): chain.eventmanager, "send_event" ) as send_event, patch.object(chain, "post_message"): chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", text="取消", ) chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -486,17 +486,17 @@ def test_plugin_input_session_ignores_non_text_messages(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) - image = CommingMessage.MessageImage(ref="https://example.invalid/image.jpg") + image = IncomingMessage.MessageImage(ref="https://example.invalid/image.jpg") with patch.object(chain, "_record_user_message"), patch.object( chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -505,7 +505,7 @@ def test_plugin_input_session_ignores_non_text_messages(): ) assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) == request assert not any( call.args and call.args[0] == EventType.MessageAction @@ -519,15 +519,15 @@ def test_plugin_input_session_ignores_none_text_messages(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) - image = CommingMessage.MessageImage(ref="https://example.invalid/image.jpg") + image = IncomingMessage.MessageImage(ref="https://example.invalid/image.jpg") handled = PluginInputInteractionHandler(messenger=chain).handle_text( context=InteractionContext( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", user_id="10001", username="tester", @@ -538,7 +538,7 @@ def test_plugin_input_session_ignores_none_text_messages(): assert handled is False assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) == request @@ -547,16 +547,16 @@ def test_plugin_input_session_is_bound_to_user_and_channel(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) - assert plugin_input_interaction_manager.get_by_user("10001", MessageChannel.Wechat) is None + assert plugin_input_interaction_manager.get_by_user("10001", NotificationChannel.Wechat) is None assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) == request - assert plugin_input_interaction_manager.get_by_user("10002", MessageChannel.Telegram) is None + assert plugin_input_interaction_manager.get_by_user("10002", NotificationChannel.Telegram) is None def test_plugin_input_session_does_not_capture_other_channel_text(): @@ -565,7 +565,7 @@ def test_plugin_input_session_does_not_capture_other_channel_text(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -574,7 +574,7 @@ def test_plugin_input_session_does_not_capture_other_channel_text(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", userid="10001", username="tester", @@ -582,7 +582,7 @@ def test_plugin_input_session_does_not_capture_other_channel_text(): ) assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) == request assert not any( call.args and call.args[0] == EventType.MessageAction @@ -596,7 +596,7 @@ def test_plugin_input_session_does_not_capture_other_source_text(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-bot-a", username="tester", ) @@ -605,7 +605,7 @@ def test_plugin_input_session_does_not_capture_other_source_text(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-bot-b", userid="10001", username="tester", @@ -613,7 +613,7 @@ def test_plugin_input_session_does_not_capture_other_source_text(): ) assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-bot-a" + "10001", NotificationChannel.Telegram, "telegram-bot-a" ) == request assert not any( call.args and call.args[0] == EventType.MessageAction @@ -627,7 +627,7 @@ def test_plugin_input_session_does_not_capture_other_chat_text(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", @@ -637,7 +637,7 @@ def test_plugin_input_session_does_not_capture_other_chat_text(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -646,7 +646,7 @@ def test_plugin_input_session_does_not_capture_other_chat_text(): ) assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) == request assert not any( call.args and call.args[0] == EventType.MessageAction @@ -657,7 +657,7 @@ def test_plugin_input_session_does_not_capture_other_chat_text(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -678,7 +678,7 @@ def test_plugin_input_prompt_message_requires_matching_reply(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", @@ -690,7 +690,7 @@ def test_plugin_input_prompt_message_requires_matching_reply(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -701,7 +701,7 @@ def test_plugin_input_prompt_message_requires_matching_reply(): record_message.assert_called_once() assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) == request assert not any( call.args and call.args[0] == EventType.MessageAction @@ -712,7 +712,7 @@ def test_plugin_input_prompt_message_requires_matching_reply(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -729,7 +729,7 @@ def test_plugin_input_prompt_message_requires_matching_reply(): assert payload["input_text"] == "当前回复框文本" assert payload["reply_to_message_id"] == "prompt-current" assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) is None @@ -739,7 +739,7 @@ def test_plugin_input_prompt_message_matches_integer_reply_ids(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id=10001, @@ -749,7 +749,7 @@ def test_plugin_input_prompt_message_matches_integer_reply_ids(): with patch.object(chain.eventmanager, "send_event") as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -771,7 +771,7 @@ def test_plugin_input_prompt_message_ignores_plain_text_without_reply(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", @@ -783,7 +783,7 @@ def test_plugin_input_prompt_message_ignores_plain_text_without_reply(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -793,7 +793,7 @@ def test_plugin_input_prompt_message_ignores_plain_text_without_reply(): record_message.assert_called_once() assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) == request assert not any( call.args and call.args[0] == EventType.MessageAction @@ -807,7 +807,7 @@ def test_plugin_input_prompt_message_allows_direct_cancel_without_reply(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", @@ -819,7 +819,7 @@ def test_plugin_input_prompt_message_allows_direct_cancel_without_reply(): chain.eventmanager, "send_event" ) as send_event, patch.object(chain, "post_message") as post_message: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -835,7 +835,7 @@ def test_plugin_input_prompt_message_allows_direct_cancel_without_reply(): assert payload["cancelled"] is True post_message.assert_called_once() assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) is None @@ -845,7 +845,7 @@ def test_expired_prompt_message_cancel_text_falls_back_to_normal_search_without_ plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", @@ -859,7 +859,7 @@ def test_expired_prompt_message_cancel_text_falls_back_to_normal_search_without_ chain, "_handle_message_core", return_value=False ) as handle_core: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -875,7 +875,7 @@ def test_expired_prompt_message_cancel_text_falls_back_to_normal_search_without_ for call in send_event.call_args_list ) assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) is None @@ -885,7 +885,7 @@ def test_plugin_input_prompt_message_requires_matching_chat_id(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", @@ -897,7 +897,7 @@ def test_plugin_input_prompt_message_requires_matching_chat_id(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -908,7 +908,7 @@ def test_plugin_input_prompt_message_requires_matching_chat_id(): record_message.assert_called_once() assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) == request assert not any( call.args and call.args[0] == EventType.MessageAction @@ -922,7 +922,7 @@ def test_expired_prompt_message_input_falls_back_to_normal_search_without_notice request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", @@ -935,7 +935,7 @@ def test_expired_prompt_message_input_falls_back_to_normal_search_without_notice chain.eventmanager, "send_event" ) as send_event, patch.object(chain, "post_message") as post_message: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -951,7 +951,7 @@ def test_expired_prompt_message_input_falls_back_to_normal_search_without_notice for call in send_event.call_args_list ) assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) is None @@ -961,7 +961,7 @@ def test_expired_prompt_message_without_reply_falls_back_and_clears_state(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", @@ -974,7 +974,7 @@ def test_expired_prompt_message_without_reply_falls_back_and_clears_state(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -988,7 +988,7 @@ def test_expired_prompt_message_without_reply_falls_back_and_clears_state(): for call in send_event.call_args_list ) assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) is None @@ -998,7 +998,7 @@ def test_plugin_input_chatless_session_keeps_legacy_chat_fallback(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -1007,7 +1007,7 @@ def test_plugin_input_chatless_session_keeps_legacy_chat_fallback(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1033,7 +1033,7 @@ def test_plugin_input_wildcard_session_does_not_match_missing_source_with_chat() ) assert plugin_input_interaction_manager.consume_by_user( - "10001", MessageChannel.Telegram, None, "chat-a" + "10001", NotificationChannel.Telegram, None, "chat-a" ) == (None, None) assert plugin_input_interaction_manager.get_by_user("10001", None, None) == request @@ -1043,17 +1043,17 @@ def test_plugin_input_chat_bound_session_does_not_match_missing_chat(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", ) assert plugin_input_interaction_manager.consume_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) == (None, None) assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) == request @@ -1063,7 +1063,7 @@ def test_plugin_input_core_path_preserves_original_chat_id(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", @@ -1071,7 +1071,7 @@ def test_plugin_input_core_path_preserves_original_chat_id(): with patch.object(chain.eventmanager, "send_event") as send_event: chain._handle_message_core( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1093,7 +1093,7 @@ def test_plugin_input_session_does_not_capture_missing_source_text(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-bot-a", username="tester", ) @@ -1102,7 +1102,7 @@ def test_plugin_input_session_does_not_capture_missing_source_text(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source=None, userid="10001", username="tester", @@ -1110,7 +1110,7 @@ def test_plugin_input_session_does_not_capture_missing_source_text(): ) assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-bot-a" + "10001", NotificationChannel.Telegram, "telegram-bot-a" ) == request assert not any( call.args and call.args[0] == EventType.MessageAction @@ -1124,7 +1124,7 @@ def test_plugin_input_session_does_not_capture_callback_payload(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", @@ -1134,7 +1134,7 @@ def test_plugin_input_session_does_not_capture_callback_payload(): chain.eventmanager, "send_event" ) as send_event, patch.object(chain, "_handle_callback", return_value=True) as handle_callback: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1146,7 +1146,7 @@ def test_plugin_input_session_does_not_capture_callback_payload(): record_message.assert_not_called() handle_callback.assert_called_once() assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) == request assert not any( call.args and call.args[0] == EventType.MessageAction @@ -1159,14 +1159,14 @@ def test_plugin_input_session_expires_after_timeout(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", timeout_seconds=120, ) request.created_at = datetime.now() - timedelta(seconds=121) - assert plugin_input_interaction_manager.get_by_user("10001", MessageChannel.Wechat) is None + assert plugin_input_interaction_manager.get_by_user("10001", NotificationChannel.Wechat) is None def test_plugin_input_session_expired_text_notifies_plugin_and_continues_routing(): @@ -1175,7 +1175,7 @@ def test_plugin_input_session_expired_text_notifies_plugin_and_continues_routing request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", timeout_seconds=120, @@ -1186,7 +1186,7 @@ def test_plugin_input_session_expired_text_notifies_plugin_and_continues_routing chain.eventmanager, "send_event" ) as send_event, patch.object(chain, "post_message") as post_message: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1211,7 +1211,7 @@ def test_plugin_input_session_expired_sensitive_text_is_not_recorded_or_routed() request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", timeout_seconds=120, @@ -1222,7 +1222,7 @@ def test_plugin_input_session_expired_sensitive_text_is_not_recorded_or_routed() chain.eventmanager, "send_event" ) as send_event, patch.object(chain, "post_message") as post_message: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1244,7 +1244,7 @@ def test_plugin_input_expired_text_after_cleanup_is_not_recorded_or_routed(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", timeout_seconds=120, @@ -1254,7 +1254,7 @@ def test_plugin_input_expired_text_after_cleanup_is_not_recorded_or_routed(): plugin_input_interaction_manager.create_or_replace( user_id="10002", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="other", timeout_seconds=120, @@ -1265,7 +1265,7 @@ def test_plugin_input_expired_text_after_cleanup_is_not_recorded_or_routed(): chain.eventmanager, "send_event" ) as send_event, patch.object(chain, "post_message") as post_message: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1296,7 +1296,7 @@ def test_plugin_input_session_with_no_channel_matches_specific_channel(): chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1325,7 +1325,7 @@ def test_plugin_input_session_with_no_channel_and_no_source_does_not_match_speci chain.eventmanager, "send_event" ) as send_event: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1344,7 +1344,7 @@ def test_plugin_input_create_or_replace_keeps_legacy_positional_timeout_and_payl request = plugin_input_interaction_manager.create_or_replace( "10001", "demo_plugin", - MessageChannel.Telegram, + NotificationChannel.Telegram, "telegram-test", "tester", "chat-a", @@ -1363,7 +1363,7 @@ def test_plugin_input_create_or_replace_ignores_prompt_message_without_chat_id() request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", prompt_message_id="prompt-current", @@ -1378,7 +1378,7 @@ def test_plugin_input_create_or_replace_ignores_prompt_message_for_non_telegram_ request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Slack, + channel=NotificationChannel.Slack, source="slack-test", username="tester", chat_id="slack-channel", @@ -1390,7 +1390,7 @@ def test_plugin_input_create_or_replace_ignores_prompt_message_for_non_telegram_ consumed, status = plugin_input_interaction_manager.consume_by_user( "10001", - MessageChannel.Slack, + NotificationChannel.Slack, "slack-test", "slack-channel", ) @@ -1403,7 +1403,7 @@ def test_plugin_input_bypass_reply_check_still_requires_matching_chat_id(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", chat_id="chat-a", @@ -1412,7 +1412,7 @@ def test_plugin_input_bypass_reply_check_still_requires_matching_chat_id(): consumed, status = plugin_input_interaction_manager.consume_by_user( "10001", - MessageChannel.Telegram, + NotificationChannel.Telegram, "telegram-test", "chat-b", bypass_reply_check=True, @@ -1421,7 +1421,7 @@ def test_plugin_input_bypass_reply_check_still_requires_matching_chat_id(): assert consumed is None assert status is None assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test", "chat-a" + "10001", NotificationChannel.Telegram, "telegram-test", "chat-a" ) == request @@ -1437,16 +1437,16 @@ def test_plugin_input_specific_session_replaces_overlapping_no_channel_session() new_request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) assert plugin_input_interaction_manager.pop_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) == new_request assert plugin_input_interaction_manager.pop_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) is None @@ -1455,16 +1455,16 @@ def test_plugin_input_session_pop_by_user_consumes_once(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) assert plugin_input_interaction_manager.pop_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) == request assert plugin_input_interaction_manager.pop_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) is None @@ -1473,17 +1473,17 @@ def test_plugin_input_session_pop_by_user_ignores_prompt_message_binding(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", prompt_message_id="prompt-current", ) assert plugin_input_interaction_manager.pop_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) == request assert plugin_input_interaction_manager.get_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) is None @@ -1492,7 +1492,7 @@ def test_plugin_input_session_pop_by_user_removes_expired_prompt_session(): request = plugin_input_interaction_manager.create_or_replace( user_id="10001", plugin_id="demo_plugin", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", prompt_message_id="prompt-current", @@ -1501,10 +1501,10 @@ def test_plugin_input_session_pop_by_user_removes_expired_prompt_session(): request.created_at = datetime.now() - timedelta(seconds=61) assert plugin_input_interaction_manager.pop_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) == request assert plugin_input_interaction_manager.pop_by_user( - "10001", MessageChannel.Telegram, "telegram-test" + "10001", NotificationChannel.Telegram, "telegram-test" ) is None @@ -1561,7 +1561,7 @@ def test_noai_prefix_starts_traditional_search_when_global_ai_enabled(): chain, "_handle_ai_message" ) as handle_ai: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1584,7 +1584,7 @@ def test_noai_prefix_preserves_traditional_interaction_priority_after_search(): chain = MessageChain() request = media_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", action="Search", @@ -1604,7 +1604,7 @@ def test_noai_prefix_preserves_traditional_interaction_priority_after_search(): return_value=True, ) as handle_text, patch.object(chain, "_handle_ai_message") as handle_ai: chain.handle_message( - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", userid="10001", username="tester", @@ -1620,7 +1620,7 @@ def test_callback_routes_to_media_interaction_chain(): chain = MessageChain() request = media_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", action="Search", @@ -1637,7 +1637,7 @@ def test_callback_routes_to_media_interaction_chain(): chain._handle_callback( callback_data=f"media:{request.request_id}:page-next", context=InteractionContext( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", user_id="10001", username="tester", @@ -1661,7 +1661,7 @@ def test_media_interaction_starts_search_and_posts_media_list(): return_value=(meta, medias), ), patch.object(chain, "post_medias_message") as post_medias_message: handled = chain.handle_text_interaction( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1686,7 +1686,7 @@ def test_media_interaction_legacy_page_callback_updates_existing_request(): chain = MediaInteractionChain() request = media_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", action="Search", @@ -1702,7 +1702,7 @@ def test_media_interaction_legacy_page_callback_updates_existing_request(): with patch.object(chain, "post_medias_message") as post_medias_message: handled = chain.handle_callback_interaction( callback_data="page_n", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1724,7 +1724,7 @@ def test_torrent_selection_prompts_download_dir_buttons_before_download(): context = _build_context() request = media_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", action="Search", @@ -1742,7 +1742,7 @@ def test_torrent_selection_prompts_download_dir_buttons_before_download(): "app.chain.message.DownloadChain.download_single" ) as download_single: handled = chain.handle_text_interaction( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1769,7 +1769,7 @@ def test_torrent_selection_skips_download_dir_when_only_one_dir_matches_media(): context = _build_context() request = media_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", action="Search", @@ -1788,7 +1788,7 @@ def test_torrent_selection_skips_download_dir_when_only_one_dir_matches_media(): return_value="hash", ) as download_single: handled = chain.handle_text_interaction( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1809,7 +1809,7 @@ def test_torrent_selection_skips_download_dir_when_user_has_single_dir(): context = _build_context() request = media_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", action="Search", @@ -1828,7 +1828,7 @@ def test_torrent_selection_skips_download_dir_when_user_has_single_dir(): return_value="hash", ) as download_single: handled = chain.handle_text_interaction( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1849,7 +1849,7 @@ def test_torrent_selection_prompts_text_download_dir_for_plain_channel(): context = _build_context() request = media_interaction_manager.create_or_replace( user_id="wechat-user", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", action="Search", @@ -1865,7 +1865,7 @@ def test_torrent_selection_prompts_text_download_dir_for_plain_channel(): return_value=_build_multiple_movie_download_dirs(), ), patch.object(chain, "post_message") as post_message: handled = chain.handle_text_interaction( - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", userid="wechat-user", username="tester", @@ -1889,7 +1889,7 @@ def test_download_dir_callback_runs_pending_single_download_without_save_path_fo context = _build_context() request = media_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", action="Search", @@ -1912,7 +1912,7 @@ def test_download_dir_callback_runs_pending_single_download_without_save_path_fo request.download_dirs = chain._get_download_dirs(context.media_info) handled = chain.handle_callback_interaction( callback_data=f"media:{request.request_id}:download-dir:1", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1931,7 +1931,7 @@ def test_download_dir_callback_runs_pending_single_download_with_save_path(): context = _build_context() request = media_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", action="Search", @@ -1954,7 +1954,7 @@ def test_download_dir_callback_runs_pending_single_download_with_save_path(): request.download_dirs = chain._get_download_dirs(context.media_info) handled = chain.handle_callback_interaction( callback_data=f"media:{request.request_id}:download-dir:2", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -1973,7 +1973,7 @@ def test_download_dir_text_reply_runs_pending_single_download_without_save_path( context = _build_context() request = media_interaction_manager.create_or_replace( user_id="wechat-user", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", action="Search", @@ -1995,7 +1995,7 @@ def test_download_dir_text_reply_runs_pending_single_download_without_save_path( ) as download_single: request.download_dirs = chain._get_download_dirs() handled = chain.handle_text_interaction( - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", userid="wechat-user", username="tester", diff --git a/tests/test_message_notification_naming_compat.py b/tests/test_message_notification_naming_compat.py new file mode 100644 index 000000000..ed02e19e2 --- /dev/null +++ b/tests/test_message_notification_naming_compat.py @@ -0,0 +1,113 @@ +""" +message/notification 命名统一的兼容守护测试 + +边界定义：notification 表示通知渠道能力，message 表示各渠道发送或接收的消息。 +canonical 源码不保留任何旧名别名，旧名一律经由 runtime/compat 映射表 +（SYMBOL_ALIASES）在导入器层惰性解析，供存量插件继续使用。 +""" +import importlib + +from app.runtime.compat.manifest import SYMBOL_ALIASES +from app.schemas.message import ( + IncomingMessage, + Message, + MessageClearBefore, + MessageClearData, + MessageClearScope, + MessageHistoryItem, +) +from app.schemas.notification import ( + ChannelCapabilities, + ChannelCapability, + ChannelCapabilityManager, +) +from app.schemas.types import MessageType, NotificationChannel + + +# 旧名 -> canonical 对象的期望映射，覆盖全部登记的兼容入口 +_EXPECTED_RESOLUTIONS = { + ("app.schemas.types", "MessageChannel"): NotificationChannel, + ("app.schemas.types", "NotificationType"): MessageType, + ("app.schemas.message", "Notification"): Message, + ("app.schemas.message", "CommingMessage"): IncomingMessage, + ("app.schemas.message", "NotificationHistoryItem"): MessageHistoryItem, + ("app.schemas.message", "NotificationClearScope"): MessageClearScope, + ("app.schemas.message", "NotificationClearBefore"): MessageClearBefore, + ("app.schemas.message", "NotificationClearData"): MessageClearData, + ("app.schemas.message", "ChannelCapability"): ChannelCapability, + ("app.schemas.message", "ChannelCapabilities"): ChannelCapabilities, + ("app.schemas.message", "ChannelCapabilityManager"): ChannelCapabilityManager, +} + + +def test_canonical_modules_do_not_define_legacy_names(): + """canonical 模块自身不得保留旧名物理别名，旧名只能来自兼容映射。""" + types_module = importlib.import_module("app.schemas.types") + message_module = importlib.import_module("app.schemas.message") + + for legacy_name in ("MessageChannel", "NotificationType"): + assert legacy_name not in types_module.__dict__ + for legacy_name in ( + "Notification", + "CommingMessage", + "NotificationHistoryItem", + "NotificationClearScope", + "NotificationClearBefore", + "NotificationClearData", + ): + assert legacy_name not in message_module.__dict__ + + +def test_manifest_registers_all_legacy_message_notification_symbols(): + """映射表必须登记全部旧名，且目标指向当前 canonical 符号。""" + for (module_name, legacy_name), canonical in _EXPECTED_RESOLUTIONS.items(): + alias = SYMBOL_ALIASES[module_name][legacy_name] + target = getattr(importlib.import_module(alias.target_module), alias.target_name) + assert target is canonical, (module_name, legacy_name) + + +def test_legacy_symbol_imports_resolve_through_compat_hook(): + """插件旧导入路径应经兼容钩子解析到 canonical 对象。""" + for (module_name, legacy_name), canonical in _EXPECTED_RESOLUTIONS.items(): + module = importlib.import_module(module_name) + assert getattr(module, legacy_name) is canonical, (module_name, legacy_name) + + +def test_schemas_package_level_legacy_imports_resolve(): + """from app.schemas import 旧名 的插件写法应继续可用。""" + schemas_package = importlib.import_module("app.schemas") + + assert schemas_package.MessageChannel is NotificationChannel + assert schemas_package.NotificationType is MessageType + assert schemas_package.Notification is Message + assert schemas_package.CommingMessage is IncomingMessage + assert schemas_package.NotificationHistoryItem is MessageHistoryItem + assert schemas_package.ChannelCapabilityManager is ChannelCapabilityManager + + +def test_legacy_from_import_statement_works(): + """from ... import 语句形式的旧导入应正常执行。""" + scope: dict = {} + exec( + "from app.schemas import Notification, MessageChannel, NotificationType\n" + "from app.schemas.message import CommingMessage\n" + "from app.schemas.types import MessageChannel as LegacyChannel\n", + scope, + ) + + assert scope["Notification"] is Message + assert scope["MessageChannel"] is NotificationChannel + assert scope["NotificationType"] is MessageType + assert scope["CommingMessage"] is IncomingMessage + assert scope["LegacyChannel"] is NotificationChannel + + +def test_legacy_and_canonical_instances_interchangeable(): + """旧名构造的实例应与 canonical 类型互相兼容（同一类对象）。""" + legacy_message = importlib.import_module("app.schemas").Notification(title="t") + + assert isinstance(legacy_message, Message) + assert isinstance( + Message(title="t"), + importlib.import_module("app.schemas.message").Notification, + ) diff --git a/tests/test_message_notifications.py b/tests/test_message_notifications.py index 90c8b42b5..daf57ed7b 100644 --- a/tests/test_message_notifications.py +++ b/tests/test_message_notifications.py @@ -8,11 +8,11 @@ from app.domain.context import Context, MediaInfo, TorrentInfo from app.domain.meta.metabase import MetaBase from app.db import AsyncSessionFactory, SessionFactory from app.db.oper.message import MessageOper -from app.db.models.message import Message +from app.db.models.message import Message as MessageModel from app.db.oper.systemconfig import SystemConfigOper from app.application.messaging.message import MessageHelper -from app.schemas import Notification, NotificationClearScope -from app.schemas.types import MediaType, NotificationType, SystemConfigKey +from app.schemas import Message, MessageClearScope +from app.schemas.types import MediaType, MessageType, SystemConfigKey def _clear_messages() -> None: @@ -20,7 +20,7 @@ def _clear_messages() -> None: 清空消息表，隔离通知测试数据。 """ with SessionFactory() as db: - db.query(Message).delete() + db.query(MessageModel).delete() db.commit() SystemConfigOper().delete(SystemConfigKey.NotificationClearBefore) @@ -39,7 +39,7 @@ def _set_message_time(title: str, reg_time: str) -> None: 调整测试消息时间，避免消息写入时的当前秒影响清理边界断言。 """ with SessionFactory() as db: - db.query(Message).filter(Message.title == title).update({"reg_time": reg_time}) + db.query(MessageModel).filter(MessageModel.title == title).update({"reg_time": reg_time}) db.commit() @@ -49,9 +49,9 @@ def test_notification_history_only_lists_sent_messages() -> None: """ _clear_messages() oper = MessageOper() - oper.add(title="系统通知", text="下载完成", action=1, mtype=NotificationType.Download) + oper.add(title="系统通知", text="下载完成", action=1, mtype=MessageType.Download) oper.add(title="用户消息", text="帮我搜索", action=0) - oper.add(title="智能体回复", text="已处理", action=1, mtype=NotificationType.Agent) + oper.add(title="智能体回复", text="已处理", action=1, mtype=MessageType.Agent) messages = MessageOper().list_by_page(page=1, count=10) assert [message.title for message in messages if message.action == 1] == ["智能体回复", "系统通知"] @@ -63,9 +63,9 @@ def test_web_message_history_returns_all_messages() -> None: """ _clear_messages() oper = MessageOper() - oper.add(title="智能体回复", text="已处理", action=1, mtype=NotificationType.Agent) + oper.add(title="智能体回复", text="已处理", action=1, mtype=MessageType.Agent) oper.add(title="用户消息", text="/ai 帮我处理", action=0) - oper.add(title="普通通知", text="下载完成", action=1, mtype=NotificationType.Download) + oper.add(title="普通通知", text="下载完成", action=1, mtype=MessageType.Download) messages = MessageOper().list_by_page(page=1, count=10) assert [message.title for message in messages] == ["普通通知", "用户消息", "智能体回复"] @@ -81,7 +81,7 @@ def test_notification_clear_marker_filters_history_across_requests() -> None: title="旧系统通知", text="任务失败", action=1, - mtype=NotificationType.Other, + mtype=MessageType.Other, ) oper.add( title="旧媒体通知", @@ -92,7 +92,7 @@ def test_notification_clear_marker_filters_history_across_requests() -> None: _set_message_time("旧系统通知", "2026-01-01 00:00:00") _set_message_time("旧媒体通知", "2026-01-01 00:00:00") - asyncio.run(clear_notification_message(scope=NotificationClearScope.Media)) + asyncio.run(clear_notification_message(scope=MessageClearScope.Media)) oper.add( title="新媒体通知", @@ -183,8 +183,8 @@ def test_notification_post_message_is_persisted_without_sse_queue() -> None: chain.eventmanager.send_event = Mock() chain.post_message( - Notification( - mtype=NotificationType.Download, + Message( + mtype=MessageType.Download, title="下载完成", text="影片已加入下载器", ) @@ -193,7 +193,7 @@ def test_notification_post_message_is_persisted_without_sse_queue() -> None: messages = MessageOper().list_by_page(page=1, count=10) assert len(messages) == 1 assert messages[0].title == "下载完成" - assert messages[0].mtype == NotificationType.Download.value + assert messages[0].mtype == MessageType.Download.value assert helper.get() is None chain.messagequeue.send_message.assert_called_once() @@ -211,8 +211,8 @@ def test_agent_notification_post_message_is_persisted_without_sse_queue() -> Non chain.eventmanager.send_event = Mock() chain.post_message( - Notification( - mtype=NotificationType.Agent, + Message( + mtype=MessageType.Agent, title="MoviePilot助手", text="已完成处理", ) @@ -221,7 +221,7 @@ def test_agent_notification_post_message_is_persisted_without_sse_queue() -> Non messages = MessageOper().list_by_page(page=1, count=10) assert len(messages) == 1 assert messages[0].title == "MoviePilot助手" - assert messages[0].mtype == NotificationType.Agent.value + assert messages[0].mtype == MessageType.Agent.value assert helper.get() is None chain.messagequeue.send_message.assert_called_once() @@ -237,7 +237,7 @@ def test_transient_notification_post_message_skips_history_but_dispatches() -> N chain.eventmanager.send_event = Mock() chain.post_message( - Notification( + Message( title="请选择下载目录", text="1. 默认目录", save_history=False, @@ -270,11 +270,11 @@ def test_transient_media_and_torrent_lists_skip_history_but_dispatch() -> None: chain.messagequeue.send_message = Mock() chain.post_medias_message( - Notification(title="请选择媒体", save_history=False), + Message(title="请选择媒体", save_history=False), medias=[media], ) chain.post_torrents_message( - Notification(title="请选择资源", save_history=False), + Message(title="请选择资源", save_history=False), torrents=[torrent], ) diff --git a/tests/test_message_processing_status.py b/tests/test_message_processing_status.py index f52b8c5b2..d5566f83c 100644 --- a/tests/test_message_processing_status.py +++ b/tests/test_message_processing_status.py @@ -9,20 +9,20 @@ from app.agent import _finish_processing_status from app.modules.discord import DiscordModule from app.modules.discord.discord import Discord from app.modules.slack import SlackModule -from app.schemas.message import ChannelCapability, ChannelCapabilityManager -from app.schemas.types import MessageChannel +from app.schemas.notification import ChannelCapability, ChannelCapabilityManager +from app.schemas.types import NotificationChannel class TestMessageProcessingStatus(unittest.TestCase): def test_processing_status_capability_only_enabled_for_supported_channels(self): supported = { - MessageChannel.Telegram, - MessageChannel.Feishu, - MessageChannel.Slack, - MessageChannel.Discord, + NotificationChannel.Telegram, + NotificationChannel.Feishu, + NotificationChannel.Slack, + NotificationChannel.Discord, } - for channel in MessageChannel: + for channel in NotificationChannel: self.assertEqual( ChannelCapabilityManager.supports_capability( channel, ChannelCapability.PROCESSING_STATUS @@ -32,7 +32,7 @@ class TestMessageProcessingStatus(unittest.TestCase): def test_slack_processing_status_uses_reaction(self): module = SlackModule() - module._channel = MessageChannel.Slack + module._channel = NotificationChannel.Slack client = MagicMock() client.add_reaction.return_value = True client.remove_reaction.return_value = True @@ -44,7 +44,7 @@ class TestMessageProcessingStatus(unittest.TestCase): patch.object(module, "get_instance", return_value=client), ): status = module.mark_message_processing_started( - channel=MessageChannel.Slack, + channel=NotificationChannel.Slack, source="slack-main", userid="U01", message_id="1710000000.000100", @@ -52,7 +52,7 @@ class TestMessageProcessingStatus(unittest.TestCase): text="hello", ) removed = module.mark_message_processing_finished( - channel=MessageChannel.Slack, + channel=NotificationChannel.Slack, source="slack-main", userid="U01", status=status, @@ -99,7 +99,7 @@ class TestMessageProcessingStatus(unittest.TestCase): def test_discord_processing_status_starts_and_stops_typing(self): module = DiscordModule() - module._channel = MessageChannel.Discord + module._channel = NotificationChannel.Discord client = MagicMock() client.start_typing.return_value = True client.stop_typing.return_value = True @@ -111,7 +111,7 @@ class TestMessageProcessingStatus(unittest.TestCase): patch.object(module, "get_instance", return_value=client), ): status = module.mark_message_processing_started( - channel=MessageChannel.Discord, + channel=NotificationChannel.Discord, source="discord-main", userid="10001", message_id="20002", @@ -119,7 +119,7 @@ class TestMessageProcessingStatus(unittest.TestCase): text="hello", ) finished = module.mark_message_processing_finished( - channel=MessageChannel.Discord, + channel=NotificationChannel.Discord, source="discord-main", userid="10001", status=status, @@ -132,7 +132,7 @@ class TestMessageProcessingStatus(unittest.TestCase): def test_agent_finish_processing_status_uses_module_interface(self): status = { - "channel": MessageChannel.Telegram.value, + "channel": NotificationChannel.Telegram.value, "source": "telegram-main", "userid": "10001", "message_id": None, diff --git a/tests/test_notification_channel_manage.py b/tests/test_notification_channel_manage.py index 7bfe4c39a..bdf1b5032 100644 --- a/tests/test_notification_channel_manage.py +++ b/tests/test_notification_channel_manage.py @@ -12,7 +12,7 @@ import pytest from app.chain.notification import NotificationChain from app.modules.wechatclawbot import WechatClawBotModule -from app.schemas.types import MessageChannel, NotificationAction +from app.schemas.types import NotificationChannel, NotificationAction @pytest.fixture @@ -23,7 +23,7 @@ def module(): def test_channel_manage_routes_only_matching_channel(module): """非本渠道的管理请求返回 None，run_module 分发将继续执行其它模块。""" result = module.channel_manage( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, action=NotificationAction.STATUS, ) assert result is None @@ -32,7 +32,7 @@ def test_channel_manage_routes_only_matching_channel(module): def test_channel_manage_rejects_unknown_action(module): """动作词汇表之外的请求返回统一错误结构。""" result = module.channel_manage( - channel=MessageChannel.WechatClawBot, + channel=NotificationChannel.WechatClawBot, action="not_an_action", ) assert result["success"] is False @@ -43,7 +43,7 @@ def test_channel_manage_requires_saved_config_without_form_params(module, monkey """无任何配置且未提供表单参数时，返回提示保存配置的错误。""" monkeypatch.setattr(module, "get_instance", lambda name=None: None) result = module.channel_manage( - channel=MessageChannel.WechatClawBot, + channel=NotificationChannel.WechatClawBot, action=NotificationAction.TEST_CONNECTION, ) assert result["success"] is False @@ -67,7 +67,7 @@ def test_channel_manage_builds_temporary_client_from_form_params(module, monkeyp ) result = module.channel_manage( - channel=MessageChannel.WechatClawBot, + channel=NotificationChannel.WechatClawBot, action=NotificationAction.TEST_CONNECTION, source="预览渠道", WECHATCLAWBOT_BASE_URL="http://127.0.0.1:1", @@ -91,7 +91,7 @@ def test_channel_manage_prefers_saved_instance(module, monkeypatch): monkeypatch.setattr(module, "get_instance", lambda name=None: saved) result = module.channel_manage( - channel=MessageChannel.WechatClawBot, + channel=NotificationChannel.WechatClawBot, action=NotificationAction.STATUS, source="已保存", ) @@ -113,7 +113,7 @@ def test_channel_manage_migrate_cache_dispatches_without_client(module, monkeypa ) result = module.channel_manage( - channel=MessageChannel.WechatClawBot, + channel=NotificationChannel.WechatClawBot, action=NotificationAction.MIGRATE_CACHE, old_name="旧名", new_name="新名", diff --git a/tests/test_notification_template_render.py b/tests/test_notification_template_render.py index a517d66f9..5c9f17545 100644 --- a/tests/test_notification_template_render.py +++ b/tests/test_notification_template_render.py @@ -21,7 +21,7 @@ from app.domain.context import MUSIC_ENTITY_ALBUM, MusicInfo from app.domain.meta.metamusic import MetaMusic from app.db.oper.systemconfig import SystemConfigOper from app.application.messaging.message import MessageTemplateHelper, TemplateContextBuilder, TemplateHelper -from app.schemas.message import Notification +from app.schemas.message import Message from app.schemas.types import ContentType, SystemConfigKey MUSIC_ORGANIZE_TEMPLATE = """ @@ -184,7 +184,7 @@ def test_message_renders_from_db_config(notification_templates: SystemConfigOper SystemConfigKey.NotificationTemplates, {"organizeSuccess": MUSIC_ORGANIZE_TEMPLATE}, ) - message = Notification(ctype=ContentType.OrganizeSuccess) + message = Message(ctype=ContentType.OrganizeSuccess) MessageTemplateHelper.render(message, **MUSIC_CONTEXT) @@ -199,7 +199,7 @@ def test_message_without_template_config_stays_unchanged( 数据库中没有模板配置时消息应保持原样，不应渲染也不应报错。 """ notification_templates.set(SystemConfigKey.NotificationTemplates, None) - message = Notification(ctype=ContentType.OrganizeSuccess) + message = Message(ctype=ContentType.OrganizeSuccess) MessageTemplateHelper.render(message, **MUSIC_CONTEXT) diff --git a/tests/test_skills_command.py b/tests/test_skills_command.py index 42f3751a0..375757cc0 100644 --- a/tests/test_skills_command.py +++ b/tests/test_skills_command.py @@ -23,7 +23,7 @@ from app.agent.skills.registry import ( SkillMarketSource, settings as skill_settings, ) -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel def _build_skill_zip(skill_dir: str, skill_name: str) -> bytes: @@ -62,7 +62,7 @@ class TestSkillsCommand(unittest.TestCase): chain = MessageChain() skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", ) @@ -72,7 +72,7 @@ class TestSkillsCommand(unittest.TestCase): return_value=True, ) as handle_text, patch.object(chain, "_handle_ai_message") as handle_ai: chain.handle_message( - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", userid="10001", username="tester", @@ -86,14 +86,14 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) with patch.object(chain._messenger, "post_message") as post_message: handled = chain.handle_text_interaction( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -110,7 +110,7 @@ class TestSkillsCommand(unittest.TestCase): chain = MessageChain() request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -122,7 +122,7 @@ class TestSkillsCommand(unittest.TestCase): chain._handle_callback( callback_data=f"skills:{request.request_id}:market", context=InteractionContext( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", user_id="10001", username="tester", @@ -390,7 +390,7 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -423,7 +423,7 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -467,7 +467,7 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -510,7 +510,7 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.WebAgent, + channel=NotificationChannel.WebAgent, source="web-agent", username="tester", ) @@ -552,7 +552,7 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -560,7 +560,7 @@ class TestSkillsCommand(unittest.TestCase): with patch.object(chain, "_render_interaction") as render: handled = chain.handle_callback_interaction( callback_data=f"skills:{request.request_id}:search", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -575,7 +575,7 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -583,7 +583,7 @@ class TestSkillsCommand(unittest.TestCase): with patch.object(chain, "_render_interaction") as render: handled = chain.handle_text_interaction( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -600,7 +600,7 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -609,7 +609,7 @@ class TestSkillsCommand(unittest.TestCase): with patch.object(chain, "_render_interaction") as render: handled = chain.handle_text_interaction( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -625,7 +625,7 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -633,7 +633,7 @@ class TestSkillsCommand(unittest.TestCase): with patch.object(chain, "_render_interaction") as render: handled = chain.handle_callback_interaction( callback_data=f"skills:{request.request_id}:source-add", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -648,7 +648,7 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -663,7 +663,7 @@ class TestSkillsCommand(unittest.TestCase): chain._messenger, "post_message" ) as post_message: handled = chain.handle_text_interaction( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -680,7 +680,7 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -693,7 +693,7 @@ class TestSkillsCommand(unittest.TestCase): chain._messenger, "post_message" ) as post_message: handled = chain.handle_text_interaction( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -710,7 +710,7 @@ class TestSkillsCommand(unittest.TestCase): chain = SkillInteractionHandler(messenger=MessageChain()) request = skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -754,7 +754,7 @@ class TestSkillsCommand(unittest.TestCase): chain._messenger, "post_message" ) as post_message: chain._update_or_post_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -766,7 +766,7 @@ class TestSkillsCommand(unittest.TestCase): ) edit_message.assert_called_once_with( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", message_id=123, chat_id="456", diff --git a/tests/test_slash_command_interactions.py b/tests/test_slash_command_interactions.py index 0602c0295..ad517791a 100644 --- a/tests/test_slash_command_interactions.py +++ b/tests/test_slash_command_interactions.py @@ -15,7 +15,7 @@ from app.application.messaging.interaction import InteractionContext from app.chain.site import SiteChain, site_interaction_manager from app.application.messaging.skill import skill_interaction_manager from app.chain.subscribe import SubscribeChain, subscribe_interaction_manager -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel class TestSlashCommandInteractions(unittest.TestCase): @@ -28,14 +28,14 @@ class TestSlashCommandInteractions(unittest.TestCase): chain = MessageChain() skill_interaction_manager.create_or_replace( user_id="10001", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", ) site_interaction_manager.create_or_replace( user_id="10001", command="/sites", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", ) @@ -47,7 +47,7 @@ class TestSlashCommandInteractions(unittest.TestCase): "app.chain.message.SkillInteractionHandler.handle_text_interaction" ) as handle_skills: chain.handle_message( - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", userid="10001", username="tester", @@ -62,14 +62,14 @@ class TestSlashCommandInteractions(unittest.TestCase): site_interaction_manager.create_or_replace( user_id="10001", command="/sites", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", ) subscribe_interaction_manager.create_or_replace( user_id="10001", command="/subscribes", - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", username="tester", ) @@ -81,7 +81,7 @@ class TestSlashCommandInteractions(unittest.TestCase): "app.chain.message.SiteChain.handle_text_interaction" ) as handle_sites: chain.handle_message( - channel=MessageChannel.Wechat, + channel=NotificationChannel.Wechat, source="wechat-test", userid="10001", username="tester", @@ -96,7 +96,7 @@ class TestSlashCommandInteractions(unittest.TestCase): request = site_interaction_manager.create_or_replace( user_id="10001", command="/sites", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -108,7 +108,7 @@ class TestSlashCommandInteractions(unittest.TestCase): chain._handle_callback( callback_data=f"sites:{request.request_id}:refresh", context=InteractionContext( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", user_id="10001", username="tester", @@ -122,7 +122,7 @@ class TestSlashCommandInteractions(unittest.TestCase): request = subscribe_interaction_manager.create_or_replace( user_id="10001", command="/subscribes", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) @@ -134,7 +134,7 @@ class TestSlashCommandInteractions(unittest.TestCase): chain._handle_callback( callback_data=f"subscribes:{request.request_id}:refresh", context=InteractionContext( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", user_id="10001", username="tester", @@ -148,14 +148,14 @@ class TestSlashCommandInteractions(unittest.TestCase): site_interaction_manager.create_or_replace( user_id="10001", command="/sites", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) with patch.object(chain, "post_message") as post_message: handled = chain.handle_text_interaction( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -173,14 +173,14 @@ class TestSlashCommandInteractions(unittest.TestCase): subscribe_interaction_manager.create_or_replace( user_id="10001", command="/subscribes", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", username="tester", ) with patch.object(chain, "post_message") as post_message: handled = chain.handle_text_interaction( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -210,7 +210,7 @@ class TestSlashCommandInteractions(unittest.TestCase): with patch("app.chain.site.SiteOper.list", return_value=fake_sites), patch.object( chain, "post_message" ) as post_message: - chain.remote_list(channel=MessageChannel.Web, userid="u1", source="web") + chain.remote_list(channel=NotificationChannel.Web, userid="u1", source="web") notification = post_message.call_args[0][0] self.assertIn("| ID | 站点 | 状态 | Cookie | 渲染 | 域名 |", notification.text) @@ -234,7 +234,7 @@ class TestSlashCommandInteractions(unittest.TestCase): with patch( "app.chain.subscribe.SubscribeOper.list", return_value=fake_subscribes ), patch.object(chain, "post_message") as post_message: - chain.remote_list(channel=MessageChannel.Web, userid="u1", source="web") + chain.remote_list(channel=NotificationChannel.Web, userid="u1", source="web") notification = post_message.call_args[0][0] self.assertIn("| ID | 名称 | 类型 | 年份 | 季/进度 | 状态 |", notification.text) @@ -256,7 +256,7 @@ class TestUpdateOrPostMessage(unittest.TestCase): update_or_post_message( chain=chain, - channel=MessageChannel.Feishu, + channel=NotificationChannel.Feishu, source="feishu-main", userid="ou_user", username="tester", diff --git a/tests/test_subscribe_chain.py b/tests/test_subscribe_chain.py index bbe8749cb..1b8072368 100644 --- a/tests/test_subscribe_chain.py +++ b/tests/test_subscribe_chain.py @@ -242,7 +242,7 @@ def _load_subscribe_chain_class(): def __init__(self, **kwargs): self.__dict__.update(kwargs) - schemas_module.Notification = _Notification + schemas_module.Message = _Notification schemas_module.Subscribe = _SubscribeSchema schemas_module.NotExistMediaInfo = _NotExistMediaInfo schemas_module.SubscribeEpisodeInfo = _SubscribeEpisodeInfo diff --git a/tests/test_sunnypt_indexer.py b/tests/test_sunnypt_indexer.py index 76fe1a05c..0f22cdeef 100644 --- a/tests/test_sunnypt_indexer.py +++ b/tests/test_sunnypt_indexer.py @@ -13,7 +13,7 @@ from app.db.oper.message import MessageOper from app.modules.indexer import IndexerModule from app.modules.indexer.parser.sunnypt import SunnyPTSiteUserInfo from app.modules.indexer.spider.sunnypt import SunnyPTSpider -from app.schemas import MediaSource, MediaType, NotificationType +from app.schemas import MediaSource, MediaType, MessageType class _FakeResponse: @@ -319,7 +319,7 @@ def test_site_messages_are_deduplicated_by_persisted_source(monkeypatch): duplicate_source = "sunnypt-message:9001-dedup-test" MessageOper().add( source=duplicate_source, - mtype=NotificationType.SiteMessage, + mtype=MessageType.SiteMessage, title="existing", text="existing", ) diff --git a/tests/test_system_notification_dispatch.py b/tests/test_system_notification_dispatch.py index 0f2894aef..64551ab74 100644 --- a/tests/test_system_notification_dispatch.py +++ b/tests/test_system_notification_dispatch.py @@ -12,7 +12,7 @@ sys.modules.setdefault("psutil", ModuleType("psutil")) from app.chain.message import MessageChain from app.application.messaging.message import MessageQueueManager -from app.schemas import Notification +from app.schemas import Message from app.foundation.identity import ( SYSTEM_INTERNAL_USER_ID, is_internal_user_id, @@ -29,7 +29,7 @@ class TestSystemNotificationDispatch(unittest.TestCase): def test_post_message_normalizes_internal_userid_before_queueing(self): chain = MessageChain() - message = Notification( + message = Message( userid=SYSTEM_INTERNAL_USER_ID, username="admin", title="后台报告", @@ -54,7 +54,7 @@ class TestSystemNotificationDispatch(unittest.TestCase): def test_send_direct_message_normalizes_internal_userid(self): chain = MessageChain() - message = Notification( + message = Message( userid=SYSTEM_INTERNAL_USER_ID, username="admin", title="后台报告", diff --git a/tests/test_telegram.py b/tests/test_telegram.py index 04eeac542..517e7fa67 100644 --- a/tests/test_telegram.py +++ b/tests/test_telegram.py @@ -13,8 +13,8 @@ from app.domain.context import MediaInfo, Context, TorrentInfo from app.domain.metainfo import MetaInfo from app.modules.telegram import TelegramModule from app.modules.telegram.telegram import Telegram -from app.schemas import Notification -from app.schemas.types import MessageChannel +from app.schemas import Message +from app.schemas.types import NotificationChannel from app.schemas.types import MediaType @@ -346,8 +346,8 @@ def test_telegram_module_passes_parse_mode_to_client(): module, "get_instance", return_value=client ): module.post_message( - Notification( - channel=MessageChannel.Telegram, + Message( + channel=NotificationChannel.Telegram, source="telegram-test", title="HTML", text="正文", @@ -374,8 +374,8 @@ def test_telegram_module_plain_post_message_keeps_chat_without_editing_source_me module, "get_instance", return_value=client ): module.post_message( - Notification( - channel=MessageChannel.Telegram, + Message( + channel=NotificationChannel.Telegram, source="telegram-test", title="Agent 回复", text="处理完成", @@ -406,8 +406,8 @@ def test_telegram_module_passes_force_reply_to_client(): module, "get_instance", return_value=client ): module.post_message( - Notification( - channel=MessageChannel.Telegram, + Message( + channel=NotificationChannel.Telegram, source="telegram-test", title="请输入目录", text="回复目录路径", @@ -441,8 +441,8 @@ def test_telegram_module_force_reply_sends_new_prompt_message(): module, "get_instance", return_value=client ): module.post_message( - Notification( - channel=MessageChannel.Telegram, + Message( + channel=NotificationChannel.Telegram, source="telegram-test", title="请输入目录", text="回复目录路径", @@ -480,8 +480,8 @@ def test_telegram_module_direct_force_reply_sends_new_prompt_message(): module, "get_instance", return_value=client ): response = module.send_direct_message( - Notification( - channel=MessageChannel.Telegram, + Message( + channel=NotificationChannel.Telegram, source="telegram-test", title="请输入目录", text="回复目录路径", @@ -521,8 +521,8 @@ def test_telegram_module_direct_buttons_keep_new_message_behavior(): module, "get_instance", return_value=client ): response = module.send_direct_message( - Notification( - channel=MessageChannel.Telegram, + Message( + channel=NotificationChannel.Telegram, source="telegram-test", title="请选择", text="请选择一个操作", @@ -560,8 +560,8 @@ def test_telegram_module_plain_direct_message_keeps_userid_target(): module, "get_instance", return_value=client ): response = module.send_direct_message( - Notification( - channel=MessageChannel.Telegram, + Message( + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", title="普通通知", diff --git a/tests/test_telegram_typing_lifecycle.py b/tests/test_telegram_typing_lifecycle.py index dc01e7de7..b66b81023 100644 --- a/tests/test_telegram_typing_lifecycle.py +++ b/tests/test_telegram_typing_lifecycle.py @@ -11,7 +11,7 @@ from app.chain.message import MessageChain from app.command import Command, _finish_command_processing_status from app.modules.telegram import TelegramModule from app.modules.telegram.telegram import Telegram -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel def _wait_until(predicate, timeout: float = 1.0) -> bool: @@ -156,7 +156,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): Telegram 通过模块处理状态接口启动 typing 保活。 """ module = TelegramModule() - module._channel = MessageChannel.Telegram + module._channel = NotificationChannel.Telegram client = Mock() client.start_typing.return_value = True @@ -164,7 +164,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): module, "get_config", return_value=SimpleNamespace(name="telegram-test") ), patch.object(module, "get_instance", return_value=client): status = module.mark_message_processing_started( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", chat_id="-100", @@ -178,7 +178,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): chain = MessageChain.__new__(MessageChain) chain.eventmanager = Mock() status = MessageChain._ProcessingStatus( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", chat_id="-100", @@ -191,7 +191,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): chain, "_mark_message_processing_finished" ) as finish_status: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -217,10 +217,10 @@ class TestTelegramTypingLifecycle(unittest.TestCase): event_data={ "cmd": "/sites", "user": "10001", - "channel": MessageChannel.Telegram, + "channel": NotificationChannel.Telegram, "source": "telegram-test", "processing_status": { - "channel": MessageChannel.Telegram.value, + "channel": NotificationChannel.Telegram.value, "source": "telegram-test", "userid": "10001", "chat_id": "-100", @@ -240,7 +240,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): def test_finish_command_processing_status_uses_module_interface(self): status = { - "channel": MessageChannel.Telegram.value, + "channel": NotificationChannel.Telegram.value, "source": "telegram-test", "userid": "10001", "chat_id": "-100", @@ -272,7 +272,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): chain, "_mark_message_processing_finished" ) as finish_status: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -286,7 +286,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): self.assertNotIn("processing_status", process_message.call_args.kwargs) self.assertEqual( process_message.call_args.kwargs["channel"], - MessageChannel.Telegram.value, + NotificationChannel.Telegram.value, ) self.assertEqual(process_message.call_args.kwargs["source"], "telegram-test") self.assertEqual(process_message.call_args.kwargs["original_chat_id"], "-100") @@ -298,12 +298,12 @@ class TestTelegramTypingLifecycle(unittest.TestCase): session_id="session-1", user_id="10001", message="第一条", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", original_chat_id="-100", ) status = { - "channel": MessageChannel.Telegram.value, + "channel": NotificationChannel.Telegram.value, "source": "telegram-test", "userid": "10001", "chat_id": "-100", @@ -328,13 +328,13 @@ class TestTelegramTypingLifecycle(unittest.TestCase): session_id="session-1", user_id="10001", message="第一条", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", original_message_id="10", original_chat_id="-100", ) status = { - "channel": MessageChannel.Telegram.value, + "channel": NotificationChannel.Telegram.value, "source": "telegram-test", "userid": "10001", "message_id": "10", @@ -352,7 +352,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): result = await _async_start_processing_status(task) self.assertEqual(calls, [{ - "channel": MessageChannel.Telegram, + "channel": NotificationChannel.Telegram, "source": "telegram-test", "userid": "10001", "message_id": "10", @@ -366,7 +366,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): def test_callback_stops_typing_when_message_handler_returns(self): chain = MessageChain.__new__(MessageChain) status = MessageChain._ProcessingStatus( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", chat_id="-100", @@ -379,7 +379,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): chain, "_mark_message_processing_finished" ) as finish_status: chain.handle_message( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -388,7 +388,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): ) finish_status.assert_called_once_with( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", status=status, @@ -399,7 +399,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): def test_chain_finishes_processing_through_module_interface(self): chain = MessageChain.__new__(MessageChain) status = MessageChain._ProcessingStatus( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", chat_id="-100", @@ -408,7 +408,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): with patch.object(chain, "finish_message_processing_status") as finish_status: chain._mark_message_processing_finished( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", status=status, @@ -417,7 +417,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): finish_status.assert_called_once_with( status=status.to_dict(), - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", message_id=None, @@ -428,7 +428,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): async def _run(): manager = AgentManager() status = { - "channel": MessageChannel.Telegram.value, + "channel": NotificationChannel.Telegram.value, "source": "telegram-test", "userid": "10001", "chat_id": "-100", @@ -457,14 +457,14 @@ class TestTelegramTypingLifecycle(unittest.TestCase): manager = AgentManager() manager._session_queues["session-1"] = asyncio.Queue() first_status = { - "channel": MessageChannel.Telegram.value, + "channel": NotificationChannel.Telegram.value, "source": "telegram-test", "userid": "10001", "chat_id": "-100", "metadata": {"kind": "typing", "seq": 1}, } second_status = { - "channel": MessageChannel.Telegram.value, + "channel": NotificationChannel.Telegram.value, "source": "telegram-test", "userid": "10001", "chat_id": "-100", @@ -474,7 +474,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): session_id="session-1", user_id="10001", message="第一条", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", original_chat_id="-100", )) @@ -482,7 +482,7 @@ class TestTelegramTypingLifecycle(unittest.TestCase): session_id="session-1", user_id="10001", message="第二条", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-test", original_chat_id="-100", )) diff --git a/tests/test_transfer_failed_retry_buttons.py b/tests/test_transfer_failed_retry_buttons.py index 495be8b57..25ae63835 100644 --- a/tests/test_transfer_failed_retry_buttons.py +++ b/tests/test_transfer_failed_retry_buttons.py @@ -15,7 +15,7 @@ from app.chain.message import MessageChain from app.chain.transfer import TransferChain from app.application.messaging.interaction import InteractionContext from app.runtime.config import settings -from app.schemas.types import MessageChannel +from app.schemas.types import NotificationChannel class TestTransferFailedRetryButtons(unittest.TestCase): @@ -42,7 +42,7 @@ class TestTransferFailedRetryButtons(unittest.TestCase): with patch.object(chain, "post_message") as post_message: chain.remote_transfer( "12", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, userid="10001", source="telegram-test", ) @@ -59,7 +59,7 @@ class TestTransferFailedRetryButtons(unittest.TestCase): chain._handle_callback( callback_data="transfer_retry_12", context=InteractionContext( - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", user_id="10001", username="tester", @@ -68,7 +68,7 @@ class TestTransferFailedRetryButtons(unittest.TestCase): transfer_cls.return_value.handle_failed_transfer_callback.assert_called_once_with( callback_data="transfer_retry_12", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -81,7 +81,7 @@ class TestTransferFailedRetryButtons(unittest.TestCase): with patch.object(chain, "post_message") as post_message: handled = chain.handle_failed_transfer_callback( callback_data="transfer_retry_12", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -141,7 +141,7 @@ class TestTransferFailedRetryButtons(unittest.TestCase): with patch.object(chain, "post_message") as post_message: chain.handle_failed_transfer_callback( callback_data="transfer_ai_retry_34", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", @@ -216,7 +216,7 @@ class TestTransferFailedRetryButtons(unittest.TestCase): ): chain.handle_failed_transfer_callback( callback_data="transfer_ai_retry_35", - channel=MessageChannel.Telegram, + channel=NotificationChannel.Telegram, source="telegram-test", userid="10001", username="tester", diff --git a/tests/test_transfer_message.py b/tests/test_transfer_message.py index 413cb18ce..3203bac07 100644 --- a/tests/test_transfer_message.py +++ b/tests/test_transfer_message.py @@ -5,7 +5,7 @@ from app.domain.context import MediaInfo from app.domain.meta.metabase import MetaBase from app.schemas import TransferInfo from app.schemas.tmdb import TmdbEpisode -from app.schemas.types import ContentType, MediaType, NotificationType +from app.schemas.types import ContentType, MediaType, MessageType def test_send_transfer_message_passes_episode_info_to_template_context() -> None: @@ -41,7 +41,7 @@ def test_send_transfer_message_passes_episode_info_to_template_context() -> None ) message = post_message.call_args.args[0] - assert message.mtype == NotificationType.Organize + assert message.mtype == MessageType.Organize assert message.ctype == ContentType.OrganizeSuccess assert post_message.call_args.kwargs["episodes_info"] is episodes_info assert post_message.call_args.kwargs["season_episode"] == "S01 E01" diff --git a/tests/test_web_agent_stream.py b/tests/test_web_agent_stream.py index e908cb561..79a1f25d3 100644 --- a/tests/test_web_agent_stream.py +++ b/tests/test_web_agent_stream.py @@ -12,17 +12,17 @@ from app.api.endpoints.agent import ( _WebAgentMoviePilotAgent, _WebAgentEventPublisher, _WEB_AGENT_FILE_REGISTRY, - _WEB_AGENT_NOTICE_QUEUES, + _WEB_AGENT_MESSAGE_QUEUES, _apply_web_agent_display_event, _build_web_agent_input_attachments, - _build_web_agent_notification_events, + _build_web_agent_message_events, _build_web_agent_command_items, _build_web_agent_session_id, _build_web_agent_traditional_callback_payload, _build_web_agent_display_message_from_events, _collect_web_agent_traditional_events, - _dispatch_web_agent_notice_event, - _extract_web_agent_notification_from_event_data, + _dispatch_web_agent_message_event, + _extract_web_agent_message_from_event_data, _has_web_agent_traditional_interaction, _prepare_web_agent_audio_attachment_path, _transcribe_web_agent_audio_refs, @@ -37,8 +37,8 @@ from app.application.messaging.agent import build_web_agent_message_update_event from app.application.messaging.agent import AgentInteractionOption, agent_interaction_manager from app.application.messaging.skill import skill_interaction_manager from app.chain.message import MessageChain -from app.schemas.message import ChannelCapability, ChannelCapabilityManager -from app.schemas.types import EventType, MessageChannel, NotificationType +from app.schemas.notification import ChannelCapability, ChannelCapabilityManager +from app.schemas.types import EventType, NotificationChannel, MessageType def test_split_web_agent_output_extracts_verbose_tool_message(): @@ -140,7 +140,7 @@ def test_build_web_agent_session_id_reuses_accessible_history(): session_id="telegram-session", user_id="telegram-user", username="tester", - channel=MessageChannel.Telegram.value, + channel=NotificationChannel.Telegram.value, source="telegram-main", messages=[], title="Telegram 会话", @@ -345,7 +345,7 @@ def test_has_web_agent_traditional_interaction_detects_pending_skills(): try: skill_interaction_manager.create_or_replace( user_id="1", - channel=MessageChannel.WebAgent, + channel=NotificationChannel.WebAgent, source="web-agent", username="admin", ) @@ -361,7 +361,7 @@ def test_web_agent_admin_context_uses_current_user_id(): agent = _WebAgentMoviePilotAgent( session_id="web-agent:session", user_id="7", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="normal-user", replay_mode=ReplyMode.CAPTURE_ONLY, @@ -397,7 +397,7 @@ def test_web_agent_output_callback_receives_only_new_text(): agent = _WebAgentMoviePilotAgent( session_id="web-agent:incremental-output", user_id="7", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", replay_mode=ReplyMode.CAPTURE_ONLY, @@ -417,7 +417,7 @@ def test_web_agent_tool_summary_is_emitted_before_following_text(): agent = _WebAgentMoviePilotAgent( session_id="web-agent:tool-order", user_id="7", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", replay_mode=ReplyMode.CAPTURE_ONLY, @@ -433,31 +433,31 @@ def test_web_agent_tool_summary_is_emitted_before_following_text(): def test_web_agent_channel_supports_streaming_and_attachments(): """WebAgent 渠道应声明流式、多媒体和文件发送能力。""" assert ChannelCapabilityManager.supports_capability( - MessageChannel.WebAgent, ChannelCapability.INLINE_BUTTONS + NotificationChannel.WebAgent, ChannelCapability.INLINE_BUTTONS ) assert ChannelCapabilityManager.supports_capability( - MessageChannel.WebAgent, ChannelCapability.CALLBACK_QUERIES + NotificationChannel.WebAgent, ChannelCapability.CALLBACK_QUERIES ) assert ChannelCapabilityManager.supports_capability( - MessageChannel.WebAgent, ChannelCapability.MESSAGE_EDITING + NotificationChannel.WebAgent, ChannelCapability.MESSAGE_EDITING ) assert ChannelCapabilityManager.supports_capability( - MessageChannel.WebAgent, ChannelCapability.IMAGES + NotificationChannel.WebAgent, ChannelCapability.IMAGES ) assert ChannelCapabilityManager.supports_capability( - MessageChannel.WebAgent, ChannelCapability.AUDIO_OUTPUT + NotificationChannel.WebAgent, ChannelCapability.AUDIO_OUTPUT ) assert ChannelCapabilityManager.supports_capability( - MessageChannel.WebAgent, ChannelCapability.FILE_SENDING + NotificationChannel.WebAgent, ChannelCapability.FILE_SENDING ) -def test_build_web_agent_notification_events_extracts_image(): +def test_build_web_agent_message_events_extracts_image(): """Agent 工具发送图片消息时应转换为图片附件事件。""" - events = _build_web_agent_notification_events( - schemas.Notification( - channel=MessageChannel.WebAgent, - mtype=NotificationType.Agent, + events = _build_web_agent_message_events( + schemas.Message( + channel=NotificationChannel.WebAgent, + mtype=MessageType.Agent, title="海报", text="已找到图片", image="https://example.com/poster.jpg", @@ -479,44 +479,44 @@ def test_build_web_agent_notification_events_extracts_image(): ] -def test_extract_web_agent_notification_supports_wrapped_message_event(): - """NoticeMessage 包装 Notification 时应仍能解析为 WebAgent 通知。""" - notification = schemas.Notification( - channel=MessageChannel.WebAgent, +def test_extract_web_agent_message_supports_wrapped_message_event(): + """NoticeMessage 包装 Message 时应仍能解析为 WebAgent 通知。""" + message = schemas.Message( + channel=NotificationChannel.WebAgent, source="web-agent", title="会话状态", userid="1", ) - extracted = _extract_web_agent_notification_from_event_data( - {"message": notification, "current_time": "2026-06-26 09:18:38"} + extracted = _extract_web_agent_message_from_event_data( + {"message": message, "current_time": "2026-06-26 09:18:38"} ) - assert extracted == notification + assert extracted == message -def test_dispatch_web_agent_notice_event_accepts_wrapped_message_event(): +def test_dispatch_web_agent_message_event_accepts_wrapped_message_event(): """WebAgent 等待队列应接收 message 包装格式的 NoticeMessage 事件。""" notice_queue = Queue() - _WEB_AGENT_NOTICE_QUEUES["1"] = [notice_queue] - notification = schemas.Notification( - channel=MessageChannel.WebAgent, + _WEB_AGENT_MESSAGE_QUEUES["1"] = [notice_queue] + message = schemas.Message( + channel=NotificationChannel.WebAgent, source="web-agent", title="会话状态", userid="1", ) try: - _dispatch_web_agent_notice_event( + _dispatch_web_agent_message_event( Event( EventType.NoticeMessage, - {"message": notification, "current_time": "2026-06-26 09:18:38"}, + {"message": message, "current_time": "2026-06-26 09:18:38"}, ) ) finally: - _WEB_AGENT_NOTICE_QUEUES.pop("1", None) + _WEB_AGENT_MESSAGE_QUEUES.pop("1", None) - assert notice_queue.get_nowait() == notification + assert notice_queue.get_nowait() == message def test_collect_web_agent_traditional_events_does_not_emit_submit_hint(): @@ -542,15 +542,15 @@ def test_collect_web_agent_traditional_events_does_not_emit_submit_hint(): assert events == [] -def test_build_web_agent_notification_events_registers_local_file(tmp_path): +def test_build_web_agent_message_events_registers_local_file(tmp_path): """Agent 工具发送本地文件时应生成可下载附件事件。""" file_path = tmp_path / "report.txt" file_path.write_text("hello", encoding="utf-8") - events = _build_web_agent_notification_events( - schemas.Notification( - channel=MessageChannel.WebAgent, - mtype=NotificationType.Agent, + events = _build_web_agent_message_events( + schemas.Message( + channel=NotificationChannel.WebAgent, + mtype=MessageType.Agent, file_path=str(file_path), file_name="report.txt", ) @@ -566,15 +566,15 @@ def test_build_web_agent_notification_events_registers_local_file(tmp_path): assert attachment["url"].startswith("message/agent/file/") -def test_build_web_agent_notification_events_registers_voice_attachment(tmp_path): +def test_build_web_agent_message_events_registers_voice_attachment(tmp_path): """Agent 工具发送语音时应转换为可播放的音频附件事件。""" voice_path = tmp_path / "reply.wav" voice_path.write_bytes(b"wav-bytes") - events = _build_web_agent_notification_events( - schemas.Notification( - channel=MessageChannel.WebAgent, - mtype=NotificationType.Agent, + events = _build_web_agent_message_events( + schemas.Message( + channel=NotificationChannel.WebAgent, + mtype=MessageType.Agent, text="你好", voice_path=str(voice_path), ) @@ -688,9 +688,9 @@ def test_web_agent_stream_binds_session_to_agent_manager(): """更新当前 SSE 受保护输出回调。""" self.protected_output_callback = protected_output_callback - def set_notification_callback(self, notification_callback): + def set_message_callback(self, message_callback): """更新当前 SSE 通知回调。""" - self.notification_callback = notification_callback + self.message_callback = message_callback async def process(self, message, **kwargs): """模拟一次 WebAgent 推理输出。""" @@ -755,7 +755,7 @@ def test_web_agent_stream_emits_secret_result_only_as_protected_event(): def __init__(self, **kwargs): self.__dict__.update(kwargs) self._pending_secret_confirmation = SimpleNamespace( - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", original_chat_id="", ) @@ -767,8 +767,8 @@ def test_web_agent_stream_emits_secret_result_only_as_protected_event(): def set_output_callback(self, output_callback): self.output_callback = output_callback - def set_notification_callback(self, notification_callback): - self.notification_callback = notification_callback + def set_message_callback(self, message_callback): + self.message_callback = message_callback def set_protected_output_callback(self, protected_output_callback): self.protected_output_callback = protected_output_callback @@ -789,7 +789,7 @@ def test_web_agent_stream_emits_secret_result_only_as_protected_event(): session_id=session_id, user_id="1", username="admin", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", messages=existing_messages, client_session_id=payload.session_id, @@ -797,7 +797,7 @@ def test_web_agent_stream_emits_secret_result_only_as_protected_event(): agent_manager.active_agents[session_id] = FakeProtectedAgent( session_id=session_id, user_id="1", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", ) @@ -858,7 +858,7 @@ def test_web_agent_cancel_keeps_existing_display_history(): session_id=session_id, user_id="1", username="admin", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", messages=existing_messages, client_session_id=payload.session_id, @@ -977,7 +977,7 @@ def test_web_agent_stream_drops_secret_result_after_disconnect(): session_id=session_id, user_id="1", username="admin", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", messages=existing_messages, client_session_id=payload.session_id, @@ -1298,12 +1298,12 @@ async def _collect_streaming_response(response): return chunks -def test_build_web_agent_notification_events_extracts_choice_card(): +def test_build_web_agent_message_events_extracts_choice_card(): """Agent 按钮通知应转换为 Web 选择卡片事件而非普通文本。""" - events = _build_web_agent_notification_events( - schemas.Notification( - channel=MessageChannel.WebAgent, - mtype=NotificationType.Agent, + events = _build_web_agent_message_events( + schemas.Message( + channel=NotificationChannel.WebAgent, + mtype=MessageType.Agent, title="需要你的选择", text="请选择要执行的操作", buttons=[ @@ -1368,7 +1368,7 @@ def test_resolve_web_agent_choice_payload_returns_next_message(): request = agent_interaction_manager.create_request( session_id="web-agent:session", user_id="1", - channel=MessageChannel.WebAgent.value, + channel=NotificationChannel.WebAgent.value, source="web-agent", username="admin", title="需要你的选择",