From b1f79a4b44d2dfc25406ad2aa7742d9c24f47fca Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Wed, 22 Nov 2023 23:19:27 +0100 Subject: [PATCH] move nsfw filter to core module, make preview hiding more effective --- modules/core.py | 2 +- webui.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/core.py b/modules/core.py index e0fcd13f..8fa97728 100644 --- a/modules/core.py +++ b/modules/core.py @@ -301,7 +301,7 @@ def ksampler(model, positive, negative, latent, seed=None, steps=30, cfg=7.0, sa def callback(step, x0, x, total_steps): fcbh.model_management.throw_exception_if_processing_interrupted() y = None - if previewer is not None and not modules.advanced_parameters.disable_preview: + if previewer is not None and not modules.advanced_parameters.disable_preview and not (modules.config.default_black_out_nsfw and modules.config.default_hide_preview_if_black_out_nsfw): y = previewer(x0, previewer_start + step, previewer_end) if callback_function is not None: callback_function(previewer_start + step, x0, x, previewer_end, y) diff --git a/webui.py b/webui.py index c796e70e..c795c702 100644 --- a/webui.py +++ b/webui.py @@ -57,7 +57,7 @@ def generate_clicked(task): percentage, title, image = product yield gr.update(visible=True, value=modules.html.make_progress_html(percentage, title)), \ - gr.update(visible=True, value=image) if image is not None and not (modules.config.default_black_out_nsfw and modules.config.default_hide_preview_if_black_out_nsfw) else gr.update(), \ + gr.update(visible=True, value=image) if image is not None else gr.update(), \ gr.update(), \ gr.update(visible=False) if flag == 'results':