Merge branch 'staging' into feat/an-macro

8309c30a3e3d120b066e86f55f9316e5cc992d6d

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

Parents: 4df98b034185de05b15bfd6ae33a604c8f887549 b6c1c9a40dbe7fce1e2ce37ee44f261de3086002
5 files changed, +16 -5Ignore whitespace
public/index.html+9 -1
@@ -3193,6 +3193,7 @@
3193 <option value="mistral-small-latest">mistral-small-latest</option>3193 <option value="mistral-small-latest">mistral-small-latest</option>
3194 <option value="mistral-medium-latest">mistral-medium-latest</option>3194 <option value="mistral-medium-latest">mistral-medium-latest</option>
3195 <option value="mistral-large-latest">mistral-large-latest</option>3195 <option value="mistral-large-latest">mistral-large-latest</option>
3196 <option value="mistral-saba-latest">mistral-saba-latest</option>
3196 <option value="codestral-latest">codestral-latest</option>3197 <option value="codestral-latest">codestral-latest</option>
3197 <option value="codestral-mamba-latest">codestral-mamba-latest</option>3198 <option value="codestral-mamba-latest">codestral-mamba-latest</option>
3198 <option value="pixtral-12b-latest">pixtral-12b-latest</option>3199 <option value="pixtral-12b-latest">pixtral-12b-latest</option>
@@ -3208,13 +3209,20 @@
3208 <option value="mistral-small-2312">mistral-small-2312</option>3209 <option value="mistral-small-2312">mistral-small-2312</option>
3209 <option value="mistral-small-2402">mistral-small-2402</option>3210 <option value="mistral-small-2402">mistral-small-2402</option>
3210 <option value="mistral-small-2409">mistral-small-2409</option>3211 <option value="mistral-small-2409">mistral-small-2409</option>
3212 <option value="mistral-small-2501">mistral-small-2501</option>
3213 <option value="mistral-small-2503">mistral-small-2503</option>
3211 <option value="mistral-medium-2312">mistral-medium-2312</option>3214 <option value="mistral-medium-2312">mistral-medium-2312</option>
3212 <option value="mistral-large-2402">mistral-large-2402</option>3215 <option value="mistral-large-2402">mistral-large-2402</option>
3213 <option value="mistral-large-2407">mistral-large-2407</option>3216 <option value="mistral-large-2407">mistral-large-2407</option>
3214 <option value="mistral-large-2411">mistral-large-2411</option>3217 <option value="mistral-large-2411">mistral-large-2411</option>
3218 <option value="mistral-large-pixtral-2411">mistral-large-pixtral-2411</option>
3219 <option value="mistral-saba-2502">mistral-saba-2502</option>
3215 <option value="codestral-2405">codestral-2405</option>3220 <option value="codestral-2405">codestral-2405</option>
3216 <option value="codestral-2405-blue">codestral-2405-blue</option>3221 <option value="codestral-2405-blue">codestral-2405-blue</option>
3217 <option value="codestral-mamba-2407">codestral-mamba-2407</option>3222 <option value="codestral-mamba-2407">codestral-mamba-2407</option>
3223 <option value="codestral-2411-rc5">codestral-2411-rc5</option>
3224 <option value="codestral-2412">codestral-2412</option>
3225 <option value="codestral-2501">codestral-2501</option>
3218 <option value="pixtral-12b-2409">pixtral-12b-2409</option>3226 <option value="pixtral-12b-2409">pixtral-12b-2409</option>
3219 <option value="pixtral-large-2411">pixtral-large-2411</option>3227 <option value="pixtral-large-2411">pixtral-large-2411</option>
3220 </optgroup>3228 </optgroup>
@@ -3417,7 +3425,7 @@
3417 </form>3425 </form>
3418 <div id="01ai_form" data-source="01ai">3426 <div id="01ai_form" data-source="01ai">
3419 <h4>3427 <h4>
3420 <a data-i18n="01.AI API Key" href="https://platform.01.ai/" target="_blank" rel="noopener noreferrer">3428 <a data-i18n="01.AI API Key" href="https://platform.lingyiwanwu.com/" target="_blank" rel="noopener noreferrer">
3421 01.AI API Key3429 01.AI API Key
3422 </a>3430 </a>
3423 </h4>3431 </h4>
public/scripts/extensions/caption/settings.html+3 -0
@@ -42,6 +42,9 @@
42 <option data-type="mistral" value="pixtral-12b-2409">pixtral-12b-2409</option>42 <option data-type="mistral" value="pixtral-12b-2409">pixtral-12b-2409</option>
43 <option data-type="mistral" value="pixtral-large-latest">pixtral-large-latest</option>43 <option data-type="mistral" value="pixtral-large-latest">pixtral-large-latest</option>
44 <option data-type="mistral" value="pixtral-large-2411">pixtral-large-2411</option>44 <option data-type="mistral" value="pixtral-large-2411">pixtral-large-2411</option>
45 <option data-type="mistral" value="mistral-large-pixtral-2411">mistral-large-pixtral-2411</option>
46 <option data-type="mistral" value="mistral-small-2503">mistral-small-2503</option>
47 <option data-type="mistral" value="mistral-small-latest">mistral-small-latest</option>
45 <option data-type="zerooneai" value="yi-vision">yi-vision</option>48 <option data-type="zerooneai" value="yi-vision">yi-vision</option>
46 <option data-type="openai" value="gpt-4-vision-preview">gpt-4-vision-preview</option>49 <option data-type="openai" value="gpt-4-vision-preview">gpt-4-vision-preview</option>
47 <option data-type="openai" value="gpt-4-turbo">gpt-4-turbo</option>50 <option data-type="openai" value="gpt-4-turbo">gpt-4-turbo</option>
public/scripts/openai.js+2 -2
@@ -4437,9 +4437,9 @@ async function onModelChange() {
4437 if (oai_settings.chat_completion_source === chat_completion_sources.MISTRALAI) {4437 if (oai_settings.chat_completion_source === chat_completion_sources.MISTRALAI) {
4438 if (oai_settings.max_context_unlocked) {4438 if (oai_settings.max_context_unlocked) {
4439 $('#openai_max_context').attr('max', unlocked_max);4439 $('#openai_max_context').attr('max', unlocked_max);
4440 } else if (oai_settings.mistralai_model.includes('codestral-mamba')) {4440 } else if (['codestral-latest', 'codestral-mamba-2407', 'codestral-2411-rc5', 'codestral-2412', 'codestral-2501'].includes(oai_settings.mistralai_model)) {
4441 $('#openai_max_context').attr('max', max_256k);4441 $('#openai_max_context').attr('max', max_256k);
4442 } else if (['mistral-large-2407', 'mistral-large-2411', 'mistral-large-latest'].includes(oai_settings.mistralai_model)) {4442 } else if (['mistral-large-2407', 'mistral-large-2411', 'mistral-large-pixtral-2411', 'mistral-large-latest'].includes(oai_settings.mistralai_model)) {
4443 $('#openai_max_context').attr('max', max_128k);4443 $('#openai_max_context').attr('max', max_128k);
4444 } else if (oai_settings.mistralai_model.includes('mistral-nemo')) {4444 } else if (oai_settings.mistralai_model.includes('mistral-nemo')) {
4445 $('#openai_max_context').attr('max', max_128k);4445 $('#openai_max_context').attr('max', max_128k);
src/endpoints/backends/chat-completions.js+1 -1
@@ -49,7 +49,7 @@ const API_COHERE_V2 = 'https://api.cohere.ai/v2';
49const API_PERPLEXITY = 'https://api.perplexity.ai';49const API_PERPLEXITY = 'https://api.perplexity.ai';
50const API_GROQ = 'https://api.groq.com/openai/v1';50const API_GROQ = 'https://api.groq.com/openai/v1';
51const API_MAKERSUITE = 'https://generativelanguage.googleapis.com';51const API_MAKERSUITE = 'https://generativelanguage.googleapis.com';
52const API_01AI = 'https://api.01.ai/v1';52const API_01AI = 'https://api.lingyiwanwu.com/v1';
53const API_BLOCKENTROPY = 'https://api.blockentropy.ai/v1';53const API_BLOCKENTROPY = 'https://api.blockentropy.ai/v1';
54const API_AI21 = 'https://api.ai21.com/studio/v1';54const API_AI21 = 'https://api.ai21.com/studio/v1';
55const API_NANOGPT = 'https://nano-gpt.com/api/v1';55const API_NANOGPT = 'https://nano-gpt.com/api/v1';
src/endpoints/openai.js+1 -1
@@ -116,7 +116,7 @@ router.post('/caption-image', async (request, response) => {
116 }116 }
117117
118 if (request.body.api === 'zerooneai') {118 if (request.body.api === 'zerooneai') {
119 apiUrl = 'https://api.01.ai/v1/chat/completions';119 apiUrl = 'https://api.lingyiwanwu.com/v1/chat/completions';
120 }120 }
121121
122 if (request.body.api === 'groq') {122 if (request.body.api === 'groq') {