mirror of
https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web.git
synced 2025-10-08 19:16:37 +08:00
Merge remote-tracking branch 'upstream/main'
This commit is contained in:
commit
5775876a2f
@ -156,6 +156,7 @@ const openaiModels = [
|
||||
const googleModels = [
|
||||
// "gemini-1.0-pro",
|
||||
// "gemini-1.5-pro-latest",
|
||||
"gemini-1.5-flash-latest",
|
||||
"gemini-pro-vision",
|
||||
];
|
||||
|
||||
|
10
app/utils.ts
10
app/utils.ts
@ -290,17 +290,19 @@ 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",
|
||||
"gemini-1.5-flash",
|
||||
"gpt-4o",
|
||||
];
|
||||
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
|
||||
);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user