From cfb70c0278ec3d2d334cf76321f2b3fc2795f4a5 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Mon, 22 Jan 2024 19:10:32 +0100 Subject: [PATCH] feat: extract attribute refiner_swap_method --- modules/advanced_parameters.py | 5 +---- modules/async_worker.py | 2 +- webui.py | 3 ++- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/modules/advanced_parameters.py b/modules/advanced_parameters.py index f512afc3..bc5c0bd5 100644 --- a/modules/advanced_parameters.py +++ b/modules/advanced_parameters.py @@ -1,19 +1,16 @@ controlnet_softness, \ - refiner_swap_method, \ freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2, \ debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, \ - inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 15 + inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 14 def set_all_advanced_parameters(*args): global controlnet_softness, \ - refiner_swap_method, \ freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2, \ debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, \ inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate controlnet_softness, \ - refiner_swap_method, \ freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2, \ debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, \ inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = args diff --git a/modules/async_worker.py b/modules/async_worker.py index 192c44e7..301918c2 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -156,6 +156,7 @@ def worker(): skipping_cn_preprocessor = args.pop() canny_low_threshold = args.pop() canny_high_threshold = args.pop() + refiner_swap_method = args.pop() cn_tasks = {x: [] for x in flags.ip_list} for _ in range(4): @@ -238,7 +239,6 @@ def worker(): width, height = int(width), int(height) skip_prompt_processing = False - refiner_swap_method = advanced_parameters.refiner_swap_method inpaint_worker.current_task = None inpaint_parameterized = advanced_parameters.inpaint_engine != 'None' diff --git a/webui.py b/webui.py index 790b2d41..c26dcb5b 100644 --- a/webui.py +++ b/webui.py @@ -446,7 +446,7 @@ with shared.gradio_root: freeu_s2 = gr.Slider(label='S2', minimum=0, maximum=4, step=0.01, value=0.95) freeu_ctrls = [freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2] - adps = [controlnet_softness, refiner_swap_method] + adps = [controlnet_softness] adps += freeu_ctrls adps += inpaint_ctrls @@ -529,6 +529,7 @@ with shared.gradio_root: ctrls += [overwrite_step, overwrite_switch, overwrite_width, overwrite_height, overwrite_vary_strength] ctrls += [overwrite_upscale_strength, mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint] ctrls += [debugging_cn_preprocessor, skipping_cn_preprocessor, canny_low_threshold, canny_high_threshold] + ctrls += [refiner_swap_method] ctrls += ip_ctrls state_is_generating = gr.State(False)