From 22af976c5181ad57854edd9b15ebbebb828086c6 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Mon, 22 Jan 2024 18:45:01 +0100 Subject: [PATCH] feat: extract attribute overwrite_vary_strength --- modules/advanced_parameters.py | 8 ++++---- modules/async_worker.py | 5 +++-- webui.py | 7 ++++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/modules/advanced_parameters.py b/modules/advanced_parameters.py index 0585c4a8..57c72eaa 100644 --- a/modules/advanced_parameters.py +++ b/modules/advanced_parameters.py @@ -1,14 +1,14 @@ -overwrite_vary_strength, overwrite_upscale_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] * 24 + inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 23 def set_all_advanced_parameters(*args): - global overwrite_vary_strength, overwrite_upscale_strength, \ + global 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, \ @@ -16,7 +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_vary_strength, overwrite_upscale_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 7110d995..656657ba 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -148,6 +148,7 @@ def worker(): overwrite_switch = args.pop() overwrite_width = args.pop() overwrite_height = args.pop() + overwrite_vary_strength = args.pop() cn_tasks = {x: [] for x in flags.ip_list} for _ in range(4): @@ -451,8 +452,8 @@ def worker(): denoising_strength = 0.5 if 'strong' in uov_method: denoising_strength = 0.85 - if advanced_parameters.overwrite_vary_strength > 0: - denoising_strength = advanced_parameters.overwrite_vary_strength + if overwrite_vary_strength > 0: + denoising_strength = overwrite_vary_strength shape_ceil = get_image_shape_ceil(uov_input_image) if shape_ceil < 1024: diff --git a/webui.py b/webui.py index b6ece454..506bd30c 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 = [overwrite_vary_strength, overwrite_upscale_strength, + adps = [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] @@ -527,8 +527,9 @@ 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] - ctrls += [scheduler_name, overwrite_step, overwrite_switch, overwrite_width, overwrite_height] + ctrls += [disable_preview, adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg] + ctrls += [sampler_name, scheduler_name] + ctrls += [overwrite_step, overwrite_switch, overwrite_width, overwrite_height, overwrite_vary_strength] ctrls += ip_ctrls state_is_generating = gr.State(False)