Merge branch 'master' into focal-point-cropping

1 files changed, 18 insertions, 7 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index c27826b6..f73647da 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -4,13 +4,22 @@ import gradio as gr
 from modules.shared import script_path

 from modules import shared

 

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

 type_of_gr_update = type(gr.update())

 

 

+def quote(text):

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

+        return text

+

+    text = str(text)

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

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

+    return f'"{text}"'

+

 def parse_generation_parameters(x: str):

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

 ```

@@ -45,11 +54,8 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
         else:

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

 

-    if len(prompt) > 0:

-        res["Prompt"] = prompt

-

-    if len(negative_prompt) > 0:

-        res["Negative prompt"] = negative_prompt

+    res["Prompt"] = prompt

+    res["Negative prompt"] = negative_prompt

 

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

         m = re_imagesize.match(v)

@@ -86,7 +92,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())