img2img UI rework: obsolete --gradio-img2img-tool --gradio-inpaint-tool and always show all tools each in own tab

1 files changed, 52 insertions, 51 deletions

diff --git a/modules/ui.py b/modules/ui.py
index 82f5dd7c..e86a624b 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -795,53 +795,67 @@ def create_ui():
 

         with FormRow().style(equal_height=False):

             with gr.Column(variant='panel', elem_id="img2img_settings"):

+                with gr.Tabs(elem_id="mode_img2img"):

+                    with gr.TabItem('img2img', id='img2img', elem_id="img2img_img2img_tab") as tab_img2img:

+                        init_img = gr.Image(label="Image for img2img", elem_id="img2img_image", show_label=False, source="upload", interactive=True, type="pil", tool="editor", image_mode="RGBA").style(height=480)

 

-                with gr.Tabs(elem_id="mode_img2img") as tabs_img2img_mode:

-                    with gr.TabItem('img2img', id='img2img', elem_id="img2img_img2img_tab"):

-                        init_img = gr.Image(label="Image for img2img", elem_id="img2img_image", show_label=False, source="upload", interactive=True, type="pil", tool=cmd_opts.gradio_img2img_tool, image_mode="RGBA").style(height=480)

+                    with gr.TabItem('Sketch', id='img2img_sketch', elem_id="img2img_img2img_sketch_tab") as tab_sketch:

+                        sketch = gr.Image(label="Image for img2img", elem_id="img2img_sketch", show_label=False, source="upload", interactive=True, type="pil", tool="color-sketch", image_mode="RGBA").style(height=480)

 

-                    with gr.TabItem('Inpaint', id='inpaint', elem_id="img2img_inpaint_tab"):

-                        init_img_with_mask = gr.Image(label="Image for inpainting with mask", show_label=False, elem_id="img2maskimg", source="upload", interactive=True, type="pil", tool=cmd_opts.gradio_inpaint_tool, image_mode="RGBA").style(height=480)

-                        init_img_with_mask_orig = gr.State(None)

+                    with gr.TabItem('Inpaint', id='inpaint', elem_id="img2img_inpaint_tab") as tab_inpaint:

+                        init_img_with_mask = gr.Image(label="Image for inpainting with mask", show_label=False, elem_id="img2maskimg", source="upload", interactive=True, type="pil", tool="sketch", image_mode="RGBA").style(height=480)

 

-                        use_color_sketch = cmd_opts.gradio_inpaint_tool == "color-sketch"

-                        if use_color_sketch:

-                            def update_orig(image, state):

-                                if image is not None:

-                                    same_size = state is not None and state.size == image.size

-                                    has_exact_match = np.any(np.all(np.array(image) == np.array(state), axis=-1))

-                                    edited = same_size and has_exact_match

-                                    return image if not edited or state is None else state

+                    with gr.TabItem('Inpaint sketch', id='inpaint_sketch', elem_id="img2img_inpaint_sketch_tab") as tab_inpaint_color:

+                        inpaint_color_sketch = gr.Image(label="Color sketch inpainting", show_label=False, elem_id="inpaint_sketch", source="upload", interactive=True, type="pil", tool="color-sketch", image_mode="RGBA").style(height=480)

+                        inpaint_color_sketch_orig = gr.State(None)

 

-                            init_img_with_mask.change(update_orig, [init_img_with_mask, init_img_with_mask_orig], init_img_with_mask_orig)

+                        def update_orig(image, state):

+                            if image is not None:

+                                same_size = state is not None and state.size == image.size

+                                has_exact_match = np.any(np.all(np.array(image) == np.array(state), axis=-1))

+                                edited = same_size and has_exact_match

+                                return image if not edited or state is None else state

 

-                        init_img_inpaint = gr.Image(label="Image for img2img", show_label=False, source="upload", interactive=True, type="pil", visible=False, elem_id="img_inpaint_base")

-                        init_mask_inpaint = gr.Image(label="Mask", source="upload", interactive=True, type="pil", visible=False, elem_id="img_inpaint_mask")

+                        inpaint_color_sketch.change(update_orig, [inpaint_color_sketch, inpaint_color_sketch_orig], inpaint_color_sketch_orig)

 

-                        with FormRow():

-                            mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=4, elem_id="img2img_mask_blur")

-                            mask_alpha = gr.Slider(label="Mask transparency", interactive=use_color_sketch, visible=use_color_sketch, elem_id="img2img_mask_alpha")

-

-                        with FormRow():

-                            mask_mode = gr.Radio(label="Mask source", choices=["Draw mask", "Upload mask"], type="index", value="Draw mask", elem_id="mask_mode")

-                            inpainting_mask_invert = gr.Radio(label='Mask mode', choices=['Inpaint masked', 'Inpaint not masked'], value='Inpaint masked', type="index", elem_id="img2img_mask_mode")

-

-                        with FormRow():

-                            inpainting_fill = gr.Radio(label='Masked content', choices=['fill', 'original', 'latent noise', 'latent nothing'], value='original', type="index", elem_id="img2img_inpainting_fill")

-

-                        with FormRow():

-                            with gr.Column():

-                                inpaint_full_res = gr.Radio(label="Inpaint area", choices=["Whole picture", "Only masked"], type="index", value="Whole picture", elem_id="img2img_inpaint_full_res")

+                    with gr.TabItem('Inpaint upload', id='inpaint_upload', elem_id="img2img_inpaint_upload_tab") as tab_inpaint_upload:

+                        init_img_inpaint = gr.Image(label="Image for img2img", show_label=False, source="upload", interactive=True, type="pil", elem_id="img_inpaint_base")

+                        init_mask_inpaint = gr.Image(label="Mask", source="upload", interactive=True, type="pil", elem_id="img_inpaint_mask")

 

-                            with gr.Column(scale=4):

-                                inpaint_full_res_padding = gr.Slider(label='Only masked padding, pixels', minimum=0, maximum=256, step=4, value=32, elem_id="img2img_inpaint_full_res_padding")

-

-                    with gr.TabItem('Batch img2img', id='batch', elem_id="img2img_batch_tab"):

+                    with gr.TabItem('Batch', id='batch', elem_id="img2img_batch_tab") as tab_batch:

                         hidden = '<br>Disabled when launched with --hide-ui-dir-config.' if shared.cmd_opts.hide_ui_dir_config else ''

                         gr.HTML(f"<p class=\"text-gray-500\">Process images in a directory on the same machine where the server is running.<br>Use an empty output directory to save pictures normally instead of writing to the output directory.{hidden}</p>")

                         img2img_batch_input_dir = gr.Textbox(label="Input directory", **shared.hide_dirs, elem_id="img2img_batch_input_dir")

                         img2img_batch_output_dir = gr.Textbox(label="Output directory", **shared.hide_dirs, elem_id="img2img_batch_output_dir")

 

+                with FormGroup(elem_id="inpaint_controls", visible=False) as inpaint_controls:

+                    with FormRow():

+                        mask_blur = gr.Slider(label='Mask blur', minimum=0, maximum=64, step=1, value=4, elem_id="img2img_mask_blur")

+                        mask_alpha = gr.Slider(label="Mask transparency", visible=False, elem_id="img2img_mask_alpha")

+

+                    with FormRow():

+                        inpainting_mask_invert = gr.Radio(label='Mask mode', choices=['Inpaint masked', 'Inpaint not masked'], value='Inpaint masked', type="index", elem_id="img2img_mask_mode")

+

+                    with FormRow():

+                        inpainting_fill = gr.Radio(label='Masked content', choices=['fill', 'original', 'latent noise', 'latent nothing'], value='original', type="index", elem_id="img2img_inpainting_fill")

+

+                    with FormRow():

+                        with gr.Column():

+                            inpaint_full_res = gr.Radio(label="Inpaint area", choices=["Whole picture", "Only masked"], type="index", value="Whole picture", elem_id="img2img_inpaint_full_res")

+

+                        with gr.Column(scale=4):

+                            inpaint_full_res_padding = gr.Slider(label='Only masked padding, pixels', minimum=0, maximum=256, step=4, value=32, elem_id="img2img_inpaint_full_res_padding")

+

+                def select_img2img_tab(tab):

+                    return gr.update(visible=tab in [2, 3, 4]), gr.update(visible=tab == 3),

+

+                for i, elem in enumerate([tab_img2img, tab_sketch, tab_inpaint, tab_inpaint_color, tab_inpaint_upload, tab_batch]):

+                    elem.select(

+                        fn=lambda tab=i: select_img2img_tab(tab),

+                        inputs=[],

+                        outputs=[inpaint_controls, mask_alpha],

+                    )

+

                 with FormRow():

                     resize_mode = gr.Radio(label="Resize mode", elem_id="resize_mode", choices=["Just resize", "Crop and resize", "Resize and fill", "Just resize (latent upscale)"], type="index", value="Just resize")

 

@@ -900,20 +914,6 @@ def create_ui():
                 ]

             )

 

-            mask_mode.change(

-                lambda mode, img: {

-                    init_img_with_mask: gr_show(mode == 0),

-                    init_img_inpaint: gr_show(mode == 1),

-                    init_mask_inpaint: gr_show(mode == 1),

-                },

-                inputs=[mask_mode, init_img_with_mask],

-                outputs=[

-                    init_img_with_mask,

-                    init_img_inpaint,

-                    init_mask_inpaint,

-                ],

-            )

-

             img2img_args = dict(

                 fn=wrap_gradio_gpu_call(modules.img2img.img2img, extra_outputs=[None, '', '']),

                 _js="submit_img2img",

@@ -924,11 +924,12 @@ def create_ui():
                     img2img_prompt_style,

                     img2img_prompt_style2,

                     init_img,

+                    sketch,

                     init_img_with_mask,

-                    init_img_with_mask_orig,

+                    inpaint_color_sketch,

+                    inpaint_color_sketch_orig,

                     init_img_inpaint,

                     init_mask_inpaint,

-                    mask_mode,

                     steps,

                     sampler_index,

                     mask_blur,