Merge branch 'staging' of https://github.com/Cohee1207/SillyTavern into staging

This commit is contained in:
RossAscends
2023-12-03 21:59:23 +09:00
2 changed files with 4 additions and 1 deletions

View File

@ -3238,6 +3238,8 @@ async function onModelChange() {
$('#top_k_openai').attr('max', 200).val(oai_settings.top_k_openai).trigger('input'); $('#top_k_openai').attr('max', 200).val(oai_settings.top_k_openai).trigger('input');
} }
$('#openai_max_context_counter').attr('max', Number($('#openai_max_context').attr('max')));
saveSettingsDebounced(); saveSettingsDebounced();
eventSource.emit(event_types.CHATCOMPLETION_MODEL_CHANGED, value); eventSource.emit(event_types.CHATCOMPLETION_MODEL_CHANGED, value);
} }
@ -3546,6 +3548,7 @@ $(document).ready(async function () {
oai_settings.use_ai21_tokenizer ? ai21_max = 8191 : ai21_max = 9200; oai_settings.use_ai21_tokenizer ? ai21_max = 8191 : ai21_max = 9200;
oai_settings.openai_max_context = Math.min(ai21_max, oai_settings.openai_max_context); oai_settings.openai_max_context = Math.min(ai21_max, oai_settings.openai_max_context);
$('#openai_max_context').attr('max', ai21_max).val(oai_settings.openai_max_context).trigger('input'); $('#openai_max_context').attr('max', ai21_max).val(oai_settings.openai_max_context).trigger('input');
$('#openai_max_context_counter').attr('max', Number($('#openai_max_context').attr('max')));
saveSettingsDebounced(); saveSettingsDebounced();
}); });

View File

@ -49,7 +49,7 @@ export {
export const MAX_CONTEXT_DEFAULT = 8192; export const MAX_CONTEXT_DEFAULT = 8192;
const MAX_CONTEXT_UNLOCKED = 200 * 1000; const MAX_CONTEXT_UNLOCKED = 200 * 1000;
const unlockedMaxContextStep = 1024; const unlockedMaxContextStep = 512;
const maxContextMin = 512; const maxContextMin = 512;
const maxContextStep = 256; const maxContextStep = 256;