优化绑定旧模型
This commit is contained in:
@@ -556,7 +556,8 @@ CREATE TABLE sessions (
|
||||
title TEXT DEFAULT '', -- 会话标题(可由 AI 生成或用户填写)
|
||||
status TEXT NOT NULL, -- queued | active | held | completed | cancelled
|
||||
phase TEXT NOT NULL DEFAULT 'planning', -- planning | execution
|
||||
model_id TEXT, -- 绑定的模型 ID(ds1/ds2/ds3),排队时为空
|
||||
model_id TEXT, -- 当前绑定的模型 ID(ds1/ds2/ds3),释放/排队时为空
|
||||
last_model_id TEXT, -- 最近用过的模型;释放后新消息优先回绑,被占才另选空闲
|
||||
created_at INTEGER NOT NULL,
|
||||
updated_at INTEGER NOT NULL,
|
||||
completed_at INTEGER,
|
||||
|
||||
@@ -16,6 +16,7 @@ function initDb(dbPath) {
|
||||
status TEXT NOT NULL,
|
||||
phase TEXT NOT NULL DEFAULT 'planning',
|
||||
model_id TEXT,
|
||||
last_model_id TEXT,
|
||||
created_at INTEGER NOT NULL,
|
||||
updated_at INTEGER NOT NULL,
|
||||
completed_at INTEGER,
|
||||
@@ -83,6 +84,11 @@ function initDb(dbPath) {
|
||||
// 迁移:旧库补 held_at 列(held 保持租约起始时间)
|
||||
const cols = db.prepare('PRAGMA table_info(sessions)').all();
|
||||
if (!cols.some(c => c.name === 'held_at')) db.exec('ALTER TABLE sessions ADD COLUMN held_at INTEGER');
|
||||
// 迁移:last_model_id 记住会话最近用过的模型,释放后新消息优先回绑(见 engine.dispatchQueued)
|
||||
if (!cols.some(c => c.name === 'last_model_id')) {
|
||||
db.exec('ALTER TABLE sessions ADD COLUMN last_model_id TEXT');
|
||||
db.exec('UPDATE sessions SET last_model_id = model_id WHERE last_model_id IS NULL AND model_id IS NOT NULL');
|
||||
}
|
||||
return db;
|
||||
}
|
||||
|
||||
|
||||
+18
-7
@@ -209,7 +209,9 @@ function dequeue(sessionId) {
|
||||
|
||||
function bindModel(session, model) {
|
||||
db.prepare('UPDATE model_pool SET is_busy = 1, current_session_id = ? WHERE id = ?').run(session.id, model.id);
|
||||
db.prepare("UPDATE sessions SET status='active', model_id=?, updated_at=? WHERE id=?").run(model.id, now(), session.id);
|
||||
// last_model_id 不随释放清除:会话再次需要模型时优先回绑(见 pickModelFor)
|
||||
db.prepare("UPDATE sessions SET status='active', model_id=?, last_model_id=?, updated_at=? WHERE id=?")
|
||||
.run(model.id, model.id, now(), session.id);
|
||||
}
|
||||
|
||||
function releaseModel(sessionId) {
|
||||
@@ -228,18 +230,27 @@ function hasPendingUser(sessionId) {
|
||||
return false;
|
||||
}
|
||||
|
||||
// 有空闲模型就按 FIFO 派发排队会话。
|
||||
// 为排队会话挑模型:上次用过的模型(last_model_id)恰好空闲则优先回绑;
|
||||
// 被占用(或从未绑过/已从配置删除)则按 id 序取任意空闲模型。
|
||||
function pickModelFor(session) {
|
||||
if (session.last_model_id) {
|
||||
const pref = db.prepare('SELECT * FROM model_pool WHERE id = ? AND is_busy = 0').get(session.last_model_id);
|
||||
if (pref) return pref;
|
||||
}
|
||||
return freeModel();
|
||||
}
|
||||
|
||||
// 有空闲模型就按 FIFO 派发排队会话(每会话优先回绑上次用过的模型)。
|
||||
function dispatchQueued() {
|
||||
for (;;) {
|
||||
const model = freeModel();
|
||||
if (!model) return;
|
||||
if (!freeModel()) return;
|
||||
const head = db.prepare('SELECT session_id FROM wait_queue ORDER BY queued_at, id').get();
|
||||
if (!head) return;
|
||||
dequeue(head.session_id);
|
||||
const session = getSession(head.session_id);
|
||||
if (!session) continue;
|
||||
if (session.status !== 'queued') continue;
|
||||
bindModel(session, model);
|
||||
if (!session || session.status !== 'queued') continue;
|
||||
// 上面已确认有空闲模型,pickModelFor 必能回退到 freeModel
|
||||
bindModel(session, pickModelFor(session));
|
||||
emitStatus(session.id);
|
||||
if (hasPendingUser(session.id)) runLoop(session.id);
|
||||
}
|
||||
|
||||
@@ -138,6 +138,19 @@ async function main() {
|
||||
'tool 消息含压缩后的 image_url 内容块',
|
||||
imgTool ? JSON.stringify(imgTool.__blocks__.map(b => b.type)) : '无多模态块');
|
||||
|
||||
// ---- 2.8 释放后新消息优先回绑上次模型(last_model_id)----
|
||||
console.log('\n[2.8] 优先回绑');
|
||||
const sp = await api('POST', '/api/sessions', { title: '冒烟-回绑' });
|
||||
let dp = await waitSession(sp.id, x => x.session.status === 'active', 5000, '绑定');
|
||||
const m1 = dp.session.model_id;
|
||||
await api('POST', '/api/sessions/' + sp.id + '/messages', { content: '回绑测试' });
|
||||
dp = await waitSession(sp.id, x => x.session.status === 'held', 8000, '回复完成 held');
|
||||
await api('POST', '/api/sessions/' + sp.id + '/release'); // 主动断开:completed + 释放模型
|
||||
dp = await waitSession(sp.id, x => x.session.status === 'completed' && !x.session.model_id, 3000, 'release 后释放');
|
||||
await api('POST', '/api/sessions/' + sp.id + '/messages', { content: '再来一句' });
|
||||
dp = await waitSession(sp.id, x => x.session.status !== 'queued', 5000, '新消息送达');
|
||||
ok(dp.session.model_id === m1, '释放后新消息回绑上次模型', dp.session.model_id + ' vs ' + m1);
|
||||
|
||||
// ---- 3. 路径穿越防护 ----
|
||||
console.log('\n[3] 路径防护');
|
||||
let blocked = false;
|
||||
|
||||
Reference in New Issue
Block a user