dsh-livebench-panel 0.1.6 → 0.1.7

package/lib/client.js

@@ -99,9 +99,9 @@ window.__ModuleLoader__.load({
 			const [exitCode, setExitCode] = useState(null);
 			const [startError, setStartError] = useState(null);
 			const [results, setResults] = useState(null);
-			const [pickedRows, setPickedRows] = useState(() => new Set());
-			const [order, setOrder] = useState(() => {
-				try { return JSON.parse(localStorage.getItem("dlb_result_order_v1")) ?? []; } catch { return []; }
+			const [pickedTasks, setPickedTasks] = useState(() => new Set());
+			const [taskOrder, setTaskOrder] = useState(() => {
+				try { return JSON.parse(localStorage.getItem("dlb_task_order_v1")) ?? []; } catch { return []; }
 			});
 			const dragKey = useRef(null);
 			const logRef = useRef(null);
@@ -265,52 +265,78 @@ window.__ModuleLoader__.load({
 				});
 			};
 
-			// ---- 成绩行：排序（拖拽，localStorage 持久化）/ 选择 / 删除 ----
-			const rowKey = (row) => `${row.model}|${row.category}|${row.task}`;
-			const sortedRows = useMemo(() => {
-				if (!results) return [];
-				const indexOf = new Map(order.map((key, index) => [key, index]));
-				return [...results.rows].sort((a, b) => {
-					const ia = indexOf.has(rowKey(a)) ? indexOf.get(rowKey(a)) : Number.MAX_SAFE_INTEGER;
-					const ib = indexOf.has(rowKey(b)) ? indexOf.get(rowKey(b)) : Number.MAX_SAFE_INTEGER;
+			// ---- 成绩矩阵：task 为行（含 category 行标）、model 为列 ----
+			// 附带：time 列（该任务评测开始时间 = 行内最早判分时间）、
+			// 行拖拽排序（localStorage 持久化）、行选择与单行/批量删除。
+			const taskKey = (category, task) => `${category}/${task}`;
+			const matrix = useMemo(() => {
+				if (!results) return null;
+				const models = [...new Set(results.rows.map((r) => r.model))].sort();
+				const byTask = new Map(); // `${cat}/${task}` -> {category, task, cells: Map(model->row), startTime}
+				for (const row of results.rows) {
+					const key = taskKey(row.category, row.task);
+					const entry = byTask.get(key) ?? { category: row.category, task: row.task, cells: new Map(), startTime: Infinity };
+					entry.cells.set(row.model, row);
+					if (row.time && row.time < entry.startTime) entry.startTime = row.time;
+					byTask.set(key, entry);
+				}
+				return { models, tasks: [...byTask.entries()] };
+			}, [results]);
+			const sortedTasks = useMemo(() => {
+				if (!matrix) return [];
+				const indexOf = new Map(taskOrder.map((key, index) => [key, index]));
+				return [...matrix.tasks].sort((a, b) => {
+					const ia = indexOf.has(a[0]) ? indexOf.get(a[0]) : Number.MAX_SAFE_INTEGER;
+					const ib = indexOf.has(b[0]) ? indexOf.get(b[0]) : Number.MAX_SAFE_INTEGER;
 					if (ia !== ib) return ia - ib;
-					return (b.time ?? 0) - (a.time ?? 0);
+					return a[0].localeCompare(b[0]);
 				});
-			}, [results, order]);
+			}, [matrix, taskOrder]);
 
-			const persistOrder = (keys) => {
-				setOrder(keys);
-				try { localStorage.setItem("dlb_result_order_v1", JSON.stringify(keys)); } catch { /* private mode */ }
+			const persistTaskOrder = (keys) => {
+				setTaskOrder(keys);
+				try { localStorage.setItem("dlb_task_order_v1", JSON.stringify(keys)); } catch { /* private mode */ }
 			};
 
 			const onRowDrop = (targetKey) => {
 				const sourceKey = dragKey.current;
 				dragKey.current = null;
 				if (!sourceKey || sourceKey === targetKey) return;
-				const keys = sortedRows.map(rowKey);
+				const keys = sortedTasks.map(([key]) => key);
 				const from = keys.indexOf(sourceKey);
 				const to = keys.indexOf(targetKey);
 				if (from < 0 || to < 0) return;
 				keys.splice(to, 0, keys.splice(from, 1)[0]);
-				persistOrder(keys);
+				persistTaskOrder(keys);
 			};
 
-			const togglePicked = (key) => setPickedRows((prev) => {
+			const togglePicked = (key) => setPickedTasks((prev) => {
 				const next = new Set(prev);
 				if (next.has(key)) next.delete(key); else next.add(key);
 				return next;
 			});
 
-			const deleteRows = async (rows) => {
-				if (rows.length === 0) return;
-				if (!window.confirm(`确认删除 ${rows.length} 条评测成绩？将同时删除对应的模型答案记录，不可恢复。`)) return;
+			// 删除一个任务行 = 删除该任务下所有模型的判分与答案记录
+			const deleteTasks = async (keys) => {
+				if (!results || keys.length === 0) return;
+				const serverRows = [];
+				for (const key of keys) {
+					const [category, task] = key.split("/");
+					for (const row of results.rows) {
+						if (row.category === category && row.task === task) {
+							serverRows.push({ model: row.model, category, task });
+						}
+					}
+				}
+				if (serverRows.length === 0) return;
+				if (!window.confirm(`确认删除所选 ${keys.length} 个任务的全部评测成绩（共 ${serverRows.length} 条模型记录，含答案）？不可恢复。`)) return;
 				await api("/delete", {
 					method: "POST",
 					headers: { "content-type": "application/json" },
-					body: JSON.stringify({ rows: rows.map((r) => ({ model: r.model, category: r.category, task: r.task })) }),
+					body: JSON.stringify({ rows: serverRows }),
 				});
-				setPickedRows(new Set());
-				persistOrder([...order].filter((key) => !rows.some((r) => rowKey(r) === key)));
+				setPickedTasks(new Set());
+				persistTaskOrder(taskOrder.filter((key) => !keys.includes(key)));
 				await loadResults();
 			};
 
@@ -405,32 +431,29 @@ window.__ModuleLoader__.load({
 					),
 					h("pre", { className: c("log"), ref: logRef }, log || "（暂无输出）"),
 				),
-				sortedRows.length > 0 && h("div", { className: c("card") },
+				sortedTasks.length > 0 && h("div", { className: c("card") },
 					h("div", { className: c("row") },
-						h("span", { className: c("label") }, "评测成绩（分数 = 平均分 ×100；行首可拖动排序，顺序保存在本机）"),
+						h("span", { className: c("label") }, "评测成绩（分数 = 平均分 ×100，括号内为 已判/总题数；行首可拖动排序，顺序保存在本机）"),
 						h("button", {
 							className: c("btn") + " " + c("btnDanger"),
-							disabled: pickedRows.size === 0,
-							onClick: () => deleteRows(sortedRows.filter((r) => pickedRows.has(rowKey(r)))),
-						}, `删除所选（${pickedRows.size}）`),
+							disabled: pickedTasks.size === 0,
+							onClick: () => deleteTasks([...pickedTasks]),
+						}, `删除所选（${pickedTasks.size}）`),
 					),
 					h("table", { className: c("table") },
 						h("thead", null, h("tr", null,
-							h("th", { style: { width: "30px" } }, "⠿"),
+							h("th", { style: { width: "26px" } }, "⠿"),
 							h("th", { style: { width: "30px" } },
-								h("input", { type: "checkbox", checked: pickedRows.size > 0 && pickedRows.size === sortedRows.length,
-									onChange: (event) => setPickedRows(event.target.checked ? new Set(sortedRows.map(rowKey)) : new Set()) })),
-							h("th", null, "time"),
-							h("th", null, "model"),
-							h("th", null, "category"),
+								h("input", { type: "checkbox", checked: pickedTasks.size > 0 && pickedTasks.size === sortedTasks.length,
+									onChange: (event) => setPickedTasks(event.target.checked ? new Set(sortedTasks.map(([key]) => key)) : new Set()) })),
 							h("th", null, "task"),
-							h("th", null, "score"),
-							h("th", null, "操作"),
+							matrix.models.map((model) => h("th", { key: model }, model)),
+							h("th", null, "删除"),
+							h("th", null, "time"),
 						)),
 						h("tbody", null,
-							sortedRows.map((row) => {
-								const key = rowKey(row);
-								const checked = pickedRows.has(key);
+							sortedTasks.map(([key, entry]) => {
+								const checked = pickedTasks.has(key);
 								return h("tr", {
 									key,
 									draggable: true,
@@ -440,15 +463,17 @@ window.__ModuleLoader__.load({
 								},
 									h("td", { className: c("drag"), title: "拖动排序" }, "⠿"),
 									h("td", null, h("input", { type: "checkbox", checked, onChange: () => togglePicked(key) })),
-									h("td", null, fmtTime(row.time)),
-									h("td", null, row.model),
-									h("td", null, row.category),
-									h("td", null, row.task),
-									h("td", { className: c("score") }, `${row.score.toFixed(1)} (${row.judged}/${row.total})`),
+									h("td", null, h("span", { title: `${entry.category} / ${entry.task}` }, `${entry.category} / ${entry.task}`)),
+									matrix.models.map((model) => {
+										const row = entry.cells.get(model);
+										return h("td", { key: model, className: c("score") },
+											row ? `${row.score.toFixed(1)} (${row.judged}/${row.total})` : "—");
+									}),
 									h("td", null, h("button", {
-										className: c("btnGhost") + " " + c("btn"), title: "删除此条成绩",
-										onClick: () => deleteRows([row]),
+										className: c("btnGhost") + " " + c("btn"), title: "删除该任务下所有模型的评测成绩",
+										onClick: () => deleteTasks([key]),
 									}, "删除")),
+									h("td", null, fmtTime(entry.startTime === Infinity ? null : entry.startTime)),
 								);
 							})),
 					),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-livebench-panel",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "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",