From 3c8e04871f688add7357e4415101311366345bd9 Mon Sep 17 00:00:00 2001 From: ninepoin4 <125990639+ninepoin4@users.noreply.github.com> Date: Mon, 16 Nov 2026 21:30:56 +0800 Subject: [PATCH] =?UTF-8?q?fix(model-puller):=20/models=20=E6=8B=89?= =?UTF-8?q?=E5=8F=96=E5=9B=9E=E9=80=80=E5=88=B0=E5=9F=9F=E5=90=8D=E6=A0=B9?= =?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9=20/anthropic=20=E7=AD=89=E5=8D=8F?= =?UTF-8?q?=E8=AE=AE=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 现象:供应商 baseUrl 配成 Anthropic 兼容端点(如 https://api.deepseek.com/anthropic)时, 界面「拉取模型」报「获取模型失败,请检查 api key」,实际 key 有效、同域名根路径 https://api.deepseek.com/models 返回 200。 原因:三处取模型列表的逻辑都只在 baseUrl 后面拼 /v1/models 与 /models, 带子路径的 baseUrl 在子路径下没有 /models,全部 404。 改动:在保留原有候选顺序的前提下,追加同域名根路径作为兜底候选: - zcode_patcher.py(注入主进程的 fetch handler) - zcode-model-puller.js(渲染层无 IPC 时的兜底路径) - model_pull.py(CLI) 验证:python -m unittest discover -s tests 全绿(282 passed, 6 skipped); 用 DeepSeek 实际配置的 baseUrl 调用 fetch_models_from_api 成功,自动回退到 https://api.deepseek.com/v1/models 并取回模型列表。 --- skills/zcode-tokenspeed/scripts/model_pull.py | 12 ++++++++++++ .../zcode-tokenspeed/scripts/zcode-model-puller.js | 8 ++++++++ skills/zcode-tokenspeed/scripts/zcode_patcher.py | 3 +++ 3 files changed, 23 insertions(+) diff --git a/skills/zcode-tokenspeed/scripts/model_pull.py b/skills/zcode-tokenspeed/scripts/model_pull.py index be3edbd..a801ba7 100644 --- a/skills/zcode-tokenspeed/scripts/model_pull.py +++ b/skills/zcode-tokenspeed/scripts/model_pull.py @@ -33,6 +33,7 @@ import sys import time import urllib.error +import urllib.parse import urllib.request from pathlib import Path @@ -146,6 +147,17 @@ def fetch_models_from_api(base_url: str, api_key: str = "", timeout: int = 10): candidates.append(f"{base_url}/models") if "/api" in base_url and not base_url.endswith("/models"): candidates.append(f"{base_url}/v1/models") + # 兼容带协议前缀的 baseUrl(如 https://api.deepseek.com/anthropic): + # 子路径下通常没有 /models,回退到同域名根路径再试。 + try: + parts = urllib.parse.urlsplit(base_url) + if parts.scheme and parts.netloc: + origin = f"{parts.scheme}://{parts.netloc}" + for candidate in (f"{origin}/v1/models", f"{origin}/models"): + if candidate not in candidates: + candidates.append(candidate) + except Exception: + pass headers = {"User-Agent": "ZCode", "Accept": "application/json"} if api_key: diff --git a/skills/zcode-tokenspeed/scripts/zcode-model-puller.js b/skills/zcode-tokenspeed/scripts/zcode-model-puller.js index 3be8c56..a01087b 100644 --- a/skills/zcode-tokenspeed/scripts/zcode-model-puller.js +++ b/skills/zcode-tokenspeed/scripts/zcode-model-puller.js @@ -1044,6 +1044,14 @@ `${cleanUrl}/models`, ]; if (cleanUrl.endsWith("/api")) candidates.unshift(`${cleanUrl}/v1/models`); + // 兼容带协议前缀的 baseUrl(如 https://api.deepseek.com/anthropic): + // 子路径下通常没有 /models,回退到同域名根路径再试。 + try { + const origin = new URL(cleanUrl).origin; + for (const rootUrl of [`${origin}/v1/models`, `${origin}/models`]) { + if (!candidates.includes(rootUrl)) candidates.push(rootUrl); + } + } catch (e) {} for (const u of candidates) { try { diff --git a/skills/zcode-tokenspeed/scripts/zcode_patcher.py b/skills/zcode-tokenspeed/scripts/zcode_patcher.py index a57c294..2abdff6 100644 --- a/skills/zcode-tokenspeed/scripts/zcode_patcher.py +++ b/skills/zcode-tokenspeed/scripts/zcode_patcher.py @@ -1071,6 +1071,9 @@ def _models_main_block(ipc_alias: str) -> bytes: 'if(u.endsWith("/v1")){cs.push(u+"/models");cs.push(u.replace(/\\/v1$/,"")+"/models")}' 'else{cs.push(u+"/v1/models");cs.push(u+"/models")}' 'if(u.endsWith("/api"))cs.unshift(u+"/v1/models");' + # 兼容带协议前缀的 baseUrl(如 https://api.deepseek.com/anthropic): + # 子路径下通常没有 /models,回退到同域名根路径再试。 + 'try{let _o=new URL(u),_b=_o.origin;for(let _q of [_b+"/v1/models",_b+"/models"]){if(cs.indexOf(_q)<0)cs.push(_q)}}catch(e){}' 'for(let cur of cs){' 'try{let res=await new Promise(resolve=>{' 'let mod=cur.startsWith("https:")?ht:hh;'