Merge pull request #2594 from SillyTavern/sd-stop Image generation stop handling

68de3fed59fb991f04b0d1918e1ed0cdb5d95f9a

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

Signed
Parents: d5576cd7b78cb84990c4b3c47fbb39c9ed07ce63 d84fef047821d2202cda629735e4ddcc8e9ff7d6
3 files changed, +21 -12Showing whitespace changes
public/scripts/extensions/stable-diffusion/button.html+6 -2
@@ -1,4 +1,8 @@
11<div id="sd_gen" class="list-group-item flex-container flexGap5">
22 <div class="fa-solid fa-paintbrush extensionsMenuExtensionButton" title="Trigger Stable Diffusion" data-i18n="[title]Trigger Stable Diffusion" /></div>
33 <span>Generate Image</span>
4+</div>
5+<div id="sd_stop_gen" class="list-group-item flex-container flexGap5">
6+ <div class="fa-solid fa-circle-stop extensionsMenuExtensionButton" title="Abort current image generation task" data-i18n="[title]Abort current image generation task"></div>
7+ <span>Stop Image Generation</span>
48</div>
public/scripts/extensions/stable-diffusion/index.js+13 -8
@@ -37,6 +37,7 @@ const MODULE_NAME = 'sd';
3737const UPDATE_INTERVAL = 1000;
3838// This is a 1x1 transparent PNG
3939const PNG_PIXEL = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=';
40+const CUSTOM_STOP_EVENT = 'sd_stop_generation';
4041
4142const sources = {
4243 extras: 'extras',
@@ -2290,6 +2291,7 @@ async function generatePicture(initiator, args, trigger, message, callback) {
22902291
22912292 const dimensions = setTypeSpecificDimensions(generationType);
22922293 const abortController = new AbortController();
2294+ const stopButton = document.getElementById('sd_stop_gen');
22932295 let negativePromptPrefix = args?.negative || '';
22942296 let imagePath = '';
22952297
@@ -2300,9 +2302,8 @@ async function generatePicture(initiator, args, trigger, message, callback) {
23002302 const prompt = await getPrompt(generationType, message, trigger, quietPrompt, combineNegatives);
23012303 console.log('Processed image prompt:', prompt);
23022304
2303- eventSource.once(event_types.GENERATION_STOPPED, stopListener);
2305+ $(stopButton).show();
23042306 contexteventSource.deactivateSendButtonsonce(CUSTOM_STOP_EVENT, stopListener);
2305- hideSwipeButtons();
23062307
23072308 if (typeof args?._abortController?.addEventListener === 'function') {
23082309 args._abortController.addEventListener('abort', stopListener);
@@ -2311,13 +2312,13 @@ async function generatePicture(initiator, args, trigger, message, callback) {
23112312 imagePath = await sendGenerationRequest(generationType, prompt, negativePromptPrefix, characterName, callback, initiator, abortController.signal);
23122313 } catch (err) {
23132314 console.trace(err);
23142315 throw new Errortoastr.error('SD prompt text generation failed. Reason: ' + err, 'Image Generation');
2316+ throw new Error('SD prompt text generation failed. Reason: ' + err);
23152317 }
23162318 finally {
2319+ $(stopButton).hide();
23172320 restoreOriginalDimensions(dimensions);
23182321 eventSource.removeListener(event_types.GENERATION_STOPPEDCUSTOM_STOP_EVENT, stopListener);
2319- context.activateSendButtons();
2320- showSwipeButtons();
23212322 }
23222323
23232324 return imagePath;
@@ -3395,7 +3396,7 @@ async function addSDGenButtons() {
33953396 $(document).on('click touchend', function (e) {
33963397 const target = $(e.target);
33973398 if (target.is(dropdown) || target.closest(dropdown).length) return;
33983399 if ((target.is(button) || target.closest(button).length) && !dropdown.is(':visible') && $('#send_but').is(':visible')) {
33993400 e.preventDefault();
34003401
34013402 dropdown.fadeIn(animation_duration);
@@ -3425,6 +3426,10 @@ async function addSDGenButtons() {
34253426 generatePicture(initiators.wand, {}, param);
34263427 }
34273428 });
3429+
3430+ const stopGenButton = $('#sd_stop_gen');
3431+ stopGenButton.hide();
3432+ stopGenButton.on('click', () => eventSource.emit(CUSTOM_STOP_EVENT));
34283433}
34293434
34303435function isValidState() {
public/scripts/extensions/translate/buttons.html+2 -2
@@ -1,8 +1,8 @@
11<div id="translate_chat" class="list-group-item flex-container flexGap5">
22 <div class="fa-solid fa-language extensionsMenuExtensionButton" /></div>
33 <span data-i18n="ext_translate_btn_chat">Translate Chat</span>
44</div>
55<div id="translate_input_message" class="list-group-item flex-container flexGap5">
66 <div class="fa-solid fa-keyboard extensionsMenuExtensionButton" /></div>
77 <span data-i18n="ext_translate_btn_input">Translate Input</span>
88</div>