Foreign-Mirrors/Fooocus
1
0
Fork 0
mirror of https://github.com/lllyasviel/Fooocus.git synced 2026-08-16 13:13:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

feat: extract attribute mixing_image_prompt_and_vary_upscale

Browse Source
This commit is contained in:
Manuel Schmid
2024-01-22 18:49:29 +01:00
parent 2ab5593d71
commit cce9871cc5
3 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/advanced_parameters.py
+4 -4
View File
@@ -1,20 +1,20 @@
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ 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] * 21 inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 20
def set_all_advanced_parameters(*args): def set_all_advanced_parameters(*args):
global mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ global 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
mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, \ 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, \
modules/async_worker.py
+4 -3
View File
@@ -150,6 +150,7 @@ def worker():
overwrite_height = args.pop() overwrite_height = args.pop()
overwrite_vary_strength = args.pop() overwrite_vary_strength = args.pop()
overwrite_upscale_strength = args.pop() overwrite_upscale_strength = args.pop()
mixing_image_prompt_and_vary_upscale = 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):
@@ -254,7 +255,7 @@ def worker():
if input_image_checkbox: if input_image_checkbox:
if (current_tab == 'uov' or ( if (current_tab == 'uov' or (
current_tab == 'ip' and advanced_parameters.mixing_image_prompt_and_vary_upscale)) \ current_tab == 'ip' and mixing_image_prompt_and_vary_upscale)) \
and uov_method != flags.disabled and uov_input_image is not None: and uov_method != flags.disabled and uov_input_image is not None:
uov_input_image = HWC3(uov_input_image) uov_input_image = HWC3(uov_input_image)
if 'vary' in uov_method: if 'vary' in uov_method:
@@ -322,8 +323,8 @@ def worker():
prompt = inpaint_additional_prompt + '\n' + prompt prompt = inpaint_additional_prompt + '\n' + prompt
goals.append('inpaint') goals.append('inpaint')
if current_tab == 'ip' or \ if current_tab == 'ip' or \
advanced_parameters.mixing_image_prompt_and_inpaint or \ mixing_image_prompt_and_vary_upscale or \
advanced_parameters.mixing_image_prompt_and_vary_upscale: advanced_parameters.mixing_image_prompt_and_inpaint:
goals.append('cn') goals.append('cn')
progressbar(async_task, 1, 'Downloading control models ...') progressbar(async_task, 1, 'Downloading control models ...')
if len(cn_tasks[flags.cn_canny]) > 0: if len(cn_tasks[flags.cn_canny]) > 0:
webui.py
+2 -2
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 = [mixing_image_prompt_and_vary_upscale, mixing_image_prompt_and_inpaint, adps = [ 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
@@ -529,7 +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 += [overwrite_upscale_strength, mixing_image_prompt_and_vary_upscale]
ctrls += ip_ctrls ctrls += ip_ctrls
state_is_generating = gr.State(False) state_is_generating = gr.State(False)