rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-05-23 14:54:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

#2460 replaceAll for all workflow placeholders

Browse Source
This commit is contained in:
Cohee 2024-07-02 19:11:45 +03:00
parent b66e589b30
commit 9eb404a275
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
public/scripts/extensions/stable-diffusion/index.js
View File

@ -2916,25 +2916,25 @@ async function generateComfyImage(prompt, negativePrompt) {
const text = await workflowResponse.text(); const text = await workflowResponse.text();
toastr.error(`Failed to load workflow.\n\n${text}`); toastr.error(`Failed to load workflow.\n\n${text}`);
} }
let workflow = (await workflowResponse.json()).replace('"%prompt%"', JSON.stringify(prompt)); let workflow = (await workflowResponse.json()).replaceAll('"%prompt%"', JSON.stringify(prompt));
workflow = workflow.replace('"%negative_prompt%"', JSON.stringify(negativePrompt)); workflow = workflow.replaceAll('"%negative_prompt%"', JSON.stringify(negativePrompt));
const seed = extension_settings.sd.seed >= 0 ? extension_settings.sd.seed : Math.round(Math.random() * Number.MAX_SAFE_INTEGER); const seed = extension_settings.sd.seed >= 0 ? extension_settings.sd.seed : Math.round(Math.random() * Number.MAX_SAFE_INTEGER);
workflow = workflow.replaceAll('"%seed%"', JSON.stringify(seed)); workflow = workflow.replaceAll('"%seed%"', JSON.stringify(seed));
placeholders.forEach(ph => { placeholders.forEach(ph => {
workflow = workflow.replace(`"%${ph}%"`, JSON.stringify(extension_settings.sd[ph])); workflow = workflow.replaceAll(`"%${ph}%"`, JSON.stringify(extension_settings.sd[ph]));
}); });
(extension_settings.sd.comfy_placeholders ?? []).forEach(ph => { (extension_settings.sd.comfy_placeholders ?? []).forEach(ph => {
workflow = workflow.replace(`"%${ph.find}%"`, JSON.stringify(substituteParams(ph.replace))); workflow = workflow.replaceAll(`"%${ph.find}%"`, JSON.stringify(substituteParams(ph.replace)));
}); });
if (/%user_avatar%/gi.test(workflow)) { if (/%user_avatar%/gi.test(workflow)) {
const response = await fetch(getUserAvatarUrl()); const response = await fetch(getUserAvatarUrl());
if (response.ok) { if (response.ok) {
const avatarBlob = await response.blob(); const avatarBlob = await response.blob();
const avatarBase64 = await getBase64Async(avatarBlob); const avatarBase64 = await getBase64Async(avatarBlob);
workflow = workflow.replace('"%user_avatar%"', JSON.stringify(avatarBase64)); workflow = workflow.replaceAll('"%user_avatar%"', JSON.stringify(avatarBase64));
} else { } else {
workflow = workflow.replace('"%user_avatar%"', JSON.stringify(PNG_PIXEL)); workflow = workflow.replaceAll('"%user_avatar%"', JSON.stringify(PNG_PIXEL));
} }
} }
if (/%char_avatar%/gi.test(workflow)) { if (/%char_avatar%/gi.test(workflow)) {
@ -2942,9 +2942,9 @@ async function generateComfyImage(prompt, negativePrompt) {
if (response.ok) { if (response.ok) {
const avatarBlob = await response.blob(); const avatarBlob = await response.blob();
const avatarBase64 = await getBase64Async(avatarBlob); const avatarBase64 = await getBase64Async(avatarBlob);
workflow = workflow.replace('"%char_avatar%"', JSON.stringify(avatarBase64)); workflow = workflow.replaceAll('"%char_avatar%"', JSON.stringify(avatarBase64));
} else { } else {
workflow = workflow.replace('"%char_avatar%"', JSON.stringify(PNG_PIXEL)); workflow = workflow.replaceAll('"%char_avatar%"', JSON.stringify(PNG_PIXEL));
} }
} }
console.log(`{ console.log(`{