mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-11-22 04:19:40 +00:00
fix(providers): keep the stored Codex catalog when a degraded discovery returns a shorter list (#16714)
This commit is contained in:
@@ -0,0 +1 @@
|
||||
- fix(providers): a Codex discovery with a failed client-version refresh no longer shrinks the stored synced catalog (#16714)
|
||||
16
src/app/api/providers/[id]/models/codexDegradedGuard.ts
Normal file
16
src/app/api/providers/[id]/models/codexDegradedGuard.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
// #16714: when the Codex client-version refresh failed (source "fallback"), the backend may hide
|
||||
// models gated behind a newer client. A live list that is a strict subset of the connection's
|
||||
// stored catalog is then not trustworthy enough to replace it. Healthy sources (override,
|
||||
// registry, pinned) stay authoritative.
|
||||
|
||||
type IdModel = { id?: unknown };
|
||||
|
||||
export function shouldKeepStoredCodexCatalog(
|
||||
versionSource: string,
|
||||
liveModels: readonly IdModel[],
|
||||
storedModels: readonly IdModel[]
|
||||
): boolean {
|
||||
if (versionSource !== "fallback" || storedModels.length === 0) return false;
|
||||
const liveIds = new Set(liveModels.map((model) => model.id));
|
||||
return storedModels.some((model) => !liveIds.has(model.id));
|
||||
}
|
||||
@@ -114,6 +114,7 @@ import {
|
||||
persistNonEmptyDiscoveredModels,
|
||||
} from "@/lib/providerModels/modelDiscovery";
|
||||
import { buildProviderModelsUrl, getDiscoveryClientVersionOptions } from "./discoveryClientVersion";
|
||||
import { shouldKeepStoredCodexCatalog } from "./codexDegradedGuard";
|
||||
import { getAdobeModels } from "./adobeFireflyDiscovery";
|
||||
import { getSyncedAvailableModels, getCustomModels, getModelIsHidden } from "@/lib/db/models";
|
||||
import { isConnectionUnavailableToAuxiliaryActivity } from "@/lib/exclusiveLeaseIsolation";
|
||||
@@ -2300,11 +2301,20 @@ export async function GET(
|
||||
githubCatalogModels && githubCatalogModels.length > 0
|
||||
? enrichCodexModelsFromGithubCatalog(liveModels, githubCatalogModels)
|
||||
: liveModels;
|
||||
const catalog = reconcileCodexCatalog(enrichedLiveModels);
|
||||
await runWithCodexConnectionFence(codexFence, () =>
|
||||
persistDiscoveredModels(provider, connectionId, catalog.activeModels)
|
||||
);
|
||||
const liveCatalog = reconcileCodexCatalog(enrichedLiveModels);
|
||||
const clientVersionSource = getCodexClientVersionSource();
|
||||
// #16714: a degraded (refresh-failed) discovery must not shrink the stored catalog.
|
||||
const keepStored = shouldKeepStoredCodexCatalog(
|
||||
clientVersionSource,
|
||||
liveCatalog.activeModels,
|
||||
cachedDiscoveryModels
|
||||
);
|
||||
const catalog = keepStored ? reconcileCodexCatalog(cachedDiscoveryModels) : liveCatalog;
|
||||
if (!keepStored) {
|
||||
await runWithCodexConnectionFence(codexFence, () =>
|
||||
persistDiscoveredModels(provider, connectionId, catalog.activeModels)
|
||||
);
|
||||
}
|
||||
return buildResponse({
|
||||
provider,
|
||||
connectionId,
|
||||
|
||||
89
tests/unit/codex-degraded-discovery-persist-16714.test.ts
Normal file
89
tests/unit/codex-degraded-discovery-persist-16714.test.ts
Normal file
@@ -0,0 +1,89 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
import fs from "node:fs";
|
||||
import os from "node:os";
|
||||
import path from "node:path";
|
||||
|
||||
const dataDir = fs.mkdtempSync(path.join(os.tmpdir(), "repro-16714-"));
|
||||
process.env.DATA_DIR = dataDir;
|
||||
delete process.env.CODEX_CLIENT_VERSION;
|
||||
const core = await import("../../src/lib/db/core.ts");
|
||||
const { createProviderConnection } = await import("../../src/lib/db/providers.ts");
|
||||
const { getCachedDiscoveredModels } =
|
||||
await import("../../src/lib/providerModels/modelDiscovery.ts");
|
||||
const { GET } = await import("../../src/app/api/providers/[id]/models/route.ts");
|
||||
const { clearCodexGithubCatalogCacheForTests } =
|
||||
await import("../../src/app/api/providers/[id]/models/discovery/codex.ts");
|
||||
const { resetCodexClientVersionCacheForTests } =
|
||||
await import("../../open-sse/config/codexClient.ts");
|
||||
const { setSafeOutboundPinnedFetchTestOverride } =
|
||||
await import("../../src/shared/network/safeOutboundFetch.ts");
|
||||
|
||||
const originalFetch = globalThis.fetch;
|
||||
test.after(() => {
|
||||
setSafeOutboundPinnedFetchTestOverride(undefined);
|
||||
globalThis.fetch = originalFetch;
|
||||
delete process.env.CODEX_CLIENT_VERSION;
|
||||
core.resetDbInstance();
|
||||
fs.rmSync(dataDir, { recursive: true, force: true });
|
||||
});
|
||||
|
||||
const call = async (id: string) => {
|
||||
const response = await GET(
|
||||
new Request(`http://localhost/api/providers/${id}/models?refresh=true&chatOnly=true`),
|
||||
{ params: { id } }
|
||||
);
|
||||
assert.equal(response.status, 200);
|
||||
return response.json();
|
||||
};
|
||||
|
||||
test("#16714: a degraded (refresh-failed) discovery must not replace a fuller synced catalog", async () => {
|
||||
const c = await createProviderConnection({
|
||||
provider: "codex",
|
||||
authType: "oauth",
|
||||
name: "repro",
|
||||
isActive: true,
|
||||
accessToken: "test-token",
|
||||
providerSpecificData: { autoFetchModels: false },
|
||||
});
|
||||
const entry = (slug: string) => ({ slug, visibility: "list", supported_in_api: true });
|
||||
|
||||
// Phase 1: healthy client version (override) -> backend advertises the newest model.
|
||||
process.env.CODEX_CLIENT_VERSION = "9.9.9";
|
||||
resetCodexClientVersionCacheForTests();
|
||||
clearCodexGithubCatalogCacheForTests();
|
||||
globalThis.fetch = async (input) =>
|
||||
String(input).includes("chatgpt.com")
|
||||
? Response.json({ models: [entry("gpt-old-a"), entry("gpt-old-b"), entry("gpt-new-gated")] })
|
||||
: Response.json({ models: [] });
|
||||
// The npm registry call is pinned (pinDns); route it through the test seam so no real network is used.
|
||||
setSafeOutboundPinnedFetchTestOverride(() => async () => new Response("down", { status: 503 }));
|
||||
const healthy = await call(c.id);
|
||||
assert.deepEqual(healthy.models.map((m: { id: string }) => m.id).sort(), [
|
||||
"gpt-new-gated",
|
||||
"gpt-old-a",
|
||||
"gpt-old-b",
|
||||
]);
|
||||
|
||||
// Phase 2: "restart" with the registry unreachable -> pinned version -> backend hides the new model.
|
||||
delete process.env.CODEX_CLIENT_VERSION;
|
||||
resetCodexClientVersionCacheForTests();
|
||||
clearCodexGithubCatalogCacheForTests();
|
||||
globalThis.fetch = async (input) =>
|
||||
String(input).includes("registry.npmjs.org")
|
||||
? new Response("down", { status: 503 })
|
||||
: String(input).includes("chatgpt.com")
|
||||
? Response.json({ models: [entry("gpt-old-a"), entry("gpt-old-b")] })
|
||||
: Response.json({ models: [] });
|
||||
const degraded = await call(c.id);
|
||||
// The API already knows the discovery is degraded...
|
||||
assert.equal(degraded.discovery.clientVersion.source, "fallback");
|
||||
assert.ok(degraded.discovery.clientVersion.degraded);
|
||||
|
||||
// ...but it persisted the short list anyway, dropping the model for the next /v1/models read.
|
||||
const persisted = (await getCachedDiscoveredModels("codex", c.id)).map((m) => m.id).sort();
|
||||
assert.ok(
|
||||
persisted.includes("gpt-new-gated"),
|
||||
`degraded discovery overwrote the synced catalog; persisted=${JSON.stringify(persisted)}`
|
||||
);
|
||||
});
|
||||
Reference in New Issue
Block a user