Merge branch 'master' into tensorboard

1 files changed, 243 insertions, 5 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index 0f041449..593d99ef 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -1,14 +1,226 @@
+import base64

+import io

+import math

 import os

 import re

+from pathlib import Path

+

 import gradio as gr

 from modules.shared import script_path

-from modules import shared

+from modules import shared, ui_tempdir, script_callbacks

+import tempfile

+from PIL import Image

 

-re_param_code = r"\s*([\w ]+):\s*([^,]+)(?:,|$)"

+re_param_code = r'\s*([\w ]+):\s*("(?:\\|\"|[^\"])+"|[^,]*)(?:,|$)'

 re_param = re.compile(re_param_code)

 re_params = re.compile(r"^(?:" + re_param_code + "){3,}$")

 re_imagesize = re.compile(r"^(\d+)x(\d+)$")

+re_hypernet_hash = re.compile("\(([0-9a-f]+)\)$")

 type_of_gr_update = type(gr.update())

+paste_fields = {}

+bind_list = []

+

+

+def reset():

+    paste_fields.clear()

+    bind_list.clear()

+

+

+def quote(text):

+    if ',' not in str(text):

+        return text

+

+    text = str(text)

+    text = text.replace('\\', '\\\\')

+    text = text.replace('"', '\\"')

+    return f'"{text}"'

+

+

+def image_from_url_text(filedata):

+    if type(filedata) == list and len(filedata) > 0 and type(filedata[0]) == dict and filedata[0].get("is_file", False):

+        filedata = filedata[0]

+

+    if type(filedata) == dict and filedata.get("is_file", False):

+        filename = filedata["name"]

+        is_in_right_dir = ui_tempdir.check_tmp_file(shared.demo, filename)

+        assert is_in_right_dir, 'trying to open image file outside of allowed directories'

+

+        return Image.open(filename)

+

+    if type(filedata) == list:

+        if len(filedata) == 0:

+            return None

+

+        filedata = filedata[0]

+

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

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

+

+    filedata = base64.decodebytes(filedata.encode('utf-8'))

+    image = Image.open(io.BytesIO(filedata))

+    return image

+

+

+def add_paste_fields(tabname, init_img, fields):

+    paste_fields[tabname] = {"init_img": init_img, "fields": fields}

+

+    # backwards compatibility for existing extensions

+    import modules.ui

+    if tabname == 'txt2img':

+        modules.ui.txt2img_paste_fields = fields

+    elif tabname == 'img2img':

+        modules.ui.img2img_paste_fields = fields

+

+

+def integrate_settings_paste_fields(component_dict):

+    from modules import ui

+

+    settings_map = {

+        'sd_hypernetwork': 'Hypernet',

+        'sd_hypernetwork_strength': 'Hypernet strength',

+        'CLIP_stop_at_last_layers': 'Clip skip',

+        'inpainting_mask_weight': 'Conditional mask weight',

+        'sd_model_checkpoint': 'Model hash',

+        'eta_noise_seed_delta': 'ENSD',

+        'initial_noise_multiplier': 'Noise multiplier',

+    }

+    settings_paste_fields = [

+        (component_dict[k], lambda d, k=k, v=v: ui.apply_setting(k, d.get(v, None)))

+        for k, v in settings_map.items()

+    ]

+

+    for tabname, info in paste_fields.items():

+        if info["fields"] is not None:

+            info["fields"] += settings_paste_fields

+

+

+def create_buttons(tabs_list):

+    buttons = {}

+    for tab in tabs_list:

+        buttons[tab] = gr.Button(f"Send to {tab}", elem_id=f"{tab}_tab")

+    return buttons

+

+

+#if send_generate_info is a tab name, mean generate_info comes from the params fields of the tab

+def bind_buttons(buttons, send_image, send_generate_info):

+    bind_list.append([buttons, send_image, send_generate_info])

+

+

+def send_image_and_dimensions(x):

+    if isinstance(x, Image.Image):

+        img = x

+    else:

+        img = image_from_url_text(x)

+

+    if shared.opts.send_size and isinstance(img, Image.Image):

+        w = img.width

+        h = img.height

+    else:

+        w = gr.update()

+        h = gr.update()

+

+    return img, w, h

+

+

+def run_bind():

+    for buttons, source_image_component, send_generate_info in bind_list:

+        for tab in buttons:

+            button = buttons[tab]

+            destination_image_component = paste_fields[tab]["init_img"]

+            fields = paste_fields[tab]["fields"]

+

+            destination_width_component = next(iter([field for field, name in fields if name == "Size-1"] if fields else []), None)

+            destination_height_component = next(iter([field for field, name in fields if name == "Size-2"] if fields else []), None)

+

+            if source_image_component and destination_image_component:

+                if isinstance(source_image_component, gr.Gallery):

+                    func = send_image_and_dimensions if destination_width_component else image_from_url_text

+                    jsfunc = "extract_image_from_gallery"

+                else:

+                    func = send_image_and_dimensions if destination_width_component else lambda x: x

+                    jsfunc = None

+

+                button.click(

+                    fn=func,

+                    _js=jsfunc,

+                    inputs=[source_image_component],

+                    outputs=[destination_image_component, destination_width_component, destination_height_component] if destination_width_component else [destination_image_component],

+                )

