mirror of
https://github.com/openclaw/openclaw.git
synced 2026-03-31 03:41:51 +00:00
d1b0f8e8e2
The forward-compat resolver hardcoded 'google' as the provider ID for template lookup, so alias providers (google-vertex, google-gemini-cli) could not find matching templates. Pass the actual provider ID from the runtime context and add a templateProviderId fallback for cross-provider template resolution. Also fix flash-lite prefix ordering — check 'gemini-3.1-flash-lite' before 'gemini-3.1-flash' to prevent misclassification. Add regression tests for pro, flash, and flash-lite across provider aliases. Fixes #36111
82 lines
2.5 KiB
TypeScript
82 lines
2.5 KiB
TypeScript
import type {
|
|
ProviderResolveDynamicModelContext,
|
|
ProviderRuntimeModel,
|
|
} from "openclaw/plugin-sdk/plugin-entry";
|
|
import { cloneFirstTemplateModel } from "openclaw/plugin-sdk/provider-model-shared";
|
|
|
|
const GEMINI_3_1_PRO_PREFIX = "gemini-3.1-pro";
|
|
const GEMINI_3_1_FLASH_LITE_PREFIX = "gemini-3.1-flash-lite";
|
|
const GEMINI_3_1_FLASH_PREFIX = "gemini-3.1-flash";
|
|
const GEMINI_3_1_PRO_TEMPLATE_IDS = ["gemini-3-pro-preview"] as const;
|
|
const GEMINI_3_1_FLASH_LITE_TEMPLATE_IDS = [
|
|
"gemini-3.1-flash-lite-preview",
|
|
] as const;
|
|
const GEMINI_3_1_FLASH_TEMPLATE_IDS = ["gemini-3-flash-preview"] as const;
|
|
|
|
function cloneFirstGoogleTemplateModel(params: {
|
|
providerId: string;
|
|
templateProviderId?: string;
|
|
modelId: string;
|
|
templateIds: readonly string[];
|
|
ctx: ProviderResolveDynamicModelContext;
|
|
patch?: Partial<ProviderRuntimeModel>;
|
|
}): ProviderRuntimeModel | undefined {
|
|
const templateProviderIds = [
|
|
params.providerId,
|
|
params.templateProviderId,
|
|
]
|
|
.map((providerId) => providerId?.trim())
|
|
.filter((providerId): providerId is string => Boolean(providerId));
|
|
|
|
for (const templateProviderId of new Set(templateProviderIds)) {
|
|
const model = cloneFirstTemplateModel({
|
|
providerId: templateProviderId,
|
|
modelId: params.modelId,
|
|
templateIds: params.templateIds,
|
|
ctx: params.ctx,
|
|
patch: {
|
|
...params.patch,
|
|
provider: params.providerId,
|
|
},
|
|
});
|
|
if (model) {
|
|
return model;
|
|
}
|
|
}
|
|
|
|
return undefined;
|
|
}
|
|
|
|
export function resolveGoogle31ForwardCompatModel(params: {
|
|
providerId: string;
|
|
templateProviderId?: string;
|
|
ctx: ProviderResolveDynamicModelContext;
|
|
}): ProviderRuntimeModel | undefined {
|
|
const trimmed = params.ctx.modelId.trim();
|
|
const lower = trimmed.toLowerCase();
|
|
|
|
let templateIds: readonly string[];
|
|
if (lower.startsWith(GEMINI_3_1_PRO_PREFIX)) {
|
|
templateIds = GEMINI_3_1_PRO_TEMPLATE_IDS;
|
|
} else if (lower.startsWith(GEMINI_3_1_FLASH_LITE_PREFIX)) {
|
|
templateIds = GEMINI_3_1_FLASH_LITE_TEMPLATE_IDS;
|
|
} else if (lower.startsWith(GEMINI_3_1_FLASH_PREFIX)) {
|
|
templateIds = GEMINI_3_1_FLASH_TEMPLATE_IDS;
|
|
} else {
|
|
return undefined;
|
|
}
|
|
|
|
return cloneFirstGoogleTemplateModel({
|
|
providerId: params.providerId,
|
|
templateProviderId: params.templateProviderId,
|
|
modelId: trimmed,
|
|
templateIds,
|
|
ctx: params.ctx,
|
|
patch: { reasoning: true },
|
|
});
|
|
}
|
|
|
|
export function isModernGoogleModel(modelId: string): boolean {
|
|
return modelId.trim().toLowerCase().startsWith("gemini-3");
|
|
}
|