mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-16 11:52:26 +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.
30 lines
1.1 KiB
TypeScript
30 lines
1.1 KiB
TypeScript
import { adaptBodyForCompression } from "../../services/compression/bodyAdapter.ts";
|
|
import { estimateTokens } from "../../services/contextManager.ts";
|
|
|
|
type JsonRecord = Record<string, unknown>;
|
|
|
|
function asJsonRecord(value: unknown): JsonRecord | null {
|
|
return value && typeof value === "object" && !Array.isArray(value) ? (value as JsonRecord) : null;
|
|
}
|
|
|
|
export function estimateFinalInputTokens(requestBody: JsonRecord | null | undefined): number {
|
|
const adapted = requestBody ? adaptBodyForCompression(requestBody).body : null;
|
|
const nestedRequest = asJsonRecord(requestBody?.request);
|
|
const messages =
|
|
adapted?.messages ||
|
|
requestBody?.contents ||
|
|
nestedRequest?.contents ||
|
|
(Array.isArray(requestBody?.input)
|
|
? requestBody.input
|
|
: requestBody?.input && typeof requestBody.input === "object"
|
|
? requestBody.input
|
|
: []);
|
|
|
|
return (
|
|
estimateTokens(messages) +
|
|
(Array.isArray(requestBody?.tools) ? estimateTokens(requestBody.tools) : 0) +
|
|
estimateTokens(requestBody?.system) +
|
|
estimateTokens(requestBody?.instructions)
|
|
);
|
|
}
|