ImageGen: Add a placeholder for {{prefixedPrompt}} in the message template Closes #2946

10f51f5d9078ff19cc6480430321aa23c742f686

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

1 files changed, +8 -7Ignore whitespace
public/scripts/extensions/stable-diffusion/index.js+8 -7
@@ -2309,14 +2309,14 @@ async function generatePicture(initiator, args, trigger, message, callback) {
23092309
23102310 if (generationType == generationMode.BACKGROUND) {
23112311 const callbackOriginal = callback;
23122312 callback = async function (prompt, imagePath, generationType, _negativePromptPrefix, _initiator, prefixedPrompt) {
23132313 const imgUrl = `url("${encodeURI(imagePath)}")`;
23142314 eventSource.emit(event_types.FORCE_SET_BACKGROUND, { url: imgUrl, path: imagePath });
23152315
23162316 if (typeof callbackOriginal === 'function') {
23172317 await callbackOriginal(prompt, imagePath, generationType, negativePromptPrefix, initiator, prefixedPrompt);
23182318 } else {
23192319 await sendMessage(prompt, imagePath, generationType, negativePromptPrefix, initiator, prefixedPrompt);
23202320 }
23212321 };
23222322 }
@@ -2646,8 +2646,8 @@ async function sendGenerationRequest(generationType, prompt, additionalNegativeP
26462646 const filename = `${characterName}_${humanizedDateTime()}`;
26472647 const base64Image = await saveBase64AsFile(result.data, characterName, filename, result.format);
26482648 callback
26492649 ? await callback(prompt, base64Image, generationType, additionalNegativePrefix, initiator, prefixedPrompt)
26502650 : await sendMessage(prompt, base64Image, generationType, additionalNegativePrefix, initiator, prefixedPrompt);
26512651 return base64Image;
26522652}
26532653
@@ -3435,12 +3435,13 @@ async function onComfyDeleteWorkflowClick() {
34353435 * @param {number} generationType Generation type of the image
34363436 * @param {string} additionalNegativePrefix Additional negative prompt used for the image generation
34373437 * @param {string} initiator The initiator of the image generation
3438+ * @param {string} prefixedPrompt Prompt with an attached specific prefix
34383439 */
34393440async function sendMessage(prompt, image, generationType, additionalNegativePrefix, initiator, prefixedPrompt) {
34403441 const context = getContext();
34413442 const name = context.groupId ? systemUserName : context.name2;
34423443 const template = extension_settings.sd.prompts[generationMode.MESSAGE] || '{{prompt}}';
34433444 const messageText = substituteParamsExtended(template, { char: name, prompt: prompt, prefixedPrompt: prefixedPrompt });
34443445 const message = {
34453446 name: name,
34463447 is_user: false,