Merge pull request #3434 from sirius422/add-gemini-models Add new gemini models and update the safety settings

b6d6727135c036b16dda3ff543a3ae2499e9b1e8

Wolfsblvt <wolfsblvt@gmail.com>

Signed
Parents: f85e464ffd9c98616cc8c250e5e264e776026cda 92a83ed01b476e65bf2188b6e7b09c802c63f35f
6 files changed, +35 -8Ignore whitespace
public/index.html+4 -1
@@ -3075,8 +3075,11 @@
30753075 <option value="gemini-1.0-ultra-latest">Gemini 1.0 Ultra</option>
30763076 </optgroup>
30773077 <optgroup label="Subversions">
30783078 <option value="gemini-2.0-flash-lite-preview-02pro-05exp">Gemini 2.0 Flash Lite PreviewPro 2025-02-05Experimental</option>
30793079 <option value="gemini-2.0-pro-exp-02-05">Gemini 2.0 Pro Experimental 2025-02-05</option>
3080+ <option value="gemini-2.0-flash-lite-preview">Gemini 2.0 Flash-Lite Preview</option>
3081+ <option value="gemini-2.0-flash-lite-preview-02-05">Gemini 2.0 Flash-Lite Preview 2025-02-05</option>
3082+ <option value="gemini-2.0-flash-001">Gemini 2.0 Flash [001]</option>
30803083 <option value="gemini-2.0-flash-thinking-exp">Gemini 2.0 Flash Thinking Experimental</option>
30813084 <option value="gemini-2.0-flash-thinking-exp-01-21">Gemini 2.0 Flash Thinking Experimental 2025-01-21</option>
30823085 <option value="gemini-2.0-flash-thinking-exp-1219">Gemini 2.0 Flash Thinking Experimental 2024-12-19</option>
public/scripts/extensions/caption/settings.html+6 -0
@@ -53,6 +53,12 @@
5353 <option data-type="anthropic" value="claude-3-opus-20240229">claude-3-opus-20240229</option>
5454 <option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
5555 <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
56+ <option data-type="google" value="gemini-2.0-pro-exp">gemini-2.0-pro-exp</option>
57+ <option data-type="google" value="gemini-2.0-pro-exp-02-05">gemini-2.0-pro-exp-02-05</option>
58+ <option data-type="google" value="gemini-2.0-flash-lite-preview">gemini-2.0-flash-lite-preview</option>
59+ <option data-type="google" value="gemini-2.0-flash-lite-preview-02-05">gemini-2.0-flash-lite-preview-02-05</option>
60+ <option data-type="google" value="gemini-2.0-flash">gemini-2.0-flash</option>
61+ <option data-type="google" value="gemini-2.0-flash-001">gemini-2.0-flash-001</option>
5662 <option data-type="google" value="gemini-2.0-flash-exp">gemini-2.0-flash-exp</option>
5763 <option data-type="google" value="gemini-2.0-flash-thinking-exp">gemini-2.0-flash-thinking-exp</option>
5864 <option data-type="google" value="gemini-2.0-flash-thinking-exp-01-21">gemini-2.0-flash-thinking-exp-01-21</option>
public/scripts/openai.js+8 -2
@@ -4239,9 +4239,9 @@ async function onModelChange() {
42394239 $('#openai_max_context').attr('max', max_2mil);
42404240 } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121') || value.includes('gemini-2.0-flash-thinking-exp-1219')) {
42414241 $('#openai_max_context').attr('max', max_32k);
42424242 } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206') || value.includes('gemini-2.0-pro')) {
42434243 $('#openai_max_context').attr('max', max_2mil);
42444244 } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash-exp') || value.includes('gemini-2.0-flash-thinking-exp')) {
42454245 $('#openai_max_context').attr('max', max_1mil);
42464246 } else if (value.includes('gemini-1.0-pro') || value === 'gemini-pro') {
42474247 $('#openai_max_context').attr('max', max_32k);
@@ -4934,6 +4934,12 @@ export function isImageInliningSupported() {
49344934 // gultra just isn't being offered as multimodal, thanks google.
49354935 const visionSupportedModels = [
49364936 'gpt-4-vision',
4937+ 'gemini-2.0-pro-exp',
4938+ 'gemini-2.0-pro-exp-02-05',
4939+ 'gemini-2.0-flash-lite-preview',
4940+ 'gemini-2.0-flash-lite-preview-02-05',
4941+ 'gemini-2.0-flash',
4942+ 'gemini-2.0-flash-001',
49374943 'gemini-2.0-flash-thinking-exp-1219',
49384944 'gemini-2.0-flash-thinking-exp-01-21',
49394945 'gemini-2.0-flash-thinking-exp',
src/constants.js+4 -4
@@ -139,19 +139,19 @@ export const UNSAFE_EXTENSIONS = [
139139export const GEMINI_SAFETY = [
140140 {
141141 category: 'HARM_CATEGORY_HARASSMENT',
142142 threshold: 'BLOCK_NONEOFF',
143143 },
144144 {
145145 category: 'HARM_CATEGORY_HATE_SPEECH',
146146 threshold: 'BLOCK_NONEOFF',
147147 },
148148 {
149149 category: 'HARM_CATEGORY_SEXUALLY_EXPLICIT',
150150 threshold: 'BLOCK_NONEOFF',
151151 },
152152 {
153153 category: 'HARM_CATEGORY_DANGEROUS_CONTENT',
154154 threshold: 'BLOCK_NONEOFF',
155155 },
156156 {
157157 category: 'HARM_CATEGORY_CIVIC_INTEGRITY',
src/endpoints/backends/chat-completions.js+7 -1
@@ -316,9 +316,15 @@ async function sendMakerSuiteRequest(request, response) {
316316 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, getPromptNames(request));
317317 let safetySettings = GEMINI_SAFETY;
318318
319- if (model.includes('gemini-2.0-flash-exp')) {
319+ // These old models do not support setting the threshold to OFF at all.
320+ if (['gemini-1.5-pro-001', 'gemini-1.5-flash-001', 'gemini-1.0-pro-001'].includes(model)) {
321+ safetySettings = GEMINI_SAFETY.map(setting => ({ ...setting, threshold: 'BLOCK_NONE' }));
322+ }
323+ // Interestingly, Gemini 2.0 Flash does support setting the threshold for HARM_CATEGORY_CIVIC_INTEGRITY to OFF.
324+ else if (['gemini-2.0-flash', 'gemini-2.0-flash-001', 'gemini-2.0-flash-exp'].includes(model)) {
320325 safetySettings = GEMINI_SAFETY.map(setting => ({ ...setting, threshold: 'OFF' }));
321326 }
327+ // Most of the other models allow for setting the threshold of filters, except for HARM_CATEGORY_CIVIC_INTEGRITY, to OFF.
322328
323329 let body = {
324330 contents: prompt.contents,
src/prompt-converters.js+6 -0
@@ -360,6 +360,12 @@ export function convertCohereMessages(messages, names) {
360360 */
361361export function convertGooglePrompt(messages, model, useSysPrompt, names) {
362362 const visionSupportedModels = [
363+ 'gemini-2.0-pro-exp',
364+ 'gemini-2.0-pro-exp-02-05',
365+ 'gemini-2.0-flash-lite-preview',
366+ 'gemini-2.0-flash-lite-preview-02-05',
367+ 'gemini-2.0-flash',
368+ 'gemini-2.0-flash-001',
363369 'gemini-2.0-flash-thinking-exp',
364370 'gemini-2.0-flash-thinking-exp-01-21',
365371 'gemini-2.0-flash-thinking-exp-1219',