Merge branch 'master' into master

1 files changed, 630 insertions, 110 deletions

diff --git a/modules/ui.py b/modules/ui.py
index 15572bb0..baf4c397 100644
--- a/modules/ui.py
+++ b/modules/ui.py
@@ -11,6 +11,7 @@ import time
 import traceback

 import platform

 import subprocess as sp

+from functools import reduce

 

 import numpy as np

 import torch

@@ -21,8 +22,11 @@ import gradio as gr
 import gradio.utils

 import gradio.routes

 

+from modules import sd_hijack, sd_models

 from modules.paths import script_path

 from modules.shared import opts, cmd_opts

+if cmd_opts.deepdanbooru:

+    from modules.deepbooru import get_deepbooru_tags

 import modules.shared as shared

 from modules.sd_samplers import samplers, samplers_for_img2img

 from modules.sd_hijack import model_hijack

@@ -32,8 +36,13 @@ import modules.gfpgan_model
 import modules.codeformer_model

 import modules.styles

 import modules.generation_parameters_copypaste

+from modules import prompt_parser

+from modules.images import save_image

+import modules.textual_inversion.ui

+import modules.hypernetworks.ui

+import modules.images_history as img_his

 

-# this is a fix for Windows users. Without it, javascript files will be served with text/html content-type and the bowser will not show any UI

+# this is a fix for Windows users. Without it, javascript files will be served with text/html content-type and the browser will not show any UI

 mimetypes.init()

 mimetypes.add_type('application/javascript', '.js')

 

@@ -43,6 +52,11 @@ if not cmd_opts.share and not cmd_opts.listen:
     gradio.utils.version_check = lambda: None

     gradio.utils.get_local_ip_address = lambda: '127.0.0.1'

 

+if cmd_opts.ngrok != None:

+    import modules.ngrok as ngrok

+    print('ngrok authtoken detected, trying to connect...')

+    ngrok.connect(cmd_opts.ngrok, cmd_opts.port if cmd_opts.port != None else 7860)

+

 

 def gr_show(visible=True):

     return {"visible": visible, "__type__": "update"}

@@ -64,7 +78,9 @@ random_symbol = '\U0001f3b2\ufe0f'  # 🎲️
 reuse_symbol = '\u267b\ufe0f'  # ♻️

 art_symbol = '\U0001f3a8'  # 🎨

 paste_symbol = '\u2199\ufe0f'  # ↙

-folder_symbol = '\uD83D\uDCC2'

+folder_symbol = '\U0001f4c2'  # 📂

+refresh_symbol = '\U0001f504'  # 🔄

+

 

 def plaintext_to_html(text):

     text = "<p>" + "<br>\n".join([f"{html.escape(x)}" for x in text.split('\n')]) + "</p>"

@@ -93,19 +109,32 @@ def send_gradio_gallery_to_image(x):
     return image_from_url_text(x[0])

 

 

-def save_files(js_data, images, index):

+def save_files(js_data, images, do_make_zip, index):

     import csv

-

-    os.makedirs(opts.outdir_save, exist_ok=True)

-

     filenames = []

+    fullfns = []

+

+    #quick dictionary to class object conversion. Its necessary due apply_filename_pattern requiring it

+    class MyObject:

+        def __init__(self, d=None):

+            if d is not None:

+                for key, value in d.items():

+                    setattr(self, key, value)

 

     data = json.loads(js_data)

+

+    p = MyObject(data)

+    path = opts.outdir_save

+    save_to_dirs = opts.use_save_to_dirs_for_ui

+    extension: str = opts.samples_format

+    start_index = 0

+

     if index > -1 and opts.save_selected_only and (index >= data["index_of_first_image"]):  # ensures we are looking at a specific non-grid picture, and we have save_selected_only

+

         images = [images[index]]

-        infotexts = [data["infotexts"][index]]

-    else:

-        infotexts = data["infotexts"]

+        start_index = index

+

+    os.makedirs(opts.outdir_save, exist_ok=True)

 

     with open(os.path.join(opts.outdir_save, "log.csv"), "a", encoding="utf8", newline='') as file:

         at_start = file.tell() == 0

@@ -113,37 +142,42 @@ def save_files(js_data, images, index):
         if at_start:

             writer.writerow(["prompt", "seed", "width", "height", "sampler", "cfgs", "steps", "filename", "negative_prompt"])

 

-        filename_base = str(int(time.time() * 1000))

-        extension = opts.samples_format.lower()

-        for i, filedata in enumerate(images):

-            filename = filename_base + ("" if len(images) == 1 else "-" + str(i + 1)) + f".{extension}"

-            filepath = os.path.join(opts.outdir_save, filename)

-

+        for image_index, filedata in enumerate(images, start_index):

             if filedata.startswith("data:image/png;base64,"):

                 filedata = filedata[len("data:image/png;base64,"):]

 

             image = Image.open(io.BytesIO(base64.decodebytes(filedata.encode('utf-8'))))

-            if opts.enable_pnginfo and extension == 'png':

-                pnginfo = PngImagePlugin.PngInfo()

-                pnginfo.add_text('parameters', infotexts[i])

-                image.save(filepath, pnginfo=pnginfo)

-            else:

-                image.save(filepath, quality=opts.jpeg_quality)

 

-            if opts.enable_pnginfo and extension in ("jpg", "jpeg", "webp"):

-                piexif.insert(piexif.dump({"Exif": {

-                    piexif.ExifIFD.UserComment: piexif.helper.UserComment.dump(infotexts[i], encoding="unicode")

-                }}), filepath)

+            is_grid = image_index < p.index_of_first_image

+            i = 0 if is_grid else (image_index - p.index_of_first_image)

+

+            fullfn, txt_fullfn = save_image(image, path, "", seed=p.all_seeds[i], prompt=p.all_prompts[i], extension=extension, info=p.infotexts[image_index], grid=is_grid, p=p, save_to_dirs=save_to_dirs)

 

+            filename = os.path.relpath(fullfn, path)

             filenames.append(filename)

+            fullfns.append(fullfn)

+            if txt_fullfn:

+                filenames.append(os.path.basename(txt_fullfn))

+                fullfns.append(txt_fullfn)

 

         writer.writerow([data["prompt"], data["seed"], data["width"], data["height"], data["sampler"], data["cfg_scale"], data["steps"], filenames[0], data["negative_prompt"]])

 

-    return '', '', plaintext_to_html(f"Saved: {filenames[0]}")

+    # Make Zip

+    if do_make_zip:

+        zip_filepath = os.path.join(path, "images.zip")

 

+        from zipfile import ZipFile

+        with ZipFile(zip_filepath, "w") as zip_file:

+            for i in range(len(fullfns)):

+                with open(fullfns[i], mode="rb") as f:

+                    zip_file.writestr(filenames[i], f.read())

+        fullfns.insert(0, zip_filepath)

 

-def wrap_gradio_call(func):

-    def f(*args, **kwargs):

+    return gr.File.update(value=fullfns, visible=True), '', '', plaintext_to_html(f"Saved: {filenames[0]}")

+

+

+def wrap_gradio_call(func, extra_outputs=None):

+    def f(*args, extra_outputs_array=extra_outputs, **kwargs):

         run_memmon = opts.memmon_poll_rate > 0 and not shared.mem_mon.disabled

         if run_memmon:

             shared.mem_mon.monitor()

@@ -152,16 +186,31 @@ def wrap_gradio_call(func):
         try:

             res = list(func(*args, **kwargs))

         except Exception as e:

+            # When printing out our debug argument list, do not print out more than a MB of text

+            max_debug_str_len = 131072 # (1024*1024)/8

+

             print("Error completing request", file=sys.stderr)

-            print("Arguments:", args, kwargs, file=sys.stderr)

+            argStr = f"Arguments: {str(args)} {str(kwargs)}"

+            print(argStr[:max_debug_str_len], file=sys.stderr)

+            if len(argStr) > max_debug_str_len:

+                print(f"(Argument list truncated at {max_debug_str_len}/{len(argStr)} characters)", file=sys.stderr)

+

             print(traceback.format_exc(), file=sys.stderr)

 

             shared.state.job = ""

             shared.state.job_count = 0

 

-            res = [None, '', f"<div class='error'>{plaintext_to_html(type(e).__name__+': '+str(e))}</div>"]

+            if extra_outputs_array is None:

+                extra_outputs_array = [None, '']

+

+            res = extra_outputs_array + [f"<div class='error'>{plaintext_to_html(type(e).__name__+': '+str(e))}</div>"]

 

         elapsed = time.perf_counter() - t

+        elapsed_m = int(elapsed // 60)

+        elapsed_s = elapsed % 60

+        elapsed_text = f"{elapsed_s:.2f}s"

+        if (elapsed_m > 0):

+            elapsed_text = f"{elapsed_m}m "+elapsed_text

 

         if run_memmon:

             mem_stats = {k: -(v//-(1024*1024)) for k, v in shared.mem_mon.stop().items()}

@@ -176,9 +225,11 @@ def wrap_gradio_call(func):
             vram_html = ''

 

         # last item is always HTML

-        res[-1] += f"<div class='performance'><p class='time'>Time taken: <wbr>{elapsed:.2f}s</p>{vram_html}</div>"

+        res[-1] += f"<div class='performance'><p class='time'>Time taken: <wbr>{elapsed_text}</p>{vram_html}</div>"

 

+        shared.state.skipped = False

         shared.state.interrupted = False

+        shared.state.job_count = 0

 

         return tuple(res)

 

@@ -187,7 +238,7 @@ def wrap_gradio_call(func):
 

 def check_progress_call(id_part):

     if shared.state.job_count == 0:

-        return "", gr_show(False), gr_show(False)

+        return "", gr_show(False), gr_show(False), gr_show(False)

 

     progress = 0

 

@@ -219,13 +270,19 @@ def check_progress_call(id_part):
         else:

             preview_visibility = gr_show(True)

 

-    return f"<span id='{id_part}_progress_span' style='display: none'>{time.time()}</span><p>{progressbar}</p>", preview_visibility, image

+    if shared.state.textinfo is not None:

+        textinfo_result = gr.HTML.update(value=shared.state.textinfo, visible=True)

+    else:

+        textinfo_result = gr_show(False)

+

+    return f"<span id='{id_part}_progress_span' style='display: none'>{time.time()}</span><p>{progressbar}</p>", preview_visibility, image, textinfo_result

 

 

 def check_progress_call_initial(id_part):

     shared.state.job_count = -1

     shared.state.current_latent = None

     shared.state.current_image = None

+    shared.state.textinfo = None

 

     return check_progress_call(id_part)

 

@@ -271,6 +328,11 @@ def interrogate(image):
     return gr_show(True) if prompt is None else prompt

 

 

+def interrogate_deepbooru(image):

+    prompt = get_deepbooru_tags(image)

+    return gr_show(True) if prompt is None else prompt

+

+

 def create_seed_inputs():

     with gr.Row():

         with gr.Box():

@@ -345,11 +407,24 @@ def connect_reuse_seed(seed: gr.Number, reuse_seed: gr.Button, generation_info:
         outputs=[seed, dummy_component]

     )

 

-def update_token_counter(text):

-    tokens, token_count, max_length = model_hijack.tokenize(text)

+

+def update_token_counter(text, steps):

+    try:

+        _, prompt_flat_list, _ = prompt_parser.get_multicond_prompt_list([text])

+        prompt_schedules = prompt_parser.get_learned_conditioning_prompt_schedules(prompt_flat_list, steps)

+

+    except Exception:

+        # a parsing error can happen here during typing, and we don't want to bother the user with

+        # messages related to it in console

+        prompt_schedules = [[[steps, text]]]

+

+    flat_prompts = reduce(lambda list1, list2: list1+list2, prompt_schedules)

+    prompts = [prompt_text for step, prompt_text in flat_prompts]

+    tokens, token_count, max_length = max([model_hijack.tokenize(prompt) for prompt in prompts], key=lambda args: args[1])

     style_class = ' class="red"' if (token_count > max_length) else ""

     return f"<span {style_class}>{token_count}/{max_length}</span>"

 

+

 def create_toprow(is_img2img):

     id_part = "img2img" if is_img2img else "txt2img"

 

@@ -358,54 +433,76 @@ def create_toprow(is_img2img):
             with gr.Row():

                 with gr.Column(scale=80):

                     with gr.Row():

-                        prompt = gr.Textbox(label="Prompt", elem_id=f"{id_part}_prompt", show_label=False, placeholder="Prompt", lines=2)

+                        prompt = gr.Textbox(label="Prompt", elem_id=f"{id_part}_prompt", show_label=False, lines=2, 

+                            placeholder="Prompt (press Ctrl+Enter or Alt+Enter to generate)"

+                        )

 

                 with gr.Column(scale=1, elem_id="roll_col"):

                     roll = gr.Button(value=art_symbol, elem_id="roll", visible=len(shared.artist_db.artists) > 0)

                     paste = gr.Button(value=paste_symbol, elem_id="paste")

                     token_counter = gr.HTML(value="<span></span>", elem_id=f"{id_part}_token_counter")

-                    hidden_button = gr.Button(visible=False, elem_id=f"{id_part}_token_button")

-                    hidden_button.click(fn=update_token_counter, inputs=[prompt], outputs=[token_counter])

+                    token_button = gr.Button(visible=False, elem_id=f"{id_part}_token_button")

 

                 with gr.Column(scale=10, elem_id="style_pos_col"):

                     prompt_style = gr.Dropdown(label="Style 1", elem_id=f"{id_part}_style_index", choices=[k for k, v in shared.prompt_styles.styles.items()], value=next(iter(shared.prompt_styles.styles.keys())), visible=len(shared.prompt_styles.styles) > 1)

 

             with gr.Row():

                 with gr.Column(scale=8):

-                    negative_prompt = gr.Textbox(label="Negative prompt", elem_id="negative_prompt", show_label=False, placeholder="Negative prompt", lines=2)

+                    with gr.Row():

+                        negative_prompt = gr.Textbox(label="Negative prompt", elem_id=f"{id_part}_neg_prompt", show_label=False, lines=2, 

+                            placeholder="Negative prompt (press Ctrl+Enter or Alt+Enter to generate)"

+                        )

+

+                with gr.Column(scale=1, elem_id="roll_col"):

+                    sh = gr.Button(elem_id="sh", visible=True)                           

 

                 with gr.Column(scale=1, elem_id="style_neg_col"):

                     prompt_style2 = gr.Dropdown(label="Style 2", elem_id=f"{id_part}_style2_index", choices=[k for k, v in shared.prompt_styles.styles.items()], value=next(iter(shared.prompt_styles.styles.keys())), visible=len(shared.prompt_styles.styles) > 1)

 

         with gr.Column(scale=1):

             with gr.Row():

+                skip = gr.Button('Skip', elem_id=f"{id_part}_skip")

                 interrupt = gr.Button('Interrupt', elem_id=f"{id_part}_interrupt")

                 submit = gr.Button('Generate', elem_id=f"{id_part}_generate", variant='primary')

 

+                skip.click(

+                    fn=lambda: shared.state.skip(),

+                    inputs=[],

+                    outputs=[],

+                )

+

                 interrupt.click(

                     fn=lambda: shared.state.interrupt(),

                     inputs=[],

                     outputs=[],

                 )

 

-            with gr.Row():

+            with gr.Row(scale=1):

                 if is_img2img:

-                    interrogate = gr.Button('Interrogate', elem_id="interrogate")

+                    interrogate = gr.Button('Interrogate\nCLIP', elem_id="interrogate")

+                    if cmd_opts.deepdanbooru:

+                        deepbooru = gr.Button('Interrogate\nDeepBooru', elem_id="deepbooru")

+                    else:

+                        deepbooru = None

                 else:

                     interrogate = None

+                    deepbooru = None

                 prompt_style_apply = gr.Button('Apply style', elem_id="style_apply")

                 save_style = gr.Button('Create style', elem_id="style_create")

 

-    return prompt, roll, prompt_style, negative_prompt, prompt_style2, submit, interrogate, prompt_style_apply, save_style, paste

+    return prompt, roll, prompt_style, negative_prompt, prompt_style2, submit, interrogate, deepbooru, prompt_style_apply, save_style, paste, token_counter, token_button

 

 

-def setup_progressbar(progressbar, preview, id_part):

+def setup_progressbar(progressbar, preview, id_part, textinfo=None):

+    if textinfo is None:

+        textinfo = gr.HTML(visible=False)

+

     check_progress = gr.Button('Check progress', elem_id=f"{id_part}_check_progress", visible=False)

     check_progress.click(

         fn=lambda: check_progress_call(id_part),

         show_progress=False,

         inputs=[],

-        outputs=[progressbar, preview, preview],

+        outputs=[progressbar, preview, preview, textinfo],

     )

 

     check_progress_initial = gr.Button('Check progress (first)', elem_id=f"{id_part}_check_progress_initial", visible=False)

@@ -413,14 +510,44 @@ def setup_progressbar(progressbar, preview, id_part):
         fn=lambda: check_progress_call_initial(id_part),

         show_progress=False,

         inputs=[],

-        outputs=[progressbar, preview, preview],

+        outputs=[progressbar, preview, preview, textinfo],

     )

 

 

-def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):

+def apply_setting(key, value):

+    if value is None:

+        return gr.update()

+

+    if key == "sd_model_checkpoint":

+        ckpt_info = sd_models.get_closet_checkpoint_match(value)

+

+        if ckpt_info is not None:

+            value = ckpt_info.title

+        else:

+            return gr.update()

+

+    comp_args = opts.data_labels[key].component_args

+    if comp_args and isinstance(comp_args, dict) and comp_args.get('visible') is False:

+        return

+

+    valtype = type(opts.data_labels[key].default)

+    oldval = opts.data[key]

+    opts.data[key] = valtype(value) if valtype != type(None) else value

+    if oldval != value and opts.data_labels[key].onchange is not None:

+        opts.data_labels[key].onchange()

+

+    opts.save(shared.config_filename)

+    return value

+

+

+def create_ui(wrap_gradio_gpu_call):

+    import modules.img2img

+    import modules.txt2img

+

     with gr.Blocks(analytics_enabled=False) as txt2img_interface:

-        txt2img_prompt, roll, txt2img_prompt_style, txt2img_negative_prompt, txt2img_prompt_style2, submit, _, txt2img_prompt_style_apply, txt2img_save_style, paste = create_toprow(is_img2img=False)

+        txt2img_prompt, roll, txt2img_prompt_style, txt2img_negative_prompt, txt2img_prompt_style2, submit, _, _, txt2img_prompt_style_apply, txt2img_save_style, txt2img_paste, token_counter, token_button = create_toprow(is_img2img=False)

         dummy_component = gr.Label(visible=False)

+        txt_prompt_img = gr.File(label="", elem_id="txt2img_prompt_image", file_count="single", type="bytes", visible=False)

 

         with gr.Row(elem_id='txt2img_progress_row'):

             with gr.Column(scale=1):

@@ -446,11 +573,12 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                     enable_hr = gr.Checkbox(label='Highres. fix', value=False)

 

                 with gr.Row(visible=False) as hr_options:

-                    scale_latent = gr.Checkbox(label='Scale latent', value=False)

+                    firstphase_width = gr.Slider(minimum=0, maximum=1024, step=64, label="Firstpass width", value=0)

+                    firstphase_height = gr.Slider(minimum=0, maximum=1024, step=64, label="Firstpass height", value=0)

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

 

-                with gr.Row():

-                    batch_count = gr.Slider(minimum=1, maximum=cmd_opts.max_batch_count, step=1, label='Batch count', value=1)

+                with gr.Row(equal_height=True):

+                    batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1)

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

 

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

