Merge remote-tracking branch 'upstream/main' into dev

This commit is contained in:
sijinhui 2024-05-15 23:17:04 +08:00
commit d4c43acd9f
2 changed files with 5 additions and 5 deletions

View File

@ -161,6 +161,7 @@ const openaiModels = [
const googleModels = [ const googleModels = [
"gemini-1.0-pro", "gemini-1.0-pro",
"gemini-1.5-pro-latest", "gemini-1.5-pro-latest",
"gemini-1.5-flash-latest",
"gemini-pro-vision", "gemini-pro-vision",
]; ];

View File

@ -296,13 +296,12 @@ export function isVisionModel(model: string) {
"vision", "vision",
"claude-3", "claude-3",
"gemini-1.5-pro", "gemini-1.5-pro",
"gpt-4-turbo", "gemini-1.5-flash",
"gpt-4o",
]; ];
const isGpt4TurboPreview = model === "gpt-4-turbo-preview"; const isGpt4Turbo =
model.includes("gpt-4-turbo") && !model.includes("preview");
return ( return (
visionKeywords.some((keyword) => model.includes(keyword)) && visionKeywords.some((keyword) => model.includes(keyword)) || isGpt4Turbo
!isGpt4TurboPreview
); );
} }