From 9f4a00e868a6bbb73d2865517d14a56a8fc6f8e9 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Mon, 22 Jan 2024 18:42:54 +0100 Subject: [PATCH] feat: extract attribute overwrite_height --- modules/advanced_parameters.py | 11 ++++------- modules/async_worker.py | 5 +++-- webui.py | 6 +++--- 3 files changed, 10 insertions(+), 12 deletions(-) diff --git a/modules/advanced_parameters.py b/modules/advanced_parameters.py index e71cc4c4..0585c4a8 100644 --- a/modules/advanced_parameters.py +++ b/modules/advanced_parameters.py @@ -1,16 +1,14 @@ -overwrite_height, \ - overwrite_vary_strength, overwrite_upscale_strength, \ +overwrite_vary_strength, overwrite_upscale_strength, \ mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \ 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] * 25 + inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 24 def set_all_advanced_parameters(*args): - global overwrite_height, \ - overwrite_vary_strength, overwrite_upscale_strength, \ + global overwrite_vary_strength, overwrite_upscale_strength, \ mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \ refiner_swap_method, \ @@ -18,8 +16,7 @@ def set_all_advanced_parameters(*args): 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 - overwrite_height, \ - overwrite_vary_strength, overwrite_upscale_strength, \ + overwrite_vary_strength, overwrite_upscale_strength, \ mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \ refiner_swap_method, \ diff --git a/modules/async_worker.py b/modules/async_worker.py index 2cb4fa7a..7110d995 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -147,6 +147,7 @@ def worker(): overwrite_step = args.pop() overwrite_switch = args.pop() overwrite_width = args.pop() + overwrite_height = args.pop() cn_tasks = {x: [] for x in flags.ip_list} for _ in range(4): @@ -350,8 +351,8 @@ def worker(): if overwrite_width > 0: width = overwrite_width - if advanced_parameters.overwrite_height > 0: - height = advanced_parameters.overwrite_height + if overwrite_height > 0: + height = overwrite_height print(f'[Parameters] Sampler = {sampler_name} - {scheduler_name}') print(f'[Parameters] Steps = {steps} - {switch}') diff --git a/webui.py b/webui.py index 25a8321c..b6ece454 100644 --- a/webui.py +++ b/webui.py @@ -446,8 +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 = [overwrite_height, - overwrite_vary_strength, overwrite_upscale_strength, + adps = [overwrite_vary_strength, overwrite_upscale_strength, mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, refiner_swap_method] @@ -528,7 +527,8 @@ with shared.gradio_root: ctrls += [input_image_checkbox, current_tab] ctrls += [uov_method, uov_input_image] ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image] - ctrls += [disable_preview, adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, scheduler_name, overwrite_step, overwrite_switch, overwrite_width] + ctrls += [disable_preview, adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name] + ctrls += [scheduler_name, overwrite_step, overwrite_switch, overwrite_width, overwrite_height] ctrls += ip_ctrls state_is_generating = gr.State(False)