@@ -475,15 +603,21 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                         button_id = "hidden_element" if shared.cmd_opts.hide_ui_dir_config else 'open_folder'

                         open_txt2img_folder = gr.Button(folder_symbol, elem_id=button_id)

 

-                with gr.Group():

-                    html_info = gr.HTML()

-                    generation_info = gr.Textbox(visible=False)

+                    with gr.Row():

+                        do_make_zip = gr.Checkbox(label="Make Zip when Save?", value=False)

+

+                    with gr.Row():

+                        download_files = gr.File(None, file_count="multiple", interactive=False, show_label=False, visible=False)

+

+                    with gr.Group():

+                        html_info = gr.HTML()

+                        generation_info = gr.Textbox(visible=False)

 

             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=txt2img,

+                fn=wrap_gradio_gpu_call(modules.txt2img.txt2img),

                 _js="submit",

                 inputs=[

                     txt2img_prompt,

@@ -502,8 +636,9 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                     height,

                     width,

                     enable_hr,

-                    scale_latent,

                     denoising_strength,

+                    firstphase_width,

+                    firstphase_height,

                 ] + custom_inputs,

                 outputs=[

                     txt2img_gallery,

@@ -516,6 +651,17 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
             txt2img_prompt.submit(**txt2img_args)

             submit.click(**txt2img_args)

 

+            txt_prompt_img.change(

+                fn=modules.images.image_data,

+                inputs=[

+                    txt_prompt_img

+                ],

+                outputs=[

+                    txt2img_prompt,

+                    txt_prompt_img

+                ]

+            )

+

             enable_hr.change(

                 fn=lambda x: gr_show(x),

                 inputs=[enable_hr],

@@ -524,13 +670,15 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
 

             save.click(

                 fn=wrap_gradio_call(save_files),

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

+                _js="(x, y, z, w) => [x, y, z, selected_gallery_index()]",

                 inputs=[

                     generation_info,

                     txt2img_gallery,

+                    do_make_zip,

                     html_info,

                 ],

                 outputs=[

+                    download_files,

                     html_info,

                     html_info,

                     html_info,

@@ -539,6 +687,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
 

             roll.click(

                 fn=roll_artist,

+                _js="update_txt2img_tokens",

                 inputs=[

                     txt2img_prompt,

                 ],

@@ -565,13 +714,29 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                 (denoising_strength, "Denoising strength"),

                 (enable_hr, lambda d: "Denoising strength" in d),

                 (hr_options, lambda d: gr.Row.update(visible="Denoising strength" in d)),

+                (firstphase_width, "First pass size-1"),

+                (firstphase_height, "First pass size-2"),

+            ]

+

+            txt2img_preview_params = [

+                txt2img_prompt,

+                txt2img_negative_prompt,

+                steps,

+                sampler_index,

+                cfg_scale,

+                seed,

+                width,

+                height,

             ]

-            modules.generation_parameters_copypaste.connect_paste(paste, txt2img_paste_fields, txt2img_prompt)

+

+            token_button.click(fn=update_token_counter, inputs=[txt2img_prompt, steps], outputs=[token_counter])

 

     with gr.Blocks(analytics_enabled=False) as img2img_interface:

-        img2img_prompt, roll, img2img_prompt_style, img2img_negative_prompt, img2img_prompt_style2, submit, img2img_interrogate, img2img_prompt_style_apply, img2img_save_style, paste = create_toprow(is_img2img=True)

+        img2img_prompt, roll, img2img_prompt_style, img2img_negative_prompt, img2img_prompt_style2, submit, img2img_interrogate, img2img_deepbooru, img2img_prompt_style_apply, img2img_save_style, img2img_paste, token_counter, token_button = create_toprow(is_img2img=True)

 

         with gr.Row(elem_id='img2img_progress_row'):

+            img2img_prompt_img = gr.File(label="", elem_id="img2img_prompt_image", file_count="single", type="bytes", visible=False)

+

             with gr.Column(scale=1):

                 pass

 

@@ -585,7 +750,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
 

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

                     with gr.TabItem('img2img', id='img2img'):

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

+                        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)

 

                     with gr.TabItem('Inpaint', id='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")

@@ -607,7 +772,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
 

                     with gr.TabItem('Batch img2img', id='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.{hidden}</p>")

+                        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)

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

 

@@ -626,7 +791,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                     tiling = gr.Checkbox(label='Tiling', value=False)

 

                 with gr.Row():

-                    batch_count = gr.Slider(minimum=1, maximum=cmd_opts.max_batch_count, step=1, label='Batch count', value=1)

+                    batch_count = gr.Slider(minimum=1, step=1, label='Batch count', value=1)

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

 

                 with gr.Group():

@@ -653,13 +818,30 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                         button_id = "hidden_element" if shared.cmd_opts.hide_ui_dir_config else 'open_folder'

                         open_img2img_folder = gr.Button(folder_symbol, elem_id=button_id)

 

-                with gr.Group():

-                    html_info = gr.HTML()

-                    generation_info = gr.Textbox(visible=False)

+                    with gr.Row():

+                        do_make_zip = gr.Checkbox(label="Make Zip when Save?", value=False)

+

+                    with gr.Row():

+                        download_files = gr.File(None, file_count="multiple", interactive=False, show_label=False, visible=False)

+

+                    with gr.Group():

+                        html_info = gr.HTML()

+                        generation_info = gr.Textbox(visible=False)

 

             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_prompt_img.change(

+                fn=modules.images.image_data,

+                inputs=[

+                    img2img_prompt_img

+                ],

+                outputs=[

+                    img2img_prompt,

+                    img2img_prompt_img

+                ]

+            )

+

             mask_mode.change(

                 lambda mode, img: {

                     init_img_with_mask: gr_show(mode == 0),

@@ -675,7 +857,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
             )

 

             img2img_args = dict(

-                fn=img2img,

+                fn=wrap_gradio_gpu_call(modules.img2img.img2img),

                 _js="submit_img2img",

                 inputs=[

                     dummy_component,

@@ -726,15 +908,24 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                 outputs=[img2img_prompt],

             )

 

+            if cmd_opts.deepdanbooru:

+                img2img_deepbooru.click(

+                    fn=interrogate_deepbooru,

+                    inputs=[init_img],

+                    outputs=[img2img_prompt],

+                )

+

             save.click(

                 fn=wrap_gradio_call(save_files),

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

+                _js="(x, y, z, w) => [x, y, z, selected_gallery_index()]",

                 inputs=[

                     generation_info,

                     img2img_gallery,

-                    html_info

+                    do_make_zip,

+                    html_info,

                 ],

                 outputs=[

+                    download_files,

                     html_info,

                     html_info,

                     html_info,

@@ -743,6 +934,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
 

             roll.click(

                 fn=roll_artist,

+                _js="update_img2img_tokens",

                 inputs=[

                     img2img_prompt,

                 ],

@@ -753,6 +945,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
 

             prompts = [(txt2img_prompt, txt2img_negative_prompt), (img2img_prompt, img2img_negative_prompt)]

             style_dropdowns = [(txt2img_prompt_style, txt2img_prompt_style2), (img2img_prompt_style, img2img_prompt_style2)]

+            style_js_funcs = ["update_txt2img_tokens", "update_img2img_tokens"]

 

             for button, (prompt, negative_prompt) in zip([txt2img_save_style, img2img_save_style], prompts):

                 button.click(

@@ -764,9 +957,10 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                     outputs=[txt2img_prompt_style, img2img_prompt_style, txt2img_prompt_style2, img2img_prompt_style2],

                 )

 

-            for button, (prompt, negative_prompt), (style1, style2) in zip([txt2img_prompt_style_apply, img2img_prompt_style_apply], prompts, style_dropdowns):

+            for button, (prompt, negative_prompt), (style1, style2), js_func in zip([txt2img_prompt_style_apply, img2img_prompt_style_apply], prompts, style_dropdowns, style_js_funcs):

                 button.click(

                     fn=apply_styles,

+                    _js=js_func,

                     inputs=[prompt, negative_prompt, style1, style2],

                     outputs=[prompt, negative_prompt, style1, style2],

                 )

@@ -788,7 +982,7 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                 (seed_resize_from_h, "Seed resize from-2"),

                 (denoising_strength, "Denoising strength"),

             ]

-            modules.generation_parameters_copypaste.connect_paste(paste, img2img_paste_fields, img2img_prompt)

+            token_button.click(fn=update_token_counter, inputs=[img2img_prompt, steps], outputs=[token_counter])

 

     with gr.Blocks(analytics_enabled=False) as extras_interface:

         with gr.Row().style(equal_height=False):

@@ -800,7 +994,15 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                     with gr.TabItem('Batch Process'):

                         image_batch = gr.File(label="Batch Process", file_count="multiple", interactive=True, type="file")

 

-                upscaling_resize = gr.Slider(minimum=1.0, maximum=4.0, step=0.05, label="Resize", value=2)

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

+                    with gr.TabItem('Scale by'):

+                        upscaling_resize = gr.Slider(minimum=1.0, maximum=4.0, step=0.05, label="Resize", value=2)

+                    with gr.TabItem('Scale to'):

+                        with gr.Group():

+                            with gr.Row():

+                                upscaling_resize_w = gr.Number(label="Width", value=512, precision=0)

+                                upscaling_resize_h = gr.Number(label="Height", value=512, precision=0)

+                            upscaling_crop = gr.Checkbox(label='Crop to fit', value=True)

 

                 with gr.Group():

                     extras_upscaler_1 = gr.Radio(label='Upscaler 1', choices=[x.name for x in shared.sd_upscalers], value=shared.sd_upscalers[0].name, type="index")

@@ -827,17 +1029,22 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                 button_id = "hidden_element" if shared.cmd_opts.hide_ui_dir_config else ''

                 open_extras_folder = gr.Button('Open output directory', elem_id=button_id)

 

+

         submit.click(

-            fn=run_extras,

+            fn=wrap_gradio_gpu_call(modules.extras.run_extras),

             _js="get_extras_tab_index",

             inputs=[

                 dummy_component,

+                dummy_component,

                 extras_image,

                 image_batch,

                 gfpgan_visibility,

                 codeformer_visibility,

                 codeformer_weight,

                 upscaling_resize,

+                upscaling_resize_w,

+                upscaling_resize_h,

+                upscaling_crop,

                 extras_upscaler_1,

                 extras_upscaler_2,

                 extras_upscaler_2_visibility,

@@ -848,17 +1055,17 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                 html_info,

             ]

         )

-     

+

         extras_send_to_img2img.click(

             fn=lambda x: image_from_url_text(x),

             _js="extract_image_from_gallery_img2img",

             inputs=[result_images],

             outputs=[init_img],

         )

-        

+

         extras_send_to_inpaint.click(

             fn=lambda x: image_from_url_text(x),

-            _js="extract_image_from_gallery_img2img",

+            _js="extract_image_from_gallery_inpaint",

             inputs=[result_images],

             outputs=[init_img_with_mask],

         )

@@ -878,29 +1085,220 @@ def create_ui(txt2img, img2img, run_extras, run_pnginfo, run_modelmerger):
                     pnginfo_send_to_img2img = gr.Button('Send to img2img')

 

         image.change(

-            fn=wrap_gradio_call(run_pnginfo),

+            fn=wrap_gradio_call(modules.extras.run_pnginfo),

             inputs=[image],

             outputs=[html, generation_info, html2],

         )

+    #images history

+    images_history_switch_dict = {

+        "fn":modules.generation_parameters_copypaste.connect_paste,

+        "t2i":txt2img_paste_fields,

+        "i2i":img2img_paste_fields

+    }

+

+    images_history = img_his.create_history_tabs(gr, opts, wrap_gradio_call(modules.extras.run_pnginfo), images_history_switch_dict)

 

     with gr.Blocks() as modelmerger_interface:

         with gr.Row().style(equal_height=False):

             with gr.Column(variant='panel'):

                 gr.HTML(value="<p>A merger of the two checkpoints will be generated in your <b>checkpoint</b> directory.</p>")

-                

+

                 with gr.Row():

-                    primary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_primary_model_name", label="Primary Model Name")

-                    secondary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_secondary_model_name", label="Secondary Model Name")

+                    primary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_primary_model_name", label="Primary model (A)")

+                    secondary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_secondary_model_name", label="Secondary model (B)")

+                    tertiary_model_name = gr.Dropdown(modules.sd_models.checkpoint_tiles(), elem_id="modelmerger_tertiary_model_name", label="Tertiary model (C)")

                 custom_name = gr.Textbox(label="Custom Name (Optional)")

-                interp_amount = gr.Slider(minimum=0.0, maximum=1.0, step=0.05, label='Interpolation Amount', value=0.3)

-                interp_method = gr.Radio(choices=["Weighted Sum", "Sigmoid", "Inverse Sigmoid"], value="Weighted Sum", label="Interpolation Method")

-                save_as_half = gr.Checkbox(value=False, label="Safe as float16")

+                interp_amount = gr.Slider(minimum=0.0, maximum=1.0, step=0.05, label='Multiplier (M) - set to 0 to get model A', value=0.3)

+                interp_method = gr.Radio(choices=["Weighted sum", "Add difference"], value="Weighted sum", label="Interpolation Method")

+                save_as_half = gr.Checkbox(value=False, label="Save as float16")

                 modelmerger_merge = gr.Button(elem_id="modelmerger_merge", label="Merge", variant='primary')

-            

+

             with gr.Column(variant='panel'):

                 submit_result = gr.Textbox(elem_id="modelmerger_result", show_label=False)

 

-    def create_setting_component(key):

+    sd_hijack.model_hijack.embedding_db.load_textual_inversion_embeddings()

+

+    with gr.Blocks() as train_interface:

+        with gr.Row().style(equal_height=False):

+            gr.HTML(value="<p style='margin-bottom: 0.7em'>See <b><a href=\"https://github.com/AUTOMATIC1111/stable-diffusion-webui/wiki/Textual-Inversion\">wiki</a></b> for detailed explanation.</p>")

+

+        with gr.Row().style(equal_height=False):

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

+

+                with gr.Tab(label="Create embedding"):

+                    new_embedding_name = gr.Textbox(label="Name")

+                    initialization_text = gr.Textbox(label="Initialization text", value="*")

+                    nvpt = gr.Slider(label="Number of vectors per token", minimum=1, maximum=75, step=1, value=1)

+

+                    with gr.Row():

+                        with gr.Column(scale=3):

+                            gr.HTML(value="")