4 Commits
6 changed files with 239 additions and 8 deletions
+3 -2
View File
@@ -4,7 +4,7 @@
- **访问地址:** `http://<IP>:16097/`
- **技术栈:** Python 3 + Flask + SQLite(纯 REST,无额外依赖)
- **版本:** v2.3.0
- **版本:** v2.5.0
---
@@ -13,6 +13,7 @@
### 🔌 大模型接口配置
- 支持 **OpenAI 兼容**OpenAI / DeepSeek / 火山方舟 / 任意兼容网关)、**AnthropicClaude**、**Google Gemini** 三类提供商
- 配置项:配置名称、Base URL(留空自动使用官方默认)、API Key(可显示/隐藏)、模型名称、温度
- **📋 查看模型按钮**:填好 Base URL + API Key 后点击,实时调用该接口的 `/models` 获取全部模型(OpenAI 兼容 `GET /models`、Anthropic `GET /v1/models`、Gemini `GET /v1beta/models`),弹出下拉面板可**搜索**(输入关键词实时过滤)/ 点击直接**填入模型名称**;仍支持手动直接输入模型名(搜索框里直接输入回车也能确认填入)
- 配置可**保存/加载/删除**,方便多模型对比
### 🚀 速度测试配置
@@ -177,4 +178,4 @@ llm-speed-tester/
## Git
- **仓库:** `hz4th_coder/llm-speed-tester`
- **版本:** v2.3.0多并发测试(默认单流,预设2/4可自定义并发档,整批吞吐聚合+按并发分组)+ 多测试结果对比(历史勾选→对比表/柱状图/并发折线图)
- **版本:** v2.5.0模型实时获取:接口配置区「📋 查看模型」按钮,Base URL+API Key 下实时拉取模型列表(GET /models),搜索/点击填入,仍支持手动输入
+31 -1
View File
@@ -2,13 +2,14 @@
"""LLM 速度测试台 - Flask 主应用"""
import io
import json
import subprocess
import requests
from flask import Flask, jsonify, request, send_file, send_from_directory
import config
import database as db
from llm_providers import DEFAULT_URLS, ProviderError, call_stream
from llm_providers import DEFAULT_URLS, ProviderError, call_stream, list_models
from tester import TestRunner
app = Flask(__name__, static_folder="static", static_url_path="")
@@ -24,6 +25,19 @@ def index():
return send_from_directory(app.static_folder, "index.html")
@app.route("/api/gpu")
def gpu_info():
"""自动探测本机 GPU(nvidia-smi),供评测站同步时标注硬件"""
try:
out = subprocess.check_output(
["nvidia-smi", "--query-gpu=name", "--format=csv,noheader"],
text=True, timeout=5, stderr=subprocess.DEVNULL)
gpus = [g.strip() for g in out.strip().splitlines() if g.strip()]
return jsonify({"ok": True, "gpus": gpus, "label": " / ".join(gpus)})
except Exception as e:
return jsonify({"ok": True, "gpus": [], "label": "", "error": str(e)})
@app.route("/api/health")
def health():
running = [tid for tid, r in RUNNERS.items() if r.is_alive()]
@@ -79,6 +93,22 @@ def del_config(cid):
return jsonify({"ok": True})
@app.route("/api/models", methods=["POST"])
def list_models_api():
"""实时获取某接口(Base URL + API Key)下的所有模型列表,供前端选择填入"""
cfg = _fill_defaults(request.get_json(force=True) or {})
try:
models = list_models(cfg)
if not models:
return jsonify({"ok": True, "models": [], "count": 0,
"note": "接口可用,但未返回任何模型"})
return jsonify({"ok": True, "models": models, "count": len(models)})
except ProviderError as e:
return jsonify({"ok": False, "error": str(e)})
except Exception as e:
return jsonify({"ok": False, "error": str(e)})
@app.route("/api/configs/test", methods=["POST"])
def test_config():
cfg = _fill_defaults(request.get_json(force=True) or {})
+50
View File
@@ -307,6 +307,56 @@ def stream_google(cfg, prompt, gen, log, should_stop=None):
cached_tokens, output_chars, len(prompt))
# ───────────────────────── 模型列表获取 ─────────────────────────
def list_models(cfg):
"""实时获取该接口(Base URL + API Key)下的所有模型 ID 列表。
支持 OpenAI 兼容 / Anthropic / Google Gemini 三种提供商。"""
provider = cfg.get("provider", "openai")
api_key = cfg.get("api_key") or ""
if not api_key:
raise ProviderError("请填写 API Key")
base = (cfg.get("base_url") or DEFAULT_URLS.get(provider, "")).rstrip("/")
if provider == "openai":
# GET {base}/models Authorization: Bearer <key> → data[].id
headers = {"Authorization": "Bearer " + api_key}
resp = requests.get(base + "/models", headers=headers,
timeout=config.CONNECT_TIMEOUT)
if resp.status_code != 200:
raise ProviderError("HTTP %s: %s" % (resp.status_code, resp.text[:400]))
data = resp.json()
return [m.get("id") for m in (data.get("data") or []) if m.get("id")]
if provider == "anthropic":
# GET {base}/v1/models x-api-key + anthropic-version → data[].id
headers = {"x-api-key": api_key, "anthropic-version": "2023-06-01"}
resp = requests.get(base + "/v1/models", headers=headers,
timeout=config.CONNECT_TIMEOUT)
if resp.status_code != 200:
raise ProviderError("HTTP %s: %s" % (resp.status_code, resp.text[:400]))
data = resp.json()
return [m.get("id") for m in (data.get("data") or []) if m.get("id")]
if provider == "google":
# GET {base}/v1beta/models?key=<key> → models[].name(形如 models/gemini-1.5-pro
resp = requests.get(base + "/v1beta/models", params={"key": api_key},
timeout=config.CONNECT_TIMEOUT)
if resp.status_code != 200:
raise ProviderError("HTTP %s: %s" % (resp.status_code, resp.text[:400]))
data = resp.json()
out = []
for m in (data.get("models") or []):
name = m.get("name") or ""
if name.startswith("models/"):
name = name[len("models/"):]
if name and name not in out:
out.append(name)
return out
raise ProviderError("不支持的提供商类型: %s" % provider)
# ───────────────────────── 统一入口 ─────────────────────────
def call_stream(cfg, prompt, gen, log=None, should_stop=None):
+28
View File
@@ -129,6 +129,34 @@ body {
.conn-result.ok { background: rgba(34,197,139,.12); color: var(--accent2); border: 1px solid rgba(34,197,139,.3); }
.conn-result.fail { background: rgba(255,92,108,.1); color: var(--danger); border: 1px solid rgba(255,92,108,.3); }
/* ── 查看模型(实时获取模型列表下拉面板) ── */
.model-pick {
margin-top: 8px; background: var(--panel2); border: 1px solid var(--accent);
border-radius: 10px; overflow: hidden;
}
.model-pick[hidden] { display: none; }
.model-pick-head {
display: flex; align-items: center; gap: 6px;
padding: 8px; border-bottom: 1px solid var(--border);
}
.model-pick-head input {
flex: 1; background: var(--bg); color: var(--text);
border: 1px solid var(--border); border-radius: 6px;
padding: 6px 8px; font-size: 12px; outline: none;
}
.model-pick-head input:focus { border-color: var(--accent); }
.model-pick-list { max-height: 240px; overflow-y: auto; }
.model-pick-item {
padding: 7px 10px; font-size: 12.5px; cursor: pointer;
font-family: var(--mono); word-break: break-all;
border-bottom: 1px solid rgba(42,53,80,.5);
}
.model-pick-item:hover { background: rgba(79,140,255,.16); color: var(--accent); }
.model-pick-item.active { background: rgba(34,197,139,.14); color: var(--accent2); }
.model-pick-empty {
padding: 14px 10px; color: var(--muted); font-size: 12px; text-align: center;
}
/* ── 指标卡 ── */
.metrics { display: grid; grid-template-columns: repeat(6, 1fr); gap: 12px; }
.metric-card {
+20 -2
View File
@@ -55,8 +55,19 @@
</div>
</div>
<div class="field">
<label>模型名称</label>
<div class="icon-input"><span class="icon">🤖</span><input id="cfg-model" placeholder="如 gpt-4o / deepseek-chat / claude-sonnet-4"></div>
<label>模型名称 <span class="hint-inline">可直接输入,也可点击「查看模型」实时获取</span></label>
<div class="row">
<div class="icon-input" style="flex:1"><span class="icon">🤖</span><input id="cfg-model" placeholder="如 gpt-4o / deepseek-chat / claude-sonnet-4"></div>
<button class="btn small" id="btn-list-models" title="实时获取此接口(Base URL + API Key)下的所有模型并选择填入">📋 查看模型</button>
</div>
<div class="model-pick" id="model-pick" hidden>
<div class="model-pick-head">
<input id="model-pick-search" placeholder="🔍 搜索模型(可直接输入模型名回车确认)" autocomplete="off">
<button class="btn small" id="model-pick-close" title="关闭"></button>
</div>
<div class="model-pick-list" id="model-pick-list"></div>
</div>
<div class="conn-result" id="model-result" hidden></div>
</div>
<div class="field">
<label>温度 Temperature <b id="tmp-val">0.7</b></label>
@@ -126,6 +137,13 @@
<label>评测站账号(结果挂到该账号下)</label>
<div class="icon-input"><span class="icon">👥</span><input id="eval-account" placeholder="如:性能评测组"></div>
</div>
<div class="field">
<label>硬件 / GPU(自动探测可修改,随结果一并发送)</label>
<div class="row">
<div class="icon-input"><span class="icon">🖥</span><input id="eval-hardware" placeholder="如:NVIDIA A100 80G"></div>
<button class="btn small" id="btn-detect-gpu" title="自动探测本机GPU">🔍 探测</button>
</div>
</div>
<button class="btn block" id="btn-eval-test">🔗 测试连接</button>
<div class="conn-result" id="eval-result" hidden></div>
<div class="hint" style="margin-top:6px">测试完成后,在历史列表或详情里点「📤 发送到评测站」,一键把结果发布到模型评测网站(端口 16066)对应账号下。</div>
+107 -3
View File
@@ -191,6 +191,7 @@ function loadSelectedConfig() {
$("#cfg-temp").value = c.temperature ?? 0.7;
$("#tmp-val").textContent = (c.temperature ?? 0.7).toFixed(1);
updateDefaultUrlHint();
hideModelPick();
flash("已加载配置:" + c.name);
}).catch(() => toast("加载失败"));
}
@@ -223,6 +224,81 @@ function showConn(ok, text) {
box.textContent = text;
}
/* ───────────────────────── 查看模型(实时获取接口下所有模型) ───────────────────────── */
function hideModelPick() {
$("#model-pick").hidden = true;
$("#model-result").hidden = true;
}
async function listModels() {
const cfg = currentConfig();
hideModelPick();
if (!cfg.base_url) { toast("请先填写 Base URL"); return; }
if (!cfg.api_key) { toast("请先填写 API Key"); return; }
const panel = $("#model-pick");
panel.hidden = false;
const listEl = $("#model-pick-list");
listEl.innerHTML = '<div class="model-pick-empty">⏳ 正在获取模型列表(GET /models...</div>';
try {
const r = await api("/api/models", "POST", cfg);
if (!r.ok) throw new Error(r.error || "获取失败");
const models = r.models || [];
if (!models.length) {
listEl.innerHTML = '<div class="model-pick-empty">⚠️ ' + esc(r.note || "接口可用,但未返回任何模型") + '</div>';
return;
}
renderModelList(models);
} catch (e) {
panel.hidden = true;
const box = $("#model-result");
box.hidden = false;
box.className = "conn-result fail";
box.textContent = "❌ 获取模型失败:" + e.message;
}
}
function renderModelList(models) {
const listEl = $("#model-pick-list");
const search = $("#model-pick-search");
search.value = "";
listEl.innerHTML = "";
const fill = (m) => {
$("#cfg-model").value = m;
hideModelPick();
toast("已填入模型:" + m);
};
const render = () => {
const q = search.value.trim().toLowerCase();
const cur = $("#cfg-model").value.trim();
const filtered = q ? models.filter((m) => m.toLowerCase().includes(q)) : models;
if (!filtered.length) {
listEl.innerHTML = '<div class="model-pick-empty">无匹配模型,可直接在上方输入模型名</div>';
return;
}
listEl.innerHTML = "";
for (const m of filtered) {
const item = document.createElement("div");
item.className = "model-pick-item" + (m === cur ? " active" : "");
item.textContent = m;
item.title = "点击填入模型名称";
item.addEventListener("click", () => fill(m));
listEl.appendChild(item);
}
};
search.addEventListener("input", render);
search.addEventListener("keydown", (e) => {
if (e.key === "Enter") {
const v = search.value.trim();
if (v) fill(v); // 手动输入回车直接确认填入
} else if (e.key === "Escape") {
hideModelPick();
}
});
render();
search.focus();
}
/* ───────────────────────── 测试运行 ───────────────────────── */
function setStatus(state, label) {
@@ -833,19 +909,41 @@ function evalSettings() {
return {
url: (localStorage.getItem("evalUrl") || "http://127.0.0.1:16066").replace(/\/+$/, ""),
account: localStorage.getItem("evalAccount") || "默认账号",
hardware: localStorage.getItem("evalHardware") || "",
};
}
function loadEvalSettings() {
const s = evalSettings();
const u = $("#eval-url"), a = $("#eval-account");
const u = $("#eval-url"), a = $("#eval-account"), h = $("#eval-hardware");
if (u) u.value = s.url;
if (a) a.value = s.account;
if (h) h.value = s.hardware;
}
function saveEvalSettings() {
localStorage.setItem("evalUrl", $("#eval-url").value.trim() || "http://127.0.0.1:16066");
localStorage.setItem("evalAccount", $("#eval-account").value.trim() || "默认账号");
localStorage.setItem("evalHardware", $("#eval-hardware").value.trim() || "");
}
async function detectGpu() {
const box = $("#eval-result");
try {
const r = await api("/api/gpu");
if (r.label) {
$("#eval-hardware").value = r.label;
saveEvalSettings();
box.hidden = false; box.className = "conn-result ok";
box.textContent = `✅ 已探测到 GPU${r.label}`;
} else {
box.hidden = false; box.className = "conn-result fail";
box.textContent = "未探测到 GPUnvidia-smi 不可用),可手动填写硬件描述";
}
} catch (e) {
box.hidden = false; box.className = "conn-result fail";
box.textContent = "❌ 探测失败:" + e.message;
}
}
async function testEvalConn() {
@@ -888,6 +986,7 @@ async function sendToEval(id) {
source_site: "llm-speed-tester",
provider: t.provider || "",
model: t.model || "",
hardware: s.hardware,
test_name: t.name || "",
summary: t.summary || {},
gen: t.gen || {},
@@ -928,13 +1027,17 @@ function flash(msg) {
/* ───────────────────────── 事件绑定 ───────────────────────── */
function bind() {
$("#cfg-provider").addEventListener("change", updateDefaultUrlHint);
$("#cfg-provider").addEventListener("change", () => { updateDefaultUrlHint(); hideModelPick(); });
$("#cfg-baseurl").addEventListener("input", hideModelPick);
$("#cfg-apikey").addEventListener("input", hideModelPick);
$("#cfg-temp").addEventListener("input", () => $("#tmp-val").textContent = parseFloat($("#cfg-temp").value).toFixed(1));
$("#btn-toggle-key").addEventListener("click", () => {
const inp = $("#cfg-apikey");
inp.type = inp.type === "password" ? "text" : "password";
});
$("#btn-list-models").addEventListener("click", listModels);
$("#model-pick-close").addEventListener("click", hideModelPick);
$("#btn-save-config").addEventListener("click", async () => {
const r = await api("/api/configs", "POST", currentConfig());
if (r.ok) { toast("配置已保存"); loadConfigs(); }
@@ -951,6 +1054,7 @@ function bind() {
$("#btn-test-conn").addEventListener("click", testConnection);
$("#btn-eval-test").addEventListener("click", testEvalConn);
$("#btn-detect-gpu").addEventListener("click", detectGpu);
$("#btn-start").addEventListener("click", startTest);
$("#btn-cancel").addEventListener("click", stopTest);
$("#btn-context-add").addEventListener("click", addContextLength);
@@ -1003,7 +1107,7 @@ function bind() {
$("#dt-export-xlsx").addEventListener("click", () => { if (window.__detail) exportXlsx(window.__detail.id); });
$("#dt-send-eval").addEventListener("click", () => { if (window.__detail) sendToEval(window.__detail.id); });
document.addEventListener("keydown", (e) => { if (e.key === "Escape") { closeDetail(); closeCompare(); } });
document.addEventListener("keydown", (e) => { if (e.key === "Escape") { hideModelPick(); closeDetail(); closeCompare(); } });
}
/* ───────────────────────── 初始化 ───────────────────────── */