Merge remote-tracking branch 'upstream/main'

This commit is contained in:
DirkSchlossmacher 2024-05-16 08:30:02 +02:00
commit 5775876a2f
2 changed files with 7 additions and 4 deletions

View File

@ -156,6 +156,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

@ -290,17 +290,19 @@ export function getMessageImages(message: RequestMessage): string[] {
} }
export function isVisionModel(model: string) { export function isVisionModel(model: string) {
// Note: This is a better way using the TypeScript feature instead of `&&` or `||` (ts v5.5.0-dev.20240314 I've been using)
const visionKeywords = [ const visionKeywords = [
"vision", "vision",
"claude-3", "claude-3",
"gemini-1.5-pro", "gemini-1.5-pro",
"gpt-4-turbo", "gemini-1.5-flash",
"gpt-4o", "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
); );
} }