Merge pull request #11047 from AUTOMATIC1111/parse_generation_parameters_with_error

handles exception when parsing generation parameters from png info
This commit is contained in:
AUTOMATIC1111 2023-06-06 00:13:27 +03:00 committed by GitHub
commit a009fe15fd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -277,15 +277,18 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model
res["Negative prompt"] = negative_prompt res["Negative prompt"] = negative_prompt
for k, v in re_param.findall(lastline): for k, v in re_param.findall(lastline):
if v[0] == '"' and v[-1] == '"': try:
v = unquote(v) if v[0] == '"' and v[-1] == '"':
v = unquote(v)
m = re_imagesize.match(v) m = re_imagesize.match(v)
if m is not None: if m is not None:
res[f"{k}-1"] = m.group(1) res[f"{k}-1"] = m.group(1)
res[f"{k}-2"] = m.group(2) res[f"{k}-2"] = m.group(2)
else: else:
res[k] = v res[k] = v
except Exception:
print(f"Error parsing \"{k}: {v}\"")
# Missing CLIP skip means it was set to 1 (the default) # Missing CLIP skip means it was set to 1 (the default)
if "Clip skip" not in res: if "Clip skip" not in res: