Merge remote-tracking branch 'auto1111/dev' into shared-hires-prompt-test

1 files changed, 43 insertions, 134 deletions

diff --git a/modules/ui.py b/modules/ui.py
index 05292734..a6b1f964 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -1,5 +1,4 @@
 import datetime

-import json

 import mimetypes

 import os

 import sys

@@ -13,7 +12,7 @@ from PIL import Image, PngImagePlugin  # noqa: F401
 from modules.call_queue import wrap_gradio_gpu_call, wrap_queued_call, wrap_gradio_call

 

 from modules import gradio_extensons  # noqa: F401

-from modules import sd_hijack, sd_models, script_callbacks, ui_extensions, deepbooru, extra_networks, ui_common, ui_postprocessing, progress, ui_loadsave, errors, shared_items, ui_settings, timer, sysinfo, ui_checkpoint_merger, ui_prompt_styles, scripts, sd_samplers, processing, ui_extra_networks

+from modules import sd_hijack, sd_models, script_callbacks, ui_extensions, deepbooru, extra_networks, ui_common, ui_postprocessing, progress, ui_loadsave, shared_items, ui_settings, timer, sysinfo, ui_checkpoint_merger, ui_prompt_styles, scripts, sd_samplers, processing, ui_extra_networks

 from modules.ui_components import FormRow, FormGroup, ToolButton, FormHTML, InputAccordion

 from modules.paths import script_path

 from modules.ui_common import create_refresh_button

@@ -142,45 +141,6 @@ def interrogate_deepbooru(image):
     return gr.update() if prompt is None else prompt

 

 

-def create_seed_inputs(target_interface):

-    with FormRow(elem_id=f"{target_interface}_seed_row", variant="compact"):

-        if cmd_opts.use_textbox_seed:

-            seed = gr.Textbox(label='Seed', value="", elem_id=f"{target_interface}_seed")

-        else:

-            seed = gr.Number(label='Seed', value=-1, elem_id=f"{target_interface}_seed", precision=0)

-

-        random_seed = ToolButton(random_symbol, elem_id=f"{target_interface}_random_seed", label='Random seed')

-        reuse_seed = ToolButton(reuse_symbol, elem_id=f"{target_interface}_reuse_seed", label='Reuse seed')

-

-        seed_checkbox = gr.Checkbox(label='Extra', elem_id=f"{target_interface}_subseed_show", value=False)

-

-    # Components to show/hide based on the 'Extra' checkbox

-    seed_extras = []

-

-    with FormRow(visible=False, elem_id=f"{target_interface}_subseed_row") as seed_extra_row_1:

-        seed_extras.append(seed_extra_row_1)

-        subseed = gr.Number(label='Variation seed', value=-1, elem_id=f"{target_interface}_subseed", precision=0)

-        random_subseed = ToolButton(random_symbol, elem_id=f"{target_interface}_random_subseed")

-        reuse_subseed = ToolButton(reuse_symbol, elem_id=f"{target_interface}_reuse_subseed")

-        subseed_strength = gr.Slider(label='Variation strength', value=0.0, minimum=0, maximum=1, step=0.01, elem_id=f"{target_interface}_subseed_strength")

-

-    with FormRow(visible=False) as seed_extra_row_2:

-        seed_extras.append(seed_extra_row_2)

-        seed_resize_from_w = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize seed from width", value=0, elem_id=f"{target_interface}_seed_resize_from_w")

-        seed_resize_from_h = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize seed from height", value=0, elem_id=f"{target_interface}_seed_resize_from_h")

-

-    random_seed.click(fn=None, _js="function(){setRandomSeed('" + target_interface + "_seed')}", show_progress=False, inputs=[], outputs=[])

-    random_subseed.click(fn=None, _js="function(){setRandomSeed('" + target_interface + "_subseed')}", show_progress=False, inputs=[], outputs=[])

-

-    def change_visibility(show):

-        return {comp: gr_show(show) for comp in seed_extras}

-

