rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2024-12-11 08:57:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix background SD gens

Browse Source
This commit is contained in:
Cohee 2023-08-20 12:16:29 +03:00
parent e8c996ff61
commit 692c1a5e60
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -588,7 +588,7 @@ async function generatePicture(_, trigger, message, callback) {
const callbackOriginal = callback; const callbackOriginal = callback;
callback = async function (prompt, base64Image) { callback = async function (prompt, base64Image) {
const imagePath = base64Image; const imagePath = base64Image;
const imgUrl = `url(${base64Image})`; const imgUrl = `url('${encodeURIComponent(base64Image)}')`;
if ('forceSetBackground' in window) { if ('forceSetBackground' in window) {
forceSetBackground(imgUrl); forceSetBackground(imgUrl);
@ -665,15 +665,15 @@ async function sendGenerationRequest(generationType, prompt, characterName=null,
} }
/** /**
* Generates an "extras" image using a provided prompt and other settings, * Generates an "extras" image using a provided prompt and other settings,
* then saves the generated image and either invokes a callback or sends a message with the image. * then saves the generated image and either invokes a callback or sends a message with the image.
* *
* @param {string} prompt - The main instruction used to guide the image generation. * @param {string} prompt - The main instruction used to guide the image generation.
* @param {string} prefix - Additional context or prefix to guide the image generation. * @param {string} prefix - Additional context or prefix to guide the image generation.
* @param {string} characterName - The name used to determine the sub-directory for saving. * @param {string} characterName - The name used to determine the sub-directory for saving.
* @param {function} [callback] - Optional callback function invoked with the prompt and saved image. * @param {function} [callback] - Optional callback function invoked with the prompt and saved image.
* If not provided, `sendMessage` is called instead. * If not provided, `sendMessage` is called instead.
* *
* @returns {Promise<void>} - A promise that resolves when the image generation and processing are complete. * @returns {Promise<void>} - A promise that resolves when the image generation and processing are complete.
*/ */
async function generateExtrasImage(prompt, prefix, characterName, callback) { async function generateExtrasImage(prompt, prefix, characterName, callback) {
@ -702,7 +702,7 @@ async function generateExtrasImage(prompt, prefix, characterName, callback) {
const data = await result.json(); const data = await result.json();
//filename should be character name + human readable timestamp + generation mode //filename should be character name + human readable timestamp + generation mode
const filename = `${characterName}_${humanizedDateTime()}`; const filename = `${characterName}_${humanizedDateTime()}`;
const base64Image = await saveBase64AsFile(data.image, characterName, filename, "jpg"); const base64Image = await saveBase64AsFile(data.image, characterName, filename, "jpg");
callback ? callback(prompt, base64Image) : sendMessage(prompt, base64Image); callback ? callback(prompt, base64Image) : sendMessage(prompt, base64Image);
} else { } else {
callPopup('Image generation has failed. Please try again.', 'text'); callPopup('Image generation has failed. Please try again.', 'text');
@ -710,15 +710,15 @@ async function generateExtrasImage(prompt, prefix, characterName, callback) {
} }
/** /**
* Generates a "horde" image using the provided prompt and configuration settings, * Generates a "horde" image using the provided prompt and configuration settings,
* then saves the generated image and either invokes a callback or sends a message with the image. * then saves the generated image and either invokes a callback or sends a message with the image.
* *
* @param {string} prompt - The main instruction used to guide the image generation. * @param {string} prompt - The main instruction used to guide the image generation.
* @param {string} prefix - Additional context or prefix to guide the image generation. * @param {string} prefix - Additional context or prefix to guide the image generation.
* @param {string} characterName - The name used to determine the sub-directory for saving. * @param {string} characterName - The name used to determine the sub-directory for saving.
* @param {function} [callback] - Optional callback function invoked with the prompt and saved image. * @param {function} [callback] - Optional callback function invoked with the prompt and saved image.
* If not provided, `sendMessage` is called instead. * If not provided, `sendMessage` is called instead.
* *
* @returns {Promise<void>} - A promise that resolves when the image generation and processing are complete. * @returns {Promise<void>} - A promise that resolves when the image generation and processing are complete.
*/ */
async function generateHordeImage(prompt, prefix, characterName, callback) { async function generateHordeImage(prompt, prefix, characterName, callback) {
@ -744,7 +744,7 @@ async function generateHordeImage(prompt, prefix, characterName, callback) {
if (result.ok) { if (result.ok) {
const data = await result.text(); const data = await result.text();
const filename = `${characterName}_${humanizedDateTime()}`; const filename = `${characterName}_${humanizedDateTime()}`;
const base64Image = await saveBase64AsFile(data, characterName, filename, "webp"); const base64Image = await saveBase64AsFile(data, characterName, filename, "webp");
callback ? callback(prompt, base64Image) : sendMessage(prompt, base64Image); callback ? callback(prompt, base64Image) : sendMessage(prompt, base64Image);
} else { } else {
toastr.error('Image generation has failed. Please try again.'); toastr.error('Image generation has failed. Please try again.');