dsh-livebench-panel 0.2.9 → 0.2.11

package/lib/client.js

@@ -107,6 +107,8 @@ window.__ModuleLoader__.load({
 					const [homeBusy, setHomeBusy] = useState(false);
 					const [results, setResults] = useState(null);
 					const [pickedModels, setPickedModels] = useState(() => new Set());
+					const [sortBy, setSortBy] = useState(null);
+					const [sortDir, setSortDir] = useState("asc");
 					const [modelOrder, setModelOrder] = useState(() => {
 						try { return JSON.parse(localStorage.getItem("dlb_model_order_v1")) ?? []; } catch { return []; }
 					});
@@ -323,16 +325,37 @@ window.__ModuleLoader__.load({
 						return { models, tasks, cells, startTimes };
 					}, [results]);
 					const cellOf = (model, key) => matrix.cells.get(`${model}__@__${key}`);
+					// 排序：sortBy=null 时用拖拽自定义顺序；点击表头在 正序/倒序 间切换
 					const sortedModels = useMemo(() => {
 						if (!matrix) return [];
+						const base = [...matrix.models];
+						if (sortBy === "model") {
+							base.sort((a, b) => (sortDir === "asc" ? a.localeCompare(b) : b.localeCompare(a)));
+							return base;
+						}
+						if (sortBy === "time") {
+							base.sort((a, b) => {
+								const ta = matrix.startTimes.get(a) ?? 0;
+								const tb = matrix.startTimes.get(b) ?? 0;
+								return sortDir === "asc" ? ta - tb : tb - ta;
+							});
+							return base;
+						}
 						const indexOf = new Map(modelOrder.map((key, index) => [key, index]));
-						return [...matrix.models].sort((a, b) => {
+						return base.sort((a, b) => {
 							const ia = indexOf.has(a) ? indexOf.get(a) : Number.MAX_SAFE_INTEGER;
 							const ib = indexOf.has(b) ? indexOf.get(b) : Number.MAX_SAFE_INTEGER;
 							if (ia !== ib) return ia - ib;
 							return a.localeCompare(b);
 						});
-					}, [matrix, modelOrder]);
+					}, [matrix, modelOrder, sortBy, sortDir]);
+
+					// 点击表头：切换排序字段（再次点击同一列则反转方向）
+					const toggleSort = (field) => {
+						if (sortBy === field) setSortDir((d) => (d === "asc" ? "desc" : "asc"));
+						else { setSortBy(field); setSortDir("asc"); }
+					};
+					const sortMark = (field) => (sortBy === field ? (sortDir === "asc" ? " ↑" : " ↓") : "");
 
 					const persistModelOrder = (keys) => {
 						setModelOrder(keys);
@@ -343,6 +366,7 @@ window.__ModuleLoader__.load({
 						const sourceModel = dragKey.current;
 						dragKey.current = null;
 						if (!sourceModel || sourceModel === targetModel) return;
+						setSortBy(null); // 拖拽即回到自定义顺序
 						const keys = sortedModels.slice();
 						const from = keys.indexOf(sourceModel);
 						const to = keys.indexOf(targetModel);
@@ -531,13 +555,21 @@ window.__ModuleLoader__.load({
 									h("th", { style: { width: "30px" } },
 										h("input", { type: "checkbox", checked: pickedModels.size > 0 && pickedModels.size === sortedModels.length,
 											onChange: (event) => setPickedModels(event.target.checked ? new Set(sortedModels) : new Set()) })),
-									h("th", null, "model"),
+									h("th", {
+										style: { cursor: "pointer", userSelect: "none" },
+										title: "点击按模型名排序（再次点击切换正序/倒序）",
+										onClick: () => toggleSort("model"),
+									}, "model" + sortMark("model")),
 									matrix.tasks.map((taskKeyCol) => {
 										const [cat, task] = taskKeyCol.split("/");
 										return h("th", { key: taskKeyCol, title: `${cat} / ${task}` }, task);
 									}),
 									h("th", null, "删除"),
-									h("th", null, "time"),
+									h("th", {
+										style: { cursor: "pointer", userSelect: "none" },
+										title: "点击按时间排序（再次点击切换正序/倒序）",
+										onClick: () => toggleSort("time"),
+									}, "time" + sortMark("time")),
 								)),
 								h("tbody", null,
 									sortedModels.map((model) => {

package/lib/index.js

@@ -485,56 +485,73 @@ function parseAnswerLineLight(line) {
 
 /**
  * Compute mean scores per (model, category, task) from ground-truth judgment
- * files, plus the judged/total question counts per task.
- * 异步流式版：不再同步整读 answer 文件（coding 类单行数 MB，同步读会卡死
- * node 事件循环导致 DSH 断连假死）。
+ * files, plus judged/total question counts per task.
+ *
+ * 性能：数据目录可能上百 MB（每次评测生成独立答案文件）。这里：
+ *  - answer 文件用【文件名】当模型名，只做行数与 "$ERROR$" 子串统计 —— 不解析大 JSON 行；
+ *  - question.jsonl 只数行数；
+ *  - 结果缓存 5 秒，避免前端频繁刷新时重复全量扫描。
  */
+let resultsCache = { at: 0, data: null };
+
+async function readTextFileAsync(path) {
+	const fsPromises = await import("node:fs/promises");
+	try {
+		return await fsPromises.readFile(path, "utf8");
+	} catch {
+		return null;
+	}
+}
+
 async function computeResults(dataDir) {
-	const judged = new Map(); // `${model}\u0000${task}` -> {model, category, task, sum, n, time}
+	const now = Date.now();
+	if (resultsCache.data !== null && now - resultsCache.at < 5000) return resultsCache.data;
+	const judged = new Map(); // `${model}${task}` -> {model, category, task, sum, n, time}
 	const totals = new Map(); // task -> question count
-	const answers = new Map(); // `${model}\u0000${task}` -> {answered, errors}
-	const catByTask = new Map(); // task -> category（rows 阶段查分类用）
+	const answers = new Map(); // `${model}${task}` -> {answered, errors}
+	const catByTask = new Map();
 	if (!existsSync(dataDir)) return { rows: [], taskTotals: {} };
 	for (const category of readDirSafe(dataDir)) {
 		const catDir = join(dataDir, category);
 		for (const task of readDirSafe(catDir)) {
 			const taskDir = join(catDir, task);
 			catByTask.set(task, category);
-			let questionCount = 0;
-			await streamJsonl(join(taskDir, "question.jsonl"), () => { questionCount += 1; });
-			totals.set(task, questionCount);
-			// answer 侧：各模型产出了多少答案、其中多少 $ERROR$（API 失败）
+			const qText = await readTextFileAsync(join(taskDir, "question.jsonl"));
+			totals.set(task, qText === null ? 0 : qText.split("\n").reduce((n, l) => n + (l.trim().length > 0 ? 1 : 0), 0));
 			const answerDir = join(taskDir, "model_answer");
 			for (const file of readDirSafe(answerDir)) {
 				if (!file.endsWith(".jsonl")) continue;
-				const fallbackModel = file.slice(0, -".jsonl".length);
-				await streamJsonl(join(answerDir, file), (line) => {
-					const parsed = parseAnswerLineLight(line);
-					if (!parsed) return;
-					const model = parsed.model ?? fallbackModel;
-					const key = `${model}\u0000${task}`;
-					const stat = answers.get(key) ?? { answered: 0, errors: 0 };
+				const model = file.slice(0, -".jsonl".length);
+				const text = await readTextFileAsync(join(answerDir, file));
+				if (text === null) continue;
+				const key = `${model}${task}`;
+				const stat = answers.get(key) ?? { answered: 0, errors: 0 };
+				for (const line of text.split("\n")) {
+					if (line.trim().length === 0) continue;
 					stat.answered += 1;
-					if (parsed.is_error) stat.errors += 1;
-					answers.set(key, stat);
-				});
+					if (line.includes('"$ERROR$"')) stat.errors += 1;
+				}
+				answers.set(key, stat);
 			}
-			// judgment 侧：判分与时间戳
-			await streamJsonl(join(taskDir, "model_judgment", "ground_truth_judgment.jsonl"), (line) => {
-				let row;
-				try { row = JSON.parse(line); } catch { return; }
-				const model = typeof row.model === "string" ? row.model : null;
-				const score = typeof row.score === "number" ? row.score : Number(row.score);
-				if (model === null || !Number.isFinite(score) || score < 0) return;
-				const key = `${model}\u0000${task}`;
-				const entry = judged.get(key) ?? { model, category, task, sum: 0, n: 0, time: 0 };
-				entry.sum += score;
-				entry.n += 1;
-				const tstamp = Number(row.tstamp);
-				if (Number.isFinite(tstamp) && tstamp > entry.time) entry.time = tstamp;
-				judged.set(key, entry);
-			});
-			// 让出事件循环：任务之间穿插执行，保证 HTTP/websocket 实时响应
+			const jText = await readTextFileAsync(join(taskDir, "model_judgment", "ground_truth_judgment.jsonl"));
+			if (jText !== null) {
+				for (const line of jText.split("\n")) {
+					if (line.trim().length === 0) continue;
+					let row;
+					try { row = JSON.parse(line); } catch { continue; }
+					const model = typeof row.model === "string" ? row.model : null;
+					const score = typeof row.score === "number" ? row.score : Number(row.score);
+					if (model === null || !Number.isFinite(score) || score < 0) continue;
+					const key = `${model}${task}`;
+					const entry = judged.get(key) ?? { model, category, task, sum: 0, n: 0, time: 0 };
+					entry.sum += score;
+					entry.n += 1;
+					const tstamp = Number(row.tstamp);
+					if (Number.isFinite(tstamp) && tstamp > entry.time) entry.time = tstamp;
+					judged.set(key, entry);
+				}
+			}
+			// 让出事件循环，保证 HTTP/websocket 实时响应
 			await new Promise((resolve) => setImmediate(resolve));
 		}
 	}
@@ -542,7 +559,7 @@ async function computeResults(dataDir) {
 	const rows = [...keys].map((key) => {
 		const entry = judged.get(key);
 		const stat = answers.get(key) ?? { answered: 0, errors: 0 };
-		const [model, task] = key.split("\u0000");
+		const [model, task] = key.split("");
 		const category = entry?.category ?? catByTask.get(task) ?? "";
 		return {
 			model,
@@ -556,8 +573,9 @@ async function computeResults(dataDir) {
 			errors: stat.errors,
 		};
 	});
-	const taskTotals = Object.fromEntries(totals);
-	return { rows, taskTotals };
+	const result = { rows, taskTotals: Object.fromEntries(totals) };
+	resultsCache = { at: Date.now(), data: result };
+	return result;
 }
 
 /**
@@ -1101,6 +1119,7 @@ function apply(ctx) {
 				removed += filterJsonlByModel(join(taskDir, "model_answer", `${model}.jsonl`), "model_id", model);
 				removed += filterJsonlByModel(join(taskDir, "model_judgment", "ground_truth_judgment.jsonl"), "model", model);
 			}
+			resultsCache = { at: 0, data: null };
 			sendJson(res, 200, { ok: true, removed });
 		},
 	}), `${name}: delete route`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-livebench-panel",
-  "version": "0.2.9",
+  "version": "0.2.11",
   "description": "DSH web plugin: a LiveBench tab in the Trajectory view (right of 对话/轨迹). Run LiveBench evaluations against every model configured in the DeepSeek Harness — pick provider/model, category, task, release and question range from dropdowns, watch progress, and read scores in place.",
   "license": "MIT",
   "type": "module",