mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-09-15 11:22:15 +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.
41 lines
1.9 KiB
TypeScript
41 lines
1.9 KiB
TypeScript
/**
|
|
* Build a sanitized OpenAI-style error body for a non-ok Antigravity/agy upstream
|
|
* response (#3229).
|
|
*
|
|
* The non-streaming executor path previously fed 4xx/5xx responses into the SSE
|
|
* collector, which produced a synthetic `{"object":"chat.completion","content":""}`
|
|
* success envelope — masking the real error. Route non-ok responses through
|
|
* `buildErrorBody` instead so the client sees a proper error (hard rule #12).
|
|
*/
|
|
import { buildErrorBody } from "../utils/error.ts";
|
|
import { isGeoBlockedError } from "../services/errorClassifier.ts";
|
|
|
|
// The dashboard "Test Connection" for antigravity only probes the OAuth userinfo
|
|
// endpoint (https://www.googleapis.com/oauth2/v1/userinfo), which is NOT
|
|
// geo-restricted — so a green tick does not prove the model path works. Spell
|
|
// this out in the geo-block message so operators stop chasing accounts.
|
|
const GEO_BLOCKED_HINT =
|
|
"The Cloud Code API is not offered from this server's current egress location " +
|
|
'("User location is not supported for the API use."). This is not an account ' +
|
|
"problem: the connection test only validates the Google OAuth token and does not " +
|
|
"call the model API. Route antigravity/agy egress through a proxy in a " +
|
|
"supported region (e.g. US/EU) or use a different provider.";
|
|
|
|
export function buildAntigravityUpstreamError(status: number, statusText: string, rawBody: string) {
|
|
let upstreamDetails: unknown;
|
|
try {
|
|
upstreamDetails = JSON.parse(rawBody);
|
|
} catch {
|
|
// upstream body is not JSON (e.g. HTML error page) — omit structured details
|
|
}
|
|
const suffix = statusText ? `: ${statusText}` : "";
|
|
if (isGeoBlockedError(rawBody)) {
|
|
return buildErrorBody(
|
|
status,
|
|
`Antigravity upstream error (${status})${suffix}. ${GEO_BLOCKED_HINT}`,
|
|
upstreamDetails
|
|
);
|
|
}
|
|
return buildErrorBody(status, `Antigravity upstream error (${status})${suffix}`, upstreamDetails);
|
|
}
|