From 264d77414a7ac6018e2ccd549d0d6f01b98eb1c4 Mon Sep 17 00:00:00 2001 From: Cohee <18619528+Cohee1207@users.noreply.github.com> Date: Tue, 25 Mar 2025 21:21:23 +0200 Subject: [PATCH] Gemini 2.5 Pro --- public/index.html | 1 + public/scripts/extensions/caption/settings.html | 1 + public/scripts/openai.js | 3 ++- src/endpoints/backends/chat-completions.js | 4 ++++ src/prompt-converters.js | 1 + 5 files changed, 9 insertions(+), 1 deletion(-) diff --git a/public/index.html b/public/index.html index 2ff69d842..12ae48143 100644 --- a/public/index.html +++ b/public/index.html @@ -3141,6 +3141,7 @@ + diff --git a/public/scripts/extensions/caption/settings.html b/public/scripts/extensions/caption/settings.html index 457ac13b5..52240e71b 100644 --- a/public/scripts/extensions/caption/settings.html +++ b/public/scripts/extensions/caption/settings.html @@ -65,6 +65,7 @@ + diff --git a/public/scripts/openai.js b/public/scripts/openai.js index 695db39a0..69b24b66d 100644 --- a/public/scripts/openai.js +++ b/public/scripts/openai.js @@ -4352,7 +4352,7 @@ async function onModelChange() { $('#openai_max_context').attr('max', max_32k); } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206') || value.includes('gemini-2.0-pro')) { $('#openai_max_context').attr('max', max_2mil); - } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash')) { + } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash') || value.includes('gemini-2.5-pro-exp-03-25')) { $('#openai_max_context').attr('max', max_1mil); } else if (value.includes('gemini-1.0-pro') || value === 'gemini-pro') { $('#openai_max_context').attr('max', max_32k); @@ -5023,6 +5023,7 @@ export function isImageInliningSupported() { // gultra just isn't being offered as multimodal, thanks google. const visionSupportedModels = [ 'gpt-4-vision', + 'gemini-2.5-pro-exp-03-25', 'gemini-2.0-pro-exp', 'gemini-2.0-pro-exp-02-05', 'gemini-2.0-flash-lite-preview', diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js index a39dcbe2f..9c5512ae7 100644 --- a/src/endpoints/backends/chat-completions.js +++ b/src/endpoints/backends/chat-completions.js @@ -364,6 +364,7 @@ async function sendMakerSuiteRequest(request, response) { } const useSystemPrompt = !useMultiModal && ( + model.includes('gemini-2.5-pro') || model.includes('gemini-2.0-pro') || model.includes('gemini-2.0-flash') || model.includes('gemini-2.0-flash-thinking-exp') || @@ -400,6 +401,9 @@ async function sendMakerSuiteRequest(request, response) { if (tool.function.parameters?.$schema) { delete tool.function.parameters.$schema; } + if (tool.function.parameters?.properties && Object.keys(tool.function.parameters.properties).length === 0) { + delete tool.function.parameters; + } functionDeclarations.push(tool.function); } } diff --git a/src/prompt-converters.js b/src/prompt-converters.js index 1ea8a6ffa..1ecfd91f6 100644 --- a/src/prompt-converters.js +++ b/src/prompt-converters.js @@ -360,6 +360,7 @@ export function convertCohereMessages(messages, names) { */ export function convertGooglePrompt(messages, model, useSysPrompt, names) { const visionSupportedModels = [ + 'gemini-2.5-pro-exp', 'gemini-2.0-pro-exp', 'gemini-2.0-pro-exp-02-05', 'gemini-2.0-flash-lite-preview',