diff --git a/scripts/dynamic_thresholding.py b/scripts/dynamic_thresholding.py index 88e543c..667b63c 100644 --- a/scripts/dynamic_thresholding.py +++ b/scripts/dynamic_thresholding.py @@ -33,6 +33,8 @@ class Script(scripts.Script): return scripts.AlwaysVisible def ui(self, is_img2img): + def vis_change(isVis): + return {"visible": isVis, "__type__": "update"} enabled = gr.Checkbox(value=False, label="Enable Dynamic Thresholding (CFG Scale Fix)") # "Dynamic Thresholding (CFG Scale Fix)" accordion = gr.Group(visible=False) @@ -41,17 +43,17 @@ class Script(scripts.Script): mimic_scale = gr.Slider(minimum=1.0, maximum=30.0, step=0.5, label='Mimic CFG Scale', value=7.0, elem_id='dynthres_mimic_scale') with gr.Accordion("Dynamic Thresholding Advanced Options", open=False, elem_id='dynthres_advanced_opts'): threshold_percentile = gr.Slider(minimum=90.0, value=100.0, maximum=100.0, step=0.05, label='Top percentile of latents to clamp', elem_id='dynthres_threshold_percentile') - mimic_mode = gr.Dropdown(VALID_MODES, value="Constant", label="Mimic Scale Scheduler", elem_id='dynthres_mimic_mode') - mimic_scale_min = gr.Slider(minimum=0.0, maximum=30.0, step=0.5, label="Minimum value of the Mimic Scale Scheduler", elem_id='dynthres_mimic_scale_min') - cfg_mode = gr.Dropdown(VALID_MODES, value="Constant", label="CFG Scale Scheduler", elem_id='dynthres_cfg_mode') - cfg_scale_min = gr.Slider(minimum=0.0, maximum=30.0, step=0.5, label="Minimum value of the CFG Scale Scheduler", elem_id='dynthres_cfg_scale_min') + with gr.Row(): + mimic_mode = gr.Dropdown(VALID_MODES, value="Constant", label="Mimic Scale Scheduler", elem_id='dynthres_mimic_mode') + cfg_mode = gr.Dropdown(VALID_MODES, value="Constant", label="CFG Scale Scheduler", elem_id='dynthres_cfg_mode') + mimic_scale_min = gr.Slider(minimum=0.0, maximum=30.0, step=0.5, visible=False, label="Minimum value of the Mimic Scale Scheduler", elem_id='dynthres_mimic_scale_min') + cfg_scale_min = gr.Slider(minimum=0.0, maximum=30.0, step=0.5, visible=False, label="Minimum value of the CFG Scale Scheduler", elem_id='dynthres_cfg_scale_min') sched_val = gr.Slider(minimum=0.0, maximum=40.0, step=0.5, value=4.0, visible=False, label="Scheduler Value", info="Value unique to the scheduler mode - for Power Up/Down, this is the power. For Linear/Cosine Repeating, this is the number of repeats per image.", elem_id='dynthres_sched_val') def shouldShowSchedulerValue(cfgMode, mimicMode): - if cfgMode in MODES_WITH_VALUE or mimicMode in MODES_WITH_VALUE: - return {"visible": True, "__type__": "update"} - return {"visible": False, "__type__": "update"} - cfg_mode.change(shouldShowSchedulerValue, inputs=[cfg_mode, mimic_mode], outputs=sched_val) - mimic_mode.change(shouldShowSchedulerValue, inputs=[cfg_mode, mimic_mode], outputs=sched_val) + sched_vis = cfgMode in MODES_WITH_VALUE or mimicMode in MODES_WITH_VALUE + return vis_change(sched_vis), vis_change(mimicMode != "Constant"), vis_change(cfgMode != "Constant") + cfg_mode.change(shouldShowSchedulerValue, inputs=[cfg_mode, mimic_mode], outputs=[sched_val, mimic_scale_min, cfg_scale_min]) + mimic_mode.change(shouldShowSchedulerValue, inputs=[cfg_mode, mimic_mode], outputs=[sched_val, mimic_scale_min, cfg_scale_min]) enabled.change( fn=lambda x: {"visible": x, "__type__": "update"}, inputs=[enabled],