From 1374481b5951bbf7ce32fd074548a6697eefc187 Mon Sep 17 00:00:00 2001 From: lllyasviel Date: Tue, 17 Oct 2023 23:23:38 -0700 Subject: [PATCH] ling --- fooocus_version.py | 2 +- modules/sdxl_styles.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/fooocus_version.py b/fooocus_version.py index 28c56fa7..a8a1a7af 100644 --- a/fooocus_version.py +++ b/fooocus_version.py @@ -1 +1 @@ -version = '2.1.696' +version = '2.1.697' diff --git a/modules/sdxl_styles.py b/modules/sdxl_styles.py index b1b7da3c..6c8b2346 100644 --- a/modules/sdxl_styles.py +++ b/modules/sdxl_styles.py @@ -100,6 +100,9 @@ def apply_style(style, positive): def apply_wildcards(wildcard_text, seed=None, directory=wildcards_path): placeholders = re.findall(r'__(\w+)__', wildcard_text) + if len(placeholders) == 0: + return wildcard_text + rng = random.Random(seed) for placeholder in placeholders: try: @@ -109,4 +112,5 @@ def apply_wildcards(wildcard_text, seed=None, directory=wildcards_path): except IOError: print(f'Error: could not open wildcard file {placeholder}.txt, using as normal word.') wildcard_text = wildcard_text.replace(f'__{placeholder}__', placeholder) + return wildcard_text