rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-06-05 21:59:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Support Gemini 2.0 Flash-exp

Browse Source
This commit is contained in:
M0cho
2024-12-12 06:31:27 +09:00
parent d9e0df0884
commit a64c8ade9d
5 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/index.html
View File

@ -3014,6 +3014,7 @@
<option value="chat-bison-001">PaLM 2 Chat (Legacy)</option> <option value="chat-bison-001">PaLM 2 Chat (Legacy)</option>
</optgroup> </optgroup>
<optgroup label="Subversions"> <optgroup label="Subversions">
<option value="gemini-2.0-flash-exp">Gemini 2.0 Flash Experiment</option>
<option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option> <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>
<option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option> <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>
<option value="gemini-exp-1206">Gemini Experimental 2024-12-06</option> <option value="gemini-exp-1206">Gemini Experimental 2024-12-06</option>

1
public/scripts/extensions/caption/settings.html
View File

@ -53,6 +53,7 @@
<option data-type="anthropic" value="claude-3-opus-20240229">claude-3-opus-20240229</option> <option data-type="anthropic" value="claude-3-opus-20240229">claude-3-opus-20240229</option>
<option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option> <option data-type="anthropic" value="claude-3-sonnet-20240229">claude-3-sonnet-20240229</option>
<option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option> <option data-type="anthropic" value="claude-3-haiku-20240307">claude-3-haiku-20240307</option>
<option data-type="google" value="gemini-2.0-flash-exp">gemini-2.0-flash-exp</option>
<option data-type="google" value="gemini-1.5-flash">gemini-1.5-flash</option> <option data-type="google" value="gemini-1.5-flash">gemini-1.5-flash</option>
<option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option> <option data-type="google" value="gemini-1.5-flash-latest">gemini-1.5-flash-latest</option>
<option data-type="google" value="gemini-1.5-flash-001">gemini-1.5-flash-001</option> <option data-type="google" value="gemini-1.5-flash-001">gemini-1.5-flash-001</option>

2
public/scripts/openai.js
View File

@ -4081,7 +4081,7 @@ async function onModelChange() {
$('#openai_max_context').attr('max', max_32k); $('#openai_max_context').attr('max', max_32k);
} else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206')) { } else if (value.includes('gemini-1.5-pro') || value.includes('gemini-exp-1206')) {
$('#openai_max_context').attr('max', max_2mil); $('#openai_max_context').attr('max', max_2mil);
} else if (value.includes('gemini-1.5-flash')) { } else if (value.includes('gemini-1.5-flash') || value.includes('gemini-2.0-flash-exp')) {
$('#openai_max_context').attr('max', max_1mil); $('#openai_max_context').attr('max', max_1mil);
} else if (value.includes('gemini-1.0-pro-vision') || value === 'gemini-pro-vision') { } else if (value.includes('gemini-1.0-pro-vision') || value === 'gemini-pro-vision') {
$('#openai_max_context').attr('max', max_16k); $('#openai_max_context').attr('max', max_16k);

8
src/endpoints/backends/chat-completions.js
View File

@ -280,7 +280,13 @@ async function sendMakerSuiteRequest(request, response) {
delete generationConfig.stopSequences; delete generationConfig.stopSequences;
} }
const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro') || model.startsWith('gemini-exp')) && request.body.use_makersuite_sysprompt; const should_use_system_prompt = (
model.includes('gemini-2.0-flash-exp') ||
model.includes('gemini-1.5-flash') ||
model.includes('gemini-1.5-pro') ||
model.startsWith('gemini-exp')
) && request.body.use_makersuite_sysprompt;
const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name); const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
let body = { let body = {
contents: prompt.contents, contents: prompt.contents,

1
src/prompt-converters.js
View File

@ -337,6 +337,7 @@ export function convertGooglePrompt(messages, model, useSysPrompt = false, charN
const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII='; const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
const visionSupportedModels = [ const visionSupportedModels = [
'gemini-2.0-flash-exp',
'gemini-1.5-flash', 'gemini-1.5-flash',
'gemini-1.5-flash-latest', 'gemini-1.5-flash-latest',
'gemini-1.5-flash-001', 'gemini-1.5-flash-001',