+

+            if send_generate_info and fields is not None:

+                if send_generate_info in paste_fields:

+                    paste_field_names = ['Prompt', 'Negative prompt', 'Steps', 'Face restoration'] + (["Seed"] if shared.opts.send_seed else [])

+                    button.click(

+                        fn=lambda *x: x,

+                        inputs=[field for field, name in paste_fields[send_generate_info]["fields"] if name in paste_field_names],

+                        outputs=[field for field, name in fields if name in paste_field_names],

+                    )

+                else:

+                    connect_paste(button, fields, send_generate_info)

+

+            button.click(

+                fn=None,

+                _js=f"switch_to_{tab}",

+                inputs=None,

+                outputs=None,

+            )

+

+

+def find_hypernetwork_key(hypernet_name, hypernet_hash=None):

+    """Determines the config parameter name to use for the hypernet based on the parameters in the infotext.

+

+    Example: an infotext provides "Hypernet: ke-ta" and "Hypernet hash: 1234abcd". For the "Hypernet" config

+    parameter this means there should be an entry that looks like "ke-ta-10000(1234abcd)" to set it to.

+

+    If the infotext has no hash, then a hypernet with the same name will be selected instead.

+    """

+    hypernet_name = hypernet_name.lower()

+    if hypernet_hash is not None:

+        # Try to match the hash in the name

+        for hypernet_key in shared.hypernetworks.keys():

+            result = re_hypernet_hash.search(hypernet_key)

+            if result is not None and result[1] == hypernet_hash:

+                return hypernet_key

+    else:

+        # Fall back to a hypernet with the same name

+        for hypernet_key in shared.hypernetworks.keys():

+            if hypernet_key.lower().startswith(hypernet_name):

+                return hypernet_key

+

+    return None

+

+

+def restore_old_hires_fix_params(res):

+    """for infotexts that specify old First pass size parameter, convert it into

+    width, height, and hr scale"""

+

+    firstpass_width = res.get('First pass size-1', None)

+    firstpass_height = res.get('First pass size-2', None)

+

+    if shared.opts.use_old_hires_fix_width_height:

+        hires_width = int(res.get("Hires resize-1", 0))

+        hires_height = int(res.get("Hires resize-2", 0))

+

+        if hires_width and hires_height:

+            res['Size-1'] = hires_width

+            res['Size-2'] = hires_height

+            return

+

+    if firstpass_width is None or firstpass_height is None:

+        return

+

+    firstpass_width, firstpass_height = int(firstpass_width), int(firstpass_height)

+    width = int(res.get("Size-1", 512))

+    height = int(res.get("Size-2", 512))

+

+    if firstpass_width == 0 or firstpass_height == 0:

+        from modules import processing

+        firstpass_width, firstpass_height = processing.old_hires_fix_first_pass_dimensions(width, height)

+

+    res['Size-1'] = firstpass_width

+    res['Size-2'] = firstpass_height

+    res['Hires resize-1'] = width

+    res['Hires resize-2'] = height

 

 

 def parse_generation_parameters(x: str):

@@ -56,10 +268,28 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
         else:

             res[k] = v

 

+    # Missing CLIP skip means it was set to 1 (the default)

+    if "Clip skip" not in res:

+        res["Clip skip"] = "1"

+

+    if "Hypernet strength" not in res:

+        res["Hypernet strength"] = "1"

+

+    if "Hypernet" in res:

+        hypernet_name = res["Hypernet"]

+        hypernet_hash = res.get("Hypernet hash", None)

+        res["Hypernet"] = find_hypernetwork_key(hypernet_name, hypernet_hash)

+

+    if "Hires resize-1" not in res:

+        res["Hires resize-1"] = 0

+        res["Hires resize-2"] = 0

+

+    restore_old_hires_fix_params(res)

+

     return res

 

 

-def connect_paste(button, paste_fields, input_comp, js=None):

+def connect_paste(button, paste_fields, input_comp, jsfunc=None):

     def paste_func(prompt):

         if not prompt and not shared.cmd_opts.hide_ui_dir_config:

             filename = os.path.join(script_path, "params.txt")

@@ -68,6 +298,7 @@ def connect_paste(button, paste_fields, input_comp, js=None):
                     prompt = file.read()

 

         params = parse_generation_parameters(prompt)

+        script_callbacks.infotext_pasted_callback(prompt, params)

         res = []

 

         for output, key in paste_fields:

@@ -83,7 +314,12 @@ def connect_paste(button, paste_fields, input_comp, js=None):
             else:

                 try:

                     valtype = type(output.value)

-                    val = valtype(v)

+

+                    if valtype == bool and v == "False":

+                        val = False

+                    else:

+                        val = valtype(v)

+

                     res.append(gr.update(value=val))

                 except Exception:

                     res.append(gr.update())

@@ -92,7 +328,9 @@ def connect_paste(button, paste_fields, input_comp, js=None):
 

     button.click(

         fn=paste_func,

-        _js=js,

+        _js=jsfunc,

         inputs=[input_comp],

         outputs=[x[0] for x in paste_fields],

     )

+

+