Merge pull request #3100 from tincansimagine/new-model-pr feat: Add multiple delayed model updates

90ee0398f29cc8d2595f4ab37a0ddd35d25ac424

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

Signed
Parents: 1938e8ac141c53846eae23a4e8d2d7093049dd1e ecbf9df79accbd61e021b8000668ff954e4e12d7
5 files changed, +11 -4Ignore whitespace
public/index.html+4 -0
@@ -2740,6 +2740,7 @@
27402740 </optgroup>
27412741 <optgroup label="GPT-4o">
27422742 <option value="gpt-4o">gpt-4o</option>
2743+ <option value="gpt-4o-2024-11-20">gpt-4o-2024-11-20</option>
27432744 <option value="gpt-4o-2024-08-06">gpt-4o-2024-08-06</option>
27442745 <option value="gpt-4o-2024-05-13">gpt-4o-2024-05-13</option>
27452746 <option value="chatgpt-4o-latest">chatgpt-4o-latest</option>
@@ -2979,6 +2980,7 @@
29792980 <option value="chat-bison-001">PaLM 2 Chat (Legacy)</option>
29802981 </optgroup>
29812982 <optgroup label="Subversions">
2983+ <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>
29822984 <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>
29832985 <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>
29842986 <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>
@@ -3159,6 +3161,8 @@
31593161 <h4 data-i18n="Cohere Model">Cohere Model</h4>
31603162 <select id="model_cohere_select">
31613163 <optgroup label="Stable">
3164+ <option value="c4ai-aya-expanse-32b">c4ai-aya-expanse-32b</option>
3165+ <option value="c4ai-aya-expanse-8b">c4ai-aya-expanse-8b</option>
31623166 <option value="c4ai-aya-23-35b">c4ai-aya-23-35b</option>
31633167 <option value="c4ai-aya-23-8b">c4ai-aya-23-8b</option>
31643168 <option value="command-light">command-light</option>
public/scripts/extensions/caption/settings.html+1 -0
@@ -61,6 +61,7 @@
6161 <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option>
6262 <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>
6363 <option data-type="google" value="gemini-exp-1114">gemini-exp-1114</option>
64+ <option data-type="google" value="gemini-exp-1121">gemini-exp-1121</option>
6465 <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>
6566 <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
6667 <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>
public/scripts/openai.js+4 -3
@@ -4056,7 +4056,7 @@ async function onModelChange() {
40564056 if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {
40574057 if (oai_settings.max_context_unlocked) {
40584058 $('#openai_max_context').attr('max', max_2mil);
40594059 } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121')) {
40604060 $('#openai_max_context').attr('max', max_32k);
40614061 } else if (value.includes('gemini-1.5-pro')) {
40624062 $('#openai_max_context').attr('max', max_2mil);
@@ -4196,10 +4196,10 @@ async function onModelChange() {
41964196 else if (['command-light-nightly', 'command-nightly'].includes(oai_settings.cohere_model)) {
41974197 $('#openai_max_context').attr('max', max_8k);
41984198 }
41994199 else if (oai_settings.cohere_model.includes('command-r') || ['c4ai-aya-expanse-32b'].includes(oai_settings.cohere_model)) {
42004200 $('#openai_max_context').attr('max', max_128k);
42014201 }
42024202 else if (['c4ai-aya-23', 'c4ai-aya-expanse-8b'].includes(oai_settings.cohere_model)) {
42034203 $('#openai_max_context').attr('max', max_8k);
42044204 }
42054205 else {
@@ -4745,6 +4745,7 @@ export function isImageInliningSupported() {
47454745 'gemini-1.5-flash-8b-exp-0827',
47464746 'gemini-1.5-flash-8b-exp-0924',
47474747 'gemini-exp-1114',
4748+ 'gemini-exp-1121',
47484749 'gemini-1.0-pro-vision-latest',
47494750 'gemini-1.5-pro',
47504751 'gemini-1.5-pro-latest',
src/endpoints/backends/chat-completions.js+1 -1
@@ -280,7 +280,7 @@ async function sendMakerSuiteRequest(request, response) {
280280 delete generationConfig.stopSequences;
281281 }
282282
283283 const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro') || model.includes('gemini-exp-1114') || model.includes('gemini-exp-1121')) && request.body.use_makersuite_sysprompt;
284284 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
285285 let body = {
286286 contents: prompt.contents,
src/prompt-converters.js+1 -0
@@ -347,6 +347,7 @@ export function convertGooglePrompt(messages, model, useSysPrompt = false, charN
347347 'gemini-1.5-flash-8b-exp-0827',
348348 'gemini-1.5-flash-8b-exp-0924',
349349 'gemini-exp-1114',
350+ 'gemini-exp-1121',
350351 'gemini-1.5-pro',
351352 'gemini-1.5-pro-latest',
352353 'gemini-1.5-pro-001',