From 073b76a6939a85c6d643f9da13b7a90d637958f5 Mon Sep 17 00:00:00 2001 From: M0cho <77959408+M0ch0@users.noreply.github.com> Date: Sat, 7 Dec 2024 02:19:15 +0900 Subject: [PATCH] Support Gemini-exp-1206 --- public/index.html | 1 + public/scripts/extensions/caption/settings.html | 1 + public/scripts/openai.js | 2 +- src/endpoints/backends/chat-completions.js | 2 +- src/prompt-converters.js | 1 + 5 files changed, 5 insertions(+), 2 deletions(-) diff --git a/public/index.html b/public/index.html index d8296c1fb..b6ae3eb29 100644 --- a/public/index.html +++ b/public/index.html @@ -2987,6 +2987,7 @@ + diff --git a/public/scripts/extensions/caption/settings.html b/public/scripts/extensions/caption/settings.html index eee8894d4..79692d54a 100644 --- a/public/scripts/extensions/caption/settings.html +++ b/public/scripts/extensions/caption/settings.html @@ -62,6 +62,7 @@ + diff --git a/public/scripts/openai.js b/public/scripts/openai.js index 1f5b4d8f9..332c4e1ed 100644 --- a/public/scripts/openai.js +++ b/public/scripts/openai.js @@ -4077,7 +4077,7 @@ async function onModelChange() { $('#openai_max_context').attr('max', max_2mil); } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121')) { $('#openai_max_context').attr('max', max_32k); - } else if (value.includes('gemini-1.5-pro')) { + } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206')) { $('#openai_max_context').attr('max', max_2mil); } else if (value.includes('gemini-1.5-flash')) { $('#openai_max_context').attr('max', max_1mil); diff --git a/src/endpoints/backends/chat-completions.js b/src/endpoints/backends/chat-completions.js index aa15c7278..cbae42f3d 100644 --- a/src/endpoints/backends/chat-completions.js +++ b/src/endpoints/backends/chat-completions.js @@ -280,7 +280,7 @@ async function sendMakerSuiteRequest(request, response) { delete generationConfig.stopSequences; } - const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro') || model.includes('gemini-exp-1114') || model.includes('gemini-exp-1121')) && request.body.use_makersuite_sysprompt; + const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro') || model.startsWith("gemini-exp")) && request.body.use_makersuite_sysprompt; const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name); let body = { contents: prompt.contents, diff --git a/src/prompt-converters.js b/src/prompt-converters.js index 79db3965c..3f052c8c5 100644 --- a/src/prompt-converters.js +++ b/src/prompt-converters.js @@ -347,6 +347,7 @@ export function convertGooglePrompt(messages, model, useSysPrompt = false, charN 'gemini-1.5-flash-8b-exp-0924', 'gemini-exp-1114', 'gemini-exp-1121', + 'gemini-exp-1206', 'gemini-1.5-pro', 'gemini-1.5-pro-latest', 'gemini-1.5-pro-001',