Merge pull request #11927 from ljleb/fix-AND

Fix composable diffusion weight parsing

Merge pull request #11927 from ljleb/fix-AND
Fix composable diffusion weight parsing
cad87bf4 · AUTOMATIC1111 · 704628b9 · cad87bf4
Commit cad87bf4 authored Jul 22, 2023 by AUTOMATIC1111
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

modules/prompt_parser.py modules/prompt_parser.py +1 -1

No files found.
--- a/modules/prompt_parser.py
+++ b/modules/prompt_parser.py
@@ -178,7 +178,7 @@ def get_learned_conditioning(model, prompts: SdConditioning | list[str], steps):


 re_AND = re.compile(r"\bAND\b")
-re_weight = re.compile(r"^(.*?)(?:\s*:\s*([-+]?(?:\d+\.?|\d*\.\d+)))?\s*$")
+re_weight = re.compile(r"^((?:\s|.)*?)(?:\s*:\s*([-+]?(?:\d+\.?|\d*\.\d+)))?\s*$")


 def get_multicond_prompt_list(prompts: SdConditioning | list[str]):