New Jeremy 2.5

e657b61df7899dc9c0be35f5dc0008b93676ae7f

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

Parents: ec428fd82f0ac3fd2ddd02f1c795fa2ef7e2d44f
4 files changed, +52 -4Showing whitespace changes
public/index.html+6 -0
@@ -3192,12 +3192,15 @@
31923192 <h4 data-i18n="Google Model">Google Model</h4>
31933193 <select id="model_google_select">
31943194 <optgroup label="Gemini 2.5">
3195+ <option value="gemini-2.5-pro">gemini-2.5-pro</option>
31953196 <option value="gemini-2.5-pro-preview-06-05">gemini-2.5-pro-preview-06-05</option>
31963197 <option value="gemini-2.5-pro-preview-05-06">gemini-2.5-pro-preview-05-06</option>
31973198 <option value="gemini-2.5-pro-preview-03-25">gemini-2.5-pro-preview-03-25</option>
31983199 <option value="gemini-2.5-pro-exp-03-25">gemini-2.5-pro-exp-03-25</option>
3200+ <option value="gemini-2.5-flash">gemini-2.5-flash</option>
31993201 <option value="gemini-2.5-flash-preview-05-20">gemini-2.5-flash-preview-05-20</option>
32003202 <option value="gemini-2.5-flash-preview-04-17">gemini-2.5-flash-preview-04-17</option>
3203+ <option value="gemini-2.5-flash-lite-preview-06-17">gemini-2.5-flash-lite-preview-06-17</option>
32013204 </optgroup>
32023205 <optgroup label="Gemini 2.0">
32033206 <option value="gemini-2.0-pro-exp-02-05">gemini-2.0-pro-exp-02-05 → 2.5-pro-exp-03-25</option>
@@ -3362,12 +3365,15 @@
33623365 <select id="model_vertexai_select">
33633366 <!-- data-mode="full" is for models that require a service account -->
33643367 <optgroup label="Gemini 2.5">
3368+ <option value="gemini-2.5-pro">gemini-2.5-pro</option>
33653369 <option value="gemini-2.5-pro-preview-06-05">gemini-2.5-pro-preview-06-05</option>
33663370 <option value="gemini-2.5-pro-preview-05-06">gemini-2.5-pro-preview-05-06</option>
33673371 <option value="gemini-2.5-pro-preview-03-25">gemini-2.5-pro-preview-03-25</option>
33683372 <option value="gemini-2.5-pro-exp-03-25" data-mode="full">gemini-2.5-pro-exp-03-25</option>
3373+ <option value="gemini-2.5-flash">gemini-2.5-flash</option>
33693374 <option value="gemini-2.5-flash-preview-05-20">gemini-2.5-flash-preview-05-20</option>
33703375 <option value="gemini-2.5-flash-preview-04-17">gemini-2.5-flash-preview-04-17</option>
3376+ <option value="gemini-2.5-flash-lite-preview-06-17">gemini-2.5-flash-lite-preview-06-17</option>
33713377 </optgroup>
33723378 <optgroup label="Gemini 2.0">
33733379 <option value="gemini-2.0-flash-exp" data-mode="full">gemini-2.0-flash-exp</option>
public/scripts/extensions/caption/settings.html+6 -0
@@ -86,12 +86,15 @@
8686 <option data-type="anthropic" value="claude-3-opus-20240229">claude-3-opus-20240229</option>
8787 <option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
8888 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
89+ <option data-type="google" value="gemini-2.5-pro">gemini-2.5-pro</option>
8990 <option data-type="google" value="gemini-2.5-pro-preview-06-05">gemini-2.5-pro-preview-06-05</option>
9091 <option data-type="google" value="gemini-2.5-pro-preview-05-06">gemini-2.5-pro-preview-05-06</option>
9192 <option data-type="google" value="gemini-2.5-pro-preview-03-25">gemini-2.5-pro-preview-03-25</option>
9293 <option data-type="google" value="gemini-2.5-pro-exp-03-25">gemini-2.5-pro-exp-03-25</option>
94+ <option data-type="google" value="gemini-2.5-flash">gemini-2.5-flash</option>
9395 <option data-type="google" value="gemini-2.5-flash-preview-05-20">gemini-2.5-flash-preview-05-20</option>
9496 <option data-type="google" value="gemini-2.5-flash-preview-04-17">gemini-2.5-flash-preview-04-17</option>
97+ <option data-type="google" value="gemini-2.5-flash-lite-preview-06-17">gemini-2.5-flash-lite-preview-06-17</option>
9598 <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>
9699 <option data-type="google" value="gemini-2.0-pro-exp">gemini-2.0-pro-exp → 2.5-pro-exp-03-25</option>
97100 <option data-type="google" value="gemini-exp-1206">gemini-exp-1206 → 2.5-pro-exp-03-25</option>
@@ -118,11 +121,14 @@
118121 <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option>
119122 <option data-type="google" value="learnlm-2.0-flash-experimental">learnlm-2.0-flash-experimental</option>
120123 <option data-type="google" value="learnlm-1.5-pro-experimental">learnlm-1.5-pro-experimental</option>
124+ <option data-type="vertexai" value="gemini-2.5-pro">gemini-2.5-pro</option>
121125 <option data-type="vertexai" value="gemini-2.5-pro-preview-06-05">gemini-2.5-pro-preview-06-05</option>
122126 <option data-type="vertexai" value="gemini-2.5-pro-preview-05-06">gemini-2.5-pro-preview-05-06</option>
123127 <option data-type="vertexai" value="gemini-2.5-pro-preview-03-25">gemini-2.5-pro-preview-03-25</option>
128+ <option data-type="vertexai" value="gemini-2.5-flash">gemini-2.5-flash</option>
124129 <option data-type="vertexai" value="gemini-2.5-flash-preview-05-20">gemini-2.5-flash-preview-05-20</option>
125130 <option data-type="vertexai" value="gemini-2.5-flash-preview-04-17">gemini-2.5-flash-preview-04-17</option>
131+ <option data-type="vertexai" value="gemini-2.5-flash-lite-preview-06-17">gemini-2.5-flash-lite-preview-06-17</option>
126132 <option data-type="vertexai" value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
127133 <option data-type="vertexai" value="gemini-2.0-flash-lite-001">gemini-2.0-flash-lite-001</option>
128134 <option data-type="groq" value="llama-3.2-11b-vision-preview">llama-3.2-11b-vision-preview</option>
src/endpoints/backends/chat-completions.js+6 -0
@@ -451,6 +451,12 @@ async function sendMakerSuiteRequest(request, response) {
451451 thinkingConfig.thinkingBudget = thinkingBudget;
452452 }
453453
454+ // Vertex doesn't allow mixing disabled thinking with includeThoughts
455+ if (useVertexAi && thinkingBudget === 0 && thinkingConfig.includeThoughts) {
456+ console.info('Thinking budget is 0, but includeThoughts is true. Thoughts will not be included in the response.');
457+ thinkingConfig.includeThoughts = false;
458+ }
459+
454460 generationConfig.thinkingConfig = thinkingConfig;
455461 }
456462
src/prompt-converters.js+34 -4
@@ -1063,10 +1063,9 @@ export function calculateGoogleBudgetTokens(maxTokens, reasoningEffort, model) {
10631063
10641064 switch (reasoningEffort) {
10651065 case REASONING_EFFORT.auto:
10661066 return null-1;
10671067 case REASONING_EFFORT.min:
10681068 budgetTokens =return 0;
1069- break;
10701069 case REASONING_EFFORT.low:
10711070 budgetTokens = Math.floor(maxTokens * 0.1);
10721071 break;
@@ -1086,12 +1085,39 @@ export function calculateGoogleBudgetTokens(maxTokens, reasoningEffort, model) {
10861085 return budgetTokens;
10871086 }
10881087
1088+ function getFlashLiteBudget() {
1089+ let budgetTokens = 0;
1090+
1091+ switch (reasoningEffort) {
1092+ case REASONING_EFFORT.auto:
1093+ return -1;
1094+ case REASONING_EFFORT.min:
1095+ return 0;
1096+ case REASONING_EFFORT.low:
1097+ budgetTokens = Math.floor(maxTokens * 0.1);
1098+ break;
1099+ case REASONING_EFFORT.medium:
1100+ budgetTokens = Math.floor(maxTokens * 0.25);
1101+ break;
1102+ case REASONING_EFFORT.high:
1103+ budgetTokens = Math.floor(maxTokens * 0.5);
1104+ break;
1105+ case REASONING_EFFORT.max:
1106+ budgetTokens = maxTokens;
1107+ break;
1108+ }
1109+
1110+ budgetTokens = Math.max(Math.min(budgetTokens, 24576), 512);
1111+
1112+ return budgetTokens;
1113+ }
1114+
10891115 function getProBudget() {
10901116 let budgetTokens = 0;
10911117
10921118 switch (reasoningEffort) {
10931119 case REASONING_EFFORT.auto:
10941120 return null-1;
10951121 case REASONING_EFFORT.min:
10961122 budgetTokens = 128;
10971123 break;
@@ -1114,6 +1140,10 @@ export function calculateGoogleBudgetTokens(maxTokens, reasoningEffort, model) {
11141140 return budgetTokens;
11151141 }
11161142
1143+ if (model.includes('flash-lite')) {
1144+ return getFlashLiteBudget();
1145+ }
1146+
11171147 if (model.includes('flash')) {
11181148 return getFlashBudget();
11191149 }