Merge branch 'dev' into patch-1

1 files changed, 64 insertions, 51 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index fe8b18b2..a3448be9 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -1,15 +1,12 @@
 import base64

-import html

 import io

-import math

+import json

 import os

 import re

-from pathlib import Path

 

 import gradio as gr

 from modules.paths import data_path

 from modules import shared, ui_tempdir, script_callbacks

-import tempfile

 from PIL import Image

 

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

@@ -23,14 +20,14 @@ registered_param_bindings = []
 

 

 class ParamBinding:

-    def __init__(self, paste_button, tabname, source_text_component=None, source_image_component=None, source_tabname=None, override_settings_component=None, paste_field_names=[]):

+    def __init__(self, paste_button, tabname, source_text_component=None, source_image_component=None, source_tabname=None, override_settings_component=None, paste_field_names=None):

         self.paste_button = paste_button

         self.tabname = tabname

         self.source_text_component = source_text_component

         self.source_image_component = source_image_component

         self.source_tabname = source_tabname

         self.override_settings_component = override_settings_component

-        self.paste_field_names = paste_field_names

+        self.paste_field_names = paste_field_names or []

 

 

 def reset():

@@ -38,20 +35,27 @@ def reset():
 

 

 def quote(text):

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

+    if ',' not in str(text) and '\n' not in str(text) and ':' not in str(text):

         return text

 

-    text = str(text)

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

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

-    return f'"{text}"'

+    return json.dumps(text, ensure_ascii=False)

+

+

+def unquote(text):

+    if len(text) == 0 or text[0] != '"' or text[-1] != '"':

+        return text

+

+    try:

+        return json.loads(text)

+    except Exception:

+        return text

 

 

 def image_from_url_text(filedata):

     if filedata is None:

         return None

 

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

+    if type(filedata) == list and filedata 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):

@@ -170,31 +174,6 @@ def send_image_and_dimensions(x):
     return img, w, h

 

 

-

-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"""

@@ -251,28 +230,40 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
         lines.append(lastline)

         lastline = ''

 

-    for i, line in enumerate(lines):

+    for line in lines:

         line = line.strip()

         if line.startswith("Negative prompt:"):

             done_with_prompt = True

             line = line[16:].strip()

-

         if done_with_prompt:

             negative_prompt += ("" if negative_prompt == "" else "\n") + line

         else:

             prompt += ("" if prompt == "" else "\n") + line

 

+    if shared.opts.infotext_styles != "Ignore":

+        found_styles, prompt, negative_prompt = shared.prompt_styles.extract_styles_from_prompt(prompt, negative_prompt)

+

+        if shared.opts.infotext_styles == "Apply":

+            res["Styles array"] = found_styles

+        elif shared.opts.infotext_styles == "Apply if any" and found_styles:

+            res["Styles array"] = found_styles

+

     res["Prompt"] = prompt

     res["Negative prompt"] = negative_prompt

 

     for k, v in re_param.findall(lastline):

-        v = v[1:-1] if v[0] == '"' and v[-1] == '"' else v

-        m = re_imagesize.match(v)

-        if m is not None:

-            res[f"{k}-1"] = m.group(1)

-            res[f"{k}-2"] = m.group(2)

-        else:

-            res[k] = v

+        try:

+            if v[0] == '"' and v[-1] == '"':

+                v = unquote(v)

+

+            m = re_imagesize.match(v)

+            if m is not None:

+                res[f"{k}-1"] = m.group(1)

+                res[f"{k}-2"] = m.group(2)

+            else:

+                res[k] = v

+        except Exception:

+            print(f"Error parsing \"{k}: {v}\"")

 

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

     if "Clip skip" not in res:

@@ -286,17 +277,34 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
         res["Hires resize-1"] = 0

         res["Hires resize-2"] = 0

 

+    if "Hires sampler" not in res:

+        res["Hires sampler"] = "Use same sampler"

+

+    if "Hires prompt" not in res:

+        res["Hires prompt"] = ""

+

+    if "Hires negative prompt" not in res:

+        res["Hires negative prompt"] = ""

+

     restore_old_hires_fix_params(res)

 

     # Missing RNG means the default was set, which is GPU RNG

     if "RNG" not in res:

         res["RNG"] = "GPU"

 

-    return res

+    if "Schedule type" not in res:

+        res["Schedule type"] = "Automatic"

+

+    if "Schedule max sigma" not in res:

+        res["Schedule max sigma"] = 0

 

+    if "Schedule min sigma" not in res:

+        res["Schedule min sigma"] = 0

 

-settings_map = {}

+    if "Schedule rho" not in res:

+        res["Schedule rho"] = 0

 

+    return res

 

 

 infotext_to_setting_name_mapping = [

@@ -304,6 +312,10 @@ infotext_to_setting_name_mapping = [
     ('Conditional mask weight', 'inpainting_mask_weight'),

     ('Model hash', 'sd_model_checkpoint'),

     ('ENSD', 'eta_noise_seed_delta'),

+    ('Schedule type', 'k_sched_type'),

+    ('Schedule max sigma', 'sigma_max'),

+    ('Schedule min sigma', 'sigma_min'),

+    ('Schedule rho', 'rho'),

     ('Noise multiplier', 'initial_noise_multiplier'),

     ('Eta', 'eta_ancestral'),

     ('Eta DDIM', 'eta_ddim'),

@@ -312,8 +324,11 @@ infotext_to_setting_name_mapping = [
     ('UniPC skip type', 'uni_pc_skip_type'),

     ('UniPC order', 'uni_pc_order'),

     ('UniPC lower order final', 'uni_pc_lower_order_final'),

+    ('Token merging ratio', 'token_merging_ratio'),

+    ('Token merging ratio hr', 'token_merging_ratio_hr'),

     ('RNG', 'randn_source'),

     ('NGMS', 's_min_uncond'),

+    ('Pad conds', 'pad_cond_uncond'),

 ]

 

 

@@ -405,7 +420,7 @@ def connect_paste(button, paste_fields, input_comp, override_settings_component,
 

             vals_pairs = [f"{k}: {v}" for k, v in vals.items()]

 

-            return gr.Dropdown.update(value=vals_pairs, choices=vals_pairs, visible=len(vals_pairs) > 0)

+            return gr.Dropdown.update(value=vals_pairs, choices=vals_pairs, visible=bool(vals_pairs))

 

         paste_fields = paste_fields + [(override_settings_component, paste_settings)]

 

@@ -422,5 +437,3 @@ def connect_paste(button, paste_fields, input_comp, override_settings_component,
         outputs=[],

         show_progress=False,

     )

-

-