#2460 replaceAll for all workflow placeholders

9eb404a2753ffe07a65a6502131dfb4ef3f0b07f

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

1 files changed, +8 -8Showing whitespace changes
public/scripts/extensions/stable-diffusion/index.js+8 -8
@@ -2916,25 +2916,25 @@ async function generateComfyImage(prompt, negativePrompt) {
29162916 const text = await workflowResponse.text();
29172917 toastr.error(`Failed to load workflow.\n\n${text}`);
29182918 }
29192919 let workflow = (await workflowResponse.json()).replacereplaceAll('"%prompt%"', JSON.stringify(prompt));
29202920 workflow = workflow.replacereplaceAll('"%negative_prompt%"', JSON.stringify(negativePrompt));
29212921
29222922 const seed = extension_settings.sd.seed >= 0 ? extension_settings.sd.seed : Math.round(Math.random() * Number.MAX_SAFE_INTEGER);
29232923 workflow = workflow.replaceAll('"%seed%"', JSON.stringify(seed));
29242924 placeholders.forEach(ph => {
29252925 workflow = workflow.replacereplaceAll(`"%${ph}%"`, JSON.stringify(extension_settings.sd[ph]));
29262926 });
29272927 (extension_settings.sd.comfy_placeholders ?? []).forEach(ph => {
29282928 workflow = workflow.replacereplaceAll(`"%${ph.find}%"`, JSON.stringify(substituteParams(ph.replace)));
29292929 });
29302930 if (/%user_avatar%/gi.test(workflow)) {
29312931 const response = await fetch(getUserAvatarUrl());
29322932 if (response.ok) {
29332933 const avatarBlob = await response.blob();
29342934 const avatarBase64 = await getBase64Async(avatarBlob);
29352935 workflow = workflow.replacereplaceAll('"%user_avatar%"', JSON.stringify(avatarBase64));
29362936 } else {
29372937 workflow = workflow.replacereplaceAll('"%user_avatar%"', JSON.stringify(PNG_PIXEL));
29382938 }
29392939 }
29402940 if (/%char_avatar%/gi.test(workflow)) {
@@ -2942,9 +2942,9 @@ async function generateComfyImage(prompt, negativePrompt) {
29422942 if (response.ok) {
29432943 const avatarBlob = await response.blob();
29442944 const avatarBase64 = await getBase64Async(avatarBlob);
29452945 workflow = workflow.replacereplaceAll('"%char_avatar%"', JSON.stringify(avatarBase64));
29462946 } else {
29472947 workflow = workflow.replacereplaceAll('"%char_avatar%"', JSON.stringify(PNG_PIXEL));
29482948 }
29492949 }
29502950 console.log(`{