Merge branch 'dev' of https://github.com/Mai-with-u/MaiBot into dev

src/llm_models/model_client/openai_client.py

@@ -370,9 +370,32 @@ def _default_normal_response_parser(
     """
     api_response = APIResponse()
 
-    if not hasattr(resp, "choices") or len(resp.choices) == 0:
+    # 兼容部分 OpenAI 兼容服务在空回复时返回 choices=None 的情况
-        raise EmptyResponseException("响应解析失败，缺失choices字段或choices列表为空")
+    choices = getattr(resp, "choices", None)
-    message_part = resp.choices[0].message
+    if not choices:
+        try:
+            model_dbg = getattr(resp, "model", None)
+            id_dbg = getattr(resp, "id", None)
+            usage_dbg = None
+            if hasattr(resp, "usage") and resp.usage:
+                usage_dbg = {
+                    "prompt": getattr(resp.usage, "prompt_tokens", None),
+                    "completion": getattr(resp.usage, "completion_tokens", None),
+                    "total": getattr(resp.usage, "total_tokens", None),
+                }
+            try:
+                raw_snippet = str(resp)[:300]
+            except Exception:
+                raw_snippet = "<unserializable>"
+            logger.debug(
+                f"empty choices: model={model_dbg} id={id_dbg} usage={usage_dbg} raw≈{raw_snippet}"
+            )
+        except Exception:
+            # 日志采集失败不应影响控制流
+            pass
+        # 统一抛出可重试的 EmptyResponseException，触发上层重试逻辑
+        raise EmptyResponseException("响应解析失败，choices 为空或缺失")
+    message_part = choices[0].message
 
     if hasattr(message_part, "reasoning_content") and message_part.reasoning_content:  # type: ignore
         # 有有效的推理字段

src/llm_models/utils_model.py

@@ -384,8 +384,8 @@ class LLMRequest:
                 failed_models_this_request.add(model_info.name)
 
                 if isinstance(last_exception, RespNotOkException) and last_exception.status_code == 400:
-                    logger.error("收到不可恢复的客户端错误 (400)，中止所有尝试。")
+                    logger.warning("收到客户端错误 (400)，跳过当前模型并继续尝试其他模型。")
-                    raise last_exception from e
+                    continue
 
         logger.error(f"所有 {max_attempts} 个模型均尝试失败。")
         if last_exception: