Merge pull request #202 from ThreeFish-AI/vk/89ae-fix-zhipu-anthro

fix(vendor-channels): 修复 anthropic→zhipu 跨供应商转换缺失导致 zhipu 400 错误

Author: ThreeFish-AI

CHANGELOG.md

@@ -4,6 +4,12 @@
 
 ## [Unreleased]
 
+### Bug Fixes
+
+- fix(vendor-channels): 新增 `anthropic → zhipu` 跨供应商转换通道，修复 Anthropic beta 功能（web search, computer use）产生的 `server_tool_use` 块导致 zhipu 400 错误的问题；
+- fix(error-classifier): 增强语义拒绝检测，识别 zhipu 等供应商返回的中文错误消息（如「API 调用参数有误」code=1210），确保正确触发故障转移；
+- fix(vendor-channels): `_remove_vendor_blocks` 增加空内容占位保护，防止内容块全部剥离后消息结构不合法。
+
 ## [v0.3.0](https://github.com/ThreeFish-AI/coding-proxy/releases/tag/v0.3.0) — 2026-04-20
 
 > [!IMPORTANT]

src/coding/proxy/convert/vendor_channels.py

@@ -10,6 +10,7 @@
     zhipu → anthropic : prepare_zhipu_to_anthropic  (剥离 thinking + tool pairing)
     zhipu → copilot   : prepare_zhipu_to_copilot    (剥离 thinking + cache_control + tool pairing)
     copilot → zhipu   : prepare_copilot_to_zhipu    (剥离 thinking + cache_control + 移除 thinking 参数 + tool pairing)
+    anthropic → zhipu : prepare_anthropic_to_zhipu  (剥离 server_tool_use + thinking + cache_control + 移除 thinking 参数 + tool pairing)
 """
 
 from __future__ import annotations
@@ -284,7 +285,13 @@ def _remove_vendor_blocks(body: dict[str, Any], block_types: set[str]) -> int:
                 removed += 1
                 continue
             new_content.append(block)
-        if removed:
+        if content != new_content:
+            if not new_content:
+                new_content = [{"type": "text", "text": "[vendor_block_removed]"}]
+                logger.info(
+                    "Inserted placeholder text block after stripping "
+                    "vendor blocks to avoid empty message content",
+                )
             message["content"] = new_content
     return removed
 
@@ -358,16 +365,17 @@ def infer_source_vendor_from_body(body: dict[str, Any]) -> str | None:
     """从请求 body 内容推断源供应商（仅在无会话上下文时作为兜底）.
 
     启发式（按置信度排序）:
-    - 出现 ``srvtoolu_*`` 格式的 ``tool_use.id`` → zhipu
-    - 出现 ``server_tool_use`` / ``server_tool_use_delta`` 类型的 content block → zhipu
+    - 出现 ``srvtoolu_*`` 格式的 ID → zhipu
+    - 出现 ``server_tool_use_delta`` 类型的 content block → zhipu
+    - 出现 ``server_tool_use`` 块 + ``toolu_*`` ID → anthropic（beta 功能产物）
 
     原则: 只读扫描不修改 body；无匹配返回 None（视作纯净无需跨供应商清洗）。
 
     Args:
         body: Anthropic Messages 请求体。
 
     Returns:
-        推断的源供应商名称（当前仅支持 ``"zhipu"``），无法推断返回 None。
+        推断的源供应商名称（``"zhipu"`` 或 ``"anthropic"``），无法推断返回 None。
     """
     for message in body.get("messages", []):
         if not isinstance(message, dict):
@@ -379,18 +387,35 @@ def infer_source_vendor_from_body(body: dict[str, Any]) -> str | None:
             if not isinstance(block, dict):
                 continue
             block_type = block.get("type")
-            if block_type in _ZHIPU_SERVER_TOOL_USE_TYPES:
-                return "zhipu"
             block_id = block.get("id")
+            tool_use_id = block.get("tool_use_id")
+
+            # Zhipu: server_tool_use_delta 是 zhipu 私有流式块（无歧义）
+            if block_type == "server_tool_use_delta":
+                return "zhipu"
+
+            # srvtoolu_* ID（无论 block type）→ zhipu
             if isinstance(block_id, str) and _ANTHROPIC_SERVER_TOOL_USE_ID_RE.match(
                 block_id
             ):
                 return "zhipu"
-            tool_use_id = block.get("tool_use_id")
             if isinstance(tool_use_id, str) and _ANTHROPIC_SERVER_TOOL_USE_ID_RE.match(
                 tool_use_id
             ):
                 return "zhipu"
+
+            # server_tool_use 块 + toolu_* ID → Anthropic beta 功能
+            if (
+                block_type == "server_tool_use"
+                and isinstance(block_id, str)
+                and _ANTHROPIC_TOOL_USE_ID_RE.match(block_id)
+            ):
+                return "anthropic"
+
+            # server_tool_use 块 + 非 toolu_/srvtoolu_ ID → 按类型兜底归 zhipu
+            if block_type == "server_tool_use":
+                return "zhipu"
+
     return None
 
 
@@ -438,6 +463,61 @@ def prepare_copilot_to_zhipu(
     return prepared, adaptations
 
 
+# ── anthropic → zhipu 转换通道 ────────────────────────────────────
+
+# Anthropic beta 特有的 server_tool_use 块类型（web search, computer use 等）.
+# 这些块在 Anthropic API 中有效，但 zhipu GLM-5 的兼容端点不支持。
+# 注意: 这与 zhipu 自己的 server_tool_use（使用 srvtoolu_* ID）是不同的概念，
+# 但它们共用同一个 type 名称 "server_tool_use"。
+_ANTHROPIC_BETA_BLOCK_TYPES = {"server_tool_use"}
+
+
+def prepare_anthropic_to_zhipu(
+    body: dict[str, Any],
+) -> tuple[dict[str, Any], list[str]]:
+    """anthropic → zhipu 转换: 清理 anthropic 产物以适配 GLM-5.
+
+    Anthropic API 可能产生的非兼容产物:
+    - ``server_tool_use`` blocks（web search / computer use 等 beta 功能）
+    - ``thinking`` / ``redacted_thinking`` blocks（含 Anthropic 签发的 signature）
+    - ``cache_control`` 字段
+    - 顶层 ``thinking`` / ``extended_thinking`` 参数
+
+    Returns:
+        (prepared_body, adaptations) — adaptations 为应用的变换描述列表。
+    """
+    prepared = copy.deepcopy(body)
+    adaptations: list[str] = []
+
+    # Step 1: 剥离 anthropic 的 server_tool_use blocks（web search, computer use 等）
+    removed_stu = _remove_vendor_blocks(prepared, _ANTHROPIC_BETA_BLOCK_TYPES)
+    if removed_stu:
+        adaptations.append(f"removed_{removed_stu}_server_tool_use_blocks")
+
+    # Step 2: 剥离 thinking/redacted_thinking blocks
+    stripped = strip_thinking_blocks(prepared)
+    if stripped:
+        adaptations.append(f"stripped_{stripped}_thinking_blocks")
+
+    # Step 3: 移除 cache_control 字段
+    removed_cc = _strip_cache_control(prepared)
+    if removed_cc:
+        adaptations.append(f"removed_{removed_cc}_cache_control_fields")
+
+    # Step 4: 移除顶层 thinking/extended_thinking 参数（GLM-5 不支持）
+    for param in ("thinking", "extended_thinking"):
+        if param in prepared:
+            del prepared[param]
+            adaptations.append(f"removed_{param}_param")
+
+    # Step 5: 强制 tool_use/tool_result 配对
+    pairing_fixes = enforce_anthropic_tool_pairing(prepared.get("messages", []))
+    if pairing_fixes:
+        adaptations.extend(pairing_fixes)
+
+    return prepared, adaptations
+
+
 # ── zhipu → copilot 转换通道 ─────────────────────────────────────
 
 
@@ -544,3 +624,4 @@ def prepare_zhipu_to_anthropic(
 VENDOR_TRANSITIONS[("zhipu", "anthropic")] = prepare_zhipu_to_anthropic
 VENDOR_TRANSITIONS[("zhipu", "copilot")] = prepare_zhipu_to_copilot
 VENDOR_TRANSITIONS[("copilot", "zhipu")] = prepare_copilot_to_zhipu
+VENDOR_TRANSITIONS[("anthropic", "zhipu")] = prepare_anthropic_to_zhipu

src/coding/proxy/routing/error_classifier.py

@@ -24,6 +24,17 @@
     }
 )
 
+# 中文语义拒绝标记（zhipu 等供应商的 400 错误消息）。
+# 使用原始大小写匹配，因为中文无大小写之分。
+_VENDOR_CN_SEMANTIC_REJECTION_MARKERS: frozenset[str] = frozenset(
+    {
+        "API 调用参数有误",
+        "参数不合法",
+        "请求参数错误",
+        "请求格式错误",
+    }
+)
+
 
 def extract_error_payload_from_http_status(
     exc: httpx.HTTPStatusError,
@@ -91,6 +102,9 @@ def is_semantic_rejection(
             "can only be in",
             "bad request",  # 覆盖 Copilot 等返回纯文本 "Bad Request" 的场景
         )
+    ) or any(
+        marker in (error_message or "")
+        for marker in _VENDOR_CN_SEMANTIC_REJECTION_MARKERS
     )
 
 

tests/test_error_classifier.py

@@ -175,6 +175,44 @@ def test_structural_tool_use_error_not_semantic(self):
             is False
         )
 
+    def test_400_with_chinese_api_error(self):
+        """zhipu 返回中文「API 调用参数有误」应被识别为语义拒绝."""
+        assert (
+            is_semantic_rejection(
+                status_code=400,
+                error_message="API 调用参数有误",
+            )
+            is True
+        )
+
+    def test_400_with_chinese_validation_error(self):
+        assert (
+            is_semantic_rejection(
+                status_code=400,
+                error_message="请求参数错误",
+            )
+            is True
+        )
+
+    def test_400_with_chinese_format_error(self):
+        assert (
+            is_semantic_rejection(
+                status_code=400,
+                error_message="请求格式错误",
+            )
+            is True
+        )
+
+    def test_chinese_error_not_matched_at_non_400(self):
+        """非 400 状态码的中文错误不应被视为语义拒绝."""
+        assert (
+            is_semantic_rejection(
+                status_code=500,
+                error_message="API 调用参数有误",
+            )
+            is False
+        )
+
 
 # --- extract_error_payload_from_http_status 测试 ---
 

tests/test_router_executor.py

@@ -1609,17 +1609,14 @@ def test_returns_none_for_no_source(self):
             is None
         )
 
-    def test_returns_none_when_no_registered_transition(self):
-        """会话历史中有 vendor 但无对应已注册转换 → 无源 vendor.
-
-        例如 anthropic → zhipu 未注册，不会触发转换。
-        """
+    def test_returns_session_vendor_with_registered_transition_anthropic_to_zhipu(self):
+        """anthropic → zhipu 已注册转换，应返回 anthropic 作为源 vendor."""
         session_record = MagicMock()
         session_record.provider_state = {"anthropic": {}}
 
         assert (
             _RouteExecutor._determine_source_vendor("zhipu", None, session_record)
-            is None
+            == "anthropic"
         )
 
     def test_returns_none_when_session_is_none(self):
@@ -1890,16 +1887,22 @@ def test_returns_body_when_no_source_vendor(self):
         assert result is body
         assert len(result["messages"][0]["content"]) == 2
 
-    def test_returns_body_for_unregistered_transition(self):
-        """未注册的转换对（如 anthropic → zhipu）→ 原样返回."""
+    def test_applies_anthropic_to_zhipu_transition(self):
+        """anthropic → zhipu 已注册转换，应清理 thinking blocks."""
         tier = MagicMock()
         tier.name = "zhipu"
 
         exec_inst = _executor([])
         body = self._body_with_thinking()
         result = exec_inst._prepare_body_for_tier(body, tier, source_vendor="anthropic")
 
-        assert result is body
+        # thinking blocks 应被剥离
+        assert result is not body
+        assert all(
+            b.get("type") not in ("thinking", "redacted_thinking")
+            for b in result["messages"][0]["content"]
+        )
+        assert len(result["messages"][0]["content"]) >= 1
 
     def test_returns_body_for_unknown_tier(self):
         """未知 tier（无注册转换）→ 原样返回."""