Merge branch 'AUTOMATIC1111:master' into fix-sd-arch-switch-in-override-settings

1 files changed, 82 insertions, 22 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index fbd91300..12a9de3d 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -1,12 +1,13 @@
 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

 import tempfile

 from PIL import Image

 

@@ -36,9 +37,12 @@ def quote(text):
 

 

 def image_from_url_text(filedata):

-    if type(filedata) == dict and filedata["is_file"]:

+    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 = any(Path(temp_dir).resolve() in Path(filename).resolve().parents for temp_dir in shared.demo.temp_dirs)

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

@@ -93,7 +97,7 @@ def integrate_settings_paste_fields(component_dict):
 def create_buttons(tabs_list):

     buttons = {}

     for tab in tabs_list:

-        buttons[tab] = gr.Button(f"Send to {tab}")

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

     return buttons

 

 

@@ -102,35 +106,57 @@ 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, send_image, send_generate_info in bind_list:

+    for buttons, source_image_component, send_generate_info in bind_list:

         for tab in buttons:

             button = buttons[tab]

-            if send_image and paste_fields[tab]["init_img"]:

-                if type(send_image) == gr.Gallery:

-                    button.click(

-                        fn=lambda x: image_from_url_text(x),

-                        _js="extract_image_from_gallery",

-                        inputs=[send_image],

-                        outputs=[paste_fields[tab]["init_img"]],

-                    )

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

-                    button.click(

-                        fn=lambda x: x,

-                        inputs=[send_image],

-                        outputs=[paste_fields[tab]["init_img"]],

-                    )

+                    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 paste_fields[tab]["fields"] is not None:

+            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'] +  (['Size-1', 'Size-2'] if shared.opts.send_size else []) + (["Seed"] if shared.opts.send_seed else [])

+                    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 paste_fields[tab]["fields"] if name in paste_field_names],

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

                     )

                 else:

-                    connect_paste(button, paste_fields[tab]["fields"], send_generate_info)

+                    connect_paste(button, fields, send_generate_info)

 

             button.click(

                 fn=None,

@@ -164,6 +190,34 @@ def find_hypernetwork_key(hypernet_name, hypernet_hash=None):
     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 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:

+        # old algorithm for auto-calculating first pass size

+        desired_pixel_count = 512 * 512

+        actual_pixel_count = width * height

+        scale = math.sqrt(desired_pixel_count / actual_pixel_count)

+        firstpass_width = math.ceil(scale * width / 64) * 64

+        firstpass_height = math.ceil(scale * height / 64) * 64

+

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

     """parses generation parameters string, the one you see in text field under the picture in UI:

 ```

@@ -221,6 +275,12 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
         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