fix: 增加 Moonshot 降级回退日志与可观测性测试

Author: Sisyphbaous-DT-Project

astrbot/core/provider/sources/openai_source.py

@@ -1104,14 +1104,20 @@ async def _handle_api_error(
                 "invalid_attachment",
                 image_fallback_used=True,
             )
-        if (
-            payloads.get("tool_choice") == "required"
+        required_tool_choice = payloads.get("tool_choice") == "required"
+        thinking_conflict_error = (
+            required_tool_choice
             and self._is_tool_choice_required_incompatible_with_thinking_error(e)
-        ):
+        )
+        if thinking_conflict_error:
             provider_name = self.provider_config.get("provider", "unknown")
+            logger.info(
+                "触发工具调用策略降级：检测到 thinking 模式不兼容，"
+                f"provider={provider_name}，tool_choice=required->auto"
+            )
             logger.warning(
-                "Detected `tool_choice=required` incompatible with thinking mode. "
-                f"Downgrading to `auto` and retrying. provider={provider_name}"
+                "检测到 `tool_choice=required` 与 thinking 模式不兼容，"
+                f"自动降级为 `auto` 并重试，provider={provider_name}"
             )
             retry_payloads = {**payloads, "tool_choice": "auto"}
             return (
@@ -1123,6 +1129,20 @@ async def _handle_api_error(
                 func_tool,
                 image_fallback_used,
             )
+        if required_tool_choice:
+            candidates = [
+                candidate.lower()
+                for candidate in self._extract_error_text_candidates(e)
+            ]
+            has_related_keywords = any(
+                "tool_choice" in candidate and "thinking" in candidate
+                for candidate in candidates
+            )
+            if has_related_keywords:
+                logger.debug(
+                    "检测到 tool_choice/thinking 相关错误，但未命中降级模式，"
+                    "保持 tool_choice=required"
+                )
 
         if (
             "Function calling is not enabled" in str(e)

tests/test_openai_source.py

@@ -675,6 +675,54 @@ async def test_handle_api_error_required_thinking_conflict_uses_payload_copy():
         await provider.terminate()
 
 
+@pytest.mark.asyncio
+async def test_handle_api_error_required_thinking_conflict_emits_fallback_log(
+    monkeypatch,
+):
+    provider = _make_provider({"provider": "moonshot"})
+    try:
+        payloads = {
+            "tool_choice": "required",
+            "messages": [{"role": "user", "content": [{"type": "text", "text": "hi"}]}],
+        }
+        context_query = payloads["messages"]
+        err = _ErrorWithBody(
+            "upstream error",
+            {
+                "error": {
+                    "message": "tool_choice 'required' is incompatible with thinking enabled",
+                    "type": "invalid_request_error",
+                }
+            },
+        )
+
+        info_logs: list[str] = []
+
+        def _capture_info(message, *args, **kwargs):
+            del args, kwargs
+            info_logs.append(str(message))
+
+        monkeypatch.setattr(
+            "astrbot.core.provider.sources.openai_source.logger.info",
+            _capture_info,
+        )
+
+        await provider._handle_api_error(
+            err,
+            payloads=payloads,
+            context_query=context_query,
+            func_tool=None,
+            chosen_key="test-key",
+            available_api_keys=["test-key"],
+            retry_cnt=0,
+            max_retries=10,
+        )
+
+        assert any("tool_choice=required->auto" in log for log in info_logs)
+    finally:
+        await provider.terminate()
+
+
 @pytest.mark.asyncio
 async def test_prepare_chat_payload_materializes_context_http_image_urls(monkeypatch):
     provider = _make_provider()