Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next…

…-Web
sunran · May 16, 2024 · 3189a7d · 3189a7d
2 parents 0fad77d + 1e00c89
commit 3189a7d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/app/constant.ts b/app/constant.ts
@@ -155,6 +155,7 @@ const openaiModels = [
 const googleModels = [
   "gemini-1.0-pro",
   "gemini-1.5-pro-latest",
+  "gemini-1.5-flash-latest",
   "gemini-pro-vision",
 ];
 

diff --git a/app/utils.ts b/app/utils.ts
@@ -290,17 +290,18 @@ export function getMessageImages(message: RequestMessage): 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 = [
     "vision",
     "claude-3",
     "gemini-1.5-pro",
-    "gpt-4-turbo",
-    "gpt-4o",
+    "gemini-1.5-flash",
   ];
-  const isGpt4TurboPreview = model === "gpt-4-turbo-preview";
+  const isGpt4Turbo =
+    model.includes("gpt-4-turbo") && !model.includes("preview");
 
   return (
-    visionKeywords.some((keyword) => model.includes(keyword)) &&
-    !isGpt4TurboPreview
+    visionKeywords.some((keyword) => model.includes(keyword)) || isGpt4Turbo
   );
 }