From 5c6c1465f436d2c82ca8fbaf0be5e4af5592c56b Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Thu, 3 Apr 2025 10:03:48 -0400 Subject: [PATCH] fix style apply params Signed-off-by: Vladimir Mandic --- CHANGELOG.md | 1 + modules/lora/extra_networks_lora.py | 2 +- modules/lora/lora_apply.py | 4 ++-- modules/styles.py | 10 ++++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 72b8d6d30..0e73825b3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -179,6 +179,7 @@ Models...And support for new models: **CogView-4**, **SANA 1.5**, - fix sampler metadata when using default sampler - fix paste incorrect float to int cast - fix server restart from ui + - fix style apply params - do not allow edit of built-in styles - improve lora compatibility with balanced offload diff --git a/modules/lora/extra_networks_lora.py b/modules/lora/extra_networks_lora.py index fe0e15de5..0f981d93a 100644 --- a/modules/lora/extra_networks_lora.py +++ b/modules/lora/extra_networks_lora.py @@ -205,5 +205,5 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork): shared.log.debug(f"Network end: type=LoRA time={l.timer.summary}") if self.errors: for k, v in self.errors.items(): - shared.log.error(f'LoRA: name="{k}" errors={v}') + shared.log.error(f'Network: type=LoRA name="{k}" errors={v}') self.errors.clear() diff --git a/modules/lora/lora_apply.py b/modules/lora/lora_apply.py index e3dae287a..8bf327151 100644 --- a/modules/lora/lora_apply.py +++ b/modules/lora/lora_apply.py @@ -101,9 +101,9 @@ def network_calc_weights(self: Union[torch.nn.Conv2d, torch.nn.Linear, torch.nn. l.timer.move += t1 - t0 except RuntimeError as e: l.extra_network_lora.errors[net.name] = l.extra_network_lora.errors.get(net.name, 0) + 1 + module_name = net.modules.get(network_layer_name, None) + shared.log.error(f'Network: type=LoRA name="{net.name}" module="{module_name}" layer="{network_layer_name}" apply weight: {e}') if l.debug: - module_name = net.modules.get(network_layer_name, None) - shared.log.error(f'LoRA apply weight name="{net.name}" module="{module_name}" layer="{network_layer_name}" {e}') errors.display(e, 'LoRA') raise RuntimeError('LoRA apply weight') from e continue diff --git a/modules/styles.py b/modules/styles.py index ecc3204f7..2de41c2a8 100644 --- a/modules/styles.py +++ b/modules/styles.py @@ -154,6 +154,7 @@ def apply_styles_to_extra(p, style: Style): p.original_negative = p.negative_prompt style_extra = apply_wildcards_to_prompt(style.extra, [style.wildcards], silent=True) + style_extra = ' ' + style_extra.lower() extra.update(infotext.parse(style_extra)) extra.pop('Prompt', None) extra.pop('Negative prompt', None) @@ -162,14 +163,15 @@ def apply_styles_to_extra(p, style: Style): for k, v in extra.items(): k = k.lower() k = k.replace(' ', '_') - if k in name_exclude: # exclude some fields - continue if k in name_map: # rename some fields k = name_map[k] + if k in name_exclude: # exclude some fields + continue if hasattr(p, k): orig = getattr(p, k) - if type(orig) != type(v) and orig is not None: - v = type(orig)(v) + if (type(orig) != type(v)) and (orig is not None): + if not (type(orig) == int and type(v) == float): # dont convert float to int + v = type(orig)(v) setattr(p, k, v) fields.append(f'{k}={v}') else: