From 704a332f3f0af4ee4857c9bf641858ad8404da2d Mon Sep 17 00:00:00 2001 From: admin Date: Tue, 15 Sep 2026 19:59:23 +0800 Subject: [PATCH] =?UTF-8?q?feat(me):=20=E4=B8=8A=E6=B8=B8=E6=8C=89?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=88=86=E7=BB=84=20+=20=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E5=8D=B3=E7=94=A8=20curl=20+=2024h=20=E6=8A=98=E7=BA=BF?= =?UTF-8?q?=E9=AB=98=E5=BA=A6=E5=8E=8B=E5=8D=8A=20(1.0.34)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - **上游按协议分组**:每个 upstream 的 `base_url`(OpenAI 协议)与 `anthropic_base_url`(Anthropic 协议)**各自渲染一份 curl 示例**—— 同一个上游支持两种客户端(OpenAI SDK / Anthropic SDK), 各拿各的 URL 即可。 - **复制即用**:每份 curl 带「OpenAI」「Anthropic」协议标签 + 复制按钮 (IP.copyText,非安全上下文 fallback prompt)。**Key 占位 ``**。 - **协议判定**:后端 view 已返回 `base_url` / `anthropic_base_url` 两个字段(1.0.23 起),不再做 heuristics 猜测。 - **24h 折线高度**:180 → **90**(再压一半),整体更紧凑。 回归 238/0 全绿。 --- www/assets/admin.css | 17 ++++++++++ www/assets/me.js | 77 ++++++++++++++++++++++++++++++++++++++------ 2 files changed, 85 insertions(+), 9 deletions(-) diff --git a/www/assets/admin.css b/www/assets/admin.css index b7d5df3..ffb1a48 100644 --- a/www/assets/admin.css +++ b/www/assets/admin.css @@ -203,3 +203,20 @@ button.host-copy:hover{text-decoration:underline solid} .spark-svg{display:block} .spark-svg .s-bar{fill:var(--c-req)} .spark-svg .s-zero{fill:#e6eaf0} + +/* ============================================================================ + me.html 「我能调的 LLM 上游」:协议分组 + 复制即用 curl + ========================================================================== */ +.upstream-card{border:1px solid var(--border);border-radius:8px;background:var(--panel); + padding:12px 14px;margin-bottom:12px} +.upstream-head{display:flex;align-items:center;flex-wrap:wrap;gap:6px;margin-bottom:8px} +.upstream-curl-row{display:flex;align-items:flex-start;gap:8px;margin-top:8px} +.upstream-curl-row + .upstream-curl-row{border-top:1px dashed var(--border);padding-top:8px} +.upstream-proto-tag{flex-shrink:0;padding:2px 8px;border-radius:4px;font-size:11px; + font-weight:600;line-height:1.4;white-space:nowrap} +.upstream-proto-tag.openai{background:#dbeafe;color:#1e40af} +.upstream-proto-tag.anthropic{background:#fde68a;color:#92400e} +.upstream-curl{flex:1;min-width:0;margin:0;padding:10px 12px;background:var(--bg); + border:1px solid var(--border);border-radius:6px;font-size:11.5px;line-height:1.55; + white-space:pre-wrap;word-break:break-all;color:#334155;font-family:ui-monospace,SFMono-Regular,Menlo,Consolas,monospace} +.copy-btn{flex-shrink:0} diff --git a/www/assets/me.js b/www/assets/me.js index 31710cc..084a89a 100644 --- a/www/assets/me.js +++ b/www/assets/me.js @@ -72,7 +72,7 @@ IP.chart.line(el, { labels: hour24.map(function (_, h) { return h; }), series: [{ name: "调用数", values: hour24.map(function (v) { return Number(v) || 0; }) }], - height: 180, + height: 90, emptyText: "过去 24 小时没有调用记录" }); } @@ -99,20 +99,79 @@ }).join(""); } + /** + * 同一个 upstream 通常**两个 base_url 都存在**: + * - `base_url`:OpenAI 协议路径(如 `https://host/minimax/v1`) + * - `anthropic_base_url`:Anthropic 协议路径(如 `https://host/minimax/anthropic`) + * + * 用户视角两种客户端(OpenAI SDK / Anthropic SDK)都能用—— + * 每种协议各自渲染一份**复制即用** curl。 + */ function renderUpstreams(upstreams) { var el = $("dUpstream"); if (!upstreams || !upstreams.length) { el.innerHTML = '当前账号无可用上游(可能白名单为空,或全部 slot 被停用)'; return; } - el.innerHTML = '' + - upstreams.map(function (u) { - return '' + - '' + - '' + - '' + - ''; - }).join("") + '
slotbase_urlmodels
' + esc(u.slot || "") + '' + esc(u.base_url || "") + '' + ((u.models || []).map(esc).join("、") || "—") + '
'; + + function curlOpenAI(baseUrl, model) { + // base_url 已带 `/v1`,再加 `/chat/completions` + return 'curl -sk -H "Authorization: Bearer " \\\n' + + ' -H "Content-Type: application/json" \\\n' + + ' ' + esc(baseUrl) + '/chat/completions \\\n' + + ' -d \'{"model":"' + esc(model) + '","messages":[{"role":"user","content":"hi"}]}\''; + } + function curlAnthropic(baseUrl, model) { + // anthropic_base_url 是 path 前缀(如 `/minimax/anthropic`),加 `/v1/messages` + // 实际看网关 nginx 配置:`/anthropic/v1/messages` 等价于上游的 anthropic 协议端点 + return 'curl -sk -H "x-api-key: " \\\n' + + ' -H "anthropic-version: 2023-06-01" \\\n' + + ' -H "Content-Type: application/json" \\\n' + + ' ' + esc(baseUrl) + '/v1/messages \\\n' + + ' -d \'{"model":"' + esc(model) + '","max_tokens":1024,"messages":[{"role":"user","content":"hi"}]}\''; + } + + function renderCard(proto, baseUrl, model) { + var curl = proto === "openai" + ? curlOpenAI(baseUrl, model) + : curlAnthropic(baseUrl, model); + return '
' + + '' + + (proto === "openai" ? "OpenAI" : "Anthropic") + '' + + '
' +
+          esc(curl) +
+        '
' + + '' + + '
'; + } + + el.innerHTML = upstreams.map(function (u) { + var model = (u.models && u.models[0]) || ""; + var hasOpenAI = !!u.base_url; + var hasAnthropic = !!u.anthropic_base_url; + var protocols = []; + if (hasOpenAI) protocols.push(["openai", u.base_url]); + if (hasAnthropic) protocols.push(["anthropic", u.anthropic_base_url]); + return '
' + + '
' + + '' + esc(u.slot || "") + '' + + '' + + esc((u.models || []).join("、") || "—") + '' + + (u.note ? '— ' + esc(u.note) + '' : '') + + '
' + + protocols.map(function (p) { return renderCard(p[0], p[1], model); }).join("") + + '
'; + }).join(""); + + // 复制按钮 + Array.prototype.forEach.call(el.querySelectorAll(".copy-btn"), function (btn) { + btn.addEventListener("click", function (e) { + e.preventDefault(); + var pre = btn.previousElementSibling; + var curl = pre.getAttribute("data-curl"); + IP.copyText(curl, "curl"); + }); + }); } function renderApix(apix) {