rixty/SillyTavern
1
0
Fork 0
mirror of https://github.com/SillyTavern/SillyTavern.git synced 2025-02-10 17:10:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

SD refine mode for paintbrush button

Browse Source
This commit is contained in:
Cohee 2023-07-22 20:32:58 +03:00
parent 52b2c89d64
commit 3feffaabe5
2 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -157,6 +157,20 @@ async function loadSettings() {
await Promise.all([loadSamplers(), loadModels()]); await Promise.all([loadSamplers(), loadModels()]);
} }
async function refinePrompt(prompt) {
if (extension_settings.sd.refine_mode) {
const refinedPrompt = await callPopup('<h3>Review and edit the prompt:</h3>Press "Cancel" to abort the image generation.', 'input', prompt, { rows: 5, okButton: 'Generate' });
if (refinedPrompt) {
return refinedPrompt;
} else {
throw new Error('Generation aborted by user.');
}
}
return prompt;
}
function onRefineModeInput() { function onRefineModeInput() {
extension_settings.sd.refine_mode = !!$('#sd_refine_mode').prop('checked'); extension_settings.sd.refine_mode = !!$('#sd_refine_mode').prop('checked');
saveSettingsDebounced(); saveSettingsDebounced();
@ -475,6 +489,10 @@ async function getPrompt(generationType, message, trigger, quiet_prompt) {
break; break;
} }
if (generationType !== generationMode.FREE) {
prompt = await refinePrompt(prompt);
}
return prompt; return prompt;
} }
@ -489,16 +507,6 @@ async function generatePrompt(quiet_prompt) {
} }
})); }));
if (extension_settings.sd.refine_mode) {
const refinedPrompt = await callPopup('<h3>Review and edit the generated prompt:</h3>Press "Cancel" to abort the image generation.', 'input', reply, { rows: 5, okButton: 'Generate' });
if (refinedPrompt) {
reply = refinedPrompt;
} else {
throw new Error('Generation aborted by user.');
}
}
return reply; return reply;
} }
@ -690,7 +698,9 @@ async function sdMessageButton(e) {
try { try {
setBusyIcon(true); setBusyIcon(true);
if (hasSavedImage) { if (hasSavedImage) {
const prompt = message?.extra?.title; const prompt = await refinePrompt(message.extra.title);
message.extra.title = prompt;
console.log('Regenerating an image, using existing prompt:', prompt); console.log('Regenerating an image, using existing prompt:', prompt);
await sendGenerationRequest(prompt, saveGeneratedImage); await sendGenerationRequest(prompt, saveGeneratedImage);
} }

2
public/scripts/extensions/stable-diffusion/style.css
View File

@ -24,6 +24,6 @@
} }
#sd_dropdown { #sd_dropdown {
z-index: 3000; z-index: 30000;
backdrop-filter: blur(--SmartThemeBlurStrength); backdrop-filter: blur(--SmartThemeBlurStrength);
} }