Merge branch 'main' of https://github.com/ChatGPTNextWeb/ChatGPT-Next-Web
This commit is contained in:
commit
42039c6aee
|
@ -165,6 +165,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",
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
11
app/utils.ts
11
app/utils.ts
|
@ -290,17 +290,18 @@ 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",
|
|
||||||
];
|
];
|
||||||
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
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue