Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f6aca87f4f | ||
|
|
e8b935fab4 | ||
|
|
1834a23b3b | ||
|
|
3a6a1e02a2 | ||
|
|
ad863077c6 | ||
|
|
b0dd109a13 | ||
|
|
79f59be6d6 |
@@ -114,9 +114,36 @@ POST /api/seed-capabilities # 🎲 能力测试演示数据
|
||||
## 9. 其他
|
||||
|
||||
```bash
|
||||
POST /api/chart # 图表代理(转发 data-chart-tool 16016,返回 PNG)
|
||||
POST /api/chart # 图表代理(转发 data-chart-tool 16016,返回 PNG,自动叠加水印)
|
||||
GET /api/settings # 前台设置(watermark/top_n)
|
||||
```
|
||||
|
||||
## 10. 速度项管理(后台,热度/个数/配置简介)
|
||||
|
||||
```bash
|
||||
GET /api/admin/speed-items
|
||||
POST /api/admin/speed-items # {provider, model, heat, count, intro, remark}
|
||||
PUT /api/admin/speed-items/<id>
|
||||
DELETE /api/admin/speed-items/<id>
|
||||
POST /api/admin/speed-items/sync # 从提交自动同步(默认热度=提交数)
|
||||
```
|
||||
|
||||
排行榜默认按 **热度(heat)** 显示前 N 个(N 后台设置 top_n 可改);搜索框热门5个取热度前5。
|
||||
|
||||
## 11. 站点设置(后台,图片水印/默认条数/排行榜列)
|
||||
|
||||
```bash
|
||||
GET /api/admin/settings
|
||||
PUT /api/admin/settings {
|
||||
"watermark_text":"...", "watermark_style":"corner", # 风格: corner/diagonal/bottom/corners/diag-big
|
||||
"top_n":10,
|
||||
"lb_show_ttft":"0", "lb_show_hardware":"1", "lb_show_framework":"1",
|
||||
"lb_merge_decode":"1", "lb_merge_hwfw":"1"
|
||||
}
|
||||
```
|
||||
|
||||
生成图表时自动叠加水印(默认首页网址,5 种预置风格,浅底深字/深底浅字自适应);排行榜列显示/合并可配。
|
||||
|
||||
## 错误
|
||||
|
||||
所有接口失败返回 `{"ok": false, "error": "..."}` + 对应 HTTP 状态码;
|
||||
|
||||
@@ -10,11 +10,11 @@
|
||||
|
||||
| 页面 | 说明 |
|
||||
|------|------|
|
||||
| `/`(index.html) | 🏆 模型速度排行:按模型+提供商聚合,表头可排序 + **硬件显示** + 解码速度对比图(**默认对比全部模型,可勾选指定模型**后重新生成) |
|
||||
| `/`(index.html) | 🏆 模型运行速度排行:**默认按热度显示前10**(后台可配)+ **网页顶部居中全局搜索**(选中跳详情)+ 排行内**搜索添加**速度项到本区域(可✕)+ 推理框架列 + **+对比/详情** + **运行速度对比图**(要对比模型可叉掉/清空/+对比添加,可下载PNG带水印) |
|
||||
| `/capabilities.html` | 🧪 **模型能力测试模块**:按分类展示测试卡片,点击展开测试项(**内容由后台管理编辑**) |
|
||||
| `/compare.html` | ⚖️ **模型对比**:默认对比全部模型,可勾选模型;**支持硬件显示**;**下方勾选可去留对比项**;可选指标/柱状/折线图 |
|
||||
| `/compare.html` | ⚖️ **模型对比(对比车驱动)**:默认对比前5个,有对比车则按加入顺序;**默认只对比预填充+解码**;对比项可去留;**图表可配置柱状(空心/实心)/折线(实线/虚线)+左右双轴+三色深度+X轴旋转防拥挤**;可下载PNG带水印 |
|
||||
| `/model.html` | 单模型详情:按上下文长度的速度折线图 + 各账号提交明细(含硬件) |
|
||||
| `/admin.html` | 🔐 **后台管理**(admin/admin123):提交管理 / 账号管理 / 能力测试管理 |
|
||||
| `/admin.html` | 🔐 **后台管理**(admin/admin123,网址直达登录,前台无入口):提交管理 / 账号管理 / 能力测试管理 / **🚀速度项管理(热度·个数·配置简介可改)** / **⚙️设置(图片水印文字·排行默认条数)** |
|
||||
|
||||
## 后台管理(/admin.html)
|
||||
|
||||
@@ -23,6 +23,8 @@
|
||||
- **📥 提交管理**:分页/搜索(模型/账号/硬件)/查看详情/删除/**点击硬件标签直接修改硬件**/🎲生成演示数据
|
||||
- **👥 账号管理**:新增/编辑/删除账号(删除连带其提交)
|
||||
- **🧪 能力测试管理**:新增/编辑/删除能力测试模块(名称/分类/图标/说明/测试项JSON/排序/启停),前台只读展示
|
||||
- **🚀 速度项管理**:每个速度项可改 **🔥热度 / 个数 / 配置简介 / 推理框架 / 备注**,可「🔄 从提交同步」自动生成;排行榜默认按热度前N个、搜索框热门5个均取自这里
|
||||
- **⚙️ 设置**:**图片水印**(文字 + **5种预置风格**:右下角标注/全图斜纹/底部横条/四角标注/对角大字,默认首页网址,浅底深字/深底浅字自适应)、**排行默认条数**、**排行榜列显示配置**(是否显示首字ms/硬件/推理框架,平均解码+最佳解码是否合并,硬件+推理框架是否合并)
|
||||
|
||||
## 与 llm-speed-tester 联动
|
||||
|
||||
|
||||
@@ -23,6 +23,111 @@ app.secret_key = config.SESSION_SECRET
|
||||
|
||||
db.init_db()
|
||||
|
||||
# 水印字体(支持中文)
|
||||
_WATERMARK_FONT = "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"
|
||||
|
||||
|
||||
def _watermark_text():
|
||||
return db.get_setting("watermark_text", config.DEFAULT_WATERMARK)
|
||||
|
||||
|
||||
def _watermark_style():
|
||||
st = db.get_setting("watermark_style", config.DEFAULT_WATERMARK_STYLE)
|
||||
return st if st in config.WATERMARK_STYLES else config.DEFAULT_WATERMARK_STYLE
|
||||
|
||||
|
||||
def _top_n():
|
||||
try:
|
||||
return max(1, int(db.get_setting("top_n", str(config.DEFAULT_TOP_N))))
|
||||
except Exception:
|
||||
return config.DEFAULT_TOP_N
|
||||
|
||||
|
||||
def _column_config():
|
||||
out = {}
|
||||
for k, default in config.COLUMN_DEFAULTS.items():
|
||||
v = db.get_setting(k, default)
|
||||
out[k] = 1 if str(v).strip() in ("1", "true", "on") else 0
|
||||
return out
|
||||
|
||||
|
||||
def apply_watermark(img_bytes: bytes, text: str, style: str = "") -> bytes:
|
||||
"""给图片叠加水印,5 种风格可选:corner右下角标注 / diagonal全图斜纹 / bottom底部横条 / corners四角标注 / diag-big对角大字
|
||||
颜色自适应:浅底深字 / 深底浅字"""
|
||||
if not text:
|
||||
return img_bytes
|
||||
style = style or config.DEFAULT_WATERMARK_STYLE
|
||||
if style not in config.WATERMARK_STYLES:
|
||||
style = config.DEFAULT_WATERMARK_STYLE
|
||||
try:
|
||||
from PIL import Image, ImageDraw, ImageFont
|
||||
except Exception:
|
||||
return img_bytes
|
||||
try:
|
||||
img = Image.open(io.BytesIO(img_bytes)).convert("RGBA")
|
||||
except Exception:
|
||||
return img_bytes
|
||||
w, h = img.size
|
||||
bg = img.getpixel((4, 4))[:3]
|
||||
bg_luma = 0.299 * bg[0] + 0.587 * bg[1] + 0.114 * bg[2]
|
||||
dark_bg = bg_luma < 140
|
||||
fill = (50, 50, 60) if not dark_bg else (255, 255, 255)
|
||||
a_diag = 30 if not dark_bg else 26
|
||||
a_main = 130 if not dark_bg else 135
|
||||
|
||||
overlay = Image.new("RGBA", (w, h), (0, 0, 0, 0))
|
||||
d = ImageDraw.Draw(overlay)
|
||||
try:
|
||||
font = ImageFont.truetype(_WATERMARK_FONT, 16)
|
||||
font_big = ImageFont.truetype(_WATERMARK_FONT, 24)
|
||||
font_huge = ImageFont.truetype(_WATERMARK_FONT, 60)
|
||||
except Exception:
|
||||
font = ImageFont.load_default()
|
||||
font_big = ImageFont.load_default()
|
||||
font_huge = ImageFont.load_default()
|
||||
|
||||
def _corner_label():
|
||||
box = d.textbbox((0, 0), text, font=font_big)
|
||||
tw = box[2] - box[0]; th = box[3] - box[1]
|
||||
d.text((w - tw - 16, h - th - 12), text, font=font_big, fill=fill + (a_main,))
|
||||
|
||||
if style == "corner":
|
||||
_corner_label()
|
||||
elif style == "diagonal":
|
||||
step = 170
|
||||
for y in range(-h, h, step):
|
||||
for x in range(-w, w, step):
|
||||
d.text((x + y * 0.4, y), text, font=font, fill=fill + (a_diag,))
|
||||
elif style == "bottom":
|
||||
# 底部半透明横条
|
||||
box = d.textbbox((0, 0), text, font=font_big)
|
||||
tw = box[2] - box[0]; th = box[3] - box[1]
|
||||
bh = th + 24
|
||||
d.rectangle([0, h - bh, w, h], fill=(0, 0, 0, 90) if not dark_bg else (255, 255, 255, 70))
|
||||
d.text((16, h - bh + 10), text, font=font_big, fill=fill + (a_main,))
|
||||
# 底部中央小字
|
||||
cx = (w - tw) // 2
|
||||
d.text((cx, h - 20), text, font=font_big, fill=fill + (110,))
|
||||
elif style == "corners":
|
||||
box = d.textbbox((0, 0), text, font=font_big)
|
||||
tw = box[2] - box[0]; th = box[3] - box[1]
|
||||
for px, py in [(12, 12), (w - tw - 12, 12), (12, h - th - 12), (w - tw - 12, h - th - 12)]:
|
||||
d.text((px, py), text, font=font_big, fill=fill + (a_main,))
|
||||
elif style == "diag-big":
|
||||
box = d.textbbox((0, 0), text, font=font_huge)
|
||||
tw = box[2] - box[0]; th = box[3] - box[1]
|
||||
for i in range(-1, 2):
|
||||
d.text(((w - tw) // 2 + i * 14, (h - th) // 2 + i * 28), text, font=font_huge, fill=fill + (38,))
|
||||
d.text(((w - tw) // 2, (h - th) // 2), text, font=font_huge, fill=fill + (80,))
|
||||
else:
|
||||
_corner_label()
|
||||
|
||||
out = Image.alpha_composite(img, overlay)
|
||||
buf = io.BytesIO()
|
||||
out.convert("RGB").save(buf, format="PNG")
|
||||
buf.seek(0)
|
||||
return buf.getvalue()
|
||||
|
||||
|
||||
@app.after_request
|
||||
def _cors(resp):
|
||||
@@ -94,6 +199,7 @@ def submit():
|
||||
account_name = (body.get("account") or "").strip() or "默认账号"
|
||||
aid = db.get_or_create_account(account_name, remark="来自 llm-speed-tester")
|
||||
sid = db.add_submission(aid, body)
|
||||
db.touch_speed_item(body.get("provider") or "", model) # 速度项热度/个数自动关联
|
||||
account = db.list_accounts()
|
||||
acc = next((a for a in account if a["id"] == aid), None)
|
||||
return jsonify({
|
||||
@@ -115,9 +221,9 @@ def stats():
|
||||
|
||||
@app.route("/api/leaderboard")
|
||||
def leaderboard():
|
||||
sort = request.args.get("sort", "avg_decode_speed")
|
||||
sort = request.args.get("sort", "heat") # 默认按热度
|
||||
order = request.args.get("order", "desc")
|
||||
limit = min(int(request.args.get("limit", 200) or 200), 500)
|
||||
limit = min(int(request.args.get("limit", 500) or 500), 1000)
|
||||
rows = db.leaderboard(sort=sort, order=order, limit=limit)
|
||||
|
||||
# 可选:指定对比哪些模型(provider|model 或 仅 model,逗号分隔)
|
||||
@@ -135,9 +241,20 @@ def leaderboard():
|
||||
keys.add(("", item))
|
||||
rows = [r for r in rows if (r["provider"], r["model"]) in keys]
|
||||
|
||||
# 可选:搜索过滤(模型/提供商/配置简介)
|
||||
q = (request.args.get("q") or "").strip().lower()
|
||||
if q:
|
||||
rows = [r for r in rows
|
||||
if q in (r["model"] or "").lower()
|
||||
or q in (r["provider"] or "").lower()
|
||||
or q in (r.get("intro") or "").lower()]
|
||||
|
||||
chart_rows = rows[: int(request.args.get("chart_top", 30) or 30)]
|
||||
chart_csv = _speed_csv(chart_rows)
|
||||
return jsonify({"ok": True, "rows": rows, "chart_csv": chart_csv})
|
||||
cols = _column_config()
|
||||
return jsonify({"ok": True, "rows": rows, "chart_csv": chart_csv, "top_n": _top_n(),
|
||||
"watermark": _watermark_text(), "watermark_style": _watermark_style(),
|
||||
"columns": cols})
|
||||
|
||||
|
||||
def _speed_csv(chart_rows):
|
||||
@@ -198,7 +315,7 @@ def model_detail():
|
||||
line_payload = {
|
||||
"data": line_csv, "chartType": "line",
|
||||
"title": "%s %s · 解码速度随上下文长度变化" % (provider or "", model),
|
||||
"theme": "default", "showLegend": True, "showGrid": True, "showLabel": False,
|
||||
"theme": "dark", "showLegend": True, "showGrid": True, "showLabel": False,
|
||||
"smoothLine": True, "dualYAxis": True,
|
||||
"leftAxisName": "预填充速度(tok/s)", "rightAxisName": "解码速度(tok/s)",
|
||||
"seriesTypes": ["line", "line"], "seriesAxis": [0, 1],
|
||||
@@ -268,7 +385,7 @@ def submission_chart(sid):
|
||||
payload = {
|
||||
"data": "\n".join(csv_lines), "chartType": "line",
|
||||
"title": "%s %s · 速度随上下文长度(提交#%d)" % (s["provider"], s["model"], sid),
|
||||
"theme": "default", "showLegend": True, "showGrid": True, "showLabel": False,
|
||||
"theme": "dark", "showLegend": True, "showGrid": True, "showLabel": False,
|
||||
"smoothLine": True, "dualYAxis": True,
|
||||
"leftAxisName": "预填充速度(tok/s)", "rightAxisName": "解码速度(tok/s)",
|
||||
"seriesTypes": ["line", "line"], "seriesAxis": [0, 1],
|
||||
@@ -312,6 +429,75 @@ def account_delete(aid):
|
||||
return jsonify({"ok": True})
|
||||
|
||||
|
||||
# ───────────────────────── 速度项管理(后台) / 设置 ─────────────────────────
|
||||
|
||||
@app.route("/api/settings")
|
||||
def public_settings():
|
||||
return jsonify({"ok": True, "watermark": _watermark_text(),
|
||||
"watermark_style": _watermark_style(),
|
||||
"top_n": _top_n(), "columns": _column_config()})
|
||||
|
||||
|
||||
@app.route("/api/admin/speed-items")
|
||||
@admin_required
|
||||
def admin_speed_items():
|
||||
return jsonify(db.list_speed_items())
|
||||
|
||||
|
||||
@app.route("/api/admin/speed-items", methods=["POST"])
|
||||
@admin_required
|
||||
def admin_speed_item_add():
|
||||
body = request.get_json(force=True) or {}
|
||||
try:
|
||||
sid = db.add_speed_item(body.get("provider", ""), body.get("model", ""),
|
||||
body.get("heat", 0), body.get("intro", ""),
|
||||
body.get("count", 0), body.get("remark", ""))
|
||||
return jsonify({"ok": True, "id": sid})
|
||||
except ValueError as e:
|
||||
return jsonify({"ok": False, "error": str(e)}), 400
|
||||
|
||||
|
||||
@app.route("/api/admin/speed-items/<int:sid>", methods=["PUT"])
|
||||
@admin_required
|
||||
def admin_speed_item_update(sid):
|
||||
body = request.get_json(force=True) or {}
|
||||
db.update_speed_item(sid, body)
|
||||
return jsonify({"ok": True})
|
||||
|
||||
|
||||
@app.route("/api/admin/speed-items/<int:sid>", methods=["DELETE"])
|
||||
@admin_required
|
||||
def admin_speed_item_delete(sid):
|
||||
db.delete_speed_item(sid)
|
||||
return jsonify({"ok": True})
|
||||
|
||||
|
||||
@app.route("/api/admin/speed-items/sync", methods=["POST"])
|
||||
@admin_required
|
||||
def admin_speed_item_sync():
|
||||
added = db.sync_speed_items()
|
||||
return jsonify({"ok": True, "added": added})
|
||||
|
||||
|
||||
@app.route("/api/admin/settings", methods=["GET"])
|
||||
@admin_required
|
||||
def admin_settings_get():
|
||||
return jsonify({"ok": True, "settings": db.get_all_settings(),
|
||||
"watermark": _watermark_text(), "watermark_style": _watermark_style(),
|
||||
"top_n": _top_n(), "columns": _column_config()})
|
||||
|
||||
|
||||
@app.route("/api/admin/settings", methods=["PUT"])
|
||||
@admin_required
|
||||
def admin_settings_put():
|
||||
body = request.get_json(force=True) or {}
|
||||
allow = {"watermark_text", "watermark_style", "top_n"} | set(config.COLUMN_DEFAULTS.keys())
|
||||
for k, v in body.items():
|
||||
if k in allow:
|
||||
db.set_setting(k, v)
|
||||
return jsonify({"ok": True})
|
||||
|
||||
|
||||
# ───────────────────────── 模型能力测试模块(前台只读,内容后台编辑) ─────────────────────────
|
||||
|
||||
@app.route("/api/capabilities")
|
||||
@@ -361,7 +547,9 @@ def _chart_proxy(payload):
|
||||
return jsonify({"ok": False, "error": "图表服务不可用: %s" % e}), 502
|
||||
if resp.status_code != 200:
|
||||
return jsonify({"ok": False, "error": "图表生成失败(%d): %s" % (resp.status_code, resp.text[:300])}), 502
|
||||
return send_file(io.BytesIO(resp.content), mimetype="image/png")
|
||||
# 叠加水印(默认首页网址,后台可配置文字+5种风格)
|
||||
data = apply_watermark(resp.content, _watermark_text(), _watermark_style())
|
||||
return send_file(io.BytesIO(data), mimetype="image/png")
|
||||
|
||||
|
||||
@app.route("/api/chart", methods=["POST"])
|
||||
@@ -435,6 +623,7 @@ def seed_demo():
|
||||
"runs": [],
|
||||
}
|
||||
db.add_submission(aid, payload)
|
||||
db.touch_speed_item(provider, model)
|
||||
cnt += 1
|
||||
return jsonify({"ok": True, "seeded": cnt, "stats": db.get_stats()})
|
||||
|
||||
|
||||
@@ -18,5 +18,21 @@ ADMIN_USER = "admin"
|
||||
ADMIN_PASSWORD = "admin123"
|
||||
SESSION_SECRET = "model-eval-site-session-secret"
|
||||
|
||||
# 图片水印(默认=首页网址,后台可改;样式后台可选)
|
||||
DEFAULT_WATERMARK = "http://121.40.164.32:16066"
|
||||
DEFAULT_WATERMARK_STYLE = "corner" # corner/diagonal/bottom/corners/diag-big
|
||||
DEFAULT_TOP_N = 10 # 排行榜默认显示热度最高的前 N 个
|
||||
|
||||
# 排行榜列配置默认值(后台⚙️设置可改)
|
||||
COLUMN_DEFAULTS = {
|
||||
"lb_show_ttft": "0", # 是否显示首字ms
|
||||
"lb_show_hardware": "1", # 是否显示硬件
|
||||
"lb_show_framework": "1", # 是否显示推理框架
|
||||
"lb_merge_decode": "1", # 平均解码+最佳解码合并为一列
|
||||
"lb_merge_hwfw": "1", # 硬件+推理框架合并在同一列
|
||||
}
|
||||
|
||||
WATERMARK_STYLES = ["corner", "diagonal", "bottom", "corners", "diag-big"]
|
||||
|
||||
# data-chart-tool 图表服务地址(画速度对比图)
|
||||
CHART_API_BASE = "http://127.0.0.1:16016"
|
||||
+182
-4
@@ -61,6 +61,24 @@ CREATE TABLE IF NOT EXISTS capabilities(
|
||||
updated_at TEXT DEFAULT (datetime('now','localtime'))
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS speed_items(
|
||||
id INTEGER PRIMARY KEY AUTOINCREMENT,
|
||||
provider TEXT DEFAULT '',
|
||||
model TEXT DEFAULT '',
|
||||
heat INTEGER DEFAULT 0,
|
||||
intro TEXT DEFAULT '',
|
||||
framework TEXT DEFAULT '',
|
||||
count INTEGER DEFAULT 0,
|
||||
remark TEXT DEFAULT '',
|
||||
updated_at TEXT DEFAULT (datetime('now','localtime'))
|
||||
);
|
||||
CREATE UNIQUE INDEX IF NOT EXISTS idx_si_model ON speed_items(provider, model);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS settings(
|
||||
key TEXT PRIMARY KEY,
|
||||
value TEXT DEFAULT ''
|
||||
);
|
||||
|
||||
CREATE INDEX IF NOT EXISTS idx_sub_model ON submissions(model, provider);
|
||||
CREATE INDEX IF NOT EXISTS idx_sub_account ON submissions(account_id);
|
||||
CREATE INDEX IF NOT EXISTS idx_sub_created ON submissions(created_at);
|
||||
@@ -80,6 +98,10 @@ def _migrate(conn):
|
||||
cols = [r[1] for r in cur.fetchall()]
|
||||
if "hardware" not in cols:
|
||||
conn.execute("ALTER TABLE submissions ADD COLUMN hardware TEXT DEFAULT ''")
|
||||
cur = conn.execute("PRAGMA table_info(speed_items)")
|
||||
scols = [r[1] for r in cur.fetchall()]
|
||||
if "framework" not in scols:
|
||||
conn.execute("ALTER TABLE speed_items ADD COLUMN framework TEXT DEFAULT ''")
|
||||
|
||||
|
||||
def init_db():
|
||||
@@ -313,14 +335,16 @@ def get_stats():
|
||||
conn.close()
|
||||
|
||||
|
||||
def leaderboard(sort="avg_decode_speed", order="desc", limit=200):
|
||||
"""按 (provider, model) 聚合所有提交 → 模型速度排行(含硬件)"""
|
||||
def leaderboard(sort="heat", order="desc", limit=500):
|
||||
"""按 (provider, model) 聚合所有提交 → 模型速度排行(含热度/配置简介/硬件)
|
||||
默认按热度(heat)倒序;sort 支持 heat/avg_decode_speed 等"""
|
||||
sort_whitelist = {
|
||||
"heat": "heat",
|
||||
"avg_decode_speed": "avg_decode_speed", "avg_prefill_speed": "avg_prefill_speed",
|
||||
"avg_ttft_ms": "avg_ttft_ms", "best_decode": "best_decode",
|
||||
"cnt": "cnt", "last_tested": "last_tested", "avg_stream_decode": "avg_stream_decode",
|
||||
}
|
||||
srt = sort_whitelist.get(sort, "avg_decode_speed")
|
||||
srt = sort_whitelist.get(sort, "heat")
|
||||
od = "DESC" if order == "asc" and srt not in ("avg_ttft_ms", "avg_total_ms") else (
|
||||
"ASC" if order == "asc" else "DESC")
|
||||
with _lock:
|
||||
@@ -338,10 +362,16 @@ def leaderboard(sort="avg_decode_speed", order="desc", limit=200):
|
||||
"AVG(s.avg_total_ms) AS avg_total_ms, "
|
||||
"MAX(s.avg_decode_speed) AS best_decode, "
|
||||
"MAX(s.created_at) AS last_tested, "
|
||||
"COALESCE(MAX(si.heat), 0) AS heat, "
|
||||
"MAX(si.intro) AS intro, "
|
||||
"MAX(si.framework) AS framework, "
|
||||
"COALESCE(MAX(si.count), 0) AS count_override, "
|
||||
"(SELECT s2.hardware FROM submissions s2 "
|
||||
" WHERE s2.provider=s.provider AND s2.model=s.model AND s2.hardware<>'' "
|
||||
" ORDER BY s2.id DESC LIMIT 1) AS hardware "
|
||||
"FROM submissions s WHERE s.model<>'' "
|
||||
"FROM submissions s "
|
||||
"LEFT JOIN speed_items si ON si.provider=s.provider AND si.model=s.model "
|
||||
"WHERE s.model<>'' "
|
||||
"GROUP BY s.provider, s.model ORDER BY %s %s LIMIT ?" % (srt, od),
|
||||
(limit,)).fetchall()
|
||||
return [dict(r) for r in rows]
|
||||
@@ -502,3 +532,151 @@ def delete_capability(cid: int):
|
||||
conn.commit()
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
# ───────────────────────── 速度项(热度/配置简介/个数,后台可改) ─────────────────────────
|
||||
|
||||
def touch_speed_item(provider, model):
|
||||
"""提交到达时确保速度项存在;不存在则以当前提交数为默认热度"""
|
||||
provider = provider or ""
|
||||
model = (model or "").strip()
|
||||
if not model:
|
||||
return None
|
||||
with _lock:
|
||||
conn = _connect()
|
||||
try:
|
||||
r = conn.execute("SELECT id FROM speed_items WHERE provider=? AND model=?",
|
||||
(provider, model)).fetchone()
|
||||
if r:
|
||||
return r["id"]
|
||||
cnt = conn.execute("SELECT COUNT(*) c FROM submissions WHERE provider=? AND model=?",
|
||||
(provider, model)).fetchone()["c"]
|
||||
cur = conn.execute(
|
||||
"INSERT INTO speed_items(provider,model,heat,intro,framework,count) VALUES(?,?,?,?,?,?)",
|
||||
(provider, model, cnt, "", "", cnt))
|
||||
conn.commit()
|
||||
return cur.lastrowid
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
def list_speed_items():
|
||||
with _lock:
|
||||
conn = _connect()
|
||||
try:
|
||||
rows = conn.execute(
|
||||
"SELECT si.*, "
|
||||
"(SELECT COUNT(*) FROM submissions s WHERE s.provider=si.provider AND s.model=si.model) AS real_cnt "
|
||||
"FROM speed_items si ORDER BY si.heat DESC, si.model").fetchall()
|
||||
return [dict(r) for r in rows]
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
def add_speed_item(provider, model, heat=0, intro="", count=0, remark=""):
|
||||
provider = provider or ""
|
||||
model = (model or "").strip()
|
||||
if not model:
|
||||
raise ValueError("模型名称不能为空")
|
||||
with _lock:
|
||||
conn = _connect()
|
||||
try:
|
||||
r = conn.execute("SELECT id FROM speed_items WHERE provider=? AND model=?",
|
||||
(provider, model)).fetchone()
|
||||
if r:
|
||||
raise ValueError("该速度项已存在")
|
||||
cur = conn.execute(
|
||||
"INSERT INTO speed_items(provider,model,heat,intro,framework,count,remark) VALUES(?,?,?,?,?,?,?)",
|
||||
(provider, model, int(heat or 0), intro or "", (data.get("framework") or "").strip(),
|
||||
int(count or 0), remark or ""))
|
||||
conn.commit()
|
||||
return cur.lastrowid
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
def update_speed_item(sid: int, data: dict):
|
||||
with _lock:
|
||||
conn = _connect()
|
||||
try:
|
||||
conn.execute(
|
||||
"UPDATE speed_items SET provider=?,model=?,heat=?,intro=?,framework=?,count=?,remark=?,"
|
||||
"updated_at=datetime('now','localtime') WHERE id=?",
|
||||
((data.get("provider") or "").strip(),
|
||||
(data.get("model") or "").strip(),
|
||||
int(data.get("heat") or 0),
|
||||
(data.get("intro") or "").strip(),
|
||||
(data.get("framework") or "").strip(),
|
||||
int(data.get("count") or 0),
|
||||
(data.get("remark") or "").strip(),
|
||||
sid))
|
||||
conn.commit()
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
def delete_speed_item(sid: int):
|
||||
with _lock:
|
||||
conn = _connect()
|
||||
try:
|
||||
conn.execute("DELETE FROM speed_items WHERE id=?", (sid,))
|
||||
conn.commit()
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
def sync_speed_items():
|
||||
"""从提交自动同步速度项:为所有有提交的模型建速度项(默认热度=提交数)"""
|
||||
added = 0
|
||||
with _lock:
|
||||
conn = _connect()
|
||||
try:
|
||||
rows = conn.execute(
|
||||
"SELECT provider, model, COUNT(*) c FROM submissions WHERE model<>'' "
|
||||
"GROUP BY provider, model").fetchall()
|
||||
for r in rows:
|
||||
r0 = conn.execute("SELECT id FROM speed_items WHERE provider=? AND model=?",
|
||||
(r["provider"], r["model"])).fetchone()
|
||||
if r0:
|
||||
continue
|
||||
conn.execute(
|
||||
"INSERT INTO speed_items(provider,model,heat,intro,framework,count) VALUES(?,?,?,?,?,?)",
|
||||
(r["provider"], r["model"], r["c"], "", "", r["c"]))
|
||||
added += 1
|
||||
conn.commit()
|
||||
return added
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
# ───────────────────────── 设置(水印/默认条数等) ─────────────────────────
|
||||
|
||||
def get_setting(key, default=""):
|
||||
with _lock:
|
||||
conn = _connect()
|
||||
try:
|
||||
r = conn.execute("SELECT value FROM settings WHERE key=?", (key,)).fetchone()
|
||||
return r["value"] if r else default
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
def set_setting(key, value):
|
||||
with _lock:
|
||||
conn = _connect()
|
||||
try:
|
||||
conn.execute("INSERT OR REPLACE INTO settings(key,value) VALUES(?,?)",
|
||||
(key, str(value or "")))
|
||||
conn.commit()
|
||||
finally:
|
||||
conn.close()
|
||||
|
||||
|
||||
def get_all_settings():
|
||||
with _lock:
|
||||
conn = _connect()
|
||||
try:
|
||||
rows = conn.execute("SELECT key,value FROM settings").fetchall()
|
||||
return {r["key"]: r["value"] for r in rows}
|
||||
finally:
|
||||
conn.close()
|
||||
@@ -36,6 +36,8 @@
|
||||
<button data-tab="subs" class="active">📥 提交管理</button>
|
||||
<button data-tab="accs">👥 账号管理</button>
|
||||
<button data-tab="caps">🧪 能力测试管理</button>
|
||||
<button data-tab="speed">🚀 速度项管理</button>
|
||||
<button data-tab="settings">⚙️ 设置</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -90,6 +92,55 @@
|
||||
</tr></thead><tbody><tr><td colspan="9" class="empty">加载中…</td></tr></tbody></table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 速度项管理 -->
|
||||
<div class="panel" id="tab-speed" hidden>
|
||||
<div class="form-row">
|
||||
<button class="btn primary" id="btn-si-add">➕ 新增速度项</button>
|
||||
<button class="btn" id="btn-si-sync">🔄 从提交同步</button>
|
||||
<span class="hint">热度/个数/配置简介 由这里维护;排行榜默认按热度显示前N个,搜索框热门5个取自这里</span>
|
||||
</div>
|
||||
<div class="tbl-wrap">
|
||||
<table id="si"><thead><tr>
|
||||
<th>#</th><th>提供商</th><th>模型</th><th>🔥热度</th><th>个数</th>
|
||||
<th>配置简介</th><th>推理框架</th><th>备注</th><th>实际提交</th><th>操作</th>
|
||||
</tr></thead><tbody><tr><td colspan="10" class="empty">加载中…</td></tr></tbody></table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- 设置 -->
|
||||
<div class="panel" id="tab-settings" hidden>
|
||||
<h2>⚙️ 站点设置</h2>
|
||||
<div class="form-grid" style="max-width:700px">
|
||||
<div><label>图片水印文字(默认首页网址)</label>
|
||||
<input type="text" id="set-watermark" placeholder="http://121.40.164.32:16066" style="width:100%"></div>
|
||||
<div><label>水印风格(5 种预置可选)</label>
|
||||
<select id="set-wmstyle" style="width:100%">
|
||||
<option value="corner">右下角标注</option>
|
||||
<option value="diagonal">全图斜纹</option>
|
||||
<option value="bottom">底部横条</option>
|
||||
<option value="corners">四角标注</option>
|
||||
<option value="diag-big">对角大字</option>
|
||||
</select></div>
|
||||
<div><label>排行榜默认显示热度前 N 个</label>
|
||||
<input type="number" id="set-topn" value="10" min="1" max="50" style="width:100%"></div>
|
||||
</div>
|
||||
|
||||
<h3 style="margin-top:16px">📋 排行榜列显示配置</h3>
|
||||
<div class="col-toggles" id="set-cols">
|
||||
<label><input type="checkbox" data-col="lb_show_ttft"> 显示首字 ms</label>
|
||||
<label><input type="checkbox" data-col="lb_show_hardware"> 显示硬件</label>
|
||||
<label><input type="checkbox" data-col="lb_show_framework"> 显示推理框架</label>
|
||||
<label><input type="checkbox" data-col="lb_merge_decode"> 平均解码+最佳解码合并为一列</label>
|
||||
<label><input type="checkbox" data-col="lb_merge_hwfw"> 硬件+推理框架合并在同一列</label>
|
||||
</div>
|
||||
|
||||
<div class="form-row" style="margin-top:12px">
|
||||
<button class="btn primary" id="btn-settings-save">💾 保存设置</button>
|
||||
<span class="hint" id="set-status"></span>
|
||||
</div>
|
||||
<div class="notice green" style="margin-top:8px">💡 水印默认使用首页网址,可改成任意文字,风格 5 选 1;排行榜列可自由开关/合并。保存后刷新首页生效。</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
||||
@@ -71,6 +71,7 @@
|
||||
<option value="3">隔3个</option>
|
||||
</select>
|
||||
<button class="btn small primary" id="cmp-chart-gen">🎨 生成/刷新图表</button>
|
||||
<button class="btn small" id="cmp-chart-dl">⬇ 下载 PNG</button>
|
||||
<span class="hint" id="cmp-chart-status"></span>
|
||||
</div>
|
||||
<div class="chart-img-wrap" id="cmp-chart-img"><div class="hint">配置好后点击生成;底部横轴字太多可旋转/加间隔避免挤在一起</div></div>
|
||||
|
||||
@@ -253,3 +253,37 @@ textarea.items-editor { min-height: 160px; font-family: ui-monospace, monospace;
|
||||
white-space: nowrap; max-width: 260px;
|
||||
}
|
||||
#cart-bar .cart-items b { color: var(--text); font-weight: 600; }
|
||||
|
||||
/* 搜索下拉 */
|
||||
.search-drop {
|
||||
position: absolute; top: 100%; left: 0; margin-top: 4px; width: 100%; max-width: 480px;
|
||||
background: var(--panel2); border: 1px solid var(--accent); border-radius: 10px;
|
||||
z-index: 30; box-shadow: 0 10px 30px rgba(0,0,0,.45); overflow: hidden;
|
||||
}
|
||||
.search-drop[hidden] { display: none; }
|
||||
.search-item { padding: 9px 14px; cursor: pointer; border-bottom: 1px solid var(--border); }
|
||||
.search-item:last-child { border-bottom: none; }
|
||||
.search-item:hover { background: rgba(91,148,255,.12); }
|
||||
.search-item .si-main { font-weight: 700; color: var(--text-strong); }
|
||||
.search-item .si-sub { color: var(--muted); font-size: 12px; margin-top: 2px; }
|
||||
.search-item .si-act { float: right; font-size: 12px; color: var(--accent); }
|
||||
|
||||
/* 网页顶部居中搜索 */
|
||||
.top-search {
|
||||
position: relative; max-width: 640px; margin: 4px auto 18px;
|
||||
}
|
||||
.top-search input {
|
||||
width: 100%; padding: 11px 16px; font-size: 14px; border-radius: 22px;
|
||||
background: var(--panel2); border: 1px solid var(--border); color: var(--text);
|
||||
}
|
||||
.top-search input:focus { border-color: var(--accent); outline: none; }
|
||||
.top-search .search-drop { max-width: 640px; }
|
||||
|
||||
/* 已添加(钉住)的速度项 */
|
||||
.pinned-chip {
|
||||
display: inline-flex; align-items: center; gap: 6px; padding: 3px 10px; border-radius: 14px;
|
||||
background: rgba(255,180,60,.12); border: 1px solid rgba(255,180,60,.4); font-size: 12.5px;
|
||||
}
|
||||
.pinned-chip .x { color: var(--muted); cursor: pointer; font-weight: 700; }
|
||||
.pinned-chip .x:hover { color: var(--danger); }
|
||||
.pinned-empty { color: var(--muted); font-size: 12px; }
|
||||
+18
-19
@@ -18,6 +18,12 @@
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<!-- 网页最上面居中:全局搜索(点击热门5个,选中跳详情) -->
|
||||
<div class="top-search">
|
||||
<input type="text" id="top-search" placeholder="🔍 搜索模型 / 提供商 / 配置简介…(点击输入框显示热门5个,选中跳转详情页)">
|
||||
<div class="search-drop" id="top-search-drop" hidden></div>
|
||||
</div>
|
||||
|
||||
<div class="stat-cards">
|
||||
<div class="stat-card"><div class="k">评测模型数</div><div class="v" id="st-models">—</div></div>
|
||||
<div class="stat-card"><div class="k">评测提交数</div><div class="v" id="st-subs">—</div></div>
|
||||
@@ -27,36 +33,29 @@
|
||||
</div>
|
||||
|
||||
<div class="panel">
|
||||
<h2>🏆 模型运行速度排行 <span class="hint">(点击表头可排序;按模型+提供商聚合所有提交)</span></h2>
|
||||
<h2>🏆 模型运行速度排行 <span class="hint">(默认显示热度最高的前10个;下方搜索框可把指定速度项添加进本区域查看)</span></h2>
|
||||
<div class="search-wrap" style="position:relative;margin-bottom:10px">
|
||||
<input type="text" id="lb-search" placeholder="🔍 搜索并「添加」具体速度项到下方列表中查看…(点击显示热门5个)" style="width:100%;max-width:480px">
|
||||
<div class="search-drop" id="lb-search-drop" hidden></div>
|
||||
</div>
|
||||
<div class="form-row" id="lb-pinned" style="margin-bottom:8px"></div>
|
||||
<div class="tbl-wrap">
|
||||
<table id="lb">
|
||||
<thead><tr>
|
||||
<th class="num">#</th>
|
||||
<th>提供商</th>
|
||||
<th>模型</th>
|
||||
<th class="num" data-sort="cnt">提交<span class="arrow"></span></th>
|
||||
<th class="num" data-sort="accounts">账号<span class="arrow"></span></th>
|
||||
<th class="num" data-sort="avg_decode_speed">平均解码 tok/s<span class="arrow"></span></th>
|
||||
<th class="num" data-sort="avg_prefill_speed">平均预填充 tok/s<span class="arrow"></span></th>
|
||||
<th class="num" data-sort="avg_ttft_ms">首字 ms<span class="arrow"></span></th>
|
||||
<th class="num" data-sort="best_decode">最佳解码 tok/s<span class="arrow"></span></th>
|
||||
<th>硬件</th>
|
||||
<th class="num" data-sort="last_tested">最后测试<span class="arrow"></span></th>
|
||||
<th>对比车</th>
|
||||
</tr></thead>
|
||||
<tbody><tr><td colspan="12" class="empty">加载中…</td></tr></tbody>
|
||||
<thead></thead>
|
||||
<tbody><tr><td colspan="13" class="empty">加载中…</td></tr></tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel">
|
||||
<h2>📊 运行速度对比图 <span class="hint">(默认对比全部模型,可勾选指定模型后重新生成)</span></h2>
|
||||
<div class="hint" style="margin-bottom:8px">选择要对比的模型(默认全部;也可点排行榜每行「🛒 加入对比车」后到「⚖️ 模型对比」页对比):</div>
|
||||
<h2>📊 运行速度对比图 <span class="hint">(要对比的模型列表:每项可✕掉,点排行榜「+对比」可添加,清空一键去除)</span></h2>
|
||||
<div class="hint" style="margin-bottom:8px">要对比的模型列表(默认对比全部):</div>
|
||||
<div class="chips" id="lb-chart-models"></div>
|
||||
<div class="form-row" style="margin-top:10px">
|
||||
<button class="btn small" id="lb-chart-all">✅ 全选</button>
|
||||
<button class="btn small" id="lb-chart-none">❌ 清空</button>
|
||||
<button class="btn small" id="lb-chart-clear">🗑 清空</button>
|
||||
<button class="btn small primary" id="lb-chart-gen">🎨 生成/刷新图表</button>
|
||||
<button class="btn small" id="lb-chart-dl">⬇ 下载 PNG</button>
|
||||
<span class="hint" id="lb-chart-status"></span>
|
||||
</div>
|
||||
<div class="chart-img-wrap" id="lb-chart-img">
|
||||
|
||||
+398
-67
@@ -45,8 +45,13 @@ function getCart() {
|
||||
function saveCart(c) { localStorage.setItem(CART_KEY, JSON.stringify(c)); }
|
||||
function cartAdd(key) {
|
||||
const c = getCart();
|
||||
if (!c.includes(key)) { c.push(key); saveCart(c); toast("🛒 已加入对比车"); }
|
||||
else { toast("已在对比车中"); }
|
||||
if (!c.includes(key)) { c.push(key); saveCart(c); toast("+ 已加入对比"); }
|
||||
else { toast("已在对比中"); }
|
||||
// 同步到首页运行速度对比图的要对比列表
|
||||
if (typeof lbChartSel !== "undefined" && lbChartSel) {
|
||||
lbChartSel.add(key);
|
||||
if (typeof renderLbChips === "function") renderLbChips();
|
||||
}
|
||||
renderCartBar();
|
||||
}
|
||||
function cartRemove(key) { saveCart(getCart().filter((k) => k !== key)); renderCartBar(); }
|
||||
@@ -87,7 +92,7 @@ function buildRunPayload(opts) {
|
||||
const series = (opts.series || RUN_SERIES).filter((s) => s.show);
|
||||
const payload = {
|
||||
data: opts.csv, chartType: "bar", title: opts.title || "模型运行速度对比",
|
||||
theme: "default", showLegend: series.length > 1, showGrid: true,
|
||||
theme: opts.theme || "dark", showLegend: series.length > 1, showGrid: true,
|
||||
showLabel: opts.showLabel ?? false, smoothLine: true,
|
||||
dualYAxis: series.some((s) => s.axis === 1),
|
||||
leftAxisName: opts.leftAxisName || "预填充速度(tok/s)",
|
||||
@@ -112,14 +117,28 @@ function navActive() {
|
||||
});
|
||||
}
|
||||
|
||||
/* ───────────────────────── 首页:排行 ───────────────────────── */
|
||||
let sortKey = "avg_decode_speed";
|
||||
/* ───────────────────────── 首页:排行(热度前N + 搜索添加 + 动态列) ───────────────────────── */
|
||||
let sortKey = "heat";
|
||||
let sortOrder = "desc";
|
||||
let lbModels = []; // [{provider, model, key}]
|
||||
let lbSelected = new Set(); // selected keys
|
||||
let lbAll = []; // 全部模型(含 heat/intro/framework/count_override),按热度
|
||||
let lbModels = [];
|
||||
let lbTopN = 10;
|
||||
let lbPinned = []; // 搜索框“添加”到本区域的模型 key(按添加顺序)
|
||||
let lbChartSel = new Set(); // 运行速度对比图要对比的模型(默认全部)
|
||||
let lbCols = { lb_show_ttft: 0, lb_show_hardware: 1, lb_show_framework: 1, lb_merge_decode: 1, lb_merge_hwfw: 1 };
|
||||
let lbQuery = "";
|
||||
|
||||
const modelKey = (p, m) => `${p}|${m}`;
|
||||
|
||||
const LB_SORT_GETTER = {
|
||||
heat: (r) => r.heat || 0, cnt: (r) => r.cnt, accounts: (r) => r.accounts,
|
||||
avg_decode_speed: (r) => r.avg_decode_speed || 0, avg_prefill_speed: (r) => r.avg_prefill_speed || 0,
|
||||
avg_ttft_ms: (r) => r.avg_ttft_ms || 0, best_decode: (r) => r.best_decode || 0,
|
||||
last_tested: (r) => r.last_tested || "",
|
||||
};
|
||||
|
||||
const fwTag = (fw) => (fw ? `<span class="hw-tag" style="background:rgba(46,230,122,.12);border-color:rgba(46,230,122,.35);color:#8ef5b8" title="推理框架">⚙ ${esc(fw)}</span>` : "");
|
||||
|
||||
async function loadStats() {
|
||||
try {
|
||||
const s = await api("/api/stats");
|
||||
@@ -134,85 +153,262 @@ async function loadStats() {
|
||||
function sortClick(key) {
|
||||
if (sortKey === key) sortOrder = sortOrder === "desc" ? "asc" : "desc";
|
||||
else { sortKey = key; sortOrder = "desc"; }
|
||||
loadLeaderboard();
|
||||
applyView();
|
||||
}
|
||||
|
||||
function cmpLb(a, b) {
|
||||
const g = LB_SORT_GETTER[sortKey] || LB_SORT_GETTER.heat;
|
||||
const va = g(a), vb = g(b);
|
||||
let c = 0;
|
||||
if (typeof va === "number" && typeof vb === "number") c = va - vb;
|
||||
else c = String(va).localeCompare(String(vb));
|
||||
return sortOrder === "desc" ? -c : c;
|
||||
}
|
||||
|
||||
/* 排行榜列定义(后台可配) */
|
||||
function lbColDefs() {
|
||||
const cols = lbCols, d = [];
|
||||
d.push({ type: "rank", label: "#", cls: "num" });
|
||||
d.push({ type: "provider", label: "提供商" });
|
||||
d.push({ type: "model", label: "模型 / 配置简介" });
|
||||
d.push({ type: "heat", label: "🔥热度", cls: "num", sort: "heat" });
|
||||
d.push({ type: "cnt", label: "提交", cls: "num", sort: "cnt" });
|
||||
d.push({ type: "accounts", label: "账号", cls: "num", sort: "accounts" });
|
||||
if (cols.lb_merge_decode) d.push({ type: "decode_merged", label: "解码 tok/s(均 / 最佳)", cls: "num", sort: "avg_decode_speed" });
|
||||
else {
|
||||
d.push({ type: "avg_decode", label: "平均解码 tok/s", cls: "num", sort: "avg_decode_speed" });
|
||||
d.push({ type: "best_decode", label: "最佳解码 tok/s", cls: "num", sort: "best_decode" });
|
||||
}
|
||||
d.push({ type: "prefill", label: "平均预填充 tok/s", cls: "num", sort: "avg_prefill_speed" });
|
||||
if (cols.lb_show_ttft) d.push({ type: "ttft", label: "首字 ms", cls: "num", sort: "avg_ttft_ms" });
|
||||
if (cols.lb_merge_hwfw) d.push({ type: "hwfw", label: "硬件 / 推理框架" });
|
||||
else {
|
||||
if (cols.lb_show_hardware) d.push({ type: "hw", label: "硬件" });
|
||||
if (cols.lb_show_framework) d.push({ type: "fw", label: "推理框架" });
|
||||
}
|
||||
d.push({ type: "last", label: "最后测试", cls: "num", sort: "last_tested" });
|
||||
d.push({ type: "ops", label: "操作" });
|
||||
return d;
|
||||
}
|
||||
|
||||
function lbCell(r, c, idx, maxDecode) {
|
||||
const key = modelKey(r.provider, r.model);
|
||||
switch (c.type) {
|
||||
case "rank": return `<td class="num">${idx + 1}</td>`;
|
||||
case "provider": return `<td><span class="pill">${esc(providerLabel(r.provider))}</span></td>`;
|
||||
case "model": {
|
||||
const intro = r.intro ? `<div class="hint">${esc(r.intro)}</div>` : "";
|
||||
return `<td><a href="/model.html?provider=${encodeURIComponent(r.provider)}&model=${encodeURIComponent(r.model)}" title="查看详情">${esc(r.model)}</a>${intro}</td>`;
|
||||
}
|
||||
case "heat": return `<td class="num"><span class="pill amber">🔥 ${fmtInt(r.heat || 0)}</span></td>`;
|
||||
case "cnt": return `<td class="num">${fmtInt(r.count_override > 0 ? r.count_override : r.cnt)}</td>`;
|
||||
case "accounts": return `<td class="num">${fmtInt(r.accounts)}</td>`;
|
||||
case "decode_merged": {
|
||||
const meter = r.avg_decode_speed ? `<div class="meter"><div style="width:${((r.avg_decode_speed || 0) / maxDecode * 100).toFixed(1)}%"></div></div>` : "";
|
||||
return `<td class="num"><span class="badge-decode">${fmt(r.avg_decode_speed)}</span> / <span class="hint">${fmt(r.best_decode)}</span>${meter}</td>`;
|
||||
}
|
||||
case "avg_decode": {
|
||||
const meter = r.avg_decode_speed ? `<div class="meter"><div style="width:${((r.avg_decode_speed || 0) / maxDecode * 100).toFixed(1)}%"></div></div>` : "";
|
||||
return `<td class="num"><span class="badge-decode">${fmt(r.avg_decode_speed)}</span>${meter}</td>`;
|
||||
}
|
||||
case "best_decode": return `<td class="num">${fmt(r.best_decode)}</td>`;
|
||||
case "prefill": return `<td class="num">${fmt(r.avg_prefill_speed)}</td>`;
|
||||
case "ttft": return `<td class="num">${fmt(r.avg_ttft_ms)}</td>`;
|
||||
case "hwfw": return `<td>${hwTag(r.hardware)} ${fwTag(r.framework)}</td>`;
|
||||
case "hw": return `<td>${hwTag(r.hardware)}</td>`;
|
||||
case "fw": return `<td>${fwTag(r.framework)}</td>`;
|
||||
case "last": return `<td class="num">${esc((r.last_tested || "").slice(5, 16))}</td>`;
|
||||
case "ops": return `<td>
|
||||
<a class="btn small" href="/model.html?provider=${encodeURIComponent(r.provider)}&model=${encodeURIComponent(r.model)}" title="查看详情">详情</a>
|
||||
<button class="btn small" data-cart="${key}" title="加入对比">+对比</button>
|
||||
</td>`;
|
||||
}
|
||||
return "<td></td>";
|
||||
}
|
||||
|
||||
function renderLbTable(rows, pinnedSet) {
|
||||
const thead = $("#lb thead");
|
||||
const tbody = $("#lb tbody");
|
||||
if (!thead || !tbody) return;
|
||||
const defs = lbColDefs();
|
||||
thead.innerHTML = "<tr>" + defs.map((c) => {
|
||||
const arrow = c.sort ? (c.sort === sortKey ? (sortOrder === "desc" ? " ▼" : " ▲") : "") : "";
|
||||
return `<th class="${c.cls || ""}" ${c.sort ? `data-sort="${c.sort}"` : ""}>${esc(c.label)}<span class="arrow">${arrow}</span></th>`;
|
||||
}).join("") + "</tr>";
|
||||
if (!rows.length) {
|
||||
tbody.innerHTML = `<tr><td colspan="${defs.length}" class="empty">${pinnedSet ? "请在下方搜索框中搜索并添加速度项查看" : "暂无评测数据"}</td></tr>`;
|
||||
return;
|
||||
}
|
||||
const maxDecode = Math.max(...rows.map((r) => r.avg_decode_speed || 0));
|
||||
tbody.innerHTML = rows.map((r, i) => {
|
||||
const pinned = pinnedSet && pinnedSet.has(modelKey(r.provider, r.model));
|
||||
const mark = pinned ? ` <span class="pill amber">📌 已添加</span>` : "";
|
||||
const cells = defs.map((c, ci) => {
|
||||
if (ci === 0) return `<td class="num">${i + 1}${mark}</td>`;
|
||||
return lbCell(r, c, i, maxDecode);
|
||||
}).join("");
|
||||
return `<tr>${cells}</tr>`;
|
||||
}).join("");
|
||||
$$("#lb th[data-sort]").forEach((th) => th.addEventListener("click", () => sortClick(th.dataset.sort)));
|
||||
}
|
||||
|
||||
async function loadLeaderboard() {
|
||||
const tbody = $("#lb tbody");
|
||||
if (!tbody) return;
|
||||
tbody.innerHTML = '<tr><td colspan="13" class="empty">加载中…</td></tr>';
|
||||
let d;
|
||||
try {
|
||||
d = await api(`/api/leaderboard?sort=heat&order=desc&limit=500`);
|
||||
} catch (e) {
|
||||
tbody.innerHTML = `<tr><td colspan="13" class="empty">加载失败:${esc(e.message)}</td></tr>`;
|
||||
return;
|
||||
}
|
||||
if (d.top_n) lbTopN = d.top_n;
|
||||
if (d.columns) lbCols = d.columns;
|
||||
lbAll = d.rows;
|
||||
lbModels = lbAll.map((r) => ({ provider: r.provider, model: r.model, key: modelKey(r.provider, r.model), intro: r.intro || "", heat: r.heat || 0 }));
|
||||
if (!lbChartSel.size) lbModels.forEach((m) => lbChartSel.add(m.key)); // 默认对比全部
|
||||
renderLbChips();
|
||||
renderPinned();
|
||||
applyView();
|
||||
}
|
||||
|
||||
/* 视图 = 已添加(pinned) + 热度前N */
|
||||
function applyView() {
|
||||
const rows = [];
|
||||
const seen = new Set();
|
||||
const pinSet = new Set(lbPinned);
|
||||
for (const key of lbPinned) {
|
||||
const m = lbAll.find((r) => modelKey(r.provider, r.model) === key);
|
||||
if (m) { rows.push(m); seen.add(key); }
|
||||
}
|
||||
let top = [...lbAll].sort(cmpLb);
|
||||
if (pinSet.size) top = top.filter((r) => !pinSet.has(modelKey(r.provider, r.model)));
|
||||
rows.push(...top.slice(0, lbTopN));
|
||||
renderLbTable(rows, pinSet);
|
||||
}
|
||||
|
||||
function renderPinned() {
|
||||
const bar = $("#lb-pinned");
|
||||
if (!bar) return;
|
||||
if (!lbPinned.length) { bar.innerHTML = '<span class="pinned-empty">尚未添加速度项 —— 用下方搜索框搜索并点「+ 添加」可把指定速度项固定到本区域查看</span>'; return; }
|
||||
bar.innerHTML = lbPinned.map((key) => {
|
||||
const m = lbAll.find((r) => modelKey(r.provider, r.model) === key);
|
||||
return `<span class="pinned-chip" data-pin="${key}">📌 ${esc(m ? m.model : cartModelName(key))} <span class="x" data-pinx="${key}">✕</span></span>`;
|
||||
}).join("");
|
||||
}
|
||||
|
||||
/* 运行速度对比图:要对比的模型 chips(每项可✕,清空一键去除) */
|
||||
function renderLbChips() {
|
||||
const box = $("#lb-chart-models");
|
||||
if (!box) return;
|
||||
box.innerHTML = "";
|
||||
if (!lbModels.length) { box.innerHTML = '<span class="hint">暂无模型</span>'; return; }
|
||||
for (const m of lbModels) {
|
||||
const on = lbSelected.has(m.key);
|
||||
const on = lbChartSel.has(m.key);
|
||||
const c = document.createElement("span");
|
||||
c.className = "chip" + (on ? " on" : "");
|
||||
c.title = "点击选择/取消该模型";
|
||||
c.innerHTML = `<span>${esc(m.model)}</span>`;
|
||||
c.addEventListener("click", () => {
|
||||
if (lbSelected.has(m.key)) lbSelected.delete(m.key); else lbSelected.add(m.key);
|
||||
c.title = "✕ 移出对比列表;在排行榜点「+对比」可再加回";
|
||||
c.innerHTML = `<span>${esc(m.model)}</span><span class="x" data-chipx="${m.key}">✕</span>`;
|
||||
c.addEventListener("click", (e) => {
|
||||
if (e.target.closest("[data-chipx]")) {
|
||||
lbChartSel.delete(m.key);
|
||||
c.classList.remove("on");
|
||||
return;
|
||||
}
|
||||
if (lbChartSel.has(m.key)) lbChartSel.delete(m.key); else lbChartSel.add(m.key);
|
||||
c.classList.toggle("on");
|
||||
});
|
||||
box.appendChild(c);
|
||||
}
|
||||
}
|
||||
|
||||
async function loadLeaderboard() {
|
||||
const tb = $("#lb tbody");
|
||||
if (!tb) return;
|
||||
tb.innerHTML = '<tr><td colspan="12" class="empty">加载中…</td></tr>';
|
||||
let d;
|
||||
try {
|
||||
d = await api(`/api/leaderboard?sort=${sortKey}&order=${sortOrder}`);
|
||||
} catch (e) {
|
||||
tb.innerHTML = `<tr><td colspan="12" class="empty">加载失败:${esc(e.message)}</td></tr>`;
|
||||
return;
|
||||
}
|
||||
$$("#lb th[data-sort]").forEach((th) => {
|
||||
th.querySelector(".arrow").textContent = (th.dataset.sort === sortKey) ? (sortOrder === "desc" ? " ▼" : " ▲") : "";
|
||||
/* 顶部居中搜索(选中跳详情) */
|
||||
function bindTopSearch() {
|
||||
const input = $("#top-search");
|
||||
const drop = $("#top-search-drop");
|
||||
if (!input || !drop) return;
|
||||
const show = (items) => {
|
||||
if (!items || !items.length) { drop.hidden = true; return; }
|
||||
drop.hidden = false;
|
||||
drop.innerHTML = items.map((r) => `<div class="search-item" data-key="${modelKey(r.provider, r.model)}">
|
||||
<div class="si-main">${esc(r.model)} <span class="pill amber" style="margin-left:6px">🔥${fmtInt(r.heat || 0)}</span></div>
|
||||
<div class="si-sub">${esc(r.intro || providerLabel(r.provider))} · 提交 ${fmtInt(r.cnt)} · 解码 ${fmt(r.avg_decode_speed)} tok/s · ${r.hardware ? esc(r.hardware) : ""} ${r.framework ? esc(r.framework) : ""}</div>
|
||||
</div>`).join("");
|
||||
};
|
||||
input.addEventListener("focus", () => show(lbAll.slice(0, 5)));
|
||||
input.addEventListener("input", () => {
|
||||
const q = input.value.trim().toLowerCase();
|
||||
const list = q ? lbAll.filter((r) => (r.model + " " + r.provider + " " + (r.intro || "")).toLowerCase().includes(q)).slice(0, 5) : lbAll.slice(0, 5);
|
||||
show(list);
|
||||
});
|
||||
if (!d.rows.length) {
|
||||
tb.innerHTML = '<tr><td colspan="12" class="empty">暂无评测数据。可在后台管理「提交管理」里点击「🎲 生成演示数据」或从 llm-speed-tester 一键发送。</td></tr>';
|
||||
return;
|
||||
}
|
||||
// 记录模型列表,用于对比图选择
|
||||
lbModels = d.rows.map((r) => ({ provider: r.provider, model: r.model, key: modelKey(r.provider, r.model) }));
|
||||
if (!lbSelected.size) lbModels.forEach((m) => lbSelected.add(m.key));
|
||||
else lbModels.forEach((m) => { if (!lbSelected.has(m.key)) lbSelected.add(m.key); }); // 新模型默认选中
|
||||
renderLbChips();
|
||||
input.addEventListener("blur", () => setTimeout(() => { drop.hidden = true; }, 150));
|
||||
drop.addEventListener("mousedown", (e) => {
|
||||
const item = e.target.closest(".search-item");
|
||||
if (!item) return;
|
||||
e.preventDefault();
|
||||
const key = item.dataset.key;
|
||||
const m = lbModels.find((x) => x.key === key);
|
||||
if (m) location.href = `/model.html?provider=${encodeURIComponent(m.provider)}&model=${encodeURIComponent(m.model)}`;
|
||||
});
|
||||
}
|
||||
|
||||
const maxDecode = Math.max(...d.rows.map((r) => r.avg_decode_speed || 0));
|
||||
tb.innerHTML = d.rows.map((r, i) => {
|
||||
const meter = r.avg_decode_speed ? `<div class="meter"><div style="width:${(r.avg_decode_speed / maxDecode * 100).toFixed(1)}%"></div></div>` : "";
|
||||
return `<tr>
|
||||
<td class="num">${i + 1}</td>
|
||||
<td><span class="pill">${esc(providerLabel(r.provider))}</span></td>
|
||||
<td><a href="/model.html?provider=${encodeURIComponent(r.provider)}&model=${encodeURIComponent(r.model)}" title="查看详情">${esc(r.model)}</a></td>
|
||||
<td class="num">${fmtInt(r.cnt)}</td>
|
||||
<td class="num">${fmtInt(r.accounts)}</td>
|
||||
<td class="num"><span class="badge-decode">${fmt(r.avg_decode_speed)}</span>${meter}</td>
|
||||
<td class="num">${fmt(r.avg_prefill_speed)}</td>
|
||||
<td class="num">${fmt(r.avg_ttft_ms)}</td>
|
||||
<td class="num">${fmt(r.best_decode)}</td>
|
||||
<td>${hwTag(r.hardware)}</td>
|
||||
<td class="num">${esc((r.last_tested || "").slice(5, 16))}</td>
|
||||
<td><button class="btn small" data-cart="${modelKey(r.provider, r.model)}" title="加入对比车">🛒 加入对比车</button></td>
|
||||
</tr>`;
|
||||
}).join("");
|
||||
/* 排行内搜索(点击“添加”把速度项固定到本区域) */
|
||||
function bindLbSearch() {
|
||||
const input = $("#lb-search");
|
||||
const drop = $("#lb-search-drop");
|
||||
if (!input || !drop) return;
|
||||
const show = (items) => {
|
||||
if (!items || !items.length) { drop.hidden = true; return; }
|
||||
drop.hidden = false;
|
||||
drop.innerHTML = items.map((r) => {
|
||||
const key = modelKey(r.provider, r.model);
|
||||
const pinned = lbPinned.includes(key);
|
||||
return `<div class="search-item" data-add="${key}">
|
||||
<div class="si-main">${esc(r.model)} <span class="pill amber" style="margin-left:6px">🔥${fmtInt(r.heat || 0)}</span></div>
|
||||
<div class="si-sub">${esc(r.intro || providerLabel(r.provider))} · 解码 ${fmt(r.avg_decode_speed)} tok/s</div>
|
||||
<span class="si-act">${pinned ? "✓ 已添加" : "+ 添加"}</span>
|
||||
</div>`;
|
||||
}).join("");
|
||||
};
|
||||
input.addEventListener("focus", () => show(lbAll.slice(0, 5)));
|
||||
input.addEventListener("input", () => {
|
||||
const q = input.value.trim().toLowerCase();
|
||||
const list = q ? lbAll.filter((r) => (r.model + " " + r.provider + " " + (r.intro || "")).toLowerCase().includes(q)).slice(0, 6) : lbAll.slice(0, 5);
|
||||
show(list);
|
||||
});
|
||||
input.addEventListener("blur", () => setTimeout(() => { drop.hidden = true; }, 150));
|
||||
drop.addEventListener("mousedown", (e) => {
|
||||
const item = e.target.closest("[data-add]");
|
||||
if (!item) return;
|
||||
e.preventDefault();
|
||||
const key = item.dataset.add;
|
||||
if (!lbPinned.includes(key)) {
|
||||
lbPinned.push(key);
|
||||
toast("📌 已添加到本区域");
|
||||
renderPinned();
|
||||
applyView();
|
||||
}
|
||||
});
|
||||
// 钉住项的 ✕
|
||||
const bar = $("#lb-pinned");
|
||||
if (bar) bar.addEventListener("click", (e) => {
|
||||
const x = e.target.closest("[data-pinx]");
|
||||
if (x) { lbPinned = lbPinned.filter((k) => k !== x.dataset.pinx); renderPinned(); applyView(); }
|
||||
});
|
||||
}
|
||||
|
||||
let lbChartUrl = "";
|
||||
async function genLbChart() {
|
||||
const status = $("#lb-chart-status");
|
||||
const imgWrap = $("#lb-chart-img");
|
||||
if (!lbSelected.size) { status.textContent = "请至少选择一个模型"; return; }
|
||||
if (!lbChartSel.size) { status.textContent = "请先添加要对比的模型(点排行榜「+对比」或点「✅ 全选」)"; return; }
|
||||
status.textContent = "⏳ 正在生成...";
|
||||
try {
|
||||
// 重新请求指定模型的排行数据(对比图只包含所选模型)
|
||||
const models = [...lbSelected].join(",");
|
||||
const d = await api(`/api/leaderboard?sort=avg_decode_speed&order=desc&models=${encodeURIComponent(models)}`);
|
||||
const models = [...lbChartSel].join(",");
|
||||
const d = await api(`/api/leaderboard?sort=heat&order=desc&models=${encodeURIComponent(models)}`);
|
||||
if (!d.rows.length) { status.textContent = "所选模型暂无数据"; return; }
|
||||
const n = d.rows.length;
|
||||
// 运行速度对比:预填充(左轴·空心柱) + 解码(右轴·实心柱) + 首字(虚线),三色
|
||||
const series = RUN_SERIES.map((s, i) => ({
|
||||
...s, show: true,
|
||||
type: ["bar", "bar", "line"][i],
|
||||
@@ -243,6 +439,14 @@ async function genLbChart() {
|
||||
} catch (e) { status.textContent = "❌ " + e.message; }
|
||||
}
|
||||
|
||||
function dlChartUrl() {
|
||||
if (!lbChartUrl) { toast("请先生成图表"); return null; }
|
||||
const a = document.createElement("a");
|
||||
a.href = lbChartUrl;
|
||||
a.download = "运行速度对比图.png";
|
||||
document.body.appendChild(a); a.click(); a.remove();
|
||||
}
|
||||
|
||||
/* ───────────────────────── 模型详情页 ───────────────────────── */
|
||||
async function loadModel() {
|
||||
const params = new URLSearchParams(location.search);
|
||||
@@ -673,6 +877,8 @@ async function checkAdmin() {
|
||||
loadSubmissions(true);
|
||||
loadAccounts();
|
||||
loadCaps();
|
||||
loadSpeedItems();
|
||||
loadSettings();
|
||||
return true;
|
||||
}
|
||||
} catch (e) { /* not logged in */ }
|
||||
@@ -686,6 +892,8 @@ function switchTab(tab) {
|
||||
$("#tab-subs").hidden = tab !== "subs";
|
||||
$("#tab-accs").hidden = tab !== "accs";
|
||||
$("#tab-caps").hidden = tab !== "caps";
|
||||
$("#tab-speed").hidden = tab !== "speed";
|
||||
$("#tab-settings").hidden = tab !== "settings";
|
||||
}
|
||||
|
||||
async function loadSubmissions(resetPage = false) {
|
||||
@@ -784,6 +992,61 @@ async function loadCaps() {
|
||||
</tr>`).join("");
|
||||
}
|
||||
|
||||
async function loadSpeedItems() {
|
||||
const tb = $("#si tbody");
|
||||
if (!tb) return;
|
||||
let list;
|
||||
try { list = await api("/api/admin/speed-items"); }
|
||||
catch (e) { tb.innerHTML = `<tr><td colspan="9" class="empty">加载失败:${esc(e.message)}</td></tr>`; return; }
|
||||
if (!list.length) {
|
||||
tb.innerHTML = '<tr><td colspan="10" class="empty">暂无速度项,点击「🔄 从提交同步」自动生成。</td></tr>';
|
||||
return;
|
||||
}
|
||||
tb.innerHTML = list.map((s) => `<tr>
|
||||
<td>${s.id}</td>
|
||||
<td><span class="pill">${esc(providerLabel(s.provider))}</span></td>
|
||||
<td>${esc(s.model)}</td>
|
||||
<td class="num"><span class="pill amber">🔥 ${fmtInt(s.heat)}</span></td>
|
||||
<td class="num">${fmtInt(s.count)}</td>
|
||||
<td title="${esc(s.intro || "")}">${esc((s.intro || "—").slice(0, 22))}</td>
|
||||
<td>${s.framework ? `<span class="hw-tag">⚙ ${esc(s.framework)}</span>` : "—"}</td>
|
||||
<td>${esc(s.remark || "—")}</td>
|
||||
<td class="num">${fmtInt(s.real_cnt)}</td>
|
||||
<td>
|
||||
<button class="btn small" data-edit-si="${s.id}" data-provider="${esc(s.provider)}" data-model="${esc(s.model)}" data-heat="${s.heat}" data-count="${s.count}" data-intro="${esc(s.intro || "")}" data-framework="${esc(s.framework || "")}" data-remark="${esc(s.remark || "")}">编辑</button>
|
||||
<button class="btn small danger" data-del-si="${s.id}">删除</button>
|
||||
</td>
|
||||
</tr>`).join("");
|
||||
}
|
||||
|
||||
async function loadSettings() {
|
||||
const s = await api("/api/admin/settings");
|
||||
if ($("#set-watermark")) $("#set-watermark").value = s.watermark || "";
|
||||
if ($("#set-wmstyle")) $("#set-wmstyle").value = s.watermark_style || "corner";
|
||||
if ($("#set-topn")) $("#set-topn").value = s.top_n || 10;
|
||||
const cols = s.columns || {};
|
||||
$$("#set-cols input[data-col]").forEach((cb) => {
|
||||
cb.checked = !!cols[cb.dataset.col];
|
||||
});
|
||||
}
|
||||
|
||||
function editSpeedItem(btn) {
|
||||
const provider = prompt("提供商:", btn.dataset.provider || "") ?? btn.dataset.provider;
|
||||
const model = prompt("模型名称:", btn.dataset.model || "");
|
||||
if (model === null) return;
|
||||
const heat = prompt("热度(数字):", btn.dataset.heat || "0");
|
||||
const count = prompt("个数(展示提交数,0=自动):", btn.dataset.count || "0");
|
||||
const intro = prompt("配置简介:", btn.dataset.intro || "");
|
||||
const framework = prompt("推理框架(如 vLLM / llama.cpp / TensorRT-LLM / SGLang):", btn.dataset.framework || "");
|
||||
const remark = prompt("备注:", btn.dataset.remark || "");
|
||||
const body = {
|
||||
provider: provider || "", model: model || "",
|
||||
heat: parseInt(heat) || 0, count: parseInt(count) || 0,
|
||||
intro: intro || "", framework: framework || "", remark: remark || "",
|
||||
};
|
||||
api(`/api/admin/speed-items/${btn.dataset.editSi}`, "PUT", body).then(() => { toast("已保存"); loadSpeedItems(); });
|
||||
}
|
||||
|
||||
function openCapEditor(c) {
|
||||
capEditId = c ? c.id : null;
|
||||
$("#cap-edit-title").textContent = c ? `编辑能力测试 #${c.id}` : "新增能力测试";
|
||||
@@ -829,19 +1092,25 @@ async function saveCapEditor() {
|
||||
|
||||
/* ───────────────────────── 事件绑定 ───────────────────────── */
|
||||
function bindIndex() {
|
||||
$$("#lb th[data-sort]").forEach((th) => th.addEventListener("click", () => sortClick(th.dataset.sort)));
|
||||
const gen = $("#lb-chart-gen");
|
||||
if (gen) gen.addEventListener("click", genLbChart);
|
||||
const all = $("#lb-chart-all");
|
||||
if (all) all.addEventListener("click", () => { lbModels.forEach((m) => lbSelected.add(m.key)); renderLbChips(); });
|
||||
const none = $("#lb-chart-none");
|
||||
if (none) none.addEventListener("click", () => { lbSelected.clear(); renderLbChips(); });
|
||||
// 对比车按钮
|
||||
// 顶部居中搜索(跳详情)
|
||||
bindTopSearch();
|
||||
// 排行内搜索(添加速度项到本区域)
|
||||
bindLbSearch();
|
||||
// 排行榜行:+对比 / 详情
|
||||
const tb = $("#lb tbody");
|
||||
if (tb) tb.addEventListener("click", (e) => {
|
||||
const btn = e.target.closest("[data-cart]");
|
||||
if (btn) cartAdd(btn.dataset.cart);
|
||||
if (btn) { e.preventDefault(); cartAdd(btn.dataset.cart); }
|
||||
});
|
||||
// 运行速度对比图:生成 / 下载 / 全选 / 清空
|
||||
const gen = $("#lb-chart-gen");
|
||||
if (gen) gen.addEventListener("click", genLbChart);
|
||||
const dl = $("#lb-chart-dl");
|
||||
if (dl) dl.addEventListener("click", () => { if (!lbChartUrl) { toast("请先生成图表"); return; } dlChartUrl(); });
|
||||
const all = $("#lb-chart-all");
|
||||
if (all) all.addEventListener("click", () => { lbModels.forEach((m) => lbChartSel.add(m.key)); renderLbChips(); });
|
||||
const clear = $("#lb-chart-clear");
|
||||
if (clear) clear.addEventListener("click", () => { lbChartSel.clear(); renderLbChips(); });
|
||||
bindCartBar();
|
||||
}
|
||||
|
||||
@@ -889,6 +1158,14 @@ function bindCompare() {
|
||||
if (run) run.addEventListener("click", runCompare);
|
||||
const gen = $("#cmp-chart-gen");
|
||||
if (gen) gen.addEventListener("click", genCmpChart);
|
||||
const dl = $("#cmp-chart-dl");
|
||||
if (dl) dl.addEventListener("click", () => {
|
||||
if (!cmpChartUrl) { toast("请先生成图表"); return; }
|
||||
const a = document.createElement("a");
|
||||
a.href = cmpChartUrl;
|
||||
a.download = "模型运行速度对比图.png";
|
||||
document.body.appendChild(a); a.click(); a.remove();
|
||||
});
|
||||
renderCmpColToggles();
|
||||
renderSeriesCfg();
|
||||
bindCartBar();
|
||||
@@ -1023,6 +1300,60 @@ function bindAdmin() {
|
||||
subClose.addEventListener("click", () => { $("#sub-mask").hidden = true; });
|
||||
$("#sub-mask").addEventListener("click", (e) => { if (e.target === $("#sub-mask")) $("#sub-mask").hidden = true; });
|
||||
}
|
||||
|
||||
// 速度项管理
|
||||
const siAdd = $("#btn-si-add");
|
||||
if (siAdd) siAdd.addEventListener("click", () => {
|
||||
const provider = prompt("提供商:", "") || "";
|
||||
const model = prompt("模型名称:", "");
|
||||
if (!model) { toast("请填写模型名称"); return; }
|
||||
const heat = prompt("热度:", "0") || 0;
|
||||
const count = prompt("个数(展示提交数,0=自动):", "0") || 0;
|
||||
const intro = prompt("配置简介:", "") || "";
|
||||
const framework = prompt("推理框架(如 vLLM / llama.cpp):", "") || "";
|
||||
api("/api/admin/speed-items", "POST", { provider, model, heat: parseInt(heat) || 0, count: parseInt(count) || 0, intro, framework })
|
||||
.then((r) => { if (!r.ok) throw new Error(r.error || "添加失败"); toast("已添加"); loadSpeedItems(); })
|
||||
.catch((e) => toast(e.message));
|
||||
});
|
||||
const siSync = $("#btn-si-sync");
|
||||
if (siSync) siSync.addEventListener("click", async () => {
|
||||
siSync.disabled = true; siSync.textContent = "同步中…";
|
||||
try {
|
||||
const r = await api("/api/admin/speed-items/sync", "POST", {});
|
||||
toast(`已同步 ${r.added} 个速度项`);
|
||||
loadSpeedItems();
|
||||
} catch (e) { toast("同步失败:" + e.message); }
|
||||
siSync.disabled = false; siSync.textContent = "🔄 从提交同步";
|
||||
});
|
||||
const siTb = $("#si tbody");
|
||||
if (siTb) siTb.addEventListener("click", (e) => {
|
||||
const ed = e.target.closest("[data-edit-si]");
|
||||
const dl = e.target.closest("[data-del-si]");
|
||||
if (ed) editSpeedItem(ed);
|
||||
if (dl) {
|
||||
if (confirm(`确定删除速度项 #${dl.dataset.delSi}?`)) {
|
||||
api(`/api/admin/speed-items/${dl.dataset.delSi}`, "DELETE").then(() => { toast("已删除"); loadSpeedItems(); });
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// 设置
|
||||
const save = $("#btn-settings-save");
|
||||
if (save) save.addEventListener("click", async () => {
|
||||
const body = {
|
||||
watermark_text: $("#set-watermark").value.trim(),
|
||||
watermark_style: $("#set-wmstyle").value,
|
||||
top_n: parseInt($("#set-topn").value) || 10,
|
||||
};
|
||||
$$("#set-cols input[data-col]").forEach((cb) => { body[cb.dataset.col] = cb.checked ? "1" : "0"; });
|
||||
try {
|
||||
await api("/api/admin/settings", "PUT", body);
|
||||
const st = $("#set-status");
|
||||
st.textContent = "✅ 已保存,刷新页面生效";
|
||||
setTimeout(() => { st.textContent = ""; }, 3000);
|
||||
toast("设置已保存");
|
||||
} catch (e) { toast("保存失败:" + e.message); }
|
||||
});
|
||||
}
|
||||
|
||||
/* ───────────────────────── 初始化 ───────────────────────── */
|
||||
|
||||
Reference in New Issue
Block a user