fix: 移除发送重试模块

Author: SXP-Simon

main.py

@@ -45,7 +45,6 @@
 )
 from .src.infrastructure.reporting.generators import ReportGenerator
 from .src.infrastructure.scheduler.auto_scheduler import AutoScheduler
-from .src.infrastructure.scheduler.retry import RetryManager
 from .src.shared.trace_context import TraceContext, TraceLogFilter
 from .src.utils.logger import logger
 from .src.utils.pdf_utils import PDFInstaller
@@ -72,7 +71,6 @@ class GroupDailyAnalysis(Star):
     template_command_service: TemplateCommandService
     telegram_template_preview_handler: TelegramTemplatePreviewHandler
     template_preview_router: TemplatePreviewRouter
-    retry_manager: RetryManager
     auto_scheduler: AutoScheduler
     message_sender: MessageSender
 
@@ -145,18 +143,12 @@ def __init__(self, context: Context, config: AstrBotConfig):
             handlers=[self.telegram_template_preview_handler]
         )
 
-        # 调度与重试
-        self.retry_manager = RetryManager(
-            self.bot_manager, self.html_render, self.report_generator
-        )
-        self.message_sender = MessageSender(
-            self.bot_manager, self.config_manager, self.retry_manager
-        )
+        # 调度与发送
+        self.message_sender = MessageSender(self.bot_manager, self.config_manager)
         self.auto_scheduler = AutoScheduler(
             self.config_manager,
             self.analysis_service,
             self.bot_manager,
-            self.retry_manager,
             self.report_generator,
             self.html_render,
             plugin_instance=self,
@@ -239,10 +231,6 @@ async def _run_initialization(self, source: str):
                 if self.auto_scheduler:
                     self.auto_scheduler.schedule_jobs(self.context)
 
-                # 4. 始终启动重试管理器
-                if self.retry_manager:
-                    await self.retry_manager.start()
-
                 self._initialized = True
                 self._discovery_run = True
                 logger.info(f"插件任务注册完成 (来源: {source})")
@@ -278,9 +266,6 @@ async def terminate(self):
                 logger.debug("正在停止自动调度器...")
                 self.auto_scheduler.unschedule_jobs(self.context)
 
-            if self.retry_manager:
-                await self.retry_manager.stop()
-
             if self.template_preview_router:
                 await self.template_preview_router.unregister_handlers()
 
@@ -625,23 +610,16 @@ async def nickname_getter(user_id: str) -> str | None:
 
             if image_url:
                 caption = TraceContext.make_report_caption()
-                await adapter.send_image(group_id, image_url, caption=caption)
-                await self._try_upload_image(group_id, image_url, platform_id)
-            elif html_content:
-                yield event.plain_result("⚠️ 群分析报告图片发送失败，自动重试中。")
-                caption = TraceContext.make_report_caption()
-                await self.retry_manager.add_task(
-                    html_content,
-                    analysis_result,
-                    group_id,
-                    platform_id,
-                    caption=caption,
-                )
-            else:
-                text_report = self.report_generator.generate_text_report(
-                    analysis_result
-                )
-                yield event.plain_result(f"⚠️ 图片生成失败，回退文本：\n\n{text_report}")
+                sent = await adapter.send_image(group_id, image_url, caption=caption)
+                if sent:
+                    await self._try_upload_image(group_id, image_url, platform_id)
+                    return  # 成功发送
+
+            # 如果图片生成或发送失败，直接回退到文本
+            logger.warning(f"图片报告发送失败，正在发送文本回退报告。群: {group_id}")
+            text_report = self.report_generator.generate_text_report(analysis_result)
+            await adapter.send_text_report(group_id, text_report)
+            return
 
         elif output_format == "pdf":
             pdf_path = await self.report_generator.generate_pdf_report(
@@ -694,8 +672,7 @@ async def nickname_getter(user_id: str) -> str | None:
 
         else:
             text_report = self.report_generator.generate_text_report(analysis_result)
-            if not await adapter.send_text(group_id, text_report):
-                yield event.plain_result(text_report)
+            await adapter.send_text_report(group_id, text_report)
 
     @filter.command("设置格式", alias={"set_format"})
     @filter.permission_type(PermissionType.ADMIN)

src/infrastructure/messaging/message_sender.py

@@ -12,10 +12,9 @@ class MessageSender:
     封装了 PlatformAdapter 的底层调用，提供更高层的发送接口
     """
 
-    def __init__(self, bot_manager, config_manager, retry_manager):
+    def __init__(self, bot_manager, config_manager):
         self.bot_manager = bot_manager
         self.config_manager = config_manager
-        self.retry_manager = retry_manager
 
     async def send_text(
         self, group_id: str, text: str, platform_id: str | None = None

src/infrastructure/platform/adapters/discord_adapter.py

@@ -124,7 +124,7 @@ async def fetch_messages(
             list[UnifiedMessage]: 统一格式的消息对象列表
         """
         if not discord:
-            logger.error("Discord module (py-cord) not found. Cannot fetch messages.")
+            logger.error("未找到 Discord 模块 (py-cord)，无法拉取历史消息。")
             return []
 
         try:

src/infrastructure/platform/adapters/lark_adapter.py

@@ -857,23 +857,6 @@ async def send_file(
             logger.error(f"飞书文件发送失败: {e}")
             return False
 
-    async def send_forward_msg(self, group_id: str, nodes: list[dict]) -> bool:
-        if not nodes:
-            return True
-        chunks: list[str] = ["📊 群分析报告摘要"]
-        for node in nodes:
-            data = node.get("data", node)
-            name = str(data.get("name", "AstrBot"))
-            content = data.get("content", "")
-            if isinstance(content, list):
-                text_parts = []
-                for seg in content:
-                    if isinstance(seg, dict) and seg.get("type") == "text":
-                        text_parts.append(str(seg.get("data", {}).get("text", "")))
-                content = "".join(text_parts)
-            chunks.append(f"[{name}] {content}")
-        return await self.send_text(group_id, "\n".join(chunks))
-
     async def get_group_info(self, group_id: str) -> UnifiedGroup | None:
         if not self._lark_client or not self._lark_client.im:
             return None

src/infrastructure/platform/adapters/onebot_adapter.py

@@ -22,7 +22,6 @@
     MessageContentType,
     UnifiedMessage,
 )
-from ....shared.trace_context import REPORT_CAPTION_PATTERN
 from ....utils.logger import logger
 from ..base import PlatformAdapter
 
@@ -494,7 +493,7 @@ async def send_image(
         """
         try:
             use_base64 = False
-            plugin = self.config.get("plugin_instance") if self.config else None
+            plugin: Any = self.config.get("plugin_instance") if self.config else None
             if plugin and hasattr(plugin, "config_manager"):
                 use_base64 = plugin.config_manager.get_enable_base64_image()
 
@@ -574,150 +573,16 @@ async def send_image(
                 logger.info(f"Base64 回退模式发送图片成功: 群 {group_id}")
                 return True
 
-        except Exception as e:
-            # 识别 OneBot 的“假失败”情况：如果由于图片过大导致超时，其实图片往往已在后台由 OneBot 自动重传并最终会成功。
-            error_str = str(e).lower()
-            # 判定为“疑似成功”的特征：超时、1200、网络错误
-            is_potential_success = (
-                "timeout" in error_str or "1200" in error_str or "网络错误" in error_str
+            await self.bot.call_action(
+                "send_group_msg",
+                group_id=int(group_id),
+                message=message,
             )
+            logger.info(f"Base64 回退模式发送图片成功: 群 {group_id}")
+            return True
 
-            if is_potential_success:
-                logger.warning(
-                    f"OneBot 发送群 {group_id} 图片出现疑似超时 ({e})。 "
-                    "进入多轮观察期，尝试通过历史回显核实..."
-                )
-
-                # Multi-stage observation. Some OneBot implementations commit
-                # history with delay after timeout-like errors.
-                observe_windows = (10, 20, 30)
-                for wait_seconds in observe_windows:
-                    await asyncio.sleep(wait_seconds)
-                    if await self.was_image_sent_recently(
-                        group_id, seconds=420, token=caption
-                    ):
-                        logger.info(
-                            f"[OneBot] [真相拦截] 群 {group_id} 在 {wait_seconds}s 观察后确认已送达，拦截重试。"
-                        )
-                        return True
-
-                return False  # 没找回，返回 False，由上层 RetryManager 接管（带 20s 延迟观察期）
-
-            logger.error(f"OneBot 图片发送最终失败: {e}")
-            return False
-
-    async def was_image_sent_recently(
-        self, group_id: str, seconds: int = 60, token: str | None = None
-    ) -> bool:
-        """
-        [真相检查] 检查最近 X 秒内，机器人是否已经向该群发送过图片。
-        用于判断之前的“超时/1200”错误是否其实已经在后台发送成功。
-        """
-        try:
-            # 1. 获取最近的消息历史 (OneBot 标准 API)
-            try:
-                history = await self.bot.call_action(
-                    "get_group_msg_history",
-                    group_id=int(group_id),
-                    count=100,  # 增大扫描深度以应对高频群聊
-                )
-            except Exception as e:
-                logger.warning(
-                    f"[OneBot] was_image_sent_recently: get_group_msg_history 失败 (可能 API 繁忙): {e}"
-                )
-                return False  # API 失败时，我们保持谨慎，但不阻止重试
-
-            if not history or "messages" not in history:
-                messages = history if isinstance(history, list) else []
-            else:
-                messages = history["messages"]
-
-            # 2. 逆序检查
-            import time
-
-            now = time.time()
-            # 1. 优先从内存缓存中获取机器人 ID
-            self_id = self.bot_self_ids[0] if self.bot_self_ids else ""
-
-            if not self_id:
-                # 尝试从 bot 实例中获取多个可能的 ID 属性
-                self_id = (
-                    str(getattr(self.bot, "self_id", ""))
-                    or str(getattr(self.bot, "uin", ""))
-                    or str(getattr(self.bot, "user_id", ""))
-                )
-
-            if not self_id:
-                # 最后的 API 兜底：尝试从 login_info 获取
-                try:
-                    login_info = await self.bot.call_action("get_login_info")
-                    if login_info and "user_id" in login_info:
-                        self_id = str(login_info["user_id"])
-                        # 更新缓存，下次无需重复请求
-                        if self_id not in self.bot_self_ids:
-                            self.bot_self_ids.append(self_id)
-                        logger.info(f"[OneBot] 成功通过 API 获取到机器人 ID: {self_id}")
-                except Exception as e:
-                    logger.debug(
-                        f"[OneBot] was_image_sent_recently: get_login_info API 调用失败: {e}"
-                    )
-
-            if not self_id:
-                logger.warning(
-                    "[OneBot] was_image_sent_recently: 无法确定机器人 ID，历史回显校验可能不准确"
-                )
-
-            # [优化] 从 Caption 中提取基于时间戳的去重 Token
-            search_token = None
-            if token:
-                match = REPORT_CAPTION_PATTERN.search(token)
-                if match:
-                    search_token = match.group(0)  # 例如 "| 03-12 17:33:20"
-
-            for msg in reversed(messages):
-                msg_time = msg.get("time", 0)
-                # 只检查约定时间范围内的消息
-                if now - msg_time > seconds:
-                    break
-
-                # 检查发送者是否是机器人自己
-                user_id = str(
-                    msg.get("user_id", msg.get("sender", {}).get("user_id", ""))
-                )
-                if user_id not in self.bot_self_ids:
-                    # 如果内存中没有，尝试最后一次实时提取作为兜底
-                    if not self_id or user_id != self_id:
-                        continue
-
-                # 检查消息内容是否包含图片
-                raw_message = msg.get("message", [])
-                # 适配字符串形式或列表形式的消息
-                msg_str = str(raw_message)
-
-                has_image = "[CQ:image" in msg_str or '"type": "image"' in msg_str
-
-                if has_image:
-                    if search_token:
-                        # 精确匹配 TraceID
-                        if search_token in msg_str:
-                            logger.info(
-                                f"[OneBot] [真相检查] 发现匹配 ID ({search_token}) 的历史图片。拦截重复发送。群: {group_id}"
-                            )
-                            return True
-                        else:
-                            logger.debug(
-                                f"[OneBot] [真相检查] 发现机器人发送的图片，但 ID 不匹配。跳过。群: {group_id}"
-                            )
-                    else:
-                        # 广义匹配（回退模式）
-                        logger.info(
-                            f"[OneBot] [真相检查] 发现近期发送过的图片回显 (广义匹配)。无需重试。群: {group_id}"
-                        )
-                        return True
-
-            return False
         except Exception as e:
-            logger.debug(f"回显自检失败: {e}")
+            logger.error(f"OneBot 图片发送最终失败: {e}")
             return False
 
     async def send_file(
@@ -761,10 +626,13 @@ async def send_file(
                     file=file_b64,
                     name=filename or os.path.basename(file_path),
                 )
-                logger.info(f"Base64 回退模式发送文件成功: {filename or file_path}")
-                return True
+            # ... 实现省略 ...
+            logger.info(
+                f"[OneBot] 文件发送成功（Base64 模式）: {filename or file_path}"
+            )
+            return True
         except Exception as e:
-            logger.error(f"OneBot 文件发送最终失败: {e}")
+            logger.error(f"[OneBot] 文件发送最终失败: {e}")
             return False
 
     async def send_forward_msg(
@@ -774,13 +642,6 @@ async def send_forward_msg(
     ) -> bool:
         """
         发送群合并转发消息。
-
-        Args:
-            group_id (str): 目标群号
-            nodes (list[dict]): 转发节点列表
-
-        Returns:
-            bool: 是否发送成功
         """
         if not hasattr(self.bot, "call_action"):
             return False
@@ -799,7 +660,7 @@ async def send_forward_msg(
             )
             return True
         except Exception as e:
-            logger.warning(f"OneBot 发送合并转发消息失败: {e}")
+            logger.warning(f"[OneBot] 发送合并转发消息失败: {e}")
             return False
 
     # ==================== IGroupInfoRepository 实现 ====================