From 2a259a8455579556ed3affa028c111f5d24afd50 Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Tue, 25 Jul 2023 22:02:25 -0400 Subject: [PATCH] fix metadata --- modules/generation_parameters_copypaste.py | 19 +++++++++++-------- modules/processing.py | 2 +- wiki | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/modules/generation_parameters_copypaste.py b/modules/generation_parameters_copypaste.py index a475afab3..9118d74f7 100644 --- a/modules/generation_parameters_copypaste.py +++ b/modules/generation_parameters_copypaste.py @@ -273,14 +273,17 @@ Steps: 20, Sampler: Euler a, CFG scale: 7, Seed: 965400086, Size: 512x512, Model res["Prompt"] = prompt 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: + pass # Missing CLIP skip means it was set to 1 (the default) if "Clip skip" not in res: diff --git a/modules/processing.py b/modules/processing.py index 987e3d519..6c972e00a 100644 --- a/modules/processing.py +++ b/modules/processing.py @@ -478,7 +478,7 @@ def create_infotext(p: StableDiffusionProcessing, all_prompts, all_seeds, all_su # sdnext "Version": git_commit, "Pipeline": 'Diffusers' if shared.backend == shared.Backend.DIFFUSERS else 'Original', - "Operations": ', '.join(list(set(p.ops))), + "Operations": ', '.join(list(set(p.ops))) if len(p.ops) > 0 else None } token_merging_ratio = p.get_token_merging_ratio() token_merging_ratio_hr = p.get_token_merging_ratio(for_hr=True) if p.enable_hr else None diff --git a/wiki b/wiki index dafa622e4..bdc13d705 160000 --- a/wiki +++ b/wiki @@ -1 +1 @@ -Subproject commit dafa622e449f67af3c561c50bf1a51220cd7bb43 +Subproject commit bdc13d7053215d3135134809a9d3a4182f8f9c9f