mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-13 18:32:12 +03:00
65e81158ab
Landed with the design call resolved per the owner's pick — **option 1**: the synced store is now endpoint-agnostic (persistDiscoveredModels and managedModelImport no longer drop non-chat models at write time), and chat selectability moved to read time (auto-pool expansion in autoStrategy applies filterChatSelectableModels; the models-route projection already had its chatOnly filter). Your discovery test now passes end-to-end (3/3): /api/show capabilities persist per connection and image/embedding requests route through the advertising host. Reconciliation notes: conflicted areas merged onto the current tip (adobe discovery import, requestedModel preflight signature, resolvedProvider fast-path coexists with the synced-route override — explicit resolution wins); carried base-red drains (#10055 memoization, #11071 test variants) dropped as already-landed; the managed-model-import exclusion test was propagated to the new contract (image/video models persist; the read filter still hides them from chat pickers — pinned by a new assertion). Full battery: 205/206 focused (the one red is a confirmed periodic-timer timing flake on the loaded devbox — 20/20 isolated), autoCombo vitest 30/30, combo suites 46/46, gates + typecheck clean. Thank you @yourspraveen — the capability probe + routing design was right; it just needed the store contract opened up. Fixes #11087.
68 lines
2.6 KiB
TypeScript
68 lines
2.6 KiB
TypeScript
import { describe, it } from "node:test";
|
|
import assert from "node:assert/strict";
|
|
import { FairCostQueue, type QueueEntry } from "../../open-sse/services/admission/queue.ts";
|
|
|
|
describe("FairCostQueue removeById cursor preservation", () => {
|
|
function qEntry(id: string, tenantKey: string, cost = 1): QueueEntry<{ id: string }> {
|
|
return {
|
|
id,
|
|
tenantKey,
|
|
cost,
|
|
enqueuedAtMs: 0,
|
|
deadlineMs: Number.MAX_SAFE_INTEGER,
|
|
payload: { id },
|
|
};
|
|
}
|
|
|
|
it("preserves the logical successor when removing a bucket before the cursor", () => {
|
|
const q = new FairCostQueue<{ id: string }>(10, 100);
|
|
assert.equal(q.enqueue(qEntry("a1", "a")), true);
|
|
assert.equal(q.enqueue(qEntry("a2", "a")), true);
|
|
assert.equal(q.enqueue(qEntry("b1", "b")), true);
|
|
assert.equal(q.enqueue(qEntry("c1", "c")), true);
|
|
|
|
// Dequeue a1 leaves cursor at b while tenant a still has a2.
|
|
assert.equal(q.dequeue()?.id, "a1");
|
|
assert.equal(q.removeById("a2")?.id, "a2");
|
|
// Successor of the pre-removal cursor must remain b, not skip to c.
|
|
assert.equal(q.dequeue()?.id, "b1");
|
|
assert.equal(q.dequeue()?.id, "c1");
|
|
assert.equal(q.size, 0);
|
|
});
|
|
|
|
it("preserves the logical successor when removing the bucket at the cursor", () => {
|
|
const q = new FairCostQueue<{ id: string }>(10, 100);
|
|
assert.equal(q.enqueue(qEntry("a1", "a")), true);
|
|
assert.equal(q.enqueue(qEntry("b1", "b")), true);
|
|
assert.equal(q.enqueue(qEntry("c1", "c")), true);
|
|
|
|
assert.equal(q.dequeue()?.id, "a1"); // cursor now at b
|
|
assert.equal(q.removeById("b1")?.id, "b1");
|
|
assert.equal(q.dequeue()?.id, "c1");
|
|
assert.equal(q.size, 0);
|
|
});
|
|
|
|
it("preserves the cursor when removing a bucket after the cursor", () => {
|
|
const q = new FairCostQueue<{ id: string }>(10, 100);
|
|
assert.equal(q.enqueue(qEntry("a1", "a")), true);
|
|
assert.equal(q.enqueue(qEntry("b1", "b")), true);
|
|
assert.equal(q.enqueue(qEntry("c1", "c")), true);
|
|
|
|
assert.equal(q.dequeue()?.id, "a1"); // cursor now at b
|
|
assert.equal(q.removeById("c1")?.id, "c1");
|
|
assert.equal(q.dequeue()?.id, "b1");
|
|
assert.equal(q.size, 0);
|
|
});
|
|
|
|
it("resets the cursor when the final bucket is removed", () => {
|
|
const q = new FairCostQueue<{ id: string }>(10, 100);
|
|
assert.equal(q.enqueue(qEntry("a1", "a")), true);
|
|
assert.equal(q.enqueue(qEntry("b1", "b")), true);
|
|
assert.equal(q.dequeue()?.id, "a1"); // cursor at b
|
|
assert.equal(q.removeById("b1")?.id, "b1");
|
|
assert.equal(q.size, 0);
|
|
assert.equal(q.enqueue(qEntry("d1", "d")), true);
|
|
assert.equal(q.dequeue()?.id, "d1");
|
|
});
|
|
});
|