Revert keepContextLock flag in setGenerationParamsFromPreset

8e94589f837b51e0399528977c1ec07998c7e34e

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

1 files changed, +3 -14Ignore whitespace
public/script.js+3 -14
@@ -1258,7 +1258,7 @@ async function getStatusTextgen() {
1258 const backend_max_context = data['default_generation_settings']['n_ctx'];1258 const backend_max_context = data['default_generation_settings']['n_ctx'];
1259 const old_value = max_context;1259 const old_value = max_context;
1260 if (max_context !== backend_max_context) {1260 if (max_context !== backend_max_context) {
1261 setGenerationParamsFromPreset({ max_length: backend_max_context }, true);1261 setGenerationParamsFromPreset({ max_length: backend_max_context });
1262 }1262 }
1263 if (old_value !== max_context) {1263 if (old_value !== max_context) {
1264 console.log(`Auto-switched max context from ${old_value} to ${max_context}`);1264 console.log(`Auto-switched max context from ${old_value} to ${max_context}`);
@@ -6837,21 +6837,10 @@ export async function saveSettings(type) {
6837/**6837/**
6838 * Sets the generation parameters from a preset object.6838 * Sets the generation parameters from a preset object.
6839 * @param {{ genamt?: number, max_length?: number }} preset Preset object6839 * @param {{ genamt?: number, max_length?: number }} preset Preset object
6840 * @param {boolean?} keepContextLock If true, will not unlock context if it needs to be unlocked
6841 */6840 */
6842export function setGenerationParamsFromPreset(preset, keepContextLock = false) {6841export function setGenerationParamsFromPreset(preset) {
6843 const needsUnlock = (preset.max_length ?? max_context) > MAX_CONTEXT_DEFAULT || (preset.genamt ?? amount_gen) > MAX_RESPONSE_DEFAULT;6842 const needsUnlock = (preset.max_length ?? max_context) > MAX_CONTEXT_DEFAULT || (preset.genamt ?? amount_gen) > MAX_RESPONSE_DEFAULT;
6844 if (!keepContextLock || $('#max_context_unlocked').prop('checked')) {6843 $('#max_context_unlocked').prop('checked', needsUnlock).trigger('change');
6845 $('#max_context_unlocked').prop('checked', needsUnlock).trigger('change');
6846 } else if (needsUnlock) {
6847 // cap values
6848 if ((preset.max_length ?? max_context) > MAX_CONTEXT_DEFAULT) {
6849 preset.max_length = MAX_CONTEXT_DEFAULT;
6850 }
6851 if ((preset.genamt ?? amount_gen) > MAX_RESPONSE_DEFAULT) {
6852 preset.genamt = MAX_RESPONSE_DEFAULT;
6853 }
6854 }
68556844
6856 if (preset.genamt !== undefined) {6845 if (preset.genamt !== undefined) {
6857 amount_gen = preset.genamt;6846 amount_gen = preset.genamt;