mirror of
https://github.com/diegosouzapw/OmniRoute.git
synced 2026-11-21 15:05:56 +00:00
fix(catalog): omit generic effort_tiers on Antigravity tier-suffixed models (#20435)
This commit is contained in:
1
changelog.d/fixes/20435-antigravity-tier-effort-tiers.md
Normal file
1
changelog.d/fixes/20435-antigravity-tier-effort-tiers.md
Normal file
@@ -0,0 +1 @@
|
||||
- **catalog:** Omit generic `effort_tiers` synthesis on Antigravity (`antigravity` / `agy`) tier-suffixed model IDs ending in `-low`, `-medium`, or `-high` in both `enrichCatalogModelEntry` and `getThinkingCapabilityFields` when no explicit/synced tiers exist ([#20435](https://github.com/cheaper-inference/OmniRoute/issues/20435)).
|
||||
@@ -9,6 +9,7 @@ import {
|
||||
extendDeepSeekEffortValues,
|
||||
} from "@/shared/reasoning/effortStandardization";
|
||||
import { knownReasoningEffortTiers } from "@/lib/modelsDevSync/transform";
|
||||
import { isAntigravityTierSuffixedModel } from "@/lib/modelMetadataRegistry";
|
||||
import { resolveModelDisplayName } from "@/shared/utils/modelDisplayName";
|
||||
|
||||
export interface CustomModelEntry {
|
||||
@@ -270,10 +271,13 @@ export function getThinkingCapabilityFields(
|
||||
modelId,
|
||||
extendCodexGpt56EffortValues(providerId, modelId, CANONICAL_EFFORT_VALUES)
|
||||
);
|
||||
const antigravityTierSuffixed = isAntigravityTierSuffixedModel(providerId, modelId);
|
||||
const advertiseTiers =
|
||||
supportsThinking &&
|
||||
!declaredNone &&
|
||||
(hasDeclaredTiers || syncedEfforts || !skipCanonicalEffortFallback);
|
||||
(hasDeclaredTiers ||
|
||||
Boolean(syncedEfforts) ||
|
||||
(!skipCanonicalEffortFallback && !antigravityTierSuffixed));
|
||||
return {
|
||||
thinking: supportsThinking,
|
||||
supportsThinking,
|
||||
|
||||
@@ -142,6 +142,22 @@ export function isGlmFamilyModel(modelId: string, displayName = ""): boolean {
|
||||
return glmFamilyPattern.test(modelId) || glmFamilyPattern.test(displayName);
|
||||
}
|
||||
|
||||
const ANTIGRAVITY_PROVIDER_IDS = new Set(["antigravity", "agy"]);
|
||||
const ANTIGRAVITY_TIER_SUFFIX_PATTERN = /-(?:low|medium|high)$/i;
|
||||
|
||||
export function isAntigravityTierSuffixedModel(
|
||||
provider: string | null | undefined,
|
||||
modelId: string
|
||||
): boolean {
|
||||
const normalizedProvider = (provider ?? "").trim().toLowerCase();
|
||||
const normalizedModel = modelId.trim();
|
||||
if (!normalizedModel) return false;
|
||||
const isAntigravityProvider =
|
||||
ANTIGRAVITY_PROVIDER_IDS.has(normalizedProvider) ||
|
||||
(!normalizedProvider && /^(?:antigravity|agy)\//i.test(normalizedModel));
|
||||
return isAntigravityProvider && ANTIGRAVITY_TIER_SUFFIX_PATTERN.test(normalizedModel);
|
||||
}
|
||||
|
||||
function toQualifiedId(
|
||||
providerAlias: string | null,
|
||||
provider: string | null,
|
||||
@@ -513,16 +529,21 @@ export function enrichCatalogModelEntry<T extends JsonRecord>(
|
||||
? declaredEffortTiers
|
||||
: sourceDeclaresThinking
|
||||
? undefined
|
||||
: // #10963: GLM-family models never inherit generic OpenAI tiers — an
|
||||
// explicit empty list is authoritative unless a provider-declared
|
||||
// contract exists (handled by declaredEffortTiers above).
|
||||
isGlmFamilyModel(metadata.model, metadata.displayName)
|
||||
? []
|
||||
: extendCodexGpt56EffortValues(
|
||||
metadata.provider,
|
||||
metadata.model,
|
||||
CANONICAL_EFFORT_VALUES
|
||||
);
|
||||
: // Antigravity tier-suffixed IDs encode a fixed thinking tier in the model
|
||||
// name and drop client-supplied reasoning_effort, so do not synthesize
|
||||
// generic OpenAI effort_tiers when no explicit/provider tiers exist.
|
||||
isAntigravityTierSuffixedModel(metadata.provider, metadata.model)
|
||||
? undefined
|
||||
: // #10963: GLM-family models never inherit generic OpenAI tiers — an
|
||||
// explicit empty list is authoritative unless a provider-declared
|
||||
// contract exists (handled by declaredEffortTiers above).
|
||||
isGlmFamilyModel(metadata.model, metadata.displayName)
|
||||
? []
|
||||
: extendCodexGpt56EffortValues(
|
||||
metadata.provider,
|
||||
metadata.model,
|
||||
CANONICAL_EFFORT_VALUES
|
||||
);
|
||||
const capabilityFields = {
|
||||
...(typeof metadata.capabilities.vision === "boolean"
|
||||
? { vision: metadata.capabilities.vision }
|
||||
|
||||
70
tests/unit/antigravity-tier-effort-tiers-20435.test.ts
Normal file
70
tests/unit/antigravity-tier-effort-tiers-20435.test.ts
Normal file
@@ -0,0 +1,70 @@
|
||||
import test from "node:test";
|
||||
import assert from "node:assert/strict";
|
||||
|
||||
import {
|
||||
enrichCatalogModelEntry,
|
||||
isAntigravityTierSuffixedModel,
|
||||
} from "../../src/lib/modelMetadataRegistry.ts";
|
||||
import { getThinkingCapabilityFields } from "../../src/app/api/v1/models/catalogHelpers.ts";
|
||||
|
||||
test("#20435 isAntigravityTierSuffixedModel matches only Antigravity tier-suffixed IDs", () => {
|
||||
assert.equal(isAntigravityTierSuffixedModel("antigravity", "gemini-3.8-flash-low"), true);
|
||||
assert.equal(isAntigravityTierSuffixedModel("antigravity", "gemini-3.8-flash-medium"), true);
|
||||
assert.equal(isAntigravityTierSuffixedModel("antigravity", "gemini-3.8-flash-high"), true);
|
||||
assert.equal(isAntigravityTierSuffixedModel("agy", "gemini-3.8-flash-high"), true);
|
||||
assert.equal(isAntigravityTierSuffixedModel(null, "antigravity/gemini-3.8-flash-medium"), true);
|
||||
|
||||
assert.equal(isAntigravityTierSuffixedModel("antigravity", "gemini-3.8-flash"), false);
|
||||
assert.equal(isAntigravityTierSuffixedModel("antigravity", "claude-opus-4-6-thinking"), false);
|
||||
assert.equal(isAntigravityTierSuffixedModel("openai", "gpt-5-high"), false);
|
||||
assert.equal(isAntigravityTierSuffixedModel("codex", "gpt-6.1-sol-high"), false);
|
||||
});
|
||||
|
||||
test("#20435 getThinkingCapabilityFields omits generic effort_tiers on Antigravity tier-suffixed models", () => {
|
||||
for (const provider of ["antigravity", "agy"]) {
|
||||
for (const tier of ["low", "medium", "high"]) {
|
||||
const modelId = `gemini-3.8-flash-${tier}`;
|
||||
const fields = getThinkingCapabilityFields(provider, modelId, true);
|
||||
assert.equal(fields.thinking, true, `${provider}/${modelId} should preserve thinking=true`);
|
||||
assert.equal(
|
||||
fields.supportsThinking,
|
||||
true,
|
||||
`${provider}/${modelId} should preserve supportsThinking=true`
|
||||
);
|
||||
assert.equal(
|
||||
"effort_tiers" in fields,
|
||||
false,
|
||||
`${provider}/${modelId} must not synthesize generic 6-tier effort_tiers`
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// Base non-tier Antigravity model still falls back when appropriate
|
||||
const baseFields = getThinkingCapabilityFields("antigravity", "gemini-3.8-flash", true);
|
||||
assert.equal(Array.isArray(baseFields.effort_tiers), true);
|
||||
|
||||
// Explicit declared tiers still win even on tier-suffixed IDs if a registry declares them
|
||||
const explicitFields = getThinkingCapabilityFields("antigravity", "gemini-3.8-flash-high", true, [
|
||||
"high",
|
||||
]);
|
||||
assert.deepEqual(explicitFields.effort_tiers, ["high"]);
|
||||
});
|
||||
|
||||
test("#20435 enrichCatalogModelEntry omits generic effort_tiers for Antigravity tier-suffixed models", () => {
|
||||
for (const provider of ["antigravity", "agy"]) {
|
||||
for (const tier of ["low", "medium", "high"]) {
|
||||
const id = `${provider}/gemini-3.8-flash-${tier}`;
|
||||
const enriched = enrichCatalogModelEntry({
|
||||
id,
|
||||
root: `gemini-3.8-flash-${tier}`,
|
||||
owned_by: provider,
|
||||
}) as { capabilities?: { effort_tiers?: string[] } };
|
||||
|
||||
assert.equal(
|
||||
enriched.capabilities?.effort_tiers,
|
||||
undefined,
|
||||
`${id} must not advertise synthetic generic effort_tiers`
|
||||
);
|
||||
}
|
||||
}
|
||||
});
|
||||
Reference in New Issue
Block a user