Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions skills/zcode-tokenspeed/scripts/model_pull.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
import sys
import time
import urllib.error
import urllib.parse
import urllib.request
from pathlib import Path

Expand Down Expand Up @@ -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:
Expand Down
8 changes: 8 additions & 0 deletions skills/zcode-tokenspeed/scripts/zcode-model-puller.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
3 changes: 3 additions & 0 deletions skills/zcode-tokenspeed/scripts/zcode_patcher.py
Original file line number Diff line number Diff line change
Expand Up @@ -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;'
Expand Down