mirror of
https://github.com/lllyasviel/Fooocus.git
synced 2026-08-16 13:13:16 +02:00
feat: extract attribute overwrite_upscale_strength
This commit is contained in:
@@ -1,22 +1,19 @@
|
|||||||
overwrite_upscale_strength, \
|
|
||||||
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \
|
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, \
|
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \
|
||||||
refiner_swap_method, \
|
refiner_swap_method, \
|
||||||
freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2, \
|
freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2, \
|
||||||
debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, \
|
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] * 23
|
inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 21
|
||||||
|
|
||||||
|
|
||||||
def set_all_advanced_parameters(*args):
|
def set_all_advanced_parameters(*args):
|
||||||
global overwrite_upscale_strength, \
|
global mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \
|
||||||
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, \
|
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \
|
||||||
refiner_swap_method, \
|
refiner_swap_method, \
|
||||||
freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2, \
|
freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2, \
|
||||||
debugging_inpaint_preprocessor, inpaint_disable_initial_latent, inpaint_engine, inpaint_strength, inpaint_respective_field, \
|
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
|
inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate
|
||||||
|
|
||||||
overwrite_upscale_strength, \
|
|
||||||
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \
|
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, \
|
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness, canny_low_threshold, canny_high_threshold, \
|
||||||
refiner_swap_method, \
|
refiner_swap_method, \
|
||||||
|
|||||||
@@ -149,6 +149,7 @@ def worker():
|
|||||||
overwrite_width = args.pop()
|
overwrite_width = args.pop()
|
||||||
overwrite_height = args.pop()
|
overwrite_height = args.pop()
|
||||||
overwrite_vary_strength = args.pop()
|
overwrite_vary_strength = args.pop()
|
||||||
|
overwrite_upscale_strength = args.pop()
|
||||||
|
|
||||||
cn_tasks = {x: [] for x in flags.ip_list}
|
cn_tasks = {x: [] for x in flags.ip_list}
|
||||||
for _ in range(4):
|
for _ in range(4):
|
||||||
@@ -524,8 +525,8 @@ def worker():
|
|||||||
tiled = True
|
tiled = True
|
||||||
denoising_strength = 0.382
|
denoising_strength = 0.382
|
||||||
|
|
||||||
if advanced_parameters.overwrite_upscale_strength > 0:
|
if overwrite_upscale_strength > 0:
|
||||||
denoising_strength = advanced_parameters.overwrite_upscale_strength
|
denoising_strength = overwrite_upscale_strength
|
||||||
|
|
||||||
initial_pixels = core.numpy_to_pytorch(uov_input_image)
|
initial_pixels = core.numpy_to_pytorch(uov_input_image)
|
||||||
progressbar(async_task, 13, 'VAE encoding ...')
|
progressbar(async_task, 13, 'VAE encoding ...')
|
||||||
|
|||||||
@@ -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_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]
|
freeu_ctrls = [freeu_enabled, freeu_b1, freeu_b2, freeu_s1, freeu_s2]
|
||||||
|
|
||||||
adps = [overwrite_upscale_strength,
|
adps = [mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint,
|
||||||
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint,
|
|
||||||
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness,
|
debugging_cn_preprocessor, skipping_cn_preprocessor, controlnet_softness,
|
||||||
canny_low_threshold, canny_high_threshold, refiner_swap_method]
|
canny_low_threshold, canny_high_threshold, refiner_swap_method]
|
||||||
adps += freeu_ctrls
|
adps += freeu_ctrls
|
||||||
@@ -530,6 +529,7 @@ with shared.gradio_root:
|
|||||||
ctrls += [disable_preview, adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg]
|
ctrls += [disable_preview, adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg]
|
||||||
ctrls += [sampler_name, scheduler_name]
|
ctrls += [sampler_name, scheduler_name]
|
||||||
ctrls += [overwrite_step, overwrite_switch, overwrite_width, overwrite_height, overwrite_vary_strength]
|
ctrls += [overwrite_step, overwrite_switch, overwrite_width, overwrite_height, overwrite_vary_strength]
|
||||||
|
ctrls += [overwrite_upscale_strength]
|
||||||
ctrls += ip_ctrls
|
ctrls += ip_ctrls
|
||||||
|
|
||||||
state_is_generating = gr.State(False)
|
state_is_generating = gr.State(False)
|
||||||
|
|||||||
Reference in New Issue
Block a user