diff --git a/public/script.js b/public/script.js index 25a564c12..80429d4b5 100644 --- a/public/script.js +++ b/public/script.js @@ -2971,7 +2971,7 @@ async function Generate(type, { automatic_trigger, force_name2, resolve, reject, } // Get the negative prompt first since it has the unmodified mesSend array - let negativePrompt = getCombinedPrompt(true); + let negativePrompt = main_api == 'textgenerationwebui' ? getCombinedPrompt(true) : undefined; let finalPromt = getCombinedPrompt(false); const cfgValues = { guidanceScale: cfgGuidanceScale?.value, diff --git a/public/scripts/nai-settings.js b/public/scripts/nai-settings.js index e19c90601..85d470c4f 100644 --- a/public/scripts/nai-settings.js +++ b/public/scripts/nai-settings.js @@ -7,6 +7,7 @@ import { saveSettingsDebounced, setGenerationParamsFromPreset } from "../script.js"; +import { getCfgPrompt } from "./extensions/cfg/util.js"; import { MAX_CONTEXT_DEFAULT, tokenizers } from "./power-user.js"; import { getSortableDelay, @@ -395,6 +396,10 @@ function getBadWordPermutations(text) { } export function getNovelGenerationData(finalPrompt, this_settings, this_amount_gen, isImpersonate, cfgValues) { + if (cfgValues.guidanceScale && cfgValues.guidanceScale !== 1) { + cfgValues.negativePrompt = (getCfgPrompt(cfgValues.guidanceScale, true))?.value; + } + const clio = nai_settings.model_novel.includes('clio'); const kayra = nai_settings.model_novel.includes('kayra');