rixty
/
SillyTavern
mirror of https://github.com/SillyTavern/SillyTavern.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Image Generation: Fix race condition in adding images to chat

This commit is contained in:
Cohee 2024-10-04 21:58:55 +03:00
parent bc5e7b1ee8
commit 8ff9ef3610
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2305,9 +2305,9 @@ async function generatePicture(initiator, args, trigger, message, callback) {
eventSource.emit(event_types.FORCE_SET_BACKGROUND, { url: imgUrl, path: imagePath }); eventSource.emit(event_types.FORCE_SET_BACKGROUND, { url: imgUrl, path: imagePath });
if (typeof callbackOriginal === 'function') { if (typeof callbackOriginal === 'function') {
callbackOriginal(prompt, imagePath, generationType, negativePromptPrefix, initiator); await callbackOriginal(prompt, imagePath, generationType, negativePromptPrefix, initiator);
} else { } else {
sendMessage(prompt, imagePath, generationType, negativePromptPrefix, initiator); await sendMessage(prompt, imagePath, generationType, negativePromptPrefix, initiator);
} }
}; };
} }
@ -2636,7 +2636,9 @@ async function sendGenerationRequest(generationType, prompt, additionalNegativeP
const filename = `${characterName}_${humanizedDateTime()}`; const filename = `${characterName}_${humanizedDateTime()}`;
const base64Image = await saveBase64AsFile(result.data, characterName, filename, result.format); const base64Image = await saveBase64AsFile(result.data, characterName, filename, result.format);
callback ? callback(prompt, base64Image, generationType, additionalNegativePrefix, initiator) : sendMessage(prompt, base64Image, generationType, additionalNegativePrefix, initiator); callback
? await callback(prompt, base64Image, generationType, additionalNegativePrefix, initiator)
: await sendMessage(prompt, base64Image, generationType, additionalNegativePrefix, initiator);
return base64Image; return base64Image;
} }