From a221de9a2b31ab63ca7f637301132979bd052372 Mon Sep 17 00:00:00 2001
From: Soulter <905617992@qq.com>
Date: Wed, 26 Mar 2025 17:56:51 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=E4=BF=AE=E5=A4=8D=20LLM?=
 =?UTF-8?q?=20=E5=93=8D=E5=BA=94=E5=90=8E=E4=BA=8B=E4=BB=B6=E9=92=A9?=
 =?UTF-8?q?=E5=AD=90=E6=97=A0=E6=B3=95=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process_stage/method/llm_request.py       | 39 ++++++++++---------
 1 file changed, 20 insertions(+), 19 deletions(-)

diff --git a/astrbot/core/pipeline/process_stage/method/llm_request.py b/astrbot/core/pipeline/process_stage/method/llm_request.py
index 8d606d9e5..7d41f7ecc 100644
--- a/astrbot/core/pipeline/process_stage/method/llm_request.py
+++ b/astrbot/core/pipeline/process_stage/method/llm_request.py
@@ -140,6 +140,26 @@ class LLMRequestSubStage(Stage):
                 need_loop = False
                 logger.debug(f"提供商请求 Payload: {req}")
                 llm_response = await provider.text_chat(**req.__dict__)  # 请求 LLM
+
+                # 执行 LLM 响应后的事件钩子。
+                handlers = star_handlers_registry.get_handlers_by_event_type(
+                    EventType.OnLLMResponseEvent
+                )
+                for handler in handlers:
+                    try:
+                        logger.debug(
+                            f"hook(on_llm_response) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}"
+                        )
+                        await handler.handler(event, llm_response)
+                    except BaseException:
+                        logger.error(traceback.format_exc())
+
+                    if event.is_stopped():
+                        logger.info(
+                            f"{star_map[handler.handler_module_path].name} - {handler.handler_name} 终止了事件传播。"
+                        )
+                        return
+
                 async for result in self._handle_llm_response(event, req, llm_response):
                     if isinstance(result, ProviderRequest):
                         # 有函数工具调用并且返回了结果，我们需要再次请求 LLM
@@ -148,25 +168,6 @@ class LLMRequestSubStage(Stage):
                     else:
                         yield
 
-            # 执行 LLM 响应后的事件钩子。
-            handlers = star_handlers_registry.get_handlers_by_event_type(
-                EventType.OnLLMResponseEvent
-            )
-            for handler in handlers:
-                try:
-                    logger.debug(
-                        f"hook(on_llm_response) -> {star_map[handler.handler_module_path].name} - {handler.handler_name}"
-                    )
-                    await handler.handler(event, llm_response)
-                except BaseException:
-                    logger.error(traceback.format_exc())
-
-                if event.is_stopped():
-                    logger.info(
-                        f"{star_map[handler.handler_module_path].name} - {handler.handler_name} 终止了事件传播。"
-                    )
-                    return
-
             asyncio.create_task(
                 Metric.upload(
                     llm_tick=1,