Remove dead Gemini 1.5 models, and clean up (#4636) * Remove dead Gemini 1.5 models, and clean up * Remove dead models (error 404): Gemini 1.5, `gemini-2.5-pro-exp-03-25`, `gemini-2.5-flash-preview-04-17` * Adjust the Gemini → descriptions * Assign default models to 2.5 Pro and Sonnet 4.5 (3.5 and 3.7 will be retiring soon) * Add `gemini-2.5-flash-image` * Don't forget learnlm-1.5-pro * Update default claude * Vertex: Clean-up 2.5 preview models * Disable thinking for 2.5-flash-image * Bring back banana preview * Update defaults in more places * Add gemini preview-09-2025 and robotics-er * unbrick my last commit * Add gemini-robotics-er to captions * Set max context for gemini-robotics-er dang --------- Co-authored-by: Cohee <18619528+Cohee1207@users.noreply.github.com>

bc40d93b49d81594043c4ed23797162aedee89c4

cloak1505 <170299980+cloak1505@users.noreply.github.com>

Signed
Parents: 5fd64bef2e0f85e7fc1986c5e4469d584bda4589
6 files changed, +42 -92Ignore whitespace
default/content/presets/openai/Default.json+3 -3
@@ -1,7 +1,7 @@
11{
22 "chat_completion_source": "openai",
33 "openai_model": "gpt-4-turbo",
44 "claude_model": "claude-3-5-sonnet-202406204-5",
55 "openrouter_model": "OR_Website",
66 "openrouter_use_fallback": false,
77 "openrouter_group_models": false,
@@ -16,8 +16,8 @@
1616 "custom_include_body": "",
1717 "custom_exclude_body": "",
1818 "custom_include_headers": "",
1919 "google_model": "gemini-2.5-pro",
2020 "vertexai_model": "gemini-2.0-flash5-001pro",
2121 "temperature": 1,
2222 "frequency_penalty": 0,
2323 "presence_penalty": 0,
default/content/settings.json+1 -1
@@ -620,7 +620,7 @@
620620 },
621621 "wi_format": "{0}",
622622 "openai_model": "gpt-4-turbo",
623623 "claude_model": "claude-3-5-sonnet-202406204-5",
624624 "ai21_model": "jamba-large",
625625 "openrouter_model": "OR_Website",
626626 "reverse_proxy": "",
public/index.html+13 -30
@@ -3156,46 +3156,32 @@
31563156 <option value="gemini-2.5-pro-preview-06-05">gemini-2.5-pro-preview-06-05</option>
31573157 <option value="gemini-2.5-pro-preview-05-06">gemini-2.5-pro-preview-05-06</option>
31583158 <option value="gemini-2.5-pro-preview-03-25">gemini-2.5-pro-preview-03-25</option>
3159- <option value="gemini-2.5-pro-exp-03-25">gemini-2.5-pro-exp-03-25</option>
31603159 <option value="gemini-2.5-flash">gemini-2.5-flash</option>
3160+ <option value="gemini-2.5-flash-preview-09-2025">gemini-2.5-flash-preview-09-2025</option>
31613161 <option value="gemini-2.5-flash-preview-05-20">gemini-2.5-flash-preview-05-20</option>
3162- <option value="gemini-2.5-flash-preview-04-17">gemini-2.5-flash-preview-04-17</option>
31633162 <option value="gemini-2.5-flash-lite">gemini-2.5-flash-lite</option>
3163+ <option value="gemini-2.5-flash-lite-preview-09-2025">gemini-2.5-flash-lite-preview-09-2025</option>
31643164 <option value="gemini-2.5-flash-lite-preview-06-17">gemini-2.5-flash-lite-preview-06-17</option>
3165+ <option value="gemini-2.5-flash-image">gemini-2.5-flash-image</option>
31653166 <option value="gemini-2.5-flash-image-preview">gemini-2.5-flash-image-preview</option>
31663167 </optgroup>
31673168 <optgroup label="Gemini 2.0">
31683169 <option value="gemini-2.0-pro-exp-02-05">gemini-2.0-pro-exp-02-05 → 2.5-pro-exp-03-25</option>
31693170 <option value="gemini-2.0-pro-exp">gemini-2.0-pro-exp → 2.5-pro-exp-03-25</option>
31703171 <option value="gemini-exp-1206">gemini-exp-1206 → 2.5-pro-exp-03-25</option>
31713172 <option value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
31723173 <option value="gemini-2.0-flash-exp-image-generation">gemini-2.0-flash-exp-image-generation</option>
31733174 <option value="gemini-2.0-flash-preview-image-generation">gemini-2.0-flash-preview-image-generation</option>
31743175 <option value="gemini-2.0-flash-exp">gemini-2.0-flash-exp</option>
31753176 <option value="gemini-2.0-flash">gemini-2.0-flash</option>
31763177 <option value="gemini-2.0-flash-thinking-exp-01-21">gemini-2.0-flash-thinking-exp-01-21 → 2.5-flash-preview-0405-1720</option>
31773178 <option value="gemini-2.0-flash-thinking-exp-1219">gemini-2.0-flash-thinking-exp-1219 → 2.5-flash-preview-0405-1720</option>
31783179 <option value="gemini-2.0-flash-thinking-exp">gemini-2.0-flash-thinking-exp → 2.5-flash-preview-0405-1720</option>
31793180 <option value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001</option>
31803181 <option value="gemini-2.0-flash-lite-preview-02-05">gemini-2.0-flash-lite-preview-02-05</option>
31813182 <option value="gemini-2.0-flash-lite-preview">gemini-2.0-flash-lite-preview</option>
31823183 <option value="gemini-2.0-flash-lite">gemini-2.0-flash-lite</option>
31833184 </optgroup>
3184- <optgroup label="Gemini 1.5">
3185- <option value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
3186- <option value="gemini-1.5-pro-002">gemini-1.5-pro-002</option>
3187- <option value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>
3188- <option value="gemini-1.5-pro">gemini-1.5-pro</option>
3189- <option value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
3190- <option value="gemini-1.5-flash-002">gemini-1.5-flash-002</option>
3191- <option value="gemini-1.5-flash-001">gemini-1.5-flash-001</option>
3192- <option value="gemini-1.5-flash">gemini-1.5-flash</option>
3193- <option value="gemini-1.5-flash-8b-latest">gemini-1.5-flash-8b-latest</option>
3194- <option value="gemini-1.5-flash-8b-001">gemini-1.5-flash-8b-001</option>
3195- <option value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>
3196- <option value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option>
3197- <option value="gemini-1.5-flash-8b">gemini-1.5-flash-8b</option>
3198- </optgroup>
31993185 <optgroup label="Gemma">
32003186 <option value="gemma-3n-e4b-it">gemma-3n-e4b-it</option>
32013187 <option value="gemma-3n-e2b-it">gemma-3n-e2b-it</option>
@@ -3207,6 +3193,9 @@
32073193 <optgroup label="LearnLM">
32083194 <option value="learnlm-2.0-flash-experimental">learnlm-2.0-flash-experimental</option>
32093195 </optgroup>
3196+ <optgroup label="Robotics-ER">
3197+ <option value="gemini-robotics-er-1.5-preview">gemini-robotics-er-1.5-preview</option>
3198+ </optgroup>
32103199 <optgroup id="google_other_models" label="Other"></optgroup>
32113200 </select>
32123201 </div>
@@ -3332,15 +3321,9 @@
33323321 <!-- data-mode="full" is for models that require a service account -->
33333322 <optgroup label="Gemini 2.5">
33343323 <option value="gemini-2.5-pro">gemini-2.5-pro</option>
3335- <option value="gemini-2.5-pro-preview-06-05">gemini-2.5-pro-preview-06-05</option>
3336- <option value="gemini-2.5-pro-preview-05-06">gemini-2.5-pro-preview-05-06</option>
3337- <option value="gemini-2.5-pro-preview-03-25">gemini-2.5-pro-preview-03-25</option>
3338- <option value="gemini-2.5-pro-exp-03-25" data-mode="full">gemini-2.5-pro-exp-03-25</option>
33393324 <option value="gemini-2.5-flash">gemini-2.5-flash</option>
3340- <option value="gemini-2.5-flash-preview-05-20">gemini-2.5-flash-preview-05-20</option>
3341- <option value="gemini-2.5-flash-preview-04-17">gemini-2.5-flash-preview-04-17</option>
33423325 <option value="gemini-2.5-flash-lite">gemini-2.5-flash-lite</option>
33433326 <option value="gemini-2.5-flash-lite-preview-06-17image">gemini-2.5-flash-lite-preview-06-17image</option>
33443327 <option value="gemini-2.5-flash-image-preview">gemini-2.5-flash-image-preview</option>
33453328 </optgroup>
33463329 <optgroup label="Gemini 2.0">
public/scripts/extensions/caption/settings.html+11 -27
@@ -101,49 +101,33 @@
101101 <option data-type="google" value="gemini-2.5-pro-preview-06-05">gemini-2.5-pro-preview-06-05</option>
102102 <option data-type="google" value="gemini-2.5-pro-preview-05-06">gemini-2.5-pro-preview-05-06</option>
103103 <option data-type="google" value="gemini-2.5-pro-preview-03-25">gemini-2.5-pro-preview-03-25</option>
104- <option data-type="google" value="gemini-2.5-pro-exp-03-25">gemini-2.5-pro-exp-03-25</option>
105104 <option data-type="google" value="gemini-2.5-flash">gemini-2.5-flash</option>
105+ <option data-type="google" value="gemini-2.5-flash-preview-09-2025">gemini-2.5-flash-preview-09-2025</option>
106106 <option data-type="google" value="gemini-2.5-flash-preview-05-20">gemini-2.5-flash-preview-05-20</option>
107- <option data-type="google" value="gemini-2.5-flash-preview-04-17">gemini-2.5-flash-preview-04-17</option>
108107 <option data-type="google" value="gemini-2.5-flash-lite">gemini-2.5-flash-lite</option>
108+ <option data-type="google" value="gemini-2.5-flash-lite-preview-09-2025">gemini-2.5-flash-lite-preview-09-2025</option>
109109 <option data-type="google" value="gemini-2.5-flash-lite-preview-06-17">gemini-2.5-flash-lite-preview-06-17</option>
110+ <option data-type="google" value="gemini-2.5-flash-image">gemini-2.5-flash-image</option>
110111 <option data-type="google" value="gemini-2.5-flash-image-preview">gemini-2.5-flash-image-preview</option>
111112 <option data-type="google" value="gemini-2.0-pro-exp-02-05">gemini-2.0-pro-exp-02-05 → 2.5-pro-exp-03-25</option>
112113 <option data-type="google" value="gemini-2.0-pro-exp">gemini-2.0-pro-exp → 2.5-pro-exp-03-25</option>
113114 <option data-type="google" value="gemini-exp-1206">gemini-exp-1206 → 2.5-pro-exp-03-25</option>
114115 <option data-type="google" value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
115116 <option data-type="google" value="gemini-2.0-flash-exp-image-generation">gemini-2.0-flash-exp-image-generation</option>
116117 <option data-type="google" value="gemini-2.0-flash-exp">gemini-2.0-flash-exp</option>
117118 <option data-type="google" value="gemini-2.0-flash">gemini-2.0-flash</option>
118119 <option data-type="google" value="gemini-2.0-flash-thinking-exp-01-21">gemini-2.0-flash-thinking-exp-01-21 → 2.5-flash-preview-045-1720</option>
119120 <option data-type="google" value="gemini-2.0-flash-thinking-exp-1219">gemini-2.0-flash-thinking-exp-1219 → 2.5-flash-preview-0405-1720</option>
120121 <option data-type="google" value="gemini-2.0-flash-thinking-exp">gemini-2.0-flash-thinking-exp → 2.5-flash-preview-0405-1720</option>
121122 <option data-type="google" value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001</option>
122123 <option data-type="google" value="gemini-2.0-flash-lite-preview-02-05">gemini-2.0-flash-lite-preview-02-05</option>
123124 <option data-type="google" value="gemini-2.0-flash-lite-preview">gemini-2.0-flash-lite-preview</option>
124- <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
125- <option data-type="google" value="gemini-1.5-pro-002">gemini-1.5-pro-002</option>
126- <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>
127- <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>
128- <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
129- <option data-type="google" value="gemini-1.5-flash-002">gemini-1.5-flash-002</option>
130- <option data-type="google" value="gemini-1.5-flash-001">gemini-1.5-flash-001</option>
131- <option data-type="google" value="gemini-1.5-flash">gemini-1.5-flash</option>
132- <option data-type="google" value="gemini-1.5-flash-8b-latest">gemini-1.5-flash-8b-latest</option>
133- <option data-type="google" value="gemini-1.5-flash-8b-001">gemini-1.5-flash-8b-001</option>
134- <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>
135- <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option>
136125 <option data-type="google" value="learnlm-2.0-flash-experimental">learnlm-2.0-flash-experimental</option>
137126 <option data-type="google" value="learnlmgemini-robotics-er-1.5-pro-experimentalpreview">learnlmgemini-robotics-er-1.5-pro-experimentalpreview</option>
138127 <option data-type="vertexai" value="gemini-2.5-pro">gemini-2.5-pro</option>
139- <option data-type="vertexai" value="gemini-2.5-pro-preview-06-05">gemini-2.5-pro-preview-06-05</option>
140- <option data-type="vertexai" value="gemini-2.5-pro-preview-05-06">gemini-2.5-pro-preview-05-06</option>
141- <option data-type="vertexai" value="gemini-2.5-pro-preview-03-25">gemini-2.5-pro-preview-03-25</option>
142128 <option data-type="vertexai" value="gemini-2.5-flash">gemini-2.5-flash</option>
143- <option data-type="vertexai" value="gemini-2.5-flash-preview-05-20">gemini-2.5-flash-preview-05-20</option>
144- <option data-type="vertexai" value="gemini-2.5-flash-preview-04-17">gemini-2.5-flash-preview-04-17</option>
145129 <option data-type="vertexai" value="gemini-2.5-flash-lite">gemini-2.5-flash-lite</option>
146130 <option data-type="vertexai" value="gemini-2.5-flash-lite-preview-06-17image">gemini-2.5-flash-lite-preview-06-17image</option>
147131 <option data-type="vertexai" value="gemini-2.5-flash-image-preview">gemini-2.5-flash-image-preview</option>
148132 <option data-type="vertexai" value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
149133 <option data-type="vertexai" value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001</option>
public/scripts/openai.js+10 -12
@@ -372,9 +372,9 @@ const default_settings = {
372372 scenario_format: default_scenario_format,
373373 personality_format: default_personality_format,
374374 openai_model: 'gpt-4-turbo',
375375 claude_model: 'claude-3-5-sonnet-202406204-5',
376376 google_model: 'gemini-12.5-pro',
377377 vertexai_model: 'gemini-2.0-flash5-001pro',
378378 ai21_model: 'jamba-large',
379379 mistralai_model: 'mistral-large-latest',
380380 cohere_model: 'command-r-plus',
@@ -468,9 +468,9 @@ const oai_settings = {
468468 scenario_format: default_scenario_format,
469469 personality_format: default_personality_format,
470470 openai_model: 'gpt-4-turbo',
471471 claude_model: 'claude-3-5-sonnet-202406204-5',
472472 google_model: 'gemini-12.5-pro',
473473 vertexai_model: 'gemini-2.0-flash5-001pro',
474474 ai21_model: 'jamba-large',
475475 mistralai_model: 'mistral-large-latest',
476476 cohere_model: 'command-r-plus',
@@ -4981,17 +4981,15 @@ async function onModelChange() {
49814981 if ([chat_completion_sources.MAKERSUITE, chat_completion_sources.VERTEXAI].includes(oai_settings.chat_completion_source)) {
49824982 if (oai_settings.max_context_unlocked) {
49834983 $('#openai_max_context').attr('max', max_2mil);
49844984 } else if (value.includes('gemini-12.5-proflash-image')) {
4985- $('#openai_max_context').attr('max', max_2mil);
4986- } else if (value.includes('gemini-2.5-flash-image-preview')) {
49874985 $('#openai_max_context').attr('max', max_32k);
49884986 } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash') || value.includes('gemini-2.0-pro') || value.includes('gemini-exp') || value.includes('gemini-2.5-flash') || value.includes('gemini-2.5-pro') || value.includes('learnlm-2.0-flash') || value.includes('gemini-robotics')) {
49894987 $('#openai_max_context').attr('max', max_1mil);
49904988 } else if (value.includes('gemma-3-27b-it')) {
49914989 $('#openai_max_context').attr('max', max_128k);
49924990 } else if (value.includes('gemma-3n-e4b-it')) {
49934991 $('#openai_max_context').attr('max', max_8k);
49944992 } else if (value.includes('gemma-3') || value.includes('learnlm-1.5-pro-experimental')) {
49954993 $('#openai_max_context').attr('max', max_32k);
49964994 } else {
49974995 $('#openai_max_context').attr('max', max_32k);
@@ -5754,11 +5752,11 @@ export function isImageInliningSupported() {
57545752 'c4ai-aya-vision',
57555753 'command-a-vision',
57565754 // Google AI Studio
5757- 'gemini-1.5',
57585755 'gemini-2.0',
57595756 'gemini-2.5',
57605757 'gemini-exp-1206',
57615758 'learnlm',
5759+ 'gemini-robotics',
57625760 // MistralAI
57635761 'mistral-small-2503',
57645762 'mistral-small-2506',
src/endpoints/backends/chat-completions.js+4 -19
@@ -377,24 +377,16 @@ async function sendMakerSuiteRequest(request, response) {
377377 'gemini-2.0-flash-exp-image-generation',
378378 'gemini-2.0-flash-preview-image-generation',
379379 'gemini-2.5-flash-image-preview',
380+ 'gemini-2.5-flash-image',
380381 ];
381382
382- // These models do not support setting the threshold to OFF at all.
383+ const isThinkingConfigModel = m => /^gemini-2.5-(flash|pro)/.test(m) && !/-image(-preview)?$/.test(m);
383- const blockNoneModels = [
384- 'gemini-1.5-pro-001',
385- 'gemini-1.5-flash-001',
386- 'gemini-1.5-flash-8b-exp-0827',
387- 'gemini-1.5-flash-8b-exp-0924',
388- ];
389-
390- const isThinkingConfigModel = m => /^gemini-2.5-(flash|pro)/.test(m) && !/-image-preview$/.test(m);
391384
392385 const noSearchModels = [
393386 'gemini-2.0-flash-lite',
394387 'gemini-2.0-flash-lite-001',
395388 'gemini-2.0-flash-lite-preview-02-05',
396389 'gemini-robotics-er-1.5-flash-8b-exp-0924preview',
397- 'gemini-1.5-flash-8b-exp-0827',
398390 ];
399391 // #endregion
400392
@@ -413,15 +405,8 @@ async function sendMakerSuiteRequest(request, response) {
413405 const prompt = convertGooglePrompt(request.body.messages, model, useSystemPrompt, getPromptNames(request));
414406 let safetySettings = GEMINI_SAFETY;
415407
416- if (blockNoneModels.includes(model)) {
417- safetySettings = GEMINI_SAFETY.map(setting => ({ ...setting, threshold: 'BLOCK_NONE' }));
418- }
419-
420408 if (enableWebSearch && !enableImageModality && !isGemma && !isLearnLM && !noSearchModels.includes(model)) {
421- const searchTool = model.includes('1.5')
409+ tools.push({ google_search: {} });
422- ? ({ google_search_retrieval: {} })
423- : ({ google_search: {} });
424- tools.push(searchTool);
425410 }
426411
427412 if (Array.isArray(request.body.tools) && request.body.tools.length > 0 && !enableImageModality && !isGemma) {