Update webui.py

webui.py

@@ -253,284 +253,285 @@ with shared.gradio_root:
             ip_tab.select(lambda: 'ip', outputs=current_tab, queue=False, _js=down_js, show_progress=False)
             desc_tab.select(lambda: 'desc', outputs=current_tab, queue=False, _js=down_js, show_progress=False)
 
-        with gr.Column(scale=1, visible=False, elem_id="advancedSettingDC") as advanced_column:
-            with gr.Tab(label='Setting'):
-                performance_selection = gr.Radio(label='Performance',
-                                                 choices=modules.flags.performance_selections,
-                                                 value=modules.config.default_performance)
-                aspect_ratios_selection = gr.Radio(label='Aspect Ratios', choices=modules.config.available_aspect_ratios,
-                                                   value=modules.config.default_aspect_ratio, info='width × height',
-                                                   elem_classes='aspect_ratios')
-                image_number = gr.Slider(label='Image Number', minimum=1, maximum=modules.config.default_max_image_number, step=1, value=1)
-
-                output_format = gr.Radio(label='Output Format',
-                                            choices=modules.flags.output_formats,
-                                            value=modules.config.default_output_format)
-
-                negative_prompt = gr.Textbox(label='Negative Prompt', show_label=True, placeholder="Type prompt here.",
-                                             info='Describing what you do not want to see.', lines=2,
-                                             elem_id='negative_prompt',
-                                             value=modules.config.default_prompt_negative,
-                                             show_copy_button=True)
-                seed_random = gr.Checkbox(label='Random', value=True)
-                image_seed = gr.Textbox(label='Seed', value=0, max_lines=1, visible=False, show_copy_button=True) # workaround for https://github.com/gradio-app/gradio/issues/5354
-
-                def random_checked(r):
-                    return gr.update(visible=not r)
-
-                def refresh_seed(r, seed_string):
-                    if r:
-                        return random.randint(constants.MIN_SEED, constants.MAX_SEED)
-                    else:
-                        try:
-                            seed_value = int(seed_string)
-                            if constants.MIN_SEED <= seed_value <= constants.MAX_SEED:
-                                return seed_value
-                        except ValueError:
-                            pass
-                        return random.randint(constants.MIN_SEED, constants.MAX_SEED)
-
-                seed_random.change(random_checked, inputs=[seed_random], outputs=[image_seed],
-                                   queue=False, show_progress=False)
-
-                def update_history_link():
-                    if args_manager.args.disable_image_log:
-                        return gr.update(value='')
-                    
-                    return gr.update(value=f'<a href="file={get_current_html_path(output_format)}" target="_blank">\U0001F4DA History Log</a>')
-
-                history_link = gr.HTML()
-                shared.gradio_root.load(update_history_link, outputs=history_link, queue=False, show_progress=False)
-
-            with gr.Tab(label='Style'):
-                style_sorter.try_load_sorted_styles(
-                    style_names=legal_style_names,
-                    default_selected=modules.config.default_styles)
-
-                style_search_bar = gr.Textbox(show_label=False, container=False,
-                                              placeholder="\U0001F50E Type here to search styles ...",
-                                              value="",
-                                              label='Search Styles',
-                                              show_copy_button=True)
-                style_selections = gr.CheckboxGroup(show_label=False, container=False,
-                                                    choices=copy.deepcopy(style_sorter.all_styles),
-                                                    value=copy.deepcopy(modules.config.default_styles),
-                                                    label='Selected Styles',
-                                                    elem_classes=['style_selections'])
-                gradio_receiver_style_selections = gr.Textbox(elem_id='gradio_receiver_style_selections', visible=False, show_copy_button=True)
-
-                shared.gradio_root.load(lambda: gr.update(choices=copy.deepcopy(style_sorter.all_styles)),
-                                        outputs=style_selections)
-
-                style_search_bar.change(style_sorter.search_styles,
-                                        inputs=[style_selections, style_search_bar],
-                                        outputs=style_selections,
-                                        queue=False,
-                                        show_progress=False).then(
-                    lambda: None, _js='()=>{refresh_style_localization();}')
-
-                gradio_receiver_style_selections.input(style_sorter.sort_styles,
-                                                       inputs=style_selections,
-                                                       outputs=style_selections,
-                                                       queue=False,
-                                                       show_progress=False).then(
-                    lambda: None, _js='()=>{refresh_style_localization();}')
-
-            with gr.Tab(label='Model'):
-                with gr.Group():
-                    with gr.Row():
-                        base_model = gr.Dropdown(label='Base Model (SDXL only)', choices=modules.config.model_filenames, value=modules.config.default_base_model_name, show_label=True)
-                        refiner_model = gr.Dropdown(label='Refiner (SDXL or SD 1.5)', choices=['None'] + modules.config.model_filenames, value=modules.config.default_refiner_model_name, show_label=True)
-
-                    refiner_switch = gr.Slider(label='Refiner Switch At', minimum=0.1, maximum=1.0, step=0.0001,
-                                               info='Use 0.4 for SD1.5 realistic models; '
-                                                    'or 0.667 for SD1.5 anime models; '
-                                                    'or 0.8 for XL-refiners; '
-                                                    'or any value for switching two SDXL models.',
-                                               value=modules.config.default_refiner_switch,
-                                               visible=modules.config.default_refiner_model_name != 'None')
+        with gr.Column(scale=1, visible=False) as advanced_column:
+            with gr.Tab(elem_id="advancedSettingDC"):
+                with gr.Tab(label='Setting'):
+                    performance_selection = gr.Radio(label='Performance',
+                                                    choices=modules.flags.performance_selections,
+                                                    value=modules.config.default_performance)
+                    aspect_ratios_selection = gr.Radio(label='Aspect Ratios', choices=modules.config.available_aspect_ratios,
+                                                    value=modules.config.default_aspect_ratio, info='width × height',
+                                                    elem_classes='aspect_ratios')
+                    image_number = gr.Slider(label='Image Number', minimum=1, maximum=modules.config.default_max_image_number, step=1, value=1)
+
+                    output_format = gr.Radio(label='Output Format',
+                                                choices=modules.flags.output_formats,
+                                                value=modules.config.default_output_format)
+
+                    negative_prompt = gr.Textbox(label='Negative Prompt', show_label=True, placeholder="Type prompt here.",
+                                                info='Describing what you do not want to see.', lines=2,
+                                                elem_id='negative_prompt',
+                                                value=modules.config.default_prompt_negative,
+                                                show_copy_button=True)
+                    seed_random = gr.Checkbox(label='Random', value=True)
+                    image_seed = gr.Textbox(label='Seed', value=0, max_lines=1, visible=False, show_copy_button=True) # workaround for https://github.com/gradio-app/gradio/issues/5354
+
+                    def random_checked(r):
+                        return gr.update(visible=not r)
+
+                    def refresh_seed(r, seed_string):
+                        if r:
+                            return random.randint(constants.MIN_SEED, constants.MAX_SEED)
+                        else:
+                            try:
+                                seed_value = int(seed_string)
+                                if constants.MIN_SEED <= seed_value <= constants.MAX_SEED:
+                                    return seed_value
+                            except ValueError:
+                                pass
+                            return random.randint(constants.MIN_SEED, constants.MAX_SEED)
+
+                    seed_random.change(random_checked, inputs=[seed_random], outputs=[image_seed],
+                                    queue=False, show_progress=False)
 
-                    refiner_model.change(lambda x: gr.update(visible=x != 'None'),
-                                         inputs=refiner_model, outputs=refiner_switch, show_progress=False, queue=False)
+                    def update_history_link():
+                        if args_manager.args.disable_image_log:
+                            return gr.update(value='')
+                        
+                        return gr.update(value=f'<a href="file={get_current_html_path(output_format)}" target="_blank">\U0001F4DA History Log</a>')
+
+                    history_link = gr.HTML()
+                    shared.gradio_root.load(update_history_link, outputs=history_link, queue=False, show_progress=False)
+
+                with gr.Tab(label='Style'):
+                    style_sorter.try_load_sorted_styles(
+                        style_names=legal_style_names,
+                        default_selected=modules.config.default_styles)
+
+                    style_search_bar = gr.Textbox(show_label=False, container=False,
+                                                placeholder="\U0001F50E Type here to search styles ...",
+                                                value="",
+                                                label='Search Styles',
+                                                show_copy_button=True)
+                    style_selections = gr.CheckboxGroup(show_label=False, container=False,
+                                                        choices=copy.deepcopy(style_sorter.all_styles),
+                                                        value=copy.deepcopy(modules.config.default_styles),
+                                                        label='Selected Styles',
+                                                        elem_classes=['style_selections'])
+                    gradio_receiver_style_selections = gr.Textbox(elem_id='gradio_receiver_style_selections', visible=False, show_copy_button=True)
+
+                    shared.gradio_root.load(lambda: gr.update(choices=copy.deepcopy(style_sorter.all_styles)),
+                                            outputs=style_selections)
+
+                    style_search_bar.change(style_sorter.search_styles,
+                                            inputs=[style_selections, style_search_bar],
+                                            outputs=style_selections,
+                                            queue=False,
+                                            show_progress=False).then(
+                        lambda: None, _js='()=>{refresh_style_localization();}')
+
+                    gradio_receiver_style_selections.input(style_sorter.sort_styles,
+                                                        inputs=style_selections,
+                                                        outputs=style_selections,
+                                                        queue=False,
+                                                        show_progress=False).then(
+                        lambda: None, _js='()=>{refresh_style_localization();}')
+
+                with gr.Tab(label='Model'):
+                    with gr.Group():
+                        with gr.Row():
+                            base_model = gr.Dropdown(label='Base Model (SDXL only)', choices=modules.config.model_filenames, value=modules.config.default_base_model_name, show_label=True)
+                            refiner_model = gr.Dropdown(label='Refiner (SDXL or SD 1.5)', choices=['None'] + modules.config.model_filenames, value=modules.config.default_refiner_model_name, show_label=True)
+
+                        refiner_switch = gr.Slider(label='Refiner Switch At', minimum=0.1, maximum=1.0, step=0.0001,
+                                                info='Use 0.4 for SD1.5 realistic models; '
+                                                        'or 0.667 for SD1.5 anime models; '
+                                                        'or 0.8 for XL-refiners; '
+                                                        'or any value for switching two SDXL models.',
+                                                value=modules.config.default_refiner_switch,
+                                                visible=modules.config.default_refiner_model_name != 'None')
+
+                        refiner_model.change(lambda x: gr.update(visible=x != 'None'),
+                                            inputs=refiner_model, outputs=refiner_switch, show_progress=False, queue=False)
+
+                    with gr.Group():
+                        lora_ctrls = []
+
+                        for i, (n, v) in enumerate(modules.config.default_loras):
+                            with gr.Row():
+                                lora_enabled = gr.Checkbox(label='Enable', value=True,
+                                                        elem_classes=['lora_enable', 'min_check'], scale=1)
+                                lora_model = gr.Dropdown(label=f'LoRA {i + 1}',
+                                                        choices=['None'] + modules.config.lora_filenames, value=n,
+                                                        elem_classes='lora_model', scale=5)
+                                lora_weight = gr.Slider(label='Weight', minimum=modules.config.default_loras_min_weight,
+                                                        maximum=modules.config.default_loras_max_weight, step=0.01, value=v,
+                                                        elem_classes='lora_weight', scale=5)
+                                lora_ctrls += [lora_enabled, lora_model, lora_weight]
 
-                with gr.Group():
-                    lora_ctrls = []
+                    with gr.Row():
+                        model_refresh = gr.Button(label='Refresh', value='\U0001f504 Refresh All Files', variant='secondary', elem_classes='refresh_button')
+                
+                with gr.Column(visible=False):
+                    with gr.Tab(label='Advanced', elem_id="advancedAdvancedSettings"):
+                        guidance_scale = gr.Slider(label='Guidance Scale', minimum=1.0, maximum=30.0, step=0.01,
+                                                value=modules.config.default_cfg_scale,
+                                                info='Higher value means style is cleaner, vivider, and more artistic.')
+                        sharpness = gr.Slider(label='Image Sharpness', minimum=0.0, maximum=30.0, step=0.001,
+                                            value=modules.config.default_sample_sharpness,
+                                            info='Higher value means image and texture are sharper.')
+                        dev_mode = gr.Checkbox(label='Developer Debug Mode', value=True, container=True)
+
+                        with gr.Column(visible=True) as dev_tools:
+                            with gr.Tab(label='Debug Tools'):
+                                adm_scaler_positive = gr.Slider(label='Positive ADM Guidance Scaler', minimum=0.1, maximum=3.0,
+                                                                step=0.001, value=1.5, info='The scaler multiplied to positive ADM (use 1.0 to disable). ')
+                                adm_scaler_negative = gr.Slider(label='Negative ADM Guidance Scaler', minimum=0.1, maximum=3.0,
+                                                                step=0.001, value=0.8, info='The scaler multiplied to negative ADM (use 1.0 to disable). ')
+                                adm_scaler_end = gr.Slider(label='ADM Guidance End At Step', minimum=0.0, maximum=1.0,
+                                                        step=0.001, value=0.3,
+                                                        info='When to end the guidance from positive/negative ADM. ')
+
+                                refiner_swap_method = gr.Dropdown(label='Refiner swap method', value=flags.refiner_swap_method,
+                                                                choices=['joint', 'separate', 'vae'])
+
+                                adaptive_cfg = gr.Slider(label='CFG Mimicking from TSNR', minimum=1.0, maximum=30.0, step=0.01,
+                                                        value=modules.config.default_cfg_tsnr,
+                                                        info='Enabling Image\'s implementation of CFG mimicking for TSNR '
+                                                            '(effective when real CFG > mimicked CFG).')
+                                sampler_name = gr.Dropdown(label='Sampler', choices=flags.sampler_list,
+                                                        value=modules.config.default_sampler)
+                                scheduler_name = gr.Dropdown(label='Scheduler', choices=flags.scheduler_list,
+                                                            value=modules.config.default_scheduler)
+
+                                generate_image_grid = gr.Checkbox(label='Generate Image Grid for Each Batch',
+                                                                info='(Experimental) This may cause performance problems on some computers and certain internet conditions.',
+                                                                value=False)
 
-                    for i, (n, v) in enumerate(modules.config.default_loras):
-                        with gr.Row():
-                            lora_enabled = gr.Checkbox(label='Enable', value=True,
-                                                       elem_classes=['lora_enable', 'min_check'], scale=1)
-                            lora_model = gr.Dropdown(label=f'LoRA {i + 1}',
-                                                     choices=['None'] + modules.config.lora_filenames, value=n,
-                                                     elem_classes='lora_model', scale=5)
-                            lora_weight = gr.Slider(label='Weight', minimum=modules.config.default_loras_min_weight,
-                                                    maximum=modules.config.default_loras_max_weight, step=0.01, value=v,
-                                                    elem_classes='lora_weight', scale=5)
-                            lora_ctrls += [lora_enabled, lora_model, lora_weight]
-
-                with gr.Row():
-                    model_refresh = gr.Button(label='Refresh', value='\U0001f504 Refresh All Files', variant='secondary', elem_classes='refresh_button')
-            
-            with gr.Column(visible=False):
-                with gr.Tab(label='Advanced', elem_id="advancedAdvancedSettings"):
-                    guidance_scale = gr.Slider(label='Guidance Scale', minimum=1.0, maximum=30.0, step=0.01,
-                                            value=modules.config.default_cfg_scale,
-                                            info='Higher value means style is cleaner, vivider, and more artistic.')
-                    sharpness = gr.Slider(label='Image Sharpness', minimum=0.0, maximum=30.0, step=0.001,
-                                        value=modules.config.default_sample_sharpness,
-                                        info='Higher value means image and texture are sharper.')
-                    dev_mode = gr.Checkbox(label='Developer Debug Mode', value=True, container=True)
-
-                    with gr.Column(visible=True) as dev_tools:
-                        with gr.Tab(label='Debug Tools'):
-                            adm_scaler_positive = gr.Slider(label='Positive ADM Guidance Scaler', minimum=0.1, maximum=3.0,
-                                                            step=0.001, value=1.5, info='The scaler multiplied to positive ADM (use 1.0 to disable). ')
-                            adm_scaler_negative = gr.Slider(label='Negative ADM Guidance Scaler', minimum=0.1, maximum=3.0,
-                                                            step=0.001, value=0.8, info='The scaler multiplied to negative ADM (use 1.0 to disable). ')
-                            adm_scaler_end = gr.Slider(label='ADM Guidance End At Step', minimum=0.0, maximum=1.0,
-                                                    step=0.001, value=0.3,
-                                                    info='When to end the guidance from positive/negative ADM. ')
-
-                            refiner_swap_method = gr.Dropdown(label='Refiner swap method', value=flags.refiner_swap_method,
-                                                            choices=['joint', 'separate', 'vae'])
-
-                            adaptive_cfg = gr.Slider(label='CFG Mimicking from TSNR', minimum=1.0, maximum=30.0, step=0.01,
-                                                    value=modules.config.default_cfg_tsnr,
-                                                    info='Enabling Image\'s implementation of CFG mimicking for TSNR '
-                                                        '(effective when real CFG > mimicked CFG).')
-                            sampler_name = gr.Dropdown(label='Sampler', choices=flags.sampler_list,
-                                                    value=modules.config.default_sampler)
-                            scheduler_name = gr.Dropdown(label='Scheduler', choices=flags.scheduler_list,
-                                                        value=modules.config.default_scheduler)
-
-                            generate_image_grid = gr.Checkbox(label='Generate Image Grid for Each Batch',
-                                                            info='(Experimental) This may cause performance problems on some computers and certain internet conditions.',
-                                                            value=False)
-
-                            overwrite_step = gr.Slider(label='Forced Overwrite of Sampling Step',
-                                                    minimum=-1, maximum=200, step=1,
-                                                    value=modules.config.default_overwrite_step,
-                                                    info='Set as -1 to disable. For developer debugging.')
-                            overwrite_switch = gr.Slider(label='Forced Overwrite of Refiner Switch Step',
+                                overwrite_step = gr.Slider(label='Forced Overwrite of Sampling Step',
                                                         minimum=-1, maximum=200, step=1,
-                                                        value=modules.config.default_overwrite_switch,
+                                                        value=modules.config.default_overwrite_step,
                                                         info='Set as -1 to disable. For developer debugging.')
-                            overwrite_width = gr.Slider(label='Forced Overwrite of Generating Width',
-                                                        minimum=-1, maximum=2048, step=1, value=-1,
-                                                        info='Set as -1 to disable. For developer debugging. '
-                                                            'Results will be worse for non-standard numbers that SDXL is not trained on.')
-                            overwrite_height = gr.Slider(label='Forced Overwrite of Generating Height',
-                                                        minimum=-1, maximum=2048, step=1, value=-1,
-                                                        info='Set as -1 to disable. For developer debugging. '
-                                                            'Results will be worse for non-standard numbers that SDXL is not trained on.')
-                            overwrite_vary_strength = gr.Slider(label='Forced Overwrite of Denoising Strength of "Vary"',
-                                                                minimum=-1, maximum=1.0, step=0.001, value=-1,
-                                                                info='Set as negative number to disable. For developer debugging.')
-                            overwrite_upscale_strength = gr.Slider(label='Forced Overwrite of Denoising Strength of "Upscale"',
-                                                                minimum=-1, maximum=1.0, step=0.001, value=-1,
-                                                                info='Set as negative number to disable. For developer debugging.')
-                            disable_preview = gr.Checkbox(label='Disable Preview', value=False,
-                                                        info='Disable preview during generation.')
-                            disable_intermediate_results = gr.Checkbox(label='Disable Intermediate Results', 
-                                                        value=modules.config.default_performance == 'Extreme Speed',
-                                                        interactive=modules.config.default_performance != 'Extreme Speed',
-                                                        info='Disable intermediate results during generation, only show final gallery.')
-                            disable_seed_increment = gr.Checkbox(label='Disable seed increment',
-                                                                info='Disable automatic seed increment when image number is > 1.',
-                                                                value=False)
-
-                            if not args_manager.args.disable_metadata:
-                                save_metadata_to_images = gr.Checkbox(label='Save Metadata to Images', value=True,
-                                                                    info='Adds parameters to generated images allowing manual regeneration.')
-                                metadata_scheme = gr.Radio(label='Metadata Scheme', choices=flags.metadata_scheme, value=modules.config.default_metadata_scheme,
-                                                        info='Image Prompt parameters are not included. Use png and a1111 for compatibility with Civitai.',
-                                                        visible=True)
-
-                                save_metadata_to_images.change(lambda x: gr.update(visible=x), inputs=[save_metadata_to_images], outputs=[metadata_scheme], 
-                                                            queue=False, show_progress=False)
-
-                        with gr.Tab(label='Control'):
-                            debugging_cn_preprocessor = gr.Checkbox(label='Debug Preprocessors', value=True,
-                                                                    info='See the results from preprocessors.')
-                            skipping_cn_preprocessor = gr.Checkbox(label='Skip Preprocessors', value=True,
-                                                                info='Do not preprocess images. (Inputs are already canny/depth/cropped-face/etc.)')
-
-                            mixing_image_prompt_and_vary_upscale = gr.Checkbox(label='Mixing Image Prompt and Vary/Upscale',
+                                overwrite_switch = gr.Slider(label='Forced Overwrite of Refiner Switch Step',
+                                                            minimum=-1, maximum=200, step=1,
+                                                            value=modules.config.default_overwrite_switch,
+                                                            info='Set as -1 to disable. For developer debugging.')
+                                overwrite_width = gr.Slider(label='Forced Overwrite of Generating Width',
+                                                            minimum=-1, maximum=2048, step=1, value=-1,
+                                                            info='Set as -1 to disable. For developer debugging. '
+                                                                'Results will be worse for non-standard numbers that SDXL is not trained on.')
+                                overwrite_height = gr.Slider(label='Forced Overwrite of Generating Height',
+                                                            minimum=-1, maximum=2048, step=1, value=-1,
+                                                            info='Set as -1 to disable. For developer debugging. '
+                                                                'Results will be worse for non-standard numbers that SDXL is not trained on.')
+                                overwrite_vary_strength = gr.Slider(label='Forced Overwrite of Denoising Strength of "Vary"',
+                                                                    minimum=-1, maximum=1.0, step=0.001, value=-1,
+                                                                    info='Set as negative number to disable. For developer debugging.')
+                                overwrite_upscale_strength = gr.Slider(label='Forced Overwrite of Denoising Strength of "Upscale"',
+                                                                    minimum=-1, maximum=1.0, step=0.001, value=-1,
+                                                                    info='Set as negative number to disable. For developer debugging.')
+                                disable_preview = gr.Checkbox(label='Disable Preview', value=False,
+                                                            info='Disable preview during generation.')
+                                disable_intermediate_results = gr.Checkbox(label='Disable Intermediate Results', 
+                                                            value=modules.config.default_performance == 'Extreme Speed',
+                                                            interactive=modules.config.default_performance != 'Extreme Speed',
+                                                            info='Disable intermediate results during generation, only show final gallery.')
+                                disable_seed_increment = gr.Checkbox(label='Disable seed increment',
+                                                                    info='Disable automatic seed increment when image number is > 1.',
+                                                                    value=False)
+
+                                if not args_manager.args.disable_metadata:
+                                    save_metadata_to_images = gr.Checkbox(label='Save Metadata to Images', value=True,
+                                                                        info='Adds parameters to generated images allowing manual regeneration.')
+                                    metadata_scheme = gr.Radio(label='Metadata Scheme', choices=flags.metadata_scheme, value=modules.config.default_metadata_scheme,
+                                                            info='Image Prompt parameters are not included. Use png and a1111 for compatibility with Civitai.',
+                                                            visible=True)
+
+                                    save_metadata_to_images.change(lambda x: gr.update(visible=x), inputs=[save_metadata_to_images], outputs=[metadata_scheme], 
+                                                                queue=False, show_progress=False)
+
+                            with gr.Tab(label='Control'):
+                                debugging_cn_preprocessor = gr.Checkbox(label='Debug Preprocessors', value=True,
+                                                                        info='See the results from preprocessors.')
+                                skipping_cn_preprocessor = gr.Checkbox(label='Skip Preprocessors', value=True,
+                                                                    info='Do not preprocess images. (Inputs are already canny/depth/cropped-face/etc.)')
+
+                                mixing_image_prompt_and_vary_upscale = gr.Checkbox(label='Mixing Image Prompt and Vary/Upscale',
+                                                                                value=True)
+                                mixing_image_prompt_and_inpaint = gr.Checkbox(label='Mixing Image Prompt and Inpaint',
                                                                             value=True)
-                            mixing_image_prompt_and_inpaint = gr.Checkbox(label='Mixing Image Prompt and Inpaint',
-                                                                        value=True)
-
-                            controlnet_softness = gr.Slider(label='Softness of ControlNet', minimum=0.0, maximum=1.0,
-                                                            step=0.001, value=0.25,
-                                                            info='Similar to the Control Mode in A1111 (use 0.0 to disable). ')
-
-                            with gr.Tab(label='Canny'):
-                                canny_low_threshold = gr.Slider(label='Canny Low Threshold', minimum=1, maximum=255,
-                                                                step=1, value=64)
-                                canny_high_threshold = gr.Slider(label='Canny High Threshold', minimum=1, maximum=255,
-                                                                step=1, value=128)
-
-                        with gr.Tab(label='Inpaint'):
-                            debugging_inpaint_preprocessor = gr.Checkbox(label='Debug Inpaint Preprocessing', value=False)
-                            inpaint_disable_initial_latent = gr.Checkbox(label='Disable initial latent in inpaint', value=False)
-                            inpaint_engine = gr.Dropdown(label='Inpaint Engine',
-                                                        value=modules.config.default_inpaint_engine_version,
-                                                        choices=flags.inpaint_engine_versions,
-                                                        info='Version of inpaint model')
-                            inpaint_strength = gr.Slider(label='Inpaint Denoising Strength',
-                                                        minimum=0.0, maximum=1.0, step=0.001, value=1.0,
-                                                        info='Same as the denoising strength in A1111 inpaint. '
-                                                            'Only used in inpaint, not used in outpaint. '
-                                                            '(Outpaint always use 1.0)')
-                            inpaint_respective_field = gr.Slider(label='Inpaint Respective Field',
-                                                                minimum=0.0, maximum=1.0, step=0.001, value=0.618,
-                                                                info='The area to inpaint. '
-                                                                    'Value 0 is same as "Only Masked" in A1111. '
-                                                                    'Value 1 is same as "Whole Image" in A1111. '
-                                                                    'Only used in inpaint, not used in outpaint. '
-                                                                    '(Outpaint always use 1.0)')
-                            inpaint_erode_or_dilate = gr.Slider(label='Mask Erode or Dilate',
-                                                                minimum=-64, maximum=64, step=1, value=0,
-                                                                info='Positive value will make white area in the mask larger, '
-                                                                    'negative value will make white area smaller.'
-                                                                    '(default is 0, always process before any mask invert)')
-                            # inpaint_mask_upload_checkbox = gr.Checkbox(label='Enable Mask Upload', value=False)
-                            # invert_mask_checkbox = gr.Checkbox(label='Invert Mask', value=False)
-
-                            inpaint_ctrls = [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.change(lambda x: gr.update(visible=x),
-                                                            inputs=inpaint_mask_upload_checkbox,
-                                                            outputs=inpaint_mask_image, queue=False, show_progress=False)
-
-                        with gr.Tab(label='FreeU'):
-                            freeu_enabled = gr.Checkbox(label='Enabled', value=False)
-                            freeu_b1 = gr.Slider(label='B1', minimum=0, maximum=2, step=0.01, value=1.01)
-                            freeu_b2 = gr.Slider(label='B2', minimum=0, maximum=2, step=0.01, value=1.02)
-                            freeu_s1 = gr.Slider(label='S1', minimum=0, maximum=4, step=0.01, value=0.99)
-                            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]
-
-                    def dev_mode_checked(r):
-                        return gr.update(visible=r)
-
-
-                    dev_mode.change(dev_mode_checked, inputs=[dev_mode], outputs=[dev_tools],
-                                    queue=False, show_progress=False)
 
-                    def model_refresh_clicked():
-                        modules.config.update_all_model_names()
-                        results = [gr.update(choices=modules.config.model_filenames)]
-                        results += [gr.update(choices=['None'] + modules.config.model_filenames)]
-                        for i in range(modules.config.default_max_lora_number):
-                            results += [gr.update(interactive=True), gr.update(choices=['None'] + modules.config.lora_filenames), gr.update()]
-                        return results
-
-                    model_refresh.click(model_refresh_clicked, [], [base_model, refiner_model] + lora_ctrls,
+                                controlnet_softness = gr.Slider(label='Softness of ControlNet', minimum=0.0, maximum=1.0,
+                                                                step=0.001, value=0.25,
+                                                                info='Similar to the Control Mode in A1111 (use 0.0 to disable). ')
+
+                                with gr.Tab(label='Canny'):
+                                    canny_low_threshold = gr.Slider(label='Canny Low Threshold', minimum=1, maximum=255,
+                                                                    step=1, value=64)
+                                    canny_high_threshold = gr.Slider(label='Canny High Threshold', minimum=1, maximum=255,
+                                                                    step=1, value=128)
+
+                            with gr.Tab(label='Inpaint'):
+                                debugging_inpaint_preprocessor = gr.Checkbox(label='Debug Inpaint Preprocessing', value=False)
+                                inpaint_disable_initial_latent = gr.Checkbox(label='Disable initial latent in inpaint', value=False)
+                                inpaint_engine = gr.Dropdown(label='Inpaint Engine',
+                                                            value=modules.config.default_inpaint_engine_version,
+                                                            choices=flags.inpaint_engine_versions,
+                                                            info='Version of inpaint model')
+                                inpaint_strength = gr.Slider(label='Inpaint Denoising Strength',
+                                                            minimum=0.0, maximum=1.0, step=0.001, value=1.0,
+                                                            info='Same as the denoising strength in A1111 inpaint. '
+                                                                'Only used in inpaint, not used in outpaint. '
+                                                                '(Outpaint always use 1.0)')
+                                inpaint_respective_field = gr.Slider(label='Inpaint Respective Field',
+                                                                    minimum=0.0, maximum=1.0, step=0.001, value=0.618,
+                                                                    info='The area to inpaint. '
+                                                                        'Value 0 is same as "Only Masked" in A1111. '
+                                                                        'Value 1 is same as "Whole Image" in A1111. '
+                                                                        'Only used in inpaint, not used in outpaint. '
+                                                                        '(Outpaint always use 1.0)')
+                                inpaint_erode_or_dilate = gr.Slider(label='Mask Erode or Dilate',
+                                                                    minimum=-64, maximum=64, step=1, value=0,
+                                                                    info='Positive value will make white area in the mask larger, '
+                                                                        'negative value will make white area smaller.'
+                                                                        '(default is 0, always process before any mask invert)')
+                                # inpaint_mask_upload_checkbox = gr.Checkbox(label='Enable Mask Upload', value=False)
+                                # invert_mask_checkbox = gr.Checkbox(label='Invert Mask', value=False)
+
+                                inpaint_ctrls = [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.change(lambda x: gr.update(visible=x),
+                                                                inputs=inpaint_mask_upload_checkbox,
+                                                                outputs=inpaint_mask_image, queue=False, show_progress=False)
+
+                            with gr.Tab(label='FreeU'):
+                                freeu_enabled = gr.Checkbox(label='Enabled', value=False)
+                                freeu_b1 = gr.Slider(label='B1', minimum=0, maximum=2, step=0.01, value=1.01)
+                                freeu_b2 = gr.Slider(label='B2', minimum=0, maximum=2, step=0.01, value=1.02)
+                                freeu_s1 = gr.Slider(label='S1', minimum=0, maximum=4, step=0.01, value=0.99)
+                                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]
+
+                        def dev_mode_checked(r):
+                            return gr.update(visible=r)
+
+
+                        dev_mode.change(dev_mode_checked, inputs=[dev_mode], outputs=[dev_tools],
                                         queue=False, show_progress=False)
 
+                        def model_refresh_clicked():
+                            modules.config.update_all_model_names()
+                            results = [gr.update(choices=modules.config.model_filenames)]
+                            results += [gr.update(choices=['None'] + modules.config.model_filenames)]
+                            for i in range(modules.config.default_max_lora_number):
+                                results += [gr.update(interactive=True), gr.update(choices=['None'] + modules.config.lora_filenames), gr.update()]
+                            return results
+
+                        model_refresh.click(model_refresh_clicked, [], [base_model, refiner_model] + lora_ctrls,
+                                            queue=False, show_progress=False)
+
         performance_selection.change(lambda x: [gr.update(interactive=x != 'Extreme Speed')] * 11 +
                                                [gr.update(visible=x != 'Extreme Speed')] * 1 +
                                                [gr.update(interactive=x != 'Extreme Speed', value=x == 'Extreme Speed', )] * 1,