diff options
| author | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-22 13:36:40 +0000 |
|---|---|---|
| committer | AUTOMATIC1111 <16777216c@gmail.com> | 2023-07-25 13:20:01 +0000 |
| commit | cad87bf4e3e0b0a759afa94e933527c3123d59bc (patch) | |
| tree | ba0403be68174e4edcaca19eace7470a9447b7c1 | |
| parent | 704628b903fc7d54ad7cb9b0f0dd4296a5913c2d (diff) | |
| download | stable-diffusion-webui-gfx803-cad87bf4e3e0b0a759afa94e933527c3123d59bc.tar.gz stable-diffusion-webui-gfx803-cad87bf4e3e0b0a759afa94e933527c3123d59bc.tar.bz2 stable-diffusion-webui-gfx803-cad87bf4e3e0b0a759afa94e933527c3123d59bc.zip | |
Merge pull request #11927 from ljleb/fix-AND
Fix composable diffusion weight parsing
| -rw-r--r-- | modules/prompt_parser.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/prompt_parser.py b/modules/prompt_parser.py index b29d079d..203ae1ac 100644 --- 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]):
|