Merge branch 'master' into master

1 files changed, 5 insertions, 5 deletions

diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py
index 98098cc8..3f224453 100644
--- a/modules/generation_parameters_copypaste.py
+++ b/modules/generation_parameters_copypaste.py
@@ -6,14 +6,13 @@ import re
 from pathlib import Path

 

 import gradio as gr

-from modules.shared import script_path

+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*("(?:\\|\"|[^\"])+"|[^,]*)(?:,|$)'

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

@@ -243,7 +242,7 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
     done_with_prompt = False

 

     *lines, lastline = x.strip().split("\n")

-    if not re_params.match(lastline):

+    if len(re_param.findall(lastline)) < 3:

         lines.append(lastline)

         lastline = ''

 

@@ -261,6 +260,7 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
     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[k+"-1"] = m.group(1)

@@ -293,7 +293,7 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
 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")

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

             if os.path.exists(filename):

                 with open(filename, "r", encoding="utf8") as file:

                     prompt = file.read()