Merge pull request #3430 from qvink/generate_before_combine_prompts_await await GENERATE_BEFORE_COMBINE_PROMPTS

d9fc76f336a72d60b446e284360b20f3fbf5ca8c

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

Signed

public/script.js+4 -4 Viewed

     // For prompt bit itemization
     let mesSendString = '';
     async 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 && !useCfgPrompt) {

         };
         // Before returning the combined prompt, give available context related information to all subscribers.
         await eventSource.emitAndWaitemit(event_types.GENERATE_BEFORE_COMBINE_PROMPTS, data);
         // If one or multiple subscribers return a value, forfeit the responsibillity of flattening the context.
         return !data.combinedPrompt ? combine() : data.combinedPrompt;
+    }
     let finalPrompt = await getCombinedPrompt(false);
     const eventData = { prompt: finalPrompt, dryRun: dryRun };
     await eventSource.emit(event_types.GENERATE_AFTER_COMBINE_PROMPTS, eventData);

@@ -4646,7 +4646,7 @@ export async function Generate(type, { automatic_trigger, force_name2, quiet_pro
4646	4646	}
4647	4647	break;
4648	4648	case 'textgenerationwebui': {
4649	4649	const cfgValues = useCfgPrompt ? { guidanceScale: cfgGuidanceScale, negativePrompt: await getCombinedPrompt(true) } : null;
4650	4650	generate_data = getTextGenGenerationData(finalPrompt, maxLength, isImpersonate, isContinue, cfgValues, type);
4651	4651	break;
4652	4652	}