refactor: address code review comments on pre_caption_images

Author: Reisenbug

astrbot/core/astr_main_agent.py

@@ -483,15 +483,13 @@ async def _request_img_caption(
 async def pre_caption_images(
     event: AstrMessageEvent,
     plugin_context: Context,
+    cfg: dict,
 ) -> None:
     """在 session lock 外提前完成图片描述，结果写入 event extra。
 
     由 pipeline 在获取 session lock 之前调用，避免图片描述慢速 LLM
     调用占用 session lock，阻塞后续消息处理。
     """
-    cfg = plugin_context.get_config(umo=event.unified_msg_origin).get(
-        "provider_settings", {}
-    )
     img_cap_prov_id: str = cfg.get("default_image_caption_provider_id") or ""
     if not img_cap_prov_id:
         return
@@ -519,7 +517,7 @@ async def pre_caption_images(
         )
         event.set_extra(_PRE_CAPTION_RESULT_KEY, caption or "")
     except Exception as exc:  # noqa: BLE001
-        logger.error("预处理图片描述失败: %s", exc)
+        logger.error("预处理图片描述失败: %s", exc, exc_info=True)
         event.set_extra(_PRE_CAPTION_RESULT_KEY, None)
 
 
@@ -530,12 +528,14 @@ async def _ensure_img_caption(
     plugin_context: Context,
     image_caption_provider: str,
 ) -> None:
+    if event.get_extra("_skip_img_caption"):
+        return
+
     pre_caption = event.get_extra(_PRE_CAPTION_RESULT_KEY)
-    if pre_caption is not None:
-        if pre_caption:
-            req.extra_user_content_parts.append(
-                TextPart(text=f"<image_caption>{pre_caption}</image_caption>")
-            )
+    if pre_caption:
+        req.extra_user_content_parts.append(
+            TextPart(text=f"<image_caption>{pre_caption}</image_caption>")
+        )
         req.image_urls = []
         return
 

astrbot/core/pipeline/process_stage/method/agent_sub_stages/internal.py

@@ -189,11 +189,13 @@ async def process(
 
             if not event.get_extra("provider_request"):
                 plugin_context = self.ctx.plugin_manager.context
-                cfg = plugin_context.get_config(
-                    umo=event.unified_msg_origin
-                ).get("provider_settings", {})
+                cfg = plugin_context.get_config(umo=event.unified_msg_origin).get(
+                    "provider_settings", {}
+                )
                 if cfg.get("image_caption_wait_for_context_order", True):
-                    await pre_caption_images(event, plugin_context)
+                    await pre_caption_images(event, plugin_context, cfg)
+                else:
+                    event.set_extra("_skip_img_caption", True)
 
             async with session_lock_manager.acquire_lock(event.unified_msg_origin):
                 logger.debug("acquired session lock for llm request")