Merge pull request #3229 from Sevenyine/staging Add new Google AI Studio model

59772bfd27d7704063f82055cd68d17bc1ec4d1c

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

Signed
Parents: 6286eb5827f48c51abde9aef021665d77eb63b73 a82c05a8acfd70d9d3526cd2a06d5c6a308e7f81
5 files changed, +6 -1Showing whitespace changes
public/index.html+1 -0
@@ -3045,6 +3045,7 @@
3045 <option value="gemini-1.0-ultra-latest">Gemini 1.0 Ultra</option>3045 <option value="gemini-1.0-ultra-latest">Gemini 1.0 Ultra</option>
3046 </optgroup>3046 </optgroup>
3047 <optgroup label="Subversions">3047 <optgroup label="Subversions">
3048 <option value="gemini-2.0-flash-thinking-exp-1219">Gemini 2.0 Flash Thinking Experimental</option>
3048 <option value="gemini-2.0-flash-exp">Gemini 2.0 Flash Experimental</option>3049 <option value="gemini-2.0-flash-exp">Gemini 2.0 Flash Experimental</option>
3049 <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>3050 <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>
3050 <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>3051 <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>
public/scripts/extensions/caption/settings.html+1 -0
@@ -54,6 +54,7 @@
54 <option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>54 <option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
55 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>55 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
56 <option data-type="google" value="gemini-2.0-flash-exp">gemini-2.0-flash-exp</option>56 <option data-type="google" value="gemini-2.0-flash-exp">gemini-2.0-flash-exp</option>
57 <option data-type="google" value="gemini-2.0-flash-thinking-exp-1219">gemini-2.0-flash-thinking-exp-1219</option>
57 <option data-type="google" value="gemini-1.5-flash">gemini-1.5-flash</option>58 <option data-type="google" value="gemini-1.5-flash">gemini-1.5-flash</option>
58 <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>59 <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
59 <option data-type="google" value="gemini-1.5-flash-001">gemini-1.5-flash-001</option>60 <option data-type="google" value="gemini-1.5-flash-001">gemini-1.5-flash-001</option>
public/scripts/openai.js+2 -1
@@ -4144,7 +4144,7 @@ async function onModelChange() {
4144 if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {4144 if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {
4145 if (oai_settings.max_context_unlocked) {4145 if (oai_settings.max_context_unlocked) {
4146 $('#openai_max_context').attr('max', max_2mil);4146 $('#openai_max_context').attr('max', max_2mil);
4147 } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121')) {4147 } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121') || value.includes('gemini-2.0-flash-thinking-exp-1219')) {
4148 $('#openai_max_context').attr('max', max_32k);4148 $('#openai_max_context').attr('max', max_32k);
4149 } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206')) {4149 } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206')) {
4150 $('#openai_max_context').attr('max', max_2mil);4150 $('#openai_max_context').attr('max', max_2mil);
@@ -4812,6 +4812,7 @@ export function isImageInliningSupported() {
4812 // gultra just isn't being offered as multimodal, thanks google.4812 // gultra just isn't being offered as multimodal, thanks google.
4813 const visionSupportedModels = [4813 const visionSupportedModels = [
4814 'gpt-4-vision',4814 'gpt-4-vision',
4815 'gemini-2.0-flash-thinking-exp-1219',
4815 'gemini-2.0-flash-exp',4816 'gemini-2.0-flash-exp',
4816 'gemini-1.5-flash',4817 'gemini-1.5-flash',
4817 'gemini-1.5-flash-latest',4818 'gemini-1.5-flash-latest',
src/endpoints/backends/chat-completions.js+1 -0
@@ -294,6 +294,7 @@ async function sendMakerSuiteRequest(request, response) {
294 }294 }
295295
296 const should_use_system_prompt = (296 const should_use_system_prompt = (
297 model.includes('gemini-2.0-flash-thinking-exp') ||
297 model.includes('gemini-2.0-flash-exp') ||298 model.includes('gemini-2.0-flash-exp') ||
298 model.includes('gemini-1.5-flash') ||299 model.includes('gemini-1.5-flash') ||
299 model.includes('gemini-1.5-pro') ||300 model.includes('gemini-1.5-pro') ||
src/prompt-converters.js+1 -0
@@ -360,6 +360,7 @@ export function convertCohereMessages(messages, names) {
360 */360 */
361export function convertGooglePrompt(messages, model, useSysPrompt, names) {361export function convertGooglePrompt(messages, model, useSysPrompt, names) {
362 const visionSupportedModels = [362 const visionSupportedModels = [
363 'gemini-2.0-flash-thinking-exp-1219',
363 'gemini-2.0-flash-exp',364 'gemini-2.0-flash-exp',
364 'gemini-1.5-flash',365 'gemini-1.5-flash',
365 'gemini-1.5-flash-latest',366 'gemini-1.5-flash-latest',