@@ -95,11 +175,11 @@
`;
head.querySelector('.cat-select').addEventListener('click', () => {
section.querySelectorAll('input[type="checkbox"]').forEach((el) => { el.checked = true; });
- updateSelectedCount();
+ withCountCb();
});
head.querySelector('.cat-clear').addEventListener('click', () => {
section.querySelectorAll('input[type="checkbox"]').forEach((el) => { el.checked = false; });
- updateSelectedCount();
+ withCountCb();
});
section.appendChild(head);
@@ -110,20 +190,28 @@
const isMulti = multi.has(name);
label.className = `bench-item${isMulti ? ' multi' : ''}`;
label.title = isMulti ? `multi-run x${state.meta.multi_run[name]}` : cat.name;
- label.innerHTML = `
${name}`;
+ label.innerHTML = `
${escapeHtml(name)}`;
if (isMulti) {
const tag = document.createElement('em');
tag.className = 'run-tag';
tag.textContent = `×${state.meta.multi_run[name]}`;
label.appendChild(tag);
}
- label.querySelector('input').addEventListener('change', updateSelectedCount);
+ label.querySelector('input').addEventListener('change', withCountCb);
grid.appendChild(label);
});
section.appendChild(grid);
box.appendChild(section);
});
- updateSelectedCount();
+ withCountCb();
+ }
+
+ function renderBenchmarks() {
+ renderBenchmarkPicker('benchmarkList', updateSelectedCount);
+ }
+
+ function renderCustomPicker() {
+ renderBenchmarkPicker('customPickList', updateCustomPickCount);
}
function updateSelectedCount() {
@@ -131,6 +219,11 @@
$('selectedCount').textContent = `已选 ${n}`;
}
+ function updateCustomPickCount() {
+ const n = [...document.querySelectorAll('#customPickList input:checked')].length;
+ $('customPickCount').textContent = `已勾选 ${n}`;
+ }
+
function setMode(mode) {
state.selectionMode = mode;
document.querySelectorAll('.mode-tabs .tab').forEach((el) => {
@@ -147,15 +240,25 @@
? excludeRaw.split(',').map((s) => s.trim()).filter(Boolean)
: [];
+ let selectionMode = state.selectionMode;
+ let suite = state.suite;
+ let finalDatasets = datasets;
+
+ if (selectionMode === 'suite' && state.suiteKind === 'custom') {
+ selectionMode = 'datasets';
+ finalDatasets = [...(state.customSuites[state.suite] || [])];
+ suite = state.suite;
+ }
+
const payload = {
model: $('model').value.trim(),
api_url: $('api_url').value.trim(),
api_key: $('api_key').value.trim() || 'EMPTY',
thinking: $('thinking').checked,
- selection_mode: state.selectionMode,
- suite: state.suite,
- datasets,
- exclude,
+ selection_mode: selectionMode,
+ suite,
+ datasets: finalDatasets,
+ exclude: selectionMode === 'suite' ? exclude : [],
folder_name: $('folder_name').value.trim() || null,
limit: $('limit').value.trim() || null,
seed: Number($('seed').value || 42),
@@ -177,6 +280,19 @@
return payload;
}
+ async function saveCustomSuite(name, datasets) {
+ const data = await api('/api/custom-suites', {
+ method: 'POST',
+ body: JSON.stringify({ name, datasets }),
+ });
+ state.customSuites = data.suites || {};
+ state.suiteKind = 'custom';
+ state.suite = name;
+ renderSuites();
+ renderCustomSuites();
+ setMsg(`已永久保存组合: ${name}（${datasets.length} 个）`, 'ok');
+ }
+
function statusClass(status) {
return status || 'idle';
}
@@ -215,10 +331,10 @@
const thinking = job.payload?.thinking ? 'thinking' : 'no-thinking';
btn.innerHTML = `
- ${job.id}
- ${job.status}
+ ${escapeHtml(job.id)}
+ ${escapeHtml(job.status)}
-
${model} · ${thinking}
+
${escapeHtml(model)} · ${thinking}
`;
btn.addEventListener('click', () => followJob(job.id, true));
if (job.id === activeId) btn.style.borderColor = 'rgba(214,162,74,0.75)';
@@ -302,7 +418,9 @@
state.meta = await api('/api/meta');
fillDefaults(state.meta);
renderSuites();
+ renderCustomSuites();
renderBenchmarks();
+ renderCustomPicker();
setMode('suite');
const jobs = await refreshJobs();
@@ -326,12 +444,73 @@
});
$('refreshJobsBtn').addEventListener('click', () => refreshJobs().catch((e) => setMsg(e.message, 'error')));
+ $('saveCustomSuiteBtn').addEventListener('click', async () => {
+ const name = $('customSuiteName').value.trim();
+ const datasets = [...document.querySelectorAll('#customPickList input:checked')].map((el) => el.value);
+ if (!name) {
+ setMsg('请填写组合名称', 'error');
+ return;
+ }
+ if (!datasets.length) {
+ setMsg('请至少勾选一个 benchmark', 'error');
+ return;
+ }
+ try {
+ await saveCustomSuite(name, datasets);
+ } catch (err) {
+ setMsg(err.message, 'error');
+ }
+ });
+
+ $('loadCheckedToCustomBtn').addEventListener('click', () => {
+ // no-op helper text: already editing in place; just focus name
+ $('customSuiteName').focus();
+ setMsg('请在下方勾选数据集并填写组合名称后保存', 'ok');
+ });
+
+ $('saveFromDatasetsBtn').addEventListener('click', async () => {
+ const datasets = [...document.querySelectorAll('#benchmarkList input:checked')].map((el) => el.value);
+ if (!datasets.length) {
+ setMsg('请先勾选 benchmark', 'error');
+ return;
+ }
+ const name = prompt('输入要永久保存的组合名称：');
+ if (!name || !name.trim()) return;
+ try {
+ // sync into custom picker too
+ const set = new Set(datasets);
+ document.querySelectorAll('#customPickList input').forEach((el) => {
+ el.checked = set.has(el.value);
+ });
+ $('customSuiteName').value = name.trim();
+ updateCustomPickCount();
+ await saveCustomSuite(name.trim(), datasets);
+ setMode('suite');
+ } catch (err) {
+ setMsg(err.message, 'error');
+ }
+ });
+
form.addEventListener('submit', async (e) => {
e.preventDefault();
setMsg('');
+ const requiredPaths = [
+ ['dataset_dir', 'Dataset Dir'],
+ ['output_dir', 'Output Dir'],
+ ['config', 'Config YAML'],
+ ['tokenizer_path', 'Tokenizer Path'],
+ ];
+ for (const [id, label] of requiredPaths) {
+ if (!$(id).value.trim()) {
+ setMsg(`请填写必填路径: ${label}`, 'error');
+ $(id).focus();
+ return;
+ }
+ }
+
const payload = collectPayload();
if (payload.selection_mode === 'datasets' && !payload.datasets.length) {
- setMsg('请至少选择一个 benchmark', 'error');
+ setMsg('请至少选择一个 benchmark / 自定义组合', 'error');
return;
}
$('launchBtn').disabled = true;
diff --git a/webui/static/index.html b/webui/static/index.html
index 42886c0..f3651db 100644
--- a/webui/static/index.html
+++ b/webui/static/index.html
@@ -34,6 +34,28 @@