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 -4Showing whitespace changes
public/index.html+4 -0
@@ -2740,6 +2740,7 @@
2740 </optgroup>2740 </optgroup>
2741 <optgroup label="GPT-4o">2741 <optgroup label="GPT-4o">
2742 <option value="gpt-4o">gpt-4o</option>2742 <option value="gpt-4o">gpt-4o</option>
2743 <option value="gpt-4o-2024-11-20">gpt-4o-2024-11-20</option>
2743 <option value="gpt-4o-2024-08-06">gpt-4o-2024-08-06</option>2744 <option value="gpt-4o-2024-08-06">gpt-4o-2024-08-06</option>
2744 <option value="gpt-4o-2024-05-13">gpt-4o-2024-05-13</option>2745 <option value="gpt-4o-2024-05-13">gpt-4o-2024-05-13</option>
2745 <option value="chatgpt-4o-latest">chatgpt-4o-latest</option>2746 <option value="chatgpt-4o-latest">chatgpt-4o-latest</option>
@@ -2979,6 +2980,7 @@
2979 <option value="chat-bison-001">PaLM 2 Chat (Legacy)</option>2980 <option value="chat-bison-001">PaLM 2 Chat (Legacy)</option>
2980 </optgroup>2981 </optgroup>
2981 <optgroup label="Subversions">2982 <optgroup label="Subversions">
2983 <option value="gemini-exp-1121">Gemini Experimental 2024-11-21</option>
2982 <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>2984 <option value="gemini-exp-1114">Gemini Experimental 2024-11-14</option>
2983 <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>2985 <option value="gemini-1.5-pro-exp-0801">Gemini 1.5 Pro Experiment 2024-08-01</option>
2984 <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>2986 <option value="gemini-1.5-pro-exp-0827">Gemini 1.5 Pro Experiment 2024-08-27</option>
@@ -3159,6 +3161,8 @@
3159 <h4 data-i18n="Cohere Model">Cohere Model</h4>3161 <h4 data-i18n="Cohere Model">Cohere Model</h4>
3160 <select id="model_cohere_select">3162 <select id="model_cohere_select">
3161 <optgroup label="Stable">3163 <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>
3162 <option value="c4ai-aya-23-35b">c4ai-aya-23-35b</option>3166 <option value="c4ai-aya-23-35b">c4ai-aya-23-35b</option>
3163 <option value="c4ai-aya-23-8b">c4ai-aya-23-8b</option>3167 <option value="c4ai-aya-23-8b">c4ai-aya-23-8b</option>
3164 <option value="command-light">command-light</option>3168 <option value="command-light">command-light</option>
public/scripts/extensions/caption/settings.html+1 -0
@@ -61,6 +61,7 @@
61 <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option>61 <option data-type="google" value="gemini-1.5-flash-8b-exp-0827">gemini-1.5-flash-8b-exp-0827</option>
62 <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>62 <option data-type="google" value="gemini-1.5-flash-8b-exp-0924">gemini-1.5-flash-8b-exp-0924</option>
63 <option data-type="google" value="gemini-exp-1114">gemini-exp-1114</option>63 <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>
64 <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>65 <option data-type="google" value="gemini-1.5-pro">gemini-1.5-pro</option>
65 <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>66 <option data-type="google" value="gemini-1.5-pro-latest">gemini-1.5-pro-latest</option>
66 <option data-type="google" value="gemini-1.5-pro-001">gemini-1.5-pro-001</option>67 <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() {
4056 if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {4056 if (oai_settings.chat_completion_source == chat_completion_sources.MAKERSUITE) {
4057 if (oai_settings.max_context_unlocked) {4057 if (oai_settings.max_context_unlocked) {
4058 $('#openai_max_context').attr('max', max_2mil);4058 $('#openai_max_context').attr('max', max_2mil);
4059 } else if (value.includes('gemini-exp-1114')){4059 } else if (value.includes('gemini-exp-1114') || value.includes('gemini-exp-1121')) {
4060 $('#openai_max_context').attr('max', max_32k);4060 $('#openai_max_context').attr('max', max_32k);
4061 } else if (value.includes('gemini-1.5-pro')) {4061 } else if (value.includes('gemini-1.5-pro')) {
4062 $('#openai_max_context').attr('max', max_2mil);4062 $('#openai_max_context').attr('max', max_2mil);
@@ -4196,10 +4196,10 @@ async function onModelChange() {
4196 else if (['command-light-nightly', 'command-nightly'].includes(oai_settings.cohere_model)) {4196 else if (['command-light-nightly', 'command-nightly'].includes(oai_settings.cohere_model)) {
4197 $('#openai_max_context').attr('max', max_8k);4197 $('#openai_max_context').attr('max', max_8k);
4198 }4198 }
4199 else if (oai_settings.cohere_model.includes('command-r')) {4199 else if (oai_settings.cohere_model.includes('command-r') || ['c4ai-aya-expanse-32b'].includes(oai_settings.cohere_model)) {
4200 $('#openai_max_context').attr('max', max_128k);4200 $('#openai_max_context').attr('max', max_128k);
4201 }4201 }
4202 else if (['c4ai-aya-23'].includes(oai_settings.cohere_model)) {4202 else if (['c4ai-aya-23', 'c4ai-aya-expanse-8b'].includes(oai_settings.cohere_model)) {
4203 $('#openai_max_context').attr('max', max_8k);4203 $('#openai_max_context').attr('max', max_8k);
4204 }4204 }
4205 else {4205 else {
@@ -4745,6 +4745,7 @@ export function isImageInliningSupported() {
4745 'gemini-1.5-flash-8b-exp-0827',4745 'gemini-1.5-flash-8b-exp-0827',
4746 'gemini-1.5-flash-8b-exp-0924',4746 'gemini-1.5-flash-8b-exp-0924',
4747 'gemini-exp-1114',4747 'gemini-exp-1114',
4748 'gemini-exp-1121',
4748 'gemini-1.0-pro-vision-latest',4749 'gemini-1.0-pro-vision-latest',
4749 'gemini-1.5-pro',4750 'gemini-1.5-pro',
4750 'gemini-1.5-pro-latest',4751 'gemini-1.5-pro-latest',
src/endpoints/backends/chat-completions.js+1 -1
@@ -280,7 +280,7 @@ async function sendMakerSuiteRequest(request, response) {
280 delete generationConfig.stopSequences;280 delete generationConfig.stopSequences;
281 }281 }
282282
283 const should_use_system_prompt = (model.includes('gemini-1.5-flash') || model.includes('gemini-1.5-pro') || model.includes('gemini-exp-1114')) && request.body.use_makersuite_sysprompt;283 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;
284 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);284 const prompt = convertGooglePrompt(request.body.messages, model, should_use_system_prompt, request.body.char_name, request.body.user_name);
285 let body = {285 let body = {
286 contents: prompt.contents,286 contents: prompt.contents,
src/prompt-converters.js+1 -0
@@ -347,6 +347,7 @@ export function convertGooglePrompt(messages, model, useSysPrompt = false, charN
347 'gemini-1.5-flash-8b-exp-0827',347 'gemini-1.5-flash-8b-exp-0827',
348 'gemini-1.5-flash-8b-exp-0924',348 'gemini-1.5-flash-8b-exp-0924',
349 'gemini-exp-1114',349 'gemini-exp-1114',
350 'gemini-exp-1121',
350 'gemini-1.5-pro',351 'gemini-1.5-pro',
351 'gemini-1.5-pro-latest',352 'gemini-1.5-pro-latest',
352 'gemini-1.5-pro-001',353 'gemini-1.5-pro-001',