From bc416b759c56be90e1cc25bcf9b626512228a62b Mon Sep 17 00:00:00 2001 From: Vladimir Mandic Date: Mon, 14 Sep 2026 09:18:55 +0200 Subject: [PATCH] cleanup wildcard metadata Signed-off-by: Vladimir Mandic --- CHANGELOG.md | 8 +++++--- extensions-builtin/sdnext-modernui | 2 +- modules/styles.py | 7 +++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e073bd292..9256755a1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,8 @@ # Change Log for SD.Next -## Update for 2026-09-13 +## Update for 2026-09-14 -### Highlights for 2026-09-13 +### Highlights for 2026-09-14 *What's New*? Well, code-wise, this is a big one... First, a-lot-of-optimizations: @@ -23,7 +23,7 @@ Plus inevitable bug-fixes... [Home](https://vladmandic.github.io/sdnext/) | [ChangeLog](https://github.com/vladmandic/automatic/blob/master/CHANGELOG.md) | [Docs](https://vladmandic.github.io/sdnext-docs/) | [Discord](https://discord.com/invite/sd-next-federal-batch-inspectors-1101998836328697867) | [Sponsor](https://github.com/sponsors/vladmandic) -### Details for 2026-09-13 +### Details for 2026-09-14 - **Models** - [Anima 2.9B Preview v1](https://huggingface.co/yeoj34760/Anima-2.9B) @@ -124,6 +124,7 @@ Plus inevitable bug-fixes... - compile: keep model compiled state - detailer: handling of stop/skip/pause - framepack: correct device assignment, thanks @li-lizhe + - json: handle file locks - log: ansi color handling - lora: cleanup tags - lora: support transformer ref models @@ -142,6 +143,7 @@ Plus inevitable bug-fixes... - prompt: unnecessary secondary prompt if same - prompt: clean prompt after network parsing - rife: cleanup dead code, thanks @Anai-Guo + - temp files: handle locking - theme: fix circular imports changing theme to default - todo: remove dead code, thanks @Anai-Guo - ui: js fetch exception handling diff --git a/extensions-builtin/sdnext-modernui b/extensions-builtin/sdnext-modernui index a9ed76cd1..e91b28e90 160000 --- a/extensions-builtin/sdnext-modernui +++ b/extensions-builtin/sdnext-modernui @@ -1 +1 @@ -Subproject commit a9ed76cd116aa666b5bab00e37eddd8edf48b01c +Subproject commit e91b28e904e7507cfb2a3ae0ec7835fb2f945d48 diff --git a/modules/styles.py b/modules/styles.py index d432959ea..9eb4bb284 100644 --- a/modules/styles.py +++ b/modules/styles.py @@ -207,8 +207,11 @@ def apply_wildcards_to_prompt(prompt, all_wildcards, seed=-1, silent=False, p: S if (len(replaced_files) > 0 or len(missing_files) > 0) and not silent: log.debug(f'Apply wildcards: found={replaced_files} missing={missing_files} path="{shared.opts.wildcards_dir}" type=file seed={seed} time={t2-t1:.2f}') if p is not None: - wildcards = p.extra_generation_params.get('Wildcards', []) + replaced_files - p.extra_generation_params['Wildcards'] = ', '.join(wildcards) + existing_wildcards = p.extra_generation_params.get('Wildcards', []) + if p.batch_size > 1 and existing_wildcards == replaced_files: + pass + else: + p.extra_generation_params['Wildcards'] = existing_wildcards + replaced_files if old_state is not None: random.setstate(old_state) return prompt