diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-06-05 21:13:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-05 21:13:27 +0000 |
| commit | a009fe15fd98b44aede07c47bf7938fb4280924b (patch) | |
| tree | df34116b007e61e41f5055b31e3cc0ccb981c2a1 | |
| parent | 0895c2369cdb795acd0de072acf426c4b54fedc5 (diff) | |
| parent | 851bf43520226da6cfe5f6546d9aaf035a121182 (diff) | |
| download | stable-diffusion-webui-gfx803-a009fe15fd98b44aede07c47bf7938fb4280924b.tar.gz stable-diffusion-webui-gfx803-a009fe15fd98b44aede07c47bf7938fb4280924b.tar.bz2 stable-diffusion-webui-gfx803-a009fe15fd98b44aede07c47bf7938fb4280924b.zip | |
Merge pull request #11047 from AUTOMATIC1111/parse_generation_parameters_with_error
handles exception when parsing generation parameters from png info
| -rw-r--r-- | modules/generation_parameters_copypaste.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py index 1d02ffae..a638f912 100644 --- a/modules/generation_parameters_copypaste.py +++ b/modules/generation_parameters_copypaste.py @@ -277,15 +277,18 @@ 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):
- 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
+ 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:
|