-    seed_checkbox.change(change_visibility, show_progress=False, inputs=[seed_checkbox], outputs=seed_extras)

-

-    return seed, reuse_seed, subseed, reuse_subseed, subseed_strength, seed_resize_from_h, seed_resize_from_w, seed_checkbox

-

-

-

 def connect_clear_prompt(button):

     """Given clear button, prompt, and token_counter objects, setup clear prompt button click event"""

     button.click(

@@ -191,39 +151,6 @@ def connect_clear_prompt(button):
     )

 

 

-def connect_reuse_seed(seed: gr.Number, reuse_seed: gr.Button, generation_info: gr.Textbox, dummy_component, is_subseed):

-    """ Connects a 'reuse (sub)seed' button's click event so that it copies last used

-        (sub)seed value from generation info the to the seed field. If copying subseed and subseed strength

-        was 0, i.e. no variation seed was used, it copies the normal seed value instead."""

-    def copy_seed(gen_info_string: str, index):

-        res = -1

-

-        try:

-            gen_info = json.loads(gen_info_string)

-            index -= gen_info.get('index_of_first_image', 0)

-

-            if is_subseed and gen_info.get('subseed_strength', 0) > 0:

-                all_subseeds = gen_info.get('all_subseeds', [-1])

-                res = all_subseeds[index if 0 <= index < len(all_subseeds) else 0]

-            else:

-                all_seeds = gen_info.get('all_seeds', [-1])

-                res = all_seeds[index if 0 <= index < len(all_seeds) else 0]

-

-        except json.decoder.JSONDecodeError:

-            if gen_info_string:

-                errors.report(f"Error parsing JSON generation info: {gen_info_string}")

-

-        return [res, gr_show(False)]

-

-    reuse_seed.click(

-        fn=copy_seed,

-        _js="(x, y) => [x, selected_gallery_index()]",

-        show_progress=False,

-        inputs=[generation_info, dummy_component],

-        outputs=[seed, dummy_component]

-    )

-

-

 def update_token_counter(text, steps):

     try:

         text, _ = extra_networks.parse_prompt(text)

@@ -429,44 +356,45 @@ def create_ui():
                                     batch_size = gr.Slider(minimum=1, maximum=8, step=1, label='Batch size', value=1, elem_id="txt2img_batch_size")

 

                     elif category == "cfg":

-                        cfg_scale = gr.Slider(minimum=1.0, maximum=30.0, step=0.5, label='CFG Scale', value=7.0, elem_id="txt2img_cfg_scale")

-

-                    elif category == "seed":

-                        seed, reuse_seed, subseed, reuse_subseed, subseed_strength, seed_resize_from_h, seed_resize_from_w, seed_checkbox = create_seed_inputs('txt2img')

+                        with gr.Row():

+                            cfg_scale = gr.Slider(minimum=1.0, maximum=30.0, step=0.5, label='CFG Scale', value=7.0, elem_id="txt2img_cfg_scale")

 

                     elif category == "checkboxes":

                         with FormRow(elem_classes="checkboxes-row", variant="compact"):

                             pass

 

-                    elif category == "hires_fix":

-                        with InputAccordion(False, label="Hires. fix") as enable_hr:

-                            with enable_hr.extra():

-                                hr_final_resolution = FormHTML(value="", elem_id="txtimg_hr_finalres", label="Upscaled resolution", interactive=False, min_width=0)

+                    elif category == "accordions":

+                        with gr.Row(elem_id="txt2img_accordions", elem_classes="accordions"):

+                            with InputAccordion(False, label="Hires. fix", elem_id="txt2img_hr") as enable_hr:

+                                with enable_hr.extra():

+                                    hr_final_resolution = FormHTML(value="", elem_id="txtimg_hr_finalres", label="Upscaled resolution", interactive=False, min_width=0)

 

-                            with FormRow(elem_id="txt2img_hires_fix_row1", variant="compact"):

-                                hr_upscaler = gr.Dropdown(label="Upscaler", elem_id="txt2img_hr_upscaler", choices=[*shared.latent_upscale_modes, *[x.name for x in shared.sd_upscalers]], value=shared.latent_upscale_default_mode)

-                                hr_second_pass_steps = gr.Slider(minimum=0, maximum=150, step=1, label='Hires steps', value=0, elem_id="txt2img_hires_steps")

-                                denoising_strength = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Denoising strength', value=0.7, elem_id="txt2img_denoising_strength")

+                                with FormRow(elem_id="txt2img_hires_fix_row1", variant="compact"):

+                                    hr_upscaler = gr.Dropdown(label="Upscaler", elem_id="txt2img_hr_upscaler", choices=[*shared.latent_upscale_modes, *[x.name for x in shared.sd_upscalers]], value=shared.latent_upscale_default_mode)

+                                    hr_second_pass_steps = gr.Slider(minimum=0, maximum=150, step=1, label='Hires steps', value=0, elem_id="txt2img_hires_steps")

+                                    denoising_strength = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Denoising strength', value=0.7, elem_id="txt2img_denoising_strength")

 

-                            with FormRow(elem_id="txt2img_hires_fix_row2", variant="compact"):

-                                hr_scale = gr.Slider(minimum=1.0, maximum=4.0, step=0.05, label="Upscale by", value=2.0, elem_id="txt2img_hr_scale")

-                                hr_resize_x = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize width to", value=0, elem_id="txt2img_hr_resize_x")

-                                hr_resize_y = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize height to", value=0, elem_id="txt2img_hr_resize_y")

+                                with FormRow(elem_id="txt2img_hires_fix_row2", variant="compact"):

+                                    hr_scale = gr.Slider(minimum=1.0, maximum=4.0, step=0.05, label="Upscale by", value=2.0, elem_id="txt2img_hr_scale")

+                                    hr_resize_x = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize width to", value=0, elem_id="txt2img_hr_resize_x")

+                                    hr_resize_y = gr.Slider(minimum=0, maximum=2048, step=8, label="Resize height to", value=0, elem_id="txt2img_hr_resize_y")

 

-                            with FormRow(elem_id="txt2img_hires_fix_row3", variant="compact", visible=opts.hires_fix_show_sampler) as hr_sampler_container:

+                                with FormRow(elem_id="txt2img_hires_fix_row3", variant="compact", visible=opts.hires_fix_show_sampler) as hr_sampler_container:

 

-                                hr_checkpoint_name = gr.Dropdown(label='Hires checkpoint', elem_id="hr_checkpoint", choices=["Use same checkpoint"] + modules.sd_models.checkpoint_tiles(use_short=True), value="Use same checkpoint")

-                                create_refresh_button(hr_checkpoint_name, modules.sd_models.list_models, lambda: {"choices": ["Use same checkpoint"] + modules.sd_models.checkpoint_tiles(use_short=True)}, "hr_checkpoint_refresh")

+                                    hr_checkpoint_name = gr.Dropdown(label='Hires checkpoint', elem_id="hr_checkpoint", choices=["Use same checkpoint"] + modules.sd_models.checkpoint_tiles(use_short=True), value="Use same checkpoint")

+                                    create_refresh_button(hr_checkpoint_name, modules.sd_models.list_models, lambda: {"choices": ["Use same checkpoint"] + modules.sd_models.checkpoint_tiles(use_short=True)}, "hr_checkpoint_refresh")

 

-                                hr_sampler_name = gr.Dropdown(label='Hires sampling method', elem_id="hr_sampler", choices=["Use same sampler"] + sd_samplers.visible_sampler_names(), value="Use same sampler")

+                                    hr_sampler_name = gr.Dropdown(label='Hires sampling method', elem_id="hr_sampler", choices=["Use same sampler"] + sd_samplers.visible_sampler_names(), value="Use same sampler")

 

-                            with FormRow(elem_id="txt2img_hires_fix_row4", variant="compact", visible=opts.hires_fix_show_prompts) as hr_prompts_container:

-                                with gr.Column(scale=80):

-                                    with gr.Row():

-                                        hr_prompt = gr.Textbox(label="Hires prompt", elem_id="hires_prompt", show_label=False, lines=3, placeholder="Prompt for hires fix pass.\nLeave empty to use the same prompt as in first pass.", elem_classes=["prompt"])

-                                with gr.Column(scale=80):

-                                    with gr.Row():

-                                        hr_negative_prompt = gr.Textbox(label="Hires negative prompt", elem_id="hires_neg_prompt", show_label=False, lines=3, placeholder="Negative prompt for hires fix pass.\nLeave empty to use the same negative prompt as in first pass.", elem_classes=["prompt"])

+                                with FormRow(elem_id="txt2img_hires_fix_row4", variant="compact", visible=opts.hires_fix_show_prompts) as hr_prompts_container:

+                                    with gr.Column(scale=80):

+                                        with gr.Row():

+                                            hr_prompt = gr.Textbox(label="Hires prompt", elem_id="hires_prompt", show_label=False, lines=3, placeholder="Prompt for hires fix pass.\nLeave empty to use the same prompt as in first pass.", elem_classes=["prompt"])

+                                    with gr.Column(scale=80):

+                                        with gr.Row():

+                                            hr_negative_prompt = gr.Textbox(label="Hires negative prompt", elem_id="hires_neg_prompt", show_label=False, lines=3, placeholder="Negative prompt for hires fix pass.\nLeave empty to use the same negative prompt as in first pass.", elem_classes=["prompt"])

+

+                            scripts.scripts_txt2img.setup_ui_for_section(category)

 

                     elif category == "batch":

                         if not opts.dimensions_and_batch_together:

@@ -482,7 +410,7 @@ def create_ui():
                         with FormGroup(elem_id="txt2img_script_container"):

                             custom_inputs = scripts.scripts_txt2img.setup_ui()

 

-                    else:

+                    if category not in {"accordions"}:

                         scripts.scripts_txt2img.setup_ui_for_section(category)

 

             hr_resolution_preview_inputs = [enable_hr, width, height, hr_scale, hr_resize_x, hr_resize_y]

@@ -506,9 +434,6 @@ def create_ui():
 

             txt2img_gallery, generation_info, html_info, html_log = create_output_panel("txt2img", opts.outdir_txt2img_samples)

 

-            connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)

-            connect_reuse_seed(subseed, reuse_subseed, generation_info, dummy_component, is_subseed=True)

-

             txt2img_args = dict(

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

                 _js="submit",

@@ -522,8 +447,6 @@ def create_ui():
                     batch_count,

                     batch_size,

                     cfg_scale,

-                    seed,

-                    subseed, subseed_strength, seed_resize_from_h, seed_resize_from_w, seed_checkbox,

                     height,

                     width,

                     enable_hr,

@@ -574,15 +497,9 @@ def create_ui():
                 (steps, "Steps"),

                 (sampler_name, "Sampler"),

                 (cfg_scale, "CFG scale"),

-                (seed, "Seed"),

                 (width, "Size-1"),

                 (height, "Size-2"),

                 (batch_size, "Batch size"),

-                (seed_checkbox, lambda d: "Variation seed" in d or "Seed resize from-1" in d),

-                (subseed, "Variation seed"),

-                (subseed_strength, "Variation seed strength"),

-                (seed_resize_from_w, "Seed resize from-1"),

-                (seed_resize_from_h, "Seed resize from-2"),

                 (toprow.ui_styles.dropdown, lambda d: d["Styles array"] if isinstance(d.get("Styles array"), list) else gr.update()),

                 (denoising_strength, "Denoising strength"),

                 (enable_hr, lambda d: "Denoising strength" in d and ("Hires upscale" in d or "Hires upscaler" in d or "Hires resize-1" in d)),

@@ -610,7 +527,7 @@ def create_ui():
                 steps,

                 sampler_name,

                 cfg_scale,

-                seed,

+                scripts.scripts_txt2img.script('Seed').seed,

                 width,

                 height,

             ]

@@ -780,20 +697,22 @@ def create_ui():
                                     batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1, elem_id="img2img_batch_count")

                                     batch_size = gr.Slider(minimum=1, maximum=8, step=1, label='Batch size', value=1, elem_id="img2img_batch_size")

 

-                    elif category == "cfg":

-                        with FormGroup():

-                            with FormRow():

-                                cfg_scale = gr.Slider(minimum=1.0, maximum=30.0, step=0.5, label='CFG Scale', value=7.0, elem_id="img2img_cfg_scale")

-                                image_cfg_scale = gr.Slider(minimum=0, maximum=3.0, step=0.05, label='Image CFG Scale', value=1.5, elem_id="img2img_image_cfg_scale", visible=False)

-                            denoising_strength = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Denoising strength', value=0.75, elem_id="img2img_denoising_strength")

+                    elif category == "denoising":

+                        denoising_strength = gr.Slider(minimum=0.0, maximum=1.0, step=0.01, label='Denoising strength', value=0.75, elem_id="img2img_denoising_strength")

 

-                    elif category == "seed":

-                        seed, reuse_seed, subseed, reuse_subseed, subseed_strength, seed_resize_from_h, seed_resize_from_w, seed_checkbox = create_seed_inputs('img2img')

+                    elif category == "cfg":

+                        with gr.Row():

+                            cfg_scale = gr.Slider(minimum=1.0, maximum=30.0, step=0.5, label='CFG Scale', value=7.0, elem_id="img2img_cfg_scale")

+                            image_cfg_scale = gr.Slider(minimum=0, maximum=3.0, step=0.05, label='Image CFG Scale', value=1.5, elem_id="img2img_image_cfg_scale", visible=False)

 

                     elif category == "checkboxes":

                         with FormRow(elem_classes="checkboxes-row", variant="compact"):

                             pass

 

+                    elif category == "accordions":

+                        with gr.Row(elem_id="img2img_accordions", elem_classes="accordions"):

+                            scripts.scripts_img2img.setup_ui_for_section(category)

+

                     elif category == "batch":

                         if not opts.dimensions_and_batch_together:

                             with FormRow(elem_id="img2img_column_batch"):

@@ -836,14 +755,12 @@ def create_ui():
                                     inputs=[],

                                     outputs=[inpaint_controls, mask_alpha],

                                 )

-                    else:

+

+                    if category not in {"accordions"}:

                         scripts.scripts_img2img.setup_ui_for_section(category)

 

             img2img_gallery, generation_info, html_info, html_log = create_output_panel("img2img", opts.outdir_img2img_samples)

 

-            connect_reuse_seed(seed, reuse_seed, generation_info, dummy_component, is_subseed=False)

-            connect_reuse_seed(subseed, reuse_subseed, generation_info, dummy_component, is_subseed=True)

-

             img2img_args = dict(

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

                 _js="submit_img2img",

@@ -870,8 +787,6 @@ def create_ui():
                     cfg_scale,

                     image_cfg_scale,

                     denoising_strength,

-                    seed,

-                    subseed, subseed_strength, seed_resize_from_h, seed_resize_from_w, seed_checkbox,

                     selected_scale_tab,

                     height,

                     width,

@@ -958,15 +873,9 @@ def create_ui():
                 (sampler_name, "Sampler"),

                 (cfg_scale, "CFG scale"),

                 (image_cfg_scale, "Image CFG scale"),

-                (seed, "Seed"),

                 (width, "Size-1"),

                 (height, "Size-2"),

                 (batch_size, "Batch size"),

-                (seed_checkbox, lambda d: "Variation seed" in d or "Seed resize from-1" in d),

-                (subseed, "Variation seed"),

-                (subseed_strength, "Variation seed strength"),

-                (seed_resize_from_w, "Seed resize from-1"),

-                (seed_resize_from_h, "Seed resize from-2"),

                 (toprow.ui_styles.dropdown, lambda d: d["Styles array"] if isinstance(d.get("Styles array"), list) else gr.update()),

                 (denoising_strength, "Denoising strength"),

                 (mask_blur, "Mask blur"),