diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-01-28 15:45:38 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-28 15:45:38 +0000 |
| commit | 91c8d0dcfc9a5d46aec47fd3eb34c633c104b5bb (patch) | |
| tree | a6b0396e2fbf2fe1ca0238a5239f6176b32c5a53 /modules/generation_parameters_copypaste.py | |
| parent | fecb990debdae2cc99b64808d22ba902e34e575b (diff) | |
| parent | 591b68e56c53eed391d08ce008423191c573784d (diff) | |
| download | stable-diffusion-webui-gfx803-91c8d0dcfc9a5d46aec47fd3eb34c633c104b5bb.tar.gz stable-diffusion-webui-gfx803-91c8d0dcfc9a5d46aec47fd3eb34c633c104b5bb.tar.bz2 stable-diffusion-webui-gfx803-91c8d0dcfc9a5d46aec47fd3eb34c633c104b5bb.zip | |
Merge pull request #7231 from EllangoK/master
Fixes X/Y/Z Plot parameters not being restored from images
Diffstat (limited to 'modules/generation_parameters_copypaste.py')
| -rw-r--r-- | modules/generation_parameters_copypaste.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py index 1bf35bbb..3c098e0d 100644 --- a/modules/generation_parameters_copypaste.py +++ b/modules/generation_parameters_copypaste.py @@ -13,7 +13,6 @@ from PIL import Image 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 = ''
@@ -262,6 +261,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)
|