From d72573aca433bbd6b6b1f93368fb409ecefc9b75 Mon Sep 17 00:00:00 2001 From: Manuel Schmid Date: Mon, 22 Jan 2024 18:04:29 +0100 Subject: [PATCH] feat: extract attribute scheduler_name --- modules/advanced_parameters.py | 8 ++++---- modules/async_worker.py | 5 ++--- webui.py | 4 ++-- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/advanced_parameters.py b/modules/advanced_parameters.py index 0b6765e5..ceaa8c25 100644 --- a/modules/advanced_parameters.py +++ b/modules/advanced_parameters.py @@ -1,15 +1,15 @@ -scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ +generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ 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] * 29 + inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 28 def set_all_advanced_parameters(*args): - global scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ + global generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ 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, \ @@ -18,7 +18,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 - scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ + generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \ 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, \ diff --git a/modules/async_worker.py b/modules/async_worker.py index cf8472d2..2402f449 100644 --- a/modules/async_worker.py +++ b/modules/async_worker.py @@ -146,6 +146,7 @@ def worker(): adm_scaler_end = args.pop() adaptive_cfg = args.pop() sampler_name = args.pop() + scheduler_name = args.pop() cn_tasks = {x: [] for x in flags.ip_list} for _ in range(4): @@ -193,7 +194,7 @@ def worker(): refiner_model_name = 'None' sampler_name = 'lcm' - scheduler_name = advanced_parameters.scheduler_name = 'lcm' + scheduler_name = 'lcm' modules.patch.sharpness = sharpness = 0.0 cfg_scale = guidance_scale = 1.0 modules.patch.adaptive_cfg = adaptive_cfg = 1.0 @@ -245,8 +246,6 @@ def worker(): seed = int(image_seed) print(f'[Parameters] Seed = {seed}') - scheduler_name = advanced_parameters.scheduler_name - goals = [] tasks = [] diff --git a/webui.py b/webui.py index a60cf2c7..a6b1228f 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 = [scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, + adps = [generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, 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, @@ -527,7 +527,7 @@ 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 += [disable_preview, adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, scheduler_name] ctrls += ip_ctrls state_is_generating = gr.State(False)