diff --git a/public/script.js b/public/script.js index e5ed2df03..dc26d9670 100644 --- a/public/script.js +++ b/public/script.js @@ -2741,6 +2741,12 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, // Fetches the combined prompt for both negative and positive prompts const cfgGuidanceScale = getGuidanceScale(); function getCombinedPrompt(isNegative) { + // Only return if the guidance scale doesn't exist or the value is 1 + // Also don't return if constructing the neutral prompt + if (isNegative && (!cfgGuidanceScale || cfgGuidanceScale?.value === 1)) { + return; + } + let finalMesSend = [...mesSend]; let cfgPrompt = {}; if (cfgGuidanceScale && cfgGuidanceScale?.value !== 1) { @@ -2754,7 +2760,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, ? cfgPrompt.value : ` ${cfgPrompt.value}`; } else { - // TODO: Switch from splice method to insertion depth method + // TODO: Make all extension prompts use an array/splice method finalMesSend.splice(mesSend.length - cfgPrompt.depth, 0, `${cfgPrompt.value}\n`); } } diff --git a/public/scripts/extensions/cfg/index.js b/public/scripts/extensions/cfg/index.js index c850ca6d6..f572d2c63 100644 --- a/public/scripts/extensions/cfg/index.js +++ b/public/scripts/extensions/cfg/index.js @@ -348,7 +348,7 @@ jQuery(async () => { .filter(":checked") .map(function() { return parseInt($(this).val()) }) .get() - .filter((e) => e !== NaN) || []; + .filter((e) => !Number.isNaN(e)) || []; chat_metadata[metadataKeys.prompt_combine] = values; saveMetadataDebounced(); diff --git a/public/scripts/extensions/cfg/util.js b/public/scripts/extensions/cfg/util.js index 850978884..6e156d5d9 100644 --- a/public/scripts/extensions/cfg/util.js +++ b/public/scripts/extensions/cfg/util.js @@ -39,10 +39,12 @@ export function getGuidanceScale() { }; } - return { - type: cfgType.global, - value: extension_settings.cfg.global.guidance_scale - }; + if (extension_settings.cfg.global && extension_settings.cfg.global?.guidance_scale !== 1) { + return { + type: cfgType.global, + value: extension_settings.cfg.global.guidance_scale + }; + } } // Gets the CFG prompt