happyz
/
Fooocus
mirror of https://github.com/lllyasviel/Fooocus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

feat: extract attribute refiner_swap_method

This commit is contained in:
Manuel Schmid 2024-01-22 19:10:32 +01:00
parent 2d8ca41ce5
commit cfb70c0278
No known key found for this signature in database
GPG Key ID: 32C4F7569B40B84B
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/advanced_parameters.py
View File

@ -1,19 +1,16 @@
controlnet_softness, \ controlnet_softness, \
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] * 15 inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 14
def set_all_advanced_parameters(*args): def set_all_advanced_parameters(*args):
global controlnet_softness, \ global controlnet_softness, \
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
controlnet_softness, \ controlnet_softness, \
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 = args inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = args

2
modules/async_worker.py
View File

@ -156,6 +156,7 @@ def worker():
skipping_cn_preprocessor = args.pop() skipping_cn_preprocessor = args.pop()
canny_low_threshold = args.pop() canny_low_threshold = args.pop()
canny_high_threshold = args.pop() canny_high_threshold = args.pop()
refiner_swap_method = 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):
@ -238,7 +239,6 @@ def worker():
width, height = int(width), int(height) width, height = int(width), int(height)
skip_prompt_processing = False skip_prompt_processing = False
refiner_swap_method = advanced_parameters.refiner_swap_method
inpaint_worker.current_task = None inpaint_worker.current_task = None
inpaint_parameterized = advanced_parameters.inpaint_engine != 'None' inpaint_parameterized = advanced_parameters.inpaint_engine != 'None'

3
webui.py
View File

@ -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_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 = [controlnet_softness, refiner_swap_method] adps = [controlnet_softness]
adps += freeu_ctrls adps += freeu_ctrls
adps += inpaint_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_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 += [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 += [debugging_cn_preprocessor, skipping_cn_preprocessor, canny_low_threshold, canny_high_threshold]
ctrls += [refiner_swap_method]
ctrls += ip_ctrls ctrls += ip_ctrls
state_is_generating = gr.State(False) state_is_generating = gr.State(False)