Merge pull request #3153 from M0ch0/staging Support Gemini-exp-1206

c78cb3b4637ff73e2c24f35ba954ee8dd170a2b2

Cohee <18619528+Cohee1207@users.noreply.github.com>

Signed
Parents: 9c43999e4b3975455e4c73132412baf7df705eed 073b76a6939a85c6d643f9da13b7a90d637958f5
5 files changed, +5 -2Ignore whitespace
public/index.html+1 -0
@@ -2987,6 +2987,7 @@
2987 <optgroup label="Subversions">2987 <optgroup label="Subversions">
2988 <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>2988 <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>
2989 <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>2989 <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>
2990 <option value="gemini-exp-1206">Gemini Experimental 2024-12-06</option>
2990 <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>2991 <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>
2991 <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>2992 <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>
2992 <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option>2993 <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option>
public/scripts/extensions/caption/settings.html+1 -0
@@ -62,6 +62,7 @@
62 <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>62 <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>
63 <option data-type="google" value="gemini-exp-1114">gemini-exp-1114</option>63 <option data-type="google" value="gemini-exp-1114">gemini-exp-1114</option>
64 <option data-type="google" value="gemini-exp-1121">gemini-exp-1121</option>64 <option data-type="google" value="gemini-exp-1121">gemini-exp-1121</option>
65 <option data-type="google" value="gemini-exp-1206">gemini-exp-1206</option>
65 <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>66 <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>
66 <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>67 <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
67 <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>68 <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>
public/scripts/openai.js+1 -1
@@ -4077,7 +4077,7 @@ async function onModelChange() {
4077 $('#openai_max_context').attr('max', max_2mil);4077 $('#openai_max_context').attr('max', max_2mil);
4078 } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121')) {4078 } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121')) {
4079 $('#openai_max_context').attr('max', max_32k);4079 $('#openai_max_context').attr('max', max_32k);
4080 } else if (value.includes('gemini-1.5-pro')) {4080 } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206')) {
4081 $('#openai_max_context').attr('max', max_2mil);4081 $('#openai_max_context').attr('max', max_2mil);
4082 } else if (value.includes('gemini-1.5-flash')) {4082 } else if (value.includes('gemini-1.5-flash')) {
4083 $('#openai_max_context').attr('max', max_1mil);4083 $('#openai_max_context').attr('max', max_1mil);
src/endpoints/backends/chat-completions.js+1 -1
@@ -280,7 +280,7 @@ async function sendMakerSuiteRequest(request, response) {
280 delete generationConfig.stopSequences;280 delete generationConfig.stopSequences;
281 }281 }
282282
283 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;283 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;
284 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);284 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
285 let body = {285 let body = {
286 contents: prompt.contents,286 contents: prompt.contents,
src/prompt-converters.js+1 -0
@@ -347,6 +347,7 @@ export function convertGooglePrompt(messages, model, useSysPrompt = false, charN
347 'gemini-1.5-flash-8b-exp-0924',347 'gemini-1.5-flash-8b-exp-0924',
348 'gemini-exp-1114',348 'gemini-exp-1114',
349 'gemini-exp-1121',349 'gemini-exp-1121',
350 'gemini-exp-1206',
350 'gemini-1.5-pro',351 'gemini-1.5-pro',
351 'gemini-1.5-pro-latest',352 'gemini-1.5-pro-latest',
352 'gemini-1.5-pro-001',353 'gemini-1.5-pro-001',