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

Merge branch 'staging' into gork-ai

Browse Source
This commit is contained in:
Cohee
2025-04-11 21:15:54 +03:00
parent 70d65f2d05 2982d7af52
commit 91fc50b82d
6 changed files with 107 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

99
public/scripts/openai.js
View File

@ -4192,6 +4192,80 @@ function getMaxContextWindowAI(value) {
}
}
/**
* Get the maximum context size for the Mistral model
* @param {string} model Model identifier
* @param {boolean} isUnlocked Whether context limits are unlocked
* @returns {number} Maximum context size in tokens
*/
function getMistralMaxContext(model, isUnlocked) {
if (isUnlocked) {
return unlocked_max;
}
if (Array.isArray(model_list) && model_list.length > 0) {
const contextLength = model_list.find((record) => record.id === model)?.max_context_length;
if (contextLength) {
return contextLength;
}
}
const contextMap = {
'codestral-2411-rc5': 262144,
'codestral-2412': 262144,
'codestral-2501': 262144,
'codestral-latest': 262144,
'codestral-mamba-2407': 262144,
'codestral-mamba-latest': 262144,
'open-codestral-mamba': 262144,
'ministral-3b-2410': 131072,
'ministral-3b-latest': 131072,
'ministral-8b-2410': 131072,
'ministral-8b-latest': 131072,
'mistral-large-2407': 131072,
'mistral-large-2411': 131072,
'mistral-large-latest': 131072,
'mistral-large-pixtral-2411': 131072,
'mistral-tiny-2407': 131072,
'mistral-tiny-latest': 131072,
'open-mistral-nemo': 131072,
'open-mistral-nemo-2407': 131072,
'pixtral-12b': 131072,
'pixtral-12b-2409': 131072,
'pixtral-12b-latest': 131072,
'pixtral-large-2411': 131072,
'pixtral-large-latest': 131072,
'open-mixtral-8x22b': 65536,
'open-mixtral-8x22b-2404': 65536,
'codestral-2405': 32768,
'mistral-embed': 32768,
'mistral-large-2402': 32768,
'mistral-medium': 32768,
'mistral-medium-2312': 32768,
'mistral-medium-latest': 32768,
'mistral-moderation-2411': 32768,
'mistral-moderation-latest': 32768,
'mistral-ocr-2503': 32768,
'mistral-ocr-latest': 32768,
'mistral-saba-2502': 32768,
'mistral-saba-latest': 32768,
'mistral-small': 32768,
'mistral-small-2312': 32768,
'mistral-small-2402': 32768,
'mistral-small-2409': 32768,
'mistral-small-2501': 32768,
'mistral-small-2503': 32768,
'mistral-small-latest': 32768,
'mistral-tiny': 32768,
'mistral-tiny-2312': 32768,
'open-mistral-7b': 32768,
'open-mixtral-8x7b': 32768,
};
// Return context size if model found, otherwise default to 32k
return Object.entries(contextMap).find(([key]) => model.includes(key))?.[1] || 32768;
}
/**
* Get the maximum context size for the Groq model
* @param {string} model Model identifier
@ -4460,27 +4534,10 @@ async function onModelChange() {
}
if (oai_settings.chat_completion_source === chat_completion_sources.MISTRALAI) {
if (oai_settings.max_context_unlocked) {
$('#openai_max_context').attr('max', unlocked_max);
} else if (['codestral-latest', 'codestral-mamba-2407', 'codestral-2411-rc5', 'codestral-2412', 'codestral-2501'].includes(oai_settings.mistralai_model)) {
$('#openai_max_context').attr('max', max_256k);
} else if (['mistral-large-2407', 'mistral-large-2411', 'mistral-large-pixtral-2411', 'mistral-large-latest'].includes(oai_settings.mistralai_model)) {
$('#openai_max_context').attr('max', max_128k);
} else if (oai_settings.mistralai_model.includes('mistral-nemo')) {
$('#openai_max_context').attr('max', max_128k);
} else if (oai_settings.mistralai_model.includes('mixtral-8x22b')) {
$('#openai_max_context').attr('max', max_64k);
} else if (oai_settings.mistralai_model.includes('pixtral')) {
$('#openai_max_context').attr('max', max_128k);
} else if (oai_settings.mistralai_model.includes('ministral')) {
$('#openai_max_context').attr('max', max_32k);
} else {
$('#openai_max_context').attr('max', max_32k);
}
const maxContext = getMistralMaxContext(oai_settings.mistralai_model, oai_settings.max_context_unlocked);
$('#openai_max_context').attr('max', maxContext);
oai_settings.openai_max_context = Math.min(oai_settings.openai_max_context, Number($('#openai_max_context').attr('max')));
$('#openai_max_context').val(oai_settings.openai_max_context).trigger('input');
//mistral also caps temp at 1.0
oai_settings.temp_openai = Math.min(claude_max_temp, oai_settings.temp_openai);
$('#temp_openai').attr('max', claude_max_temp).val(oai_settings.temp_openai).trigger('input');
}
@ -5070,7 +5127,9 @@ export function isImageInliningSupported() {
'o1-2024-12-17',
'chatgpt-4o-latest',
'yi-vision',
'pixtral-latest',
'mistral-large-pixtral-2411',
'mistral-small-2503',
'mistral-small-latest',
'pixtral-12b-latest',
'pixtral-12b',
'pixtral-12b-2409',