Refactor args for context/instruct select

4ba99412af473695225bfccf10c8bc8930479f82

Wolfsblvt <wolfsblvt@gmail.com>

public/script.js+2 -2 Viewed

@@ -8526,7 +8526,7 @@ async function selectContextCallback(args, name) {
8526	8526	}
8527	8527
8528	8528	const foundName = result[0].item;
8529	8529	selectContextPreset(foundName, { quiet: quiet });
8530	8530	return foundName;
8531	8531	}
8532	8532

@@ -8546,7 +8546,7 @@ async function selectInstructCallback(args, name) {
8546	8546	}
8547	8547
8548	8548	const foundName = result[0].item;
8549	8549	selectInstructPreset(foundName, { quiet: quiet });
8550	8550	return foundName;
8551	8551	}
8552	8552

public/scripts/instruct-mode.js+14 -10 Viewed

 /**
  * Select context template if not already selected.
  * @param {string} preset Preset name.
  * @param {booleanobject} quiet Suppress[options={}] infoOptional messagearguments.
 + * @param {boolean} [options.quiet=false] Suppress toast messages.
 + * @param {boolean} [options.isAuto=false] Is auto-select.
  */
 export function selectContextPreset(preset, { quiet = false, isAuto = false } = {}) {
     // If context template is not already selected, select it
     if (preset !== power_user.context.preset) {
         $('#context_presets').val(preset).trigger('change');
         !quiet && toastr.info(`Context Template: preset "${preset}" ${isAuto ? 'auto-' : ''}selected`);
+    }
     // If instruct mode is disabled, enable it, except for default context template

 /**
  * Select instruct preset if not already selected.
  * @param {string} preset Preset name.
  * @param {booleanobject} quiet Suppress[options={}] infoOptional messagearguments.
 + * @param {boolean} [options.quiet=false] Suppress toast messages.
 + * @param {boolean} [options.isAuto=false] Is auto-select.
  */
 export function selectInstructPreset(preset, { quiet = false, isAuto = false } = {}) {
     // If instruct preset is not already selected, select it
     if (preset !== power_user.instruct.preset) {
         $('#instruct_presets').val(preset).trigger('change');
         !quiet && toastr.info(`Instruct ModeTemplate: template "${preset}" ${isAuto ? 'auto-' : ''}selected`);
+    }
     // If instruct mode is disabled, enable it

@@ -189,7 +193,7 @@ export function autoSelectInstructPreset(modelId) {
189	193	// If instruct preset matches the context template
190	194	if (power_user.instruct.bind_to_context && instruct_preset.name === power_user.context.preset) {
191	195	foundMatch = true;
192	196	selectInstructPreset(instruct_preset.name, { isAuto: true });
193	197	break;
194	198	}
195	199	}

                     // Stop on first match so it won't cycle back and forth between presets if multiple regexes match
                     if (regex instanceof RegExp && regex.test(modelId)) {
                         selectInstructPreset(preset.name, { isAuto: true });
                         return true;
+                    }

@@ -541,13 +545,13 @@ function selectMatchingContextTemplate(name) {
541	545	// If context template matches the instruct preset
542	546	if (context_preset.name === name) {
543	547	foundMatch = true;
544	548	selectContextPreset(context_preset.name, { isAuto: true });
545	549	break;
546	550	}
547	551	}
548	552	if (!foundMatch) {
549	553	// If no match was found, select default context preset
550	554	selectContextPreset(power_user.default_context, { isAuto: true });
551	555	}
552	556	}
553	557

public/scripts/power-user.js+1 -1 Viewed

@@ -1798,7 +1798,7 @@ async function loadContextSettings() {
1798	1798	for (const instruct_preset of instruct_presets) {
1799	1799	// If instruct preset matches the context template
1800	1800	if (instruct_preset.name === name) {
1801	1801	selectInstructPreset(instruct_preset.name, { isAuto: true });
1802	1802	break;
1803	1803	}
1804	1804	}