fix:重新加入空回复处理 已验证并测试

Author: a61995987

astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -241,6 +241,19 @@ async def _iter_llm_responses_with_fallback(
             has_stream_output = False
             try:
                 async for resp in self._iter_llm_responses(include_model=idx == 0):
+                    # 如果回复为空且无工具调用 且不是最后一个回退渠道 则引发fallback(仅适配非流)
+                    # 此处不应判断整个消息链是否为空 因为消息链包含整个对话流 而空回复可能发生在任何阶段
+                    if (
+                        not resp.completion_text
+                        and not resp.tools_call_args
+                        and not is_last_candidate
+                    ):
+                        logger.warning(
+                            "Chat Model %s returns empty response, trying fallback to next provider.",
+                            candidate_id,
+                        )
+                        break
+
                     if resp.is_chunk:
                         has_stream_output = True
                         yield resp

astrbot/core/provider/sources/openai_source.py

@@ -315,7 +315,7 @@ async def _query_stream(
                 if not choice.delta or not choice.delta.tool_calls:
                     continue
                 for tool_call in choice.delta.tool_calls:
-                    if getattr(tool_call, "type", None) in (None, ""):
+                    if hasattr(tool_call, "type") and tool_call.type in (None, ""):
                         tool_call.type = "function"
 
             try:
@@ -326,8 +326,8 @@ async def _query_stream(
                     exc_info=True,
                 )
                 logger.warning(f"Saving chunk state error: {e}")
-                
-            if not chunk.choices or len(chunk.choices) == 0:
+
+            if not chunk.choices:
                 continue
             delta = chunk.choices[0].delta
             # logger.debug(f"chunk delta: {delta}")