mirror of
https://github.com/lllyasviel/Fooocus.git
synced 2026-08-16 13:13:16 +02:00
feat: extract attribute adm_scaler_positive
This commit is contained in:
@@ -1,4 +1,4 @@
|
|||||||
adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, \
|
adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, \
|
||||||
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \
|
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \
|
||||||
overwrite_vary_strength, overwrite_upscale_strength, \
|
overwrite_vary_strength, 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, \
|
||||||
@@ -6,11 +6,11 @@ adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_
|
|||||||
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] * 34
|
inpaint_mask_upload_checkbox, invert_mask_checkbox, inpaint_erode_or_dilate = [None] * 33
|
||||||
|
|
||||||
|
|
||||||
def set_all_advanced_parameters(*args):
|
def set_all_advanced_parameters(*args):
|
||||||
global adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, \
|
global adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, \
|
||||||
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \
|
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \
|
||||||
overwrite_vary_strength, overwrite_upscale_strength, \
|
overwrite_vary_strength, 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, \
|
||||||
@@ -20,7 +20,7 @@ def set_all_advanced_parameters(*args):
|
|||||||
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
|
||||||
|
|
||||||
adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, \
|
adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name, \
|
||||||
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \
|
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height, \
|
||||||
overwrite_vary_strength, overwrite_upscale_strength, \
|
overwrite_vary_strength, 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, \
|
||||||
|
|||||||
@@ -141,6 +141,7 @@ def worker():
|
|||||||
inpaint_additional_prompt = args.pop()
|
inpaint_additional_prompt = args.pop()
|
||||||
inpaint_mask_image_upload = args.pop()
|
inpaint_mask_image_upload = args.pop()
|
||||||
disable_preview = args.pop()
|
disable_preview = args.pop()
|
||||||
|
adm_scaler_positive = 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):
|
||||||
@@ -193,7 +194,7 @@ def worker():
|
|||||||
cfg_scale = guidance_scale = 1.0
|
cfg_scale = guidance_scale = 1.0
|
||||||
modules.patch.adaptive_cfg = advanced_parameters.adaptive_cfg = 1.0
|
modules.patch.adaptive_cfg = advanced_parameters.adaptive_cfg = 1.0
|
||||||
refiner_switch = 1.0
|
refiner_switch = 1.0
|
||||||
modules.patch.positive_adm_scale = advanced_parameters.adm_scaler_positive = 1.0
|
modules.patch.positive_adm_scale = adm_scaler_positive = 1.0
|
||||||
modules.patch.negative_adm_scale = advanced_parameters.adm_scaler_negative = 1.0
|
modules.patch.negative_adm_scale = advanced_parameters.adm_scaler_negative = 1.0
|
||||||
modules.patch.adm_scaler_end = advanced_parameters.adm_scaler_end = 0.0
|
modules.patch.adm_scaler_end = advanced_parameters.adm_scaler_end = 0.0
|
||||||
steps = 8
|
steps = 8
|
||||||
@@ -204,7 +205,7 @@ def worker():
|
|||||||
modules.patch.sharpness = sharpness
|
modules.patch.sharpness = sharpness
|
||||||
print(f'[Parameters] Sharpness = {modules.patch.sharpness}')
|
print(f'[Parameters] Sharpness = {modules.patch.sharpness}')
|
||||||
|
|
||||||
modules.patch.positive_adm_scale = advanced_parameters.adm_scaler_positive
|
modules.patch.positive_adm_scale = adm_scaler_positive
|
||||||
modules.patch.negative_adm_scale = advanced_parameters.adm_scaler_negative
|
modules.patch.negative_adm_scale = advanced_parameters.adm_scaler_negative
|
||||||
modules.patch.adm_scaler_end = advanced_parameters.adm_scaler_end
|
modules.patch.adm_scaler_end = advanced_parameters.adm_scaler_end
|
||||||
print(f'[Parameters] ADM Scale = '
|
print(f'[Parameters] ADM Scale = '
|
||||||
|
|||||||
@@ -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 = [adm_scaler_positive, adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name,
|
adps = [adm_scaler_negative, adm_scaler_end, adaptive_cfg, sampler_name,
|
||||||
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height,
|
scheduler_name, generate_image_grid, overwrite_step, overwrite_switch, overwrite_width, overwrite_height,
|
||||||
overwrite_vary_strength, overwrite_upscale_strength,
|
overwrite_vary_strength, 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,
|
||||||
@@ -528,7 +528,7 @@ with shared.gradio_root:
|
|||||||
ctrls += [input_image_checkbox, current_tab]
|
ctrls += [input_image_checkbox, current_tab]
|
||||||
ctrls += [uov_method, uov_input_image]
|
ctrls += [uov_method, uov_input_image]
|
||||||
ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image]
|
ctrls += [outpaint_selections, inpaint_input_image, inpaint_additional_prompt, inpaint_mask_image]
|
||||||
ctrls += [disable_preview]
|
ctrls += [disable_preview, adm_scaler_positive]
|
||||||
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