From b701c824bda24952bb47846848304fa2f2673ef0 Mon Sep 17 00:00:00 2001 From: kicer Date: Wed, 2 Sep 2026 00:14:25 +0800 Subject: [PATCH] =?UTF-8?q?token=E7=94=A8=E9=87=8F=E8=BE=93=E5=85=A5/?= =?UTF-8?q?=E8=BE=93=E5=87=BA=E5=88=86=E5=BC=80=E7=BB=9F=E8=AE=A1=E5=B1=95?= =?UTF-8?q?=E7=A4=BA;=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=94=B9=E4=B8=BA=E5=8D=A0=E6=BB=A1=E5=AE=BD=E5=BA=A6?= =?UTF-8?q?=E4=B8=8E=E5=85=A8=E5=B1=80=E6=8C=89=E9=92=AE=E9=A3=8E=E6=A0=BC?= =?UTF-8?q?=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/server/engine.js | 24 +++++++++++++----------- app/server/public/css/style.css | 9 ++++----- app/server/public/index.html | 10 +++++----- app/server/public/js/models.js | 6 ++++-- app/server/server.js | 10 ++++++---- app/test/smoke.js | 10 ++++++---- 6 files changed, 38 insertions(+), 31 deletions(-) diff --git a/app/server/engine.js b/app/server/engine.js index 408d62b..a448649 100644 --- a/app/server/engine.js +++ b/app/server/engine.js @@ -92,25 +92,27 @@ function recordModelUsage(sessionId, modelId, usage) { ).run(sessionId, modelId, pt, ct, tt, now()); } -// 每模型 token 用量统计:今日(本地时区自然日起)+ 累计。 -// 返回 { [model_id]: { today_tokens, total_tokens } },配置内的模型保证有零值占位。 +// 每模型 token 用量统计:今日(本地时区自然日起)+ 累计,输入/输出分开。 +// 返回 { [model_id]: { today_prompt, today_completion, total_prompt, total_completion } }, +// 配置内的模型保证有零值占位。 function modelUsageStats() { const d = new Date(); const dayStart = new Date(d.getFullYear(), d.getMonth(), d.getDate()).getTime(); const stats = {}; const slot = function (id) { - if (!stats[id]) stats[id] = { today_tokens: 0, total_tokens: 0 }; + if (!stats[id]) stats[id] = { today_prompt: 0, today_completion: 0, total_prompt: 0, total_completion: 0 }; return stats[id]; }; for (const m of cfg.models) slot(m.id); - const today = db.prepare( - 'SELECT model_id, SUM(total_tokens) AS n FROM model_usage WHERE created_at >= ? GROUP BY model_id' - ).all(dayStart); - for (const r of today) slot(r.model_id).today_tokens = r.n || 0; - const total = db.prepare( - 'SELECT model_id, SUM(total_tokens) AS n FROM model_usage GROUP BY model_id' - ).all(); - for (const r of total) slot(r.model_id).total_tokens = r.n || 0; + const sumSql = 'SELECT model_id, SUM(prompt_tokens) AS p, SUM(completion_tokens) AS c FROM model_usage'; + for (const r of db.prepare(sumSql + ' WHERE created_at >= ? GROUP BY model_id').all(dayStart)) { + slot(r.model_id).today_prompt = r.p || 0; + slot(r.model_id).today_completion = r.c || 0; + } + for (const r of db.prepare(sumSql + ' GROUP BY model_id').all()) { + slot(r.model_id).total_prompt = r.p || 0; + slot(r.model_id).total_completion = r.c || 0; + } return stats; } diff --git a/app/server/public/css/style.css b/app/server/public/css/style.css index e91703f..20ed93a 100644 --- a/app/server/public/css/style.css +++ b/app/server/public/css/style.css @@ -78,12 +78,11 @@ body { .search-cancel { background: none; border: none; color: #2a5299; font-size: 14px; padding: 6px 4px; cursor: pointer; flex: none; } .search-tip { color: #8891a5; font-size: 12px; padding: 2px 4px 8px; } .load-more { - display: block; margin: 4px auto 14px; - padding: 8px 26px; background: #fff; color: #2a5299; - border: 1px solid #d5deee; border-radius: 18px; - font-size: 13px; cursor: pointer; box-shadow: 0 1px 3px rgba(30,40,90,0.06); + width: 100%; background: #f2f3f7; color: #445; + border: 1px solid #dde; border-radius: 10px; + padding: 10px; font-size: 14px; cursor: pointer; margin-bottom: 10px; } -.load-more:active { background: #eef3fc; } +.load-more:active { background: #e8eaf0; } .load-more:disabled { opacity: 0.5; cursor: default; } /* ---- 任务状态栏 ---- */ diff --git a/app/server/public/index.html b/app/server/public/index.html index 3fa78ac..cf332f1 100644 --- a/app/server/public/index.html +++ b/app/server/public/index.html @@ -284,10 +284,10 @@ - - - - - + + + + + diff --git a/app/server/public/js/models.js b/app/server/public/js/models.js index b9bd465..4b35b4e 100644 --- a/app/server/public/js/models.js +++ b/app/server/public/js/models.js @@ -40,8 +40,10 @@ async function loadModelCards() { '
' + esc(m.id) + (run && run.is_busy && run.current_session_id ? ' · 会话 ' + esc(run.current_session_id) : '') + '
' + '
--
' + - '
' + (run ? fmtTok(run.today_tokens) : '--') + '
' + - '
' + (run ? fmtTok(run.total_tokens) : '--') + '
' + + '
' + (run ? fmtTok(run.today_prompt) : '--') + '
' + + '
' + (run ? fmtTok(run.today_completion) : '--') + '
' + + '
' + (run ? fmtTok(run.total_prompt) : '--') + '
' + + '
' + (run ? fmtTok(run.total_completion) : '--') + '
' + ''; }).join('') + (modelsPendingRestart diff --git a/app/server/server.js b/app/server/server.js index 3b61d6d..718b4a5 100644 --- a/app/server/server.js +++ b/app/server/server.js @@ -38,14 +38,16 @@ app.use('/api/skills', require('./routes/skills')); app.use('/api/config', require('./routes/config')); app.use('/api/system', require('./routes/system')); -// 模型池状态(前端可展示空闲/占用)+ 每模型 token 用量(今日/累计) +// 模型池状态(前端可展示空闲/占用)+ 每模型 token 用量(今日/累计,输入/输出分开) 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(); for (const r of rows) { - const s = stats[r.id] || { today_tokens: 0, total_tokens: 0 }; - r.today_tokens = s.today_tokens; - r.total_tokens = s.total_tokens; + const s = stats[r.id] || {}; + r.today_prompt = s.today_prompt || 0; + r.today_completion = s.today_completion || 0; + r.total_prompt = s.total_prompt || 0; + r.total_completion = s.total_completion || 0; } res.json(rows); }); diff --git a/app/test/smoke.js b/app/test/smoke.js index 3f57c41..9676260 100644 --- a/app/test/smoke.js +++ b/app/test/smoke.js @@ -245,11 +245,13 @@ async function main() { ok(qc.some(x => x.id === fs9.id), 'q= 按消息内容命中'); const qnone = await api('GET', '/api/sessions?q=绝无此内容xyzzy-9x7'); ok(Array.isArray(qnone) && qnone.length === 0, 'q= 无命中返回空'); - // token 用量:model_usage 由 mock 上游的 usage 帧驱动,今日/累计应已统计 + // token 用量:model_usage 由 mock 上游的 usage 帧驱动,输入/输出分开统计 const usagePool = await api('GET', '/api/models'); - const sumToday = usagePool.reduce(function (n, m) { return n + (m.today_tokens || 0); }, 0); - const sumAll = usagePool.reduce(function (n, m) { return n + (m.total_tokens || 0); }, 0); - ok(sumToday > 0 && sumAll >= sumToday, '/api/models 携带今日/累计 token 用量', '今日=' + sumToday + ' 累计=' + sumAll); + const sumP = usagePool.reduce(function (n, m) { return n + (m.today_prompt || 0); }, 0); + const sumC = usagePool.reduce(function (n, m) { return n + (m.today_completion || 0); }, 0); + const sumTP = usagePool.reduce(function (n, m) { return n + (m.total_prompt || 0); }, 0); + ok(sumP > 0 && sumC > 0 && sumTP >= sumP, + '/api/models 携带今日/累计输入输出 token 用量', '今日输入=' + sumP + ' 今日输出=' + sumC); // ---- 10. 技能管理(阶段 3)---- console.log('\n[10] 技能管理');