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;'