refactor: remove redundant model fallback conversions

This commit is contained in:
Peter Steinberger
2026-04-10 22:24:45 +01:00
parent 3d1b74bfc1
commit dcc3392a1a

View File

@@ -337,7 +337,7 @@ function resolveImageFallbackCandidates(params: {
const addRaw = (raw: string, opts?: { allowlist?: boolean }) => {
const resolved = resolveModelRefFromString({
raw: String(raw ?? ""),
raw,
defaultProvider: params.defaultProvider,
aliasIndex,
});
@@ -387,8 +387,8 @@ function resolveFallbackCandidates(params: {
: null;
const defaultProvider = primary?.provider ?? DEFAULT_PROVIDER;
const defaultModel = primary?.model ?? DEFAULT_MODEL;
const providerRaw = normalizeOptionalString(String(params.provider ?? "")) || defaultProvider;
const modelRaw = normalizeOptionalString(String(params.model ?? "")) || defaultModel;
const providerRaw = normalizeOptionalString(params.provider) || defaultProvider;
const modelRaw = normalizeOptionalString(params.model) || defaultModel;
const normalizedPrimary = normalizeModelRef(providerRaw, modelRaw);
const configuredPrimary = normalizeModelRef(defaultProvider, defaultModel);
const aliasIndex = buildModelAliasIndex({
@@ -415,7 +415,7 @@ function resolveFallbackCandidates(params: {
if (normalizedPrimary.provider !== configuredPrimary.provider) {
const isConfiguredFallback = configuredFallbacks.some((raw) => {
const resolved = resolveModelRefFromString({
raw: String(raw ?? ""),
raw,
defaultProvider,
aliasIndex,
});
@@ -429,7 +429,7 @@ function resolveFallbackCandidates(params: {
for (const raw of modelFallbacks) {
const resolved = resolveModelRefFromString({
raw: String(raw ?? ""),
raw,
defaultProvider,
aliasIndex,
});
@@ -456,7 +456,7 @@ const PROBE_STATE_TTL_MS = 24 * 60 * 60 * 1000;
const MAX_PROBE_KEYS = 256;
function resolveProbeThrottleKey(provider: string, agentDir?: string): string {
const scope = normalizeOptionalString(String(agentDir ?? "")) ?? "";
const scope = normalizeOptionalString(agentDir) ?? "";
return scope ? `${scope}${PROBE_SCOPE_DELIMITER}${provider}` : provider;
}