From 7682f696ccdd50687fe0c3b77edb53085764ca32 Mon Sep 17 00:00:00 2001 From: kicer Date: Wed, 2 Sep 2026 00:07:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E7=8E=B0=E4=BB=8A=E6=97=A5/=E7=B4=AF?= =?UTF-8?q?=E8=AE=A1token=E7=94=A8=E9=87=8F=E7=BB=9F=E8=AE=A1;=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E5=88=A0=E9=99=A4=E6=8C=89=E9=92=AE=E4=B8=8E=E6=8A=80?= =?UTF-8?q?=E8=83=BD=E9=A1=B5=E7=BB=9F=E4=B8=80;=E5=8A=A0=E8=BD=BD?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE=E6=A0=B7=E5=BC=8F=E9=87=8D?= =?UTF-8?q?=E5=81=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/server/db.js | 13 +++++++++++ app/server/engine.js | 38 +++++++++++++++++++++++++++++++++ app/server/public/css/style.css | 9 ++++---- app/server/public/index.html | 10 ++++----- app/server/public/js/models.js | 12 +++++++---- app/server/public/js/tasks.js | 2 +- app/server/server.js | 11 ++++++++-- app/test/mock-upstream.js | 3 +++ app/test/smoke.js | 8 ++++++- 9 files changed, 89 insertions(+), 17 deletions(-) diff --git a/app/server/db.js b/app/server/db.js index c21d847..bf8d427 100644 --- a/app/server/db.js +++ b/app/server/db.js @@ -64,8 +64,21 @@ function initDb(dbPath) { value TEXT ); + -- 模型 token 用量流水(每次模型回合一条)。故意不建会话外键: + -- 删会话后累计统计仍需保留 + CREATE TABLE IF NOT EXISTS model_usage ( + id INTEGER PRIMARY KEY AUTOINCREMENT, + session_id TEXT NOT NULL, + model_id TEXT NOT NULL, + prompt_tokens INTEGER DEFAULT 0, + completion_tokens INTEGER DEFAULT 0, + total_tokens INTEGER DEFAULT 0, + created_at INTEGER NOT NULL + ); + CREATE INDEX IF NOT EXISTS idx_messages_session ON messages(session_id, id); CREATE INDEX IF NOT EXISTS idx_files_session ON files(session_id); + CREATE INDEX IF NOT EXISTS idx_model_usage_model_time ON model_usage(model_id, created_at); `); // 迁移:旧库补 held_at 列(held 保持租约起始时间) const cols = db.prepare('PRAGMA table_info(sessions)').all(); diff --git a/app/server/engine.js b/app/server/engine.js index 6a786d3..408d62b 100644 --- a/app/server/engine.js +++ b/app/server/engine.js @@ -79,6 +79,41 @@ function saveMessage(sessionId, msg) { return info.lastInsertRowid; } +// 记录一次模型回合的 token 用量(上游未返回 usage 时跳过)。 +// 写入 model_usage 表,不建会话外键:删会话后累计统计仍保留。 +function recordModelUsage(sessionId, modelId, usage) { + if (!modelId || !usage) return; + const pt = usage.prompt_tokens || 0; + const ct = usage.completion_tokens || 0; + const tt = usage.total_tokens || (pt + ct); + if (!pt && !ct && !tt) return; + db.prepare( + 'INSERT INTO model_usage (session_id, model_id, prompt_tokens, completion_tokens, total_tokens, created_at) VALUES (?,?,?,?,?,?)' + ).run(sessionId, modelId, pt, ct, tt, now()); +} + +// 每模型 token 用量统计:今日(本地时区自然日起)+ 累计。 +// 返回 { [model_id]: { today_tokens, total_tokens } },配置内的模型保证有零值占位。 +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 }; + 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; + return stats; +} + function emitStatus(sessionId) { const s = getSession(sessionId); if (!s) return; @@ -356,6 +391,7 @@ async function runLoopInner(sessionId, run) { })) : null, }; const assistantId = saveMessage(sessionId, msgRow); + recordModelUsage(sessionId, session.model_id, result.usage); bus.emit(sessionId, 'assistant_message', { id: assistantId, content: msgRow.content, tool_calls: msgRow.tool_calls }); if (!hasTools) { @@ -571,6 +607,8 @@ module.exports = { saveMessage, queuePosition, modelDisplayName, + recordModelUsage, + modelUsageStats, dispatchQueued, TOOL_DEFINITIONS, START_EXECUTION_MESSAGE, diff --git a/app/server/public/css/style.css b/app/server/public/css/style.css index 08adb2c..e91703f 100644 --- a/app/server/public/css/style.css +++ b/app/server/public/css/style.css @@ -67,7 +67,6 @@ body { .badge.completed { background: #eceff5; color: #5c6674; } .badge.held { background: #fff4dc; color: #a06a00; } .badge.cancelled { background: #fdecea; color: #b3382c; } -.session-del { color: #c33; background: none; border: none; font-size: 12px; padding: 6px; } /* ---- 任务搜索 + 归档折叠(2.0) ---- */ .search-bar { display: flex; gap: 8px; align-items: center; padding: 10px 12px 0; } @@ -79,10 +78,12 @@ 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 { - width: 100%; background: none; border: 1px dashed #ccd2dd; border-radius: 10px; - color: #667; font-size: 13px; padding: 9px; margin-bottom: 10px; cursor: pointer; + 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); } -.load-more:active { background: #eceef3; } +.load-more:active { background: #eef3fc; } .load-more:disabled { opacity: 0.5; cursor: default; } /* ---- 任务状态栏 ---- */ diff --git a/app/server/public/index.html b/app/server/public/index.html index bb39bc7..3fa78ac 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 a0cbadc..b9bd465 100644 --- a/app/server/public/js/models.js +++ b/app/server/public/js/models.js @@ -1,5 +1,5 @@ // 模型 Tab(阶段 5):模型池状态 + 增 / 改 / 删(仅写 config.yml,到「设置」页重启才生效)。 -// 卡片默认只展示:名称 / id / 运行状态 + 余额、token 用量占位(功能后续上线)。 +// 卡片默认只展示:名称 / id / 运行状态 + 余额占位 + 今日/累计 token 用量(model_usage 表统计)。 // 编辑走统一弹窗(新增复用同一弹窗);id 不可页面修改(会话按 id 绑定,改 id 走配置文件原文)。 'use strict'; @@ -10,6 +10,10 @@ let runtimeById = {}; // 运行池状态,按 id 关联 let modelsPendingRestart = false; let moeIdx = -1; // 当前编辑弹窗对应的下标;-1 = 新增 +function fmtTok(n) { + return (Number(n) || 0).toLocaleString('zh-CN'); +} + async function loadModelCards() { const el = $('model-cards'); if (!el) return; @@ -36,13 +40,13 @@ 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) : '--') + '
' + ''; }).join('') + (modelsPendingRestart ? '
已写入 config.yml,到「设置」页重启服务后生效。
' - : '
余额与 token 用量统计后续上线;改动写入 config.yml,重启服务后生效。
'); + : '
余额需对接模型提供方 API,暂未实现;改动写入 config.yml,重启服务后生效。
'); } catch (e) { el.innerHTML = '
加载失败:' + esc(e.message) + '
'; } diff --git a/app/server/public/js/tasks.js b/app/server/public/js/tasks.js index 658dbd1..618b8ae 100644 --- a/app/server/public/js/tasks.js +++ b/app/server/public/js/tasks.js @@ -73,7 +73,7 @@ function sessionCard(s) { '
' + esc(s.id) + '' + badge + (s.model_id ? '' + esc(s.model_id) + '' : '') + '
' + '' + - '' + + '' + ''; } diff --git a/app/server/server.js b/app/server/server.js index 4f85812..3b61d6d 100644 --- a/app/server/server.js +++ b/app/server/server.js @@ -38,9 +38,16 @@ app.use('/api/skills', require('./routes/skills')); app.use('/api/config', require('./routes/config')); app.use('/api/system', require('./routes/system')); -// 模型池状态(前端可展示空闲/占用) +// 模型池状态(前端可展示空闲/占用)+ 每模型 token 用量(今日/累计) app.get('/api/models', (req, res) => { - res.json(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(); + 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; + } + res.json(rows); }); app.get('/api/health', (req, res) => res.json({ ok: true, time: Date.now() })); diff --git a/app/test/mock-upstream.js b/app/test/mock-upstream.js index 9613362..0e1ba3d 100644 --- a/app/test/mock-upstream.js +++ b/app/test/mock-upstream.js @@ -17,6 +17,8 @@ function streamText(res, text, delayMs) { if (!queue.length) { clearInterval(timer); sse(res, { choices: [{ delta: {}, finish_reason: 'stop' }] }); + // 尾声 usage 帧(OpenAI stream_options.include_usage 行为),供 token 用量统计测试 + sse(res, { usage: { prompt_tokens: 100, completion_tokens: 20, total_tokens: 120 } }); res.write('data: [DONE]\n\n'); res.end(); return; @@ -33,6 +35,7 @@ function streamToolCall(res) { sse(res, { choices: [{ delta: { tool_calls: [{ function: { arguments: '{"path": "hello.txt",' } }] } }] }); sse(res, { choices: [{ delta: { tool_calls: [{ function: { arguments: ' "content": "hello from agent"}' } }] } }] }); sse(res, { choices: [{ delta: {}, finish_reason: 'tool_calls' }] }); + sse(res, { usage: { prompt_tokens: 80, completion_tokens: 40, total_tokens: 120 } }); res.write('data: [DONE]\n\n'); res.end(); } diff --git a/app/test/smoke.js b/app/test/smoke.js index 4b803b1..3f57c41 100644 --- a/app/test/smoke.js +++ b/app/test/smoke.js @@ -226,7 +226,8 @@ async function main() { const fs9 = await api('POST', '/api/sessions', { title: uniqTitle }); ok(fs9 && fs9.id, '创建搜索专用会话'); await api('POST', '/api/sessions/' + fs9.id + '/messages', { content: 'zzq-unique 检索内容 12345' }); - await waitSession(fs9.id, x => x.messages.some(m => m.content.indexOf('zzq-unique') >= 0), 8000, '消息落库'); + // 等到结版(completed 为终态,避免 active/done 归类断言撞上 held→completed 过渡态) + await waitSession(fs9.id, x => x.session.status === 'completed', 8000, 'AI 回复后租约到期结版,token 用量已落库'); const st9 = (await api('GET', '/api/sessions/' + fs9.id)).session.status; const actSet = await api('GET', '/api/sessions?status=active&limit=200'); const doneSet = await api('GET', '/api/sessions?status=done&limit=200'); @@ -244,6 +245,11 @@ 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 帧驱动,今日/累计应已统计 + 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); // ---- 10. 技能管理(阶段 3)---- console.log('\n[10] 技能管理');