ultra re-addition (just in case), fixed system prompt line

366070adee8aa63908b506f90bb3d0499892feeb

Succubyss <87207237+Succubyss@users.noreply.github.com>

Parents: 7e8b7e128ed632be53d2b266df445d9b16a60c3e
3 files changed, +7 -2Ignore whitespace
public/index.html+2 -0
@@ -2810,6 +2810,8 @@
2810 <option value="gemini-pro-vision">Gemini Pro Vision (1.0)</option>2810 <option value="gemini-pro-vision">Gemini Pro Vision (1.0)</option>
2811 <option value="text-bison-001">PaLM 2 (Legacy)</option>2811 <option value="text-bison-001">PaLM 2 (Legacy)</option>
2812 <option value="chat-bison-001">PaLM 2 Chat (Legacy)</option>2812 <option value="chat-bison-001">PaLM 2 Chat (Legacy)</option>
2813 <option value="gemini-ultra">Gemini Ultra (1.0)</option>
2814 <option value="gemini-1.0-ultra-latest">Gemini 1.0 Ultra</option>
2813 </optgroup>2815 </optgroup>
2814 <optgroup label="Subversions">2816 <optgroup label="Subversions">
2815 <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>2817 <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>
public/scripts/openai.js+4 -1
@@ -4068,10 +4068,13 @@ async function onModelChange() {
4068 $('#openai_max_context').attr('max', max_32k);4068 $('#openai_max_context').attr('max', max_32k);
4069 } else if (value === 'text-bison-001') {4069 } else if (value === 'text-bison-001') {
4070 $('#openai_max_context').attr('max', max_8k);4070 $('#openai_max_context').attr('max', max_8k);
4071 // The ultra endpoints are possibly dead:
4072 } else if (value.includes('gemini-1.0-ultra') || value === 'gemini-ultra') {
4073 $('#openai_max_context').attr('max', max_32k);
4071 } else {4074 } else {
4072 $('#openai_max_context').attr('max', max_4k);4075 $('#openai_max_context').attr('max', max_4k);
4073 }4076 }
4074 let makersuite_max_temp = value.includes('vision') ? 1.0 : 2.0;4077 let makersuite_max_temp = (value.includes('vision') || value.includes('ultra')) ? 1.0 : 2.0;
4075 oai_settings.temp_openai = Math.min(makersuite_max_temp, oai_settings.temp_openai);4078 oai_settings.temp_openai = Math.min(makersuite_max_temp, oai_settings.temp_openai);
4076 $('#temp_openai').attr('max', makersuite_max_temp).val(oai_settings.temp_openai).trigger('input');4079 $('#temp_openai').attr('max', makersuite_max_temp).val(oai_settings.temp_openai).trigger('input');
4077 oai_settings.openai_max_context = Math.min(Number($('#openai_max_context').attr('max')), oai_settings.openai_max_context);4080 oai_settings.openai_max_context = Math.min(Number($('#openai_max_context').attr('max')), oai_settings.openai_max_context);
src/endpoints/backends/chat-completions.js+1 -1
@@ -271,7 +271,7 @@ async function sendMakerSuiteRequest(request, response) {
271 };271 };
272272
273 function getGeminiBody() {273 function getGeminiBody() {
274 const should_use_system_prompt = ['gemini-1.5-flash', 'gemini-1.5-pro'].includes(model) && request.body.use_makersuite_sysprompt;274 const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro')) && request.body.use_makersuite_sysprompt;
275 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);275 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
276 let body = {276 let body = {
277 contents: prompt.contents,277 contents: prompt.contents,