Prune Google models

28d42e520035567223fb985304d6585a87cc99ab

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

Parents: 37c97db96980f63357aeca393cfa0d1d553de7b0
4 files changed, +32 -76Ignore whitespace
public/index.html+22 -40
@@ -3146,49 +3146,31 @@
31463146 <div>
31473147 <h4 data-i18n="Google Model">Google Model</h4>
31483148 <select id="model_google_select">
31493149 <optgroup label="PrimaryGemini">
31503150 <option value="gemini-2.05-flashpro-preview-03-25">Gemini gemini-2.0 Flash5-pro-preview-03-25</option>
31513151 <option value="gemini-12.5-pro-exp-03-25">Gemini 1gemini-2.5 Pro-pro-exp-03-25</option>
31523152 <option value="gemini-12.5-flash-preview-04-17">Gemini 1gemini-2.5 Flash-flash-preview-04-17</option>
31533153 <option value="gemini-12.0-proflash-001">Gemini 1gemini-2.0 Pro (Deprecated)-flash-001</option>
31543154 <option value="gemini-pro2.0-flash-exp-image-generation">Gemini Pro (1gemini-2.0) (Deprecated)-flash-exp-image-generation</option>
31553155 <option value="gemini-ultra2.0-flash-lite-001">Gemini Ultra (1gemini-2.0)-flash-lite-001</option>
31563156 <option value="gemini-1.05-ultrapro-latest002">Gemini gemini-1.0 Ultra5-pro-002</option>
3157+ <option value="gemini-1.5-flash-001">gemini-1.5-flash-001</option>
3158+ <option value="gemini-1.5-flash-8b-001">gemini-1.5-flash-8b-001</option>
31573159 </optgroup>
3160+ <!-- When a model updates, add NEW version to ABOVE and move OLD to BELOW
3161+ <optgroup label="Previous">
3162+ <option value=""></option>
3163+ <optgroup> -->
3164+ <!-- Updates to Gemma and Preview groups will be handled differently -->
31583165 <optgroup label="Gemma">
31593166 <option value="gemma-3-27b-it">Gemma gemma-3 27B-27b-it</option>
3167+ <option value="gemma-3-12b-it">gemma-3-12b-it</option>
3168+ <option value="gemma-3-4b-it">gemma-3-4b-it</option>
3169+ <option value="gemma-3-1b-it">gemma-3-1b-it</option>
31603170 </optgroup>
31613171 <optgroup label="SubversionsPreview">
31623172 <option value="geminilearnlm-2.5-pro-preview0-03flash-25experimental">Gemini learnlm-2.5 Pro Preview 20250-03flash-25experimental</option>
31633173 <option value="geminilearnlm-21.5-pro-exp-03-25experimental">Gemini 2learnlm-1.5 Pro Experimental 2025-03pro-25experimental</option>
3164- <option value="gemini-2.0-pro-exp">Gemini 2.0 Pro Experimental</option>
3165- <option value="gemini-2.0-pro-exp-02-05">Gemini 2.0 Pro Experimental 2025-02-05</option>
3166- <option value="gemini-2.5-flash-preview-04-17">Gemini 2.5 Flash Preview 2025-04-17</option>
3167- <option value="gemini-2.0-flash-lite-preview">Gemini 2.0 Flash-Lite Preview</option>
3168- <option value="gemini-2.0-flash-lite-preview-02-05">Gemini 2.0 Flash-Lite Preview 2025-02-05</option>
3169- <option value="gemini-2.0-flash-001">Gemini 2.0 Flash [001]</option>
3170- <option value="gemini-2.0-flash-thinking-exp">Gemini 2.0 Flash Thinking Experimental</option>
3171- <option value="gemini-2.0-flash-thinking-exp-01-21">Gemini 2.0 Flash Thinking Experimental 2025-01-21</option>
3172- <option value="gemini-2.0-flash-thinking-exp-1219">Gemini 2.0 Flash Thinking Experimental 2024-12-19</option>
3173- <option value="gemini-2.0-flash-exp">Gemini 2.0 Flash Experimental</option>
3174- <option value="gemini-2.0-flash-exp-image-generation">Gemini 2.0 Flash (Image Generation) Experimental</option>
3175- <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>
3176- <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>
3177- <option value="gemini-exp-1206">Gemini Experimental 2024-12-06</option>
3178- <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experimental 2024-08-01</option>
3179- <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experimental 2024-08-27</option>
3180- <option value="gemini-1.5-pro-latest">Gemini 1.5 Pro [latest]</option>
3181- <option value="gemini-1.5-pro-001">Gemini 1.5 Pro [001]</option>
3182- <option value="gemini-1.5-pro-002">Gemini 1.5 Pro [002]</option>
3183- <option value="gemini-1.5-flash-8b">Gemini 1.5 Flash 8B</option>
3184- <option value="gemini-1.5-flash-exp-0827">Gemini 1.5 Flash Experimental 2024-08-27</option>
3185- <option value="gemini-1.5-flash-8b-exp-0827">Gemini 1.5 Flash 8B Experimental 2024-08-27</option>
3186- <option value="gemini-1.5-flash-8b-exp-0924">Gemini 1.5 Flash 8B Experimental 2024-09-24</option>
3187- <option value="gemini-1.5-flash-latest">Gemini 1.5 Flash [latest]</option>
3188- <option value="gemini-1.5-flash-001">Gemini 1.5 Flash [001]</option>
3189- <option value="gemini-1.5-flash-002">Gemini 1.5 Flash [002]</option>
3190- <option value="gemini-1.0-pro-latest">Gemini 1.0 Pro [latest] (Deprecated)</option>
3191- <option value="gemini-1.0-pro-001">Gemini 1.0 Pro (Tuning) [001] (Deprecated)</option>
31923174 </optgroup>
31933175 </select>
31943176 </div>
public/scripts/extensions/caption/settings.html+3 -24
@@ -79,34 +79,13 @@
7979 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
8080 <option data-type="google" value="gemini-2.5-pro-preview-03-25">gemini-2.5-pro-preview-03-25</option>
8181 <option data-type="google" value="gemini-2.5-pro-exp-03-25">gemini-2.5-pro-exp-03-25</option>
82- <option data-type="google" value="gemini-2.0-pro-exp">gemini-2.0-pro-exp</option>
83- <option data-type="google" value="gemini-2.0-pro-exp-02-05">gemini-2.0-pro-exp-02-05</option>
8482 <option data-type="google" value="gemini-2.5-flash-preview-04-17">gemini-2.5-flash-preview-04-17</option>
85- <option data-type="google" value="gemini-2.0-flash-lite-preview">gemini-2.0-flash-lite-preview</option>
86- <option data-type="google" value="gemini-2.0-flash-lite-preview-02-05">gemini-2.0-flash-lite-preview-02-05</option>
87- <option data-type="google" value="gemini-2.0-flash">gemini-2.0-flash</option>
8883 <option data-type="google" value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
89- <option data-type="google" value="gemini-2.0-flash-exp">gemini-2.0-flash-exp</option>
9084 <option data-type="google" value="gemini-2.0-flash-exp-image-generation">gemini-2.0-flash-exp-image-generation</option>
9185 <option data-type="google" value="gemini-2.0-flash-thinkinglite-exp001">gemini-2.0-flash-thinkinglite-exp001</option>
92- <option data-type="google" value="gemini-2.0-flash-thinking-exp-01-21">gemini-2.0-flash-thinking-exp-01-21</option>
93- <option data-type="google" value="gemini-2.0-flash-thinking-exp-1219">gemini-2.0-flash-thinking-exp-1219</option>
94- <option data-type="google" value="gemini-1.5-flash">gemini-1.5-flash</option>
95- <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
96- <option data-type="google" value="gemini-1.5-flash-001">gemini-1.5-flash-001</option>
97- <option data-type="google" value="gemini-1.5-flash-002">gemini-1.5-flash-002</option>
98- <option data-type="google" value="gemini-1.5-flash-exp-0827">gemini-1.5-flash-exp-0827</option>
99- <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option>
100- <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>
101- <option data-type="google" value="gemini-exp-1114">gemini-exp-1114</option>
102- <option data-type="google" value="gemini-exp-1121">gemini-exp-1121</option>
103- <option data-type="google" value="gemini-exp-1206">gemini-exp-1206</option>
104- <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>
105- <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
106- <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>
10786 <option data-type="google" value="gemini-1.5-pro-002">gemini-1.5-pro-002</option>
10887 <option data-type="google" value="gemini-1.5-pro-expflash-0801001">gemini-1.5-pro-expflash-0801001</option>
10988 <option data-type="google" value="gemini-1.5-proflash-exp8b-0827001">gemini-1.5-proflash-exp8b-0827001</option>
11089 <option data-type="groq" value="llama-3.2-11b-vision-preview">llama-3.2-11b-vision-preview</option>
11190 <option data-type="groq" value="llama-3.2-90b-vision-preview">llama-3.2-90b-vision-preview</option>
11291 <option data-type="groq" value="llava-v1.5-7b-4096-preview">llava-v1.5-7b-4096-preview</option>
public/scripts/openai.js+6 -10
@@ -4481,20 +4481,16 @@ async function onModelChange() {
44814481 if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {
44824482 if (oai_settings.max_context_unlocked) {
44834483 $('#openai_max_context').attr('max', max_2mil);
44844484 } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121') || value.includes('gemini-21.0-flash-thinking-exp5-1219pro')) {
4485- $('#openai_max_context').attr('max', max_32k);
4486- } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206') || value.includes('gemini-2.0-pro')) {
44874485 $('#openai_max_context').attr('max', max_2mil);
44884486 } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash') || value.includes('gemini-2.5-flash-preview-040-17pro') || value.includes('gemini-2.5-pro-exp-03-25flash') || value.includes('gemini-2.5-pro-preview') || value.includes('learnlm-032.0-25flash')) {
44894487 $('#openai_max_context').attr('max', max_1mil);
44904488 } else if (value.includes('geminigemma-1.03-pro') || value === 'gemini27b-proit')) {
4491- $('#openai_max_context').attr('max', max_32k);
4492- } else if (value.includes('gemini-1.0-ultra') || value === 'gemini-ultra') {
4493- $('#openai_max_context').attr('max', max_32k);
4494- } else if (value.includes('gemma-3')) {
44954489 $('#openai_max_context').attr('max', max_128k);
4490+ } else if (value.includes('gemma-3') || value.includes('learnlm-1.5-pro-experimental')) {
4491+ $('#openai_max_context').attr('max', max_32k);
44964492 } else {
44974493 $('#openai_max_context').attr('max', max_4kmax_32k);
44984494 }
44994495 let makersuite_max_temp = (value.includes('vision') || value.includes('ultra') || value.includes('gemma')) ? 1.0 : 2.0;
45004496 oai_settings.temp_openai = Math.min(makersuite_max_temp, oai_settings.temp_openai);
src/endpoints/backends/chat-completions.js+1 -2
@@ -372,9 +372,8 @@ async function sendMakerSuiteRequest(request, response) {
372372 model.includes('gemini-2.5-flash') ||
373373 model.includes('gemini-2.0-pro') ||
374374 model.includes('gemini-2.0-flash') ||
375- model.includes('gemini-2.0-flash-thinking-exp') ||
376- model.includes('gemini-1.5-flash') ||
377375 model.includes('gemini-1.5-pro') ||
376+ model.includes('gemini-1.5-flash') ||
378377 model.startsWith('gemini-exp')
379378 ) && request.body.use_makersuite_sysprompt;
380379