From e65cece595da3b75751a6f8355f57ae11b2c1472 Mon Sep 17 00:00:00 2001 From: kicer Date: Sun, 6 Sep 2026 20:03:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A8=A1=E5=9E=8B=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E5=BC=B9=E7=AA=97=EF=BC=9A/api/models=20=E8=A1=A5?= =?UTF-8?q?=E9=BD=90=20platform/mid/vision/key=5Fcount=EF=BC=9B=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=8C=89=E5=B9=B3=E5=8F=B0=E5=88=86=E7=BB=84=E3=80=81?= =?UTF-8?q?key=20=E7=A9=BA=E9=97=B2=E6=95=B0=E5=88=A4=E5=AE=9A=E5=8F=AF?= =?UTF-8?q?=E9=80=89=EF=BC=88=E5=8D=A0=E7=94=A8=E6=A8=A1=E5=9E=8B=E6=95=B0?= =?UTF-8?q?=E2=89=A5key=E6=95=B0=E5=88=99=E5=B9=B3=E5=8F=B0=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E9=80=89=EF=BC=89=EF=BC=9B=E6=B5=8B=E8=AF=95=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E8=BF=81=E7=A7=BB=E6=96=B0=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/server/public/css/style.css | 1 + app/server/public/index.html | 59 ++++++++++++++------------------- app/server/public/js/tasks.js | 55 +++++++++++++++--------------- app/server/server.js | 21 +++++++++++- app/test/config.test.yml | 16 ++++----- app/test/smoke.js | 2 +- 6 files changed, 81 insertions(+), 73 deletions(-) diff --git a/app/server/public/css/style.css b/app/server/public/css/style.css index f7d126d..e3b355d 100644 --- a/app/server/public/css/style.css +++ b/app/server/public/css/style.css @@ -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-info { flex: 1; min-width: 0; } .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-tag { font-size: 11px; padding: 1px 6px; border-radius: 4px; } .msw-tag.vision { background: #dbeafe; color: #1d4ed8; } diff --git a/app/server/public/index.html b/app/server/public/index.html index f2a0965..e0caf9a 100644 --- a/app/server/public/index.html +++ b/app/server/public/index.html @@ -1063,56 +1063,48 @@ const list = $('bind-model-list'); const footer = $('bind-model-footer'); list.innerHTML = '
加载中…
'; + footer.textContent = ''; $('bind-model-modal').classList.remove('hidden'); try { + // /api/models 已按平台补齐 platform/mid/vision/key_count(见 server.js);行本身按模型 id 唯一。 + // 已删除但重启前仍在运行池里的模型不再展示,避免误绑到重启后就消失的模型 const rows = ((await req('GET', '/api/models')) || []).filter(m => !SET.deletedModels[m.id]); if (!rows.length) { list.innerHTML = '
还没有配置模型。
'; - footer.textContent = ''; return; } // 平台颜色盘(循环使用) const DOT_COLORS = ['#3B82F6','#10B981','#F59E0B','#EF4444','#8B5CF6','#EC4899','#06B6D4','#F97316']; - // 按平台分组: platform -> { name, keyCount, models[] } + // 按平台分组;models 全平台共用,一个会话占用一个 key → 平台空闲 key 数 = key_count - 占用模型数 const platMap = new Map(); for (const m of rows) { - if (!platMap.has(m.platform)) { - platMap.set(m.platform, { name: m.platform || '未知平台', keyCount: 0, models: [] }); - } - 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 pk = m.platform || ''; + if (!platMap.has(pk)) { + platMap.set(pk, { name: pk || '未知平台', keyCount: m.key_count || 0, models: [], busyCount: 0 }); } + 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 = []; - for (const [platName, g] of platMap) { - const isLocked = g.models.some(m => m.is_busy); - g.keyCount = g.keyIndices ? g.keyIndices.size : 1; - for (const m of g.models) { - totalAll++; - if (!isLocked && !m.is_busy) totalAvailable++; - } - groups.push({ platName, isLocked, keyCount: g.keyCount, models: g.models }); + for (const g of platMap.values()) { + g.freeKeys = Math.max(0, g.keyCount - g.busyCount); + groups.push(g); } - 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 itemHtml = grp.models.map(m => { - const disabled = m.is_busy || grp.isLocked; + const itemHtml = g.models.map(m => { + const disabled = !!m.is_busy || g.freeKeys <= 0; + const title = m.is_busy ? ' 占用中' : (g.freeKeys <= 0 ? ' 无空闲 Key' : ''); return '
' + '
' + '
' + - '
' + esc(m.display_name || m.mid || m.id) + '
' + + '
' + esc(m.display_name || m.mid || m.id) + + (title ? ' ' + title.trim() + '' : '') + '
' + '
' + (m.vision ? 'Vision' : '') + 'Thinking' + @@ -1123,16 +1115,15 @@ return '
' + '
' + '' + - '' + esc(grp.platName) + '' + - '' + grp.keyCount + ' key' + (grp.keyCount > 1 ? 's' : '') + '' + + '' + esc(g.name) + '' + + '' + g.keyCount + ' key' + (g.keyCount > 1 ? 's' : '') + '' + '
' + itemHtml + '
'; }).join(''); - footer.textContent = '共 ' + totalAvailable + ' / ' + totalAll + ' 个模型可用'; + footer.textContent = '共 ' + avail + ' 个模型可用'; } catch (e) { list.innerHTML = '
读取模型列表失败:' + e.message + '
'; - footer.textContent = ''; } } function closeModelSwitch() { $('bind-model-modal').classList.add('hidden'); } diff --git a/app/server/public/js/tasks.js b/app/server/public/js/tasks.js index 91a605b..07e78b0 100644 --- a/app/server/public/js/tasks.js +++ b/app/server/public/js/tasks.js @@ -773,48 +773,46 @@ const ui = { const list = $('bind-model-list'); const footer = $('bind-model-footer'); list.innerHTML = '
加载中…
'; + footer && (footer.textContent = ''); $('bind-model-modal').classList.remove('hidden'); try { + // /api/models 已按平台补齐 platform/mid/vision/key_count(见 server.js);行按模型 id 唯一。 const rows = (await req('GET', '/api/models')) || []; if (!rows.length) { list.innerHTML = '
还没有配置模型。
'; - footer && (footer.textContent = ''); return; } const DOT_COLORS = ['#3B82F6','#10B981','#F59E0B','#EF4444','#8B5CF6','#EC4899','#06B6D4','#F97316']; + // 按平台分组;一个会话占用一个 key → 平台空闲 key 数 = key_count - 占用模型数 const platMap = new Map(); for (const m of rows) { - if (!platMap.has(m.platform)) { - platMap.set(m.platform, { name: m.platform || '未知平台', keyIndices: new Set(), models: [], seenIds: new Set() }); - } - 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 pk = m.platform || ''; + if (!platMap.has(pk)) { + platMap.set(pk, { name: pk || '未知平台', keyCount: m.key_count || 0, models: [], busyCount: 0 }); } + const g = platMap.get(pk); + g.models.push(m); + if (m.is_busy) g.busyCount++; } - let totalAvailable = 0, totalAll = 0; const groups = []; - let gi = 0; - for (const [platName, g] of platMap) { - const isLocked = g.models.some(m => m.is_busy); - 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++; + for (const g of platMap.values()) { + g.freeKeys = Math.max(0, g.keyCount - g.busyCount); + groups.push(g); } - list.innerHTML = groups.map(grp => { - const itemHtml = grp.models.map(m => { - const disabled = m.is_busy || grp.isLocked; + // 可选 = 模型自身空闲 且 该平台还有空闲 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 itemHtml = g.models.map(m => { + const disabled = !!m.is_busy || g.freeKeys <= 0; + const title = m.is_busy ? ' 占用中' : (g.freeKeys <= 0 ? ' 无空闲 Key' : ''); return '
' + '
' + '
' + - '
' + esc(m.display_name || m.mid || m.id) + '
' + + '
' + esc(m.display_name || m.mid || m.id) + + (title ? ' ' + title.trim() + '' : '') + '
' + '
' + (m.vision ? 'Vision' : '') + 'Thinking' + @@ -824,17 +822,16 @@ const ui = { }).join(''); return '
' + '
' + - '' + - '' + esc(grp.platName) + '' + - '' + grp.keyCount + ' key' + (grp.keyCount > 1 ? 's' : '') + '' + + '' + + '' + esc(g.name) + '' + + '' + g.keyCount + ' key' + (g.keyCount > 1 ? 's' : '') + '' + '
' + itemHtml + '
'; }).join(''); - footer && (footer.textContent = '共 ' + totalAvailable + ' / ' + totalAll + ' 个模型可用'); + footer && (footer.textContent = '共 ' + avail + ' 个模型可用'); } catch (e) { list.innerHTML = '
读取模型列表失败:' + e.message + '
'; - footer && (footer.textContent = ''); } }, closeModelSwitch() { $('bind-model-modal').classList.add('hidden'); }, diff --git a/app/server/server.js b/app/server/server.js index e099f47..75cef15 100644 --- a/app/server/server.js +++ b/app/server/server.js @@ -43,11 +43,30 @@ app.use('/api/config', require('./routes/config')); app.use('/api/platforms', require('./routes/platforms')); 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) => { const rows = db.prepare('SELECT id, display_name, is_busy, current_session_id FROM model_pool ORDER BY id').all(); 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) { + 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] || {}; r.today_prompt = s.today_prompt || 0; r.today_completion = s.today_completion || 0; diff --git a/app/test/config.test.yml b/app/test/config.test.yml index 24c7167..a807b64 100644 --- a/app/test/config.test.yml +++ b/app/test/config.test.yml @@ -4,22 +4,22 @@ platforms: - name: mock-a url: "http://127.0.0.1:9999/v1" type: openai + models: + - id: ds1 + display_name: "Mock Model 1" + vision: true keys: - api_key: "" - models: - - id: ds1 - display_name: "Mock Model 1" - vision: true - name: mock-b url: "http://127.0.0.1:9999/v1" type: custom + models: + - id: ds2 + display_name: "Mock Model 2" + vision: true keys: - api_key: "" concurrency: 1 - models: - - id: ds2 - display_name: "Mock Model 2" - vision: true workspace_root: "./test/tmp/tasks" # 隔离数据目录:db/启动 prompt dump 落 tmp(随每次运行的 rm -rf 一同清掉), diff --git a/app/test/smoke.js b/app/test/smoke.js index 8820a21..436ca0d 100644 --- a/app/test/smoke.js +++ b/app/test/smoke.js @@ -258,7 +258,7 @@ async function main() { try { await api('PUT', '/api/config', { text: 'models: [unclosed' }); } catch (e) { bad400 = /400/.test(e.message); } ok(bad400, 'PUT 非法配置被 400 拒绝'); 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; ok(mpatch.ok && mtext.includes('改名模型'), 'PATCH 支持 platforms 嵌套数组下标'); const restored = await api('PUT', '/api/config', { text: origText });