修复模型选择弹窗:/api/models 补齐 platform/mid/vision/key_count;前端按平台分组、key 空闲数判定可选(占用模型数≥key数则平台不可选);测试配置迁移新结构
This commit is contained in:
@@ -1043,6 +1043,7 @@ label.icon-btn { cursor: pointer; }
|
|||||||
.msw-item.selected .msw-radio::after { content: '✓'; color: #fff; font-size: 11px; font-weight: 700; }
|
.msw-item.selected .msw-radio::after { content: '✓'; color: #fff; font-size: 11px; font-weight: 700; }
|
||||||
.msw-info { flex: 1; min-width: 0; }
|
.msw-info { flex: 1; min-width: 0; }
|
||||||
.msw-name { font-size: 14px; font-weight: 500; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
.msw-name { font-size: 14px; font-weight: 500; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; }
|
||||||
|
.msw-busy { font-size: 12px; font-weight: 400; color: var(--gray-light); }
|
||||||
.msw-tags { display: flex; gap: 4px; margin-top: 3px; flex-wrap: wrap; }
|
.msw-tags { display: flex; gap: 4px; margin-top: 3px; flex-wrap: wrap; }
|
||||||
.msw-tag { font-size: 11px; padding: 1px 6px; border-radius: 4px; }
|
.msw-tag { font-size: 11px; padding: 1px 6px; border-radius: 4px; }
|
||||||
.msw-tag.vision { background: #dbeafe; color: #1d4ed8; }
|
.msw-tag.vision { background: #dbeafe; color: #1d4ed8; }
|
||||||
|
|||||||
@@ -1063,56 +1063,48 @@
|
|||||||
const list = $('bind-model-list');
|
const list = $('bind-model-list');
|
||||||
const footer = $('bind-model-footer');
|
const footer = $('bind-model-footer');
|
||||||
list.innerHTML = '<div class="empty-tip">加载中…</div>';
|
list.innerHTML = '<div class="empty-tip">加载中…</div>';
|
||||||
|
footer.textContent = '';
|
||||||
$('bind-model-modal').classList.remove('hidden');
|
$('bind-model-modal').classList.remove('hidden');
|
||||||
try {
|
try {
|
||||||
|
// /api/models 已按平台补齐 platform/mid/vision/key_count(见 server.js);行本身按模型 id 唯一。
|
||||||
|
// 已删除但重启前仍在运行池里的模型不再展示,避免误绑到重启后就消失的模型
|
||||||
const rows = ((await req('GET', '/api/models')) || []).filter(m => !SET.deletedModels[m.id]);
|
const rows = ((await req('GET', '/api/models')) || []).filter(m => !SET.deletedModels[m.id]);
|
||||||
if (!rows.length) {
|
if (!rows.length) {
|
||||||
list.innerHTML = '<div class="empty-tip">还没有配置模型。</div>';
|
list.innerHTML = '<div class="empty-tip">还没有配置模型。</div>';
|
||||||
footer.textContent = '';
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// 平台颜色盘(循环使用)
|
// 平台颜色盘(循环使用)
|
||||||
const DOT_COLORS = ['#3B82F6','#10B981','#F59E0B','#EF4444','#8B5CF6','#EC4899','#06B6D4','#F97316'];
|
const DOT_COLORS = ['#3B82F6','#10B981','#F59E0B','#EF4444','#8B5CF6','#EC4899','#06B6D4','#F97316'];
|
||||||
// 按平台分组: platform -> { name, keyCount, models[] }
|
// 按平台分组;models 全平台共用,一个会话占用一个 key → 平台空闲 key 数 = key_count - 占用模型数
|
||||||
const platMap = new Map();
|
const platMap = new Map();
|
||||||
for (const m of rows) {
|
for (const m of rows) {
|
||||||
if (!platMap.has(m.platform)) {
|
const pk = m.platform || '';
|
||||||
platMap.set(m.platform, { name: m.platform || '未知平台', keyCount: 0, models: [] });
|
if (!platMap.has(pk)) {
|
||||||
}
|
platMap.set(pk, { name: pk || '未知平台', keyCount: m.key_count || 0, models: [], busyCount: 0 });
|
||||||
const g = platMap.get(m.platform);
|
|
||||||
// 统计 key 数(cfg.models 里同平台但不同 key_index 的条目数)
|
|
||||||
// 同时收集该平台的 key_index 集合
|
|
||||||
if (g.keyIndices === undefined) g.keyIndices = new Set();
|
|
||||||
if (m.key_index !== undefined) g.keyIndices.add(m.key_index);
|
|
||||||
// 同 id 的 model 取第一条(cfg.models 同 id 会出现 N 次,N=key 数)
|
|
||||||
if (!g.seenIds) g.seenIds = new Set();
|
|
||||||
if (!g.seenIds.has(m.id)) {
|
|
||||||
g.seenIds.add(m.id);
|
|
||||||
g.models.push(m);
|
|
||||||
}
|
}
|
||||||
|
const g = platMap.get(pk);
|
||||||
|
g.models.push(m);
|
||||||
|
if (m.is_busy) g.busyCount++;
|
||||||
}
|
}
|
||||||
// 平台是否锁定:该平台下任意模型 is_busy 则整平台锁定
|
|
||||||
let totalAvailable = 0;
|
|
||||||
let totalAll = 0;
|
|
||||||
const groups = [];
|
const groups = [];
|
||||||
for (const [platName, g] of platMap) {
|
for (const g of platMap.values()) {
|
||||||
const isLocked = g.models.some(m => m.is_busy);
|
g.freeKeys = Math.max(0, g.keyCount - g.busyCount);
|
||||||
g.keyCount = g.keyIndices ? g.keyIndices.size : 1;
|
groups.push(g);
|
||||||
for (const m of g.models) {
|
|
||||||
totalAll++;
|
|
||||||
if (!isLocked && !m.is_busy) totalAvailable++;
|
|
||||||
}
|
|
||||||
groups.push({ platName, isLocked, keyCount: g.keyCount, models: g.models });
|
|
||||||
}
|
}
|
||||||
list.innerHTML = groups.map((grp, gi) => {
|
// 可选 = 模型自身空闲 且 该平台还有空闲 key;统计可用数供底部提示
|
||||||
|
let avail = 0;
|
||||||
|
for (const g of groups) for (const m of g.models) if (!m.is_busy && g.freeKeys > 0) avail++;
|
||||||
|
list.innerHTML = groups.map((g, gi) => {
|
||||||
const dotColor = DOT_COLORS[gi % DOT_COLORS.length];
|
const dotColor = DOT_COLORS[gi % DOT_COLORS.length];
|
||||||
const itemHtml = grp.models.map(m => {
|
const itemHtml = g.models.map(m => {
|
||||||
const disabled = m.is_busy || grp.isLocked;
|
const disabled = !!m.is_busy || g.freeKeys <= 0;
|
||||||
|
const title = m.is_busy ? ' 占用中' : (g.freeKeys <= 0 ? ' 无空闲 Key' : '');
|
||||||
return '<div class="msw-item' + (disabled ? ' disabled' : '') + '"' +
|
return '<div class="msw-item' + (disabled ? ' disabled' : '') + '"' +
|
||||||
(disabled ? '' : ' onclick="bindModel(\'' + esc(m.id) + '\')"') + '>' +
|
(disabled ? '' : ' onclick="bindModel(\'' + esc(m.id) + '\')"') + '>' +
|
||||||
'<div class="msw-radio"></div>' +
|
'<div class="msw-radio"></div>' +
|
||||||
'<div class="msw-info">' +
|
'<div class="msw-info">' +
|
||||||
'<div class="msw-name">' + esc(m.display_name || m.mid || m.id) + '</div>' +
|
'<div class="msw-name">' + esc(m.display_name || m.mid || m.id) +
|
||||||
|
(title ? ' <span class="msw-busy">' + title.trim() + '</span>' : '') + '</div>' +
|
||||||
'<div class="msw-tags">' +
|
'<div class="msw-tags">' +
|
||||||
(m.vision ? '<span class="msw-tag vision">Vision</span>' : '') +
|
(m.vision ? '<span class="msw-tag vision">Vision</span>' : '') +
|
||||||
'<span class="msw-tag thinking">Thinking</span>' +
|
'<span class="msw-tag thinking">Thinking</span>' +
|
||||||
@@ -1123,16 +1115,15 @@
|
|||||||
return '<div class="msw-group">' +
|
return '<div class="msw-group">' +
|
||||||
'<div class="msw-group-header">' +
|
'<div class="msw-group-header">' +
|
||||||
'<span class="msw-dot" style="background:' + dotColor + '"></span>' +
|
'<span class="msw-dot" style="background:' + dotColor + '"></span>' +
|
||||||
'<span>' + esc(grp.platName) + '</span>' +
|
'<span>' + esc(g.name) + '</span>' +
|
||||||
'<span class="msw-group-keys">' + grp.keyCount + ' key' + (grp.keyCount > 1 ? 's' : '') + '</span>' +
|
'<span class="msw-group-keys">' + g.keyCount + ' key' + (g.keyCount > 1 ? 's' : '') + '</span>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
itemHtml +
|
itemHtml +
|
||||||
'</div>';
|
'</div>';
|
||||||
}).join('');
|
}).join('');
|
||||||
footer.textContent = '共 ' + totalAvailable + ' / ' + totalAll + ' 个模型可用';
|
footer.textContent = '共 ' + avail + ' 个模型可用';
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
list.innerHTML = '<div class="empty-tip">读取模型列表失败:' + e.message + '</div>';
|
list.innerHTML = '<div class="empty-tip">读取模型列表失败:' + e.message + '</div>';
|
||||||
footer.textContent = '';
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
function closeModelSwitch() { $('bind-model-modal').classList.add('hidden'); }
|
function closeModelSwitch() { $('bind-model-modal').classList.add('hidden'); }
|
||||||
|
|||||||
@@ -773,48 +773,46 @@ const ui = {
|
|||||||
const list = $('bind-model-list');
|
const list = $('bind-model-list');
|
||||||
const footer = $('bind-model-footer');
|
const footer = $('bind-model-footer');
|
||||||
list.innerHTML = '<div class="empty-tip">加载中…</div>';
|
list.innerHTML = '<div class="empty-tip">加载中…</div>';
|
||||||
|
footer && (footer.textContent = '');
|
||||||
$('bind-model-modal').classList.remove('hidden');
|
$('bind-model-modal').classList.remove('hidden');
|
||||||
try {
|
try {
|
||||||
|
// /api/models 已按平台补齐 platform/mid/vision/key_count(见 server.js);行按模型 id 唯一。
|
||||||
const rows = (await req('GET', '/api/models')) || [];
|
const rows = (await req('GET', '/api/models')) || [];
|
||||||
if (!rows.length) {
|
if (!rows.length) {
|
||||||
list.innerHTML = '<div class="empty-tip">还没有配置模型。</div>';
|
list.innerHTML = '<div class="empty-tip">还没有配置模型。</div>';
|
||||||
footer && (footer.textContent = '');
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
const DOT_COLORS = ['#3B82F6','#10B981','#F59E0B','#EF4444','#8B5CF6','#EC4899','#06B6D4','#F97316'];
|
const DOT_COLORS = ['#3B82F6','#10B981','#F59E0B','#EF4444','#8B5CF6','#EC4899','#06B6D4','#F97316'];
|
||||||
|
// 按平台分组;一个会话占用一个 key → 平台空闲 key 数 = key_count - 占用模型数
|
||||||
const platMap = new Map();
|
const platMap = new Map();
|
||||||
for (const m of rows) {
|
for (const m of rows) {
|
||||||
if (!platMap.has(m.platform)) {
|
const pk = m.platform || '';
|
||||||
platMap.set(m.platform, { name: m.platform || '未知平台', keyIndices: new Set(), models: [], seenIds: new Set() });
|
if (!platMap.has(pk)) {
|
||||||
}
|
platMap.set(pk, { name: pk || '未知平台', keyCount: m.key_count || 0, models: [], busyCount: 0 });
|
||||||
const g = platMap.get(m.platform);
|
|
||||||
if (m.key_index !== undefined) g.keyIndices.add(m.key_index);
|
|
||||||
if (!g.seenIds.has(m.id)) {
|
|
||||||
g.seenIds.add(m.id);
|
|
||||||
g.models.push(m);
|
|
||||||
}
|
}
|
||||||
|
const g = platMap.get(pk);
|
||||||
|
g.models.push(m);
|
||||||
|
if (m.is_busy) g.busyCount++;
|
||||||
}
|
}
|
||||||
let totalAvailable = 0, totalAll = 0;
|
|
||||||
const groups = [];
|
const groups = [];
|
||||||
let gi = 0;
|
for (const g of platMap.values()) {
|
||||||
for (const [platName, g] of platMap) {
|
g.freeKeys = Math.max(0, g.keyCount - g.busyCount);
|
||||||
const isLocked = g.models.some(m => m.is_busy);
|
groups.push(g);
|
||||||
const keyCount = g.keyIndices.size || 1;
|
|
||||||
for (const m of g.models) {
|
|
||||||
totalAll++;
|
|
||||||
if (!isLocked && !m.is_busy) totalAvailable++;
|
|
||||||
}
|
|
||||||
groups.push({ platName, isLocked, keyCount, models: g.models, dotColor: DOT_COLORS[gi % DOT_COLORS.length] });
|
|
||||||
gi++;
|
|
||||||
}
|
}
|
||||||
list.innerHTML = groups.map(grp => {
|
// 可选 = 模型自身空闲 且 该平台还有空闲 key
|
||||||
const itemHtml = grp.models.map(m => {
|
let avail = 0;
|
||||||
const disabled = m.is_busy || grp.isLocked;
|
for (const g of groups) for (const m of g.models) if (!m.is_busy && g.freeKeys > 0) avail++;
|
||||||
|
list.innerHTML = groups.map((g, gi) => {
|
||||||
|
const dotColor = DOT_COLORS[gi % DOT_COLORS.length];
|
||||||
|
const itemHtml = g.models.map(m => {
|
||||||
|
const disabled = !!m.is_busy || g.freeKeys <= 0;
|
||||||
|
const title = m.is_busy ? ' 占用中' : (g.freeKeys <= 0 ? ' 无空闲 Key' : '');
|
||||||
return '<div class="msw-item' + (disabled ? ' disabled' : '') + '"' +
|
return '<div class="msw-item' + (disabled ? ' disabled' : '') + '"' +
|
||||||
(disabled ? '' : ' onclick="ui.bindModel(\'' + esc(m.id) + '\')"') + '>' +
|
(disabled ? '' : ' onclick="ui.bindModel(\'' + esc(m.id) + '\')"') + '>' +
|
||||||
'<div class="msw-radio"></div>' +
|
'<div class="msw-radio"></div>' +
|
||||||
'<div class="msw-info">' +
|
'<div class="msw-info">' +
|
||||||
'<div class="msw-name">' + esc(m.display_name || m.mid || m.id) + '</div>' +
|
'<div class="msw-name">' + esc(m.display_name || m.mid || m.id) +
|
||||||
|
(title ? ' <span class="msw-busy">' + title.trim() + '</span>' : '') + '</div>' +
|
||||||
'<div class="msw-tags">' +
|
'<div class="msw-tags">' +
|
||||||
(m.vision ? '<span class="msw-tag vision">Vision</span>' : '') +
|
(m.vision ? '<span class="msw-tag vision">Vision</span>' : '') +
|
||||||
'<span class="msw-tag thinking">Thinking</span>' +
|
'<span class="msw-tag thinking">Thinking</span>' +
|
||||||
@@ -824,17 +822,16 @@ const ui = {
|
|||||||
}).join('');
|
}).join('');
|
||||||
return '<div class="msw-group">' +
|
return '<div class="msw-group">' +
|
||||||
'<div class="msw-group-header">' +
|
'<div class="msw-group-header">' +
|
||||||
'<span class="msw-dot" style="background:' + grp.dotColor + '"></span>' +
|
'<span class="msw-dot" style="background:' + dotColor + '"></span>' +
|
||||||
'<span>' + esc(grp.platName) + '</span>' +
|
'<span>' + esc(g.name) + '</span>' +
|
||||||
'<span class="msw-group-keys">' + grp.keyCount + ' key' + (grp.keyCount > 1 ? 's' : '') + '</span>' +
|
'<span class="msw-group-keys">' + g.keyCount + ' key' + (g.keyCount > 1 ? 's' : '') + '</span>' +
|
||||||
'</div>' +
|
'</div>' +
|
||||||
itemHtml +
|
itemHtml +
|
||||||
'</div>';
|
'</div>';
|
||||||
}).join('');
|
}).join('');
|
||||||
footer && (footer.textContent = '共 ' + totalAvailable + ' / ' + totalAll + ' 个模型可用');
|
footer && (footer.textContent = '共 ' + avail + ' 个模型可用');
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
list.innerHTML = '<div class="empty-tip">读取模型列表失败:' + e.message + '</div>';
|
list.innerHTML = '<div class="empty-tip">读取模型列表失败:' + e.message + '</div>';
|
||||||
footer && (footer.textContent = '');
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
closeModelSwitch() { $('bind-model-modal').classList.add('hidden'); },
|
closeModelSwitch() { $('bind-model-modal').classList.add('hidden'); },
|
||||||
|
|||||||
+20
-1
@@ -43,11 +43,30 @@ app.use('/api/config', require('./routes/config'));
|
|||||||
app.use('/api/platforms', require('./routes/platforms'));
|
app.use('/api/platforms', require('./routes/platforms'));
|
||||||
app.use('/api/system', require('./routes/system'));
|
app.use('/api/system', require('./routes/system'));
|
||||||
|
|
||||||
// 模型池状态(前端可展示空闲/占用)+ 每模型 token 用量(今日/累计,输入/输出分开)
|
// 模型池状态(前端可展示空闲/占用)+ 每模型 token 用量(今日/累计,输入/输出分开)。
|
||||||
|
// 从生效配置补齐平台维度字段(platform/mid/vision/type + 平台 key 数 key_count):
|
||||||
|
// model_pool 表只有 id/display_name/占用态,会话页「选择模型」弹窗需要按平台分组展示。
|
||||||
|
// 配置里新增但重启前未进池的模型不在此返回(池才是运行时真相)。
|
||||||
app.get('/api/models', (req, res) => {
|
app.get('/api/models', (req, res) => {
|
||||||
const rows = db.prepare('SELECT id, display_name, is_busy, current_session_id FROM model_pool ORDER BY id').all();
|
const rows = db.prepare('SELECT id, display_name, is_busy, current_session_id FROM model_pool ORDER BY id').all();
|
||||||
const stats = engine.modelUsageStats();
|
const stats = engine.modelUsageStats();
|
||||||
|
// 配置视图:模型唯一键 → 平台/原始 id/vision;平台名 → key 数(cfg.models 含 key 副本,不能直接拿来用)
|
||||||
|
const cfgNow = engine.getConfig();
|
||||||
|
const infoById = {};
|
||||||
|
const keyCountByPlat = {};
|
||||||
|
for (const p of cfgNow.platforms || []) {
|
||||||
|
keyCountByPlat[p.name] = (p.keys || []).length;
|
||||||
|
for (const m of p.models || []) {
|
||||||
|
infoById[p.name + '/' + m.id] = { platform: p.name, mid: m.id, vision: !!m.vision, type: p.type };
|
||||||
|
}
|
||||||
|
}
|
||||||
for (const r of rows) {
|
for (const r of rows) {
|
||||||
|
const info = infoById[r.id] || {};
|
||||||
|
r.platform = info.platform || '';
|
||||||
|
r.mid = info.mid || '';
|
||||||
|
r.vision = info.vision || false;
|
||||||
|
r.type = info.type || '';
|
||||||
|
r.key_count = keyCountByPlat[r.platform] || 0;
|
||||||
const s = stats[r.id] || {};
|
const s = stats[r.id] || {};
|
||||||
r.today_prompt = s.today_prompt || 0;
|
r.today_prompt = s.today_prompt || 0;
|
||||||
r.today_completion = s.today_completion || 0;
|
r.today_completion = s.today_completion || 0;
|
||||||
|
|||||||
@@ -4,22 +4,22 @@ platforms:
|
|||||||
- name: mock-a
|
- name: mock-a
|
||||||
url: "http://127.0.0.1:9999/v1"
|
url: "http://127.0.0.1:9999/v1"
|
||||||
type: openai
|
type: openai
|
||||||
|
models:
|
||||||
|
- id: ds1
|
||||||
|
display_name: "Mock Model 1"
|
||||||
|
vision: true
|
||||||
keys:
|
keys:
|
||||||
- api_key: ""
|
- api_key: ""
|
||||||
models:
|
|
||||||
- id: ds1
|
|
||||||
display_name: "Mock Model 1"
|
|
||||||
vision: true
|
|
||||||
- name: mock-b
|
- name: mock-b
|
||||||
url: "http://127.0.0.1:9999/v1"
|
url: "http://127.0.0.1:9999/v1"
|
||||||
type: custom
|
type: custom
|
||||||
|
models:
|
||||||
|
- id: ds2
|
||||||
|
display_name: "Mock Model 2"
|
||||||
|
vision: true
|
||||||
keys:
|
keys:
|
||||||
- api_key: ""
|
- api_key: ""
|
||||||
concurrency: 1
|
concurrency: 1
|
||||||
models:
|
|
||||||
- id: ds2
|
|
||||||
display_name: "Mock Model 2"
|
|
||||||
vision: true
|
|
||||||
|
|
||||||
workspace_root: "./test/tmp/tasks"
|
workspace_root: "./test/tmp/tasks"
|
||||||
# 隔离数据目录:db/启动 prompt dump 落 tmp(随每次运行的 rm -rf 一同清掉),
|
# 隔离数据目录:db/启动 prompt dump 落 tmp(随每次运行的 rm -rf 一同清掉),
|
||||||
|
|||||||
+1
-1
@@ -258,7 +258,7 @@ async function main() {
|
|||||||
try { await api('PUT', '/api/config', { text: 'models: [unclosed' }); } catch (e) { bad400 = /400/.test(e.message); }
|
try { await api('PUT', '/api/config', { text: 'models: [unclosed' }); } catch (e) { bad400 = /400/.test(e.message); }
|
||||||
ok(bad400, 'PUT 非法配置被 400 拒绝');
|
ok(bad400, 'PUT 非法配置被 400 拒绝');
|
||||||
ok(fs.readFileSync(cfgPath, 'utf8') === rawBeforeBadPut, '非法写入未动文件');
|
ok(fs.readFileSync(cfgPath, 'utf8') === rawBeforeBadPut, '非法写入未动文件');
|
||||||
const mpatch = await api('PATCH', '/api/config', { path: 'platforms.0.keys.0.models.0.display_name', value: '改名模型' });
|
const mpatch = await api('PATCH', '/api/config', { path: 'platforms.0.models.0.display_name', value: '改名模型' });
|
||||||
const mtext = (await api('GET', '/api/config')).text;
|
const mtext = (await api('GET', '/api/config')).text;
|
||||||
ok(mpatch.ok && mtext.includes('改名模型'), 'PATCH 支持 platforms 嵌套数组下标');
|
ok(mpatch.ok && mtext.includes('改名模型'), 'PATCH 支持 platforms 嵌套数组下标');
|
||||||
const restored = await api('PUT', '/api/config', { text: origText });
|
const restored = await api('PUT', '/api/config', { text: origText });
|
||||||
|
|||||||
Reference in New Issue
Block a user