Commit cad87bf4 authored by AUTOMATIC1111's avatar AUTOMATIC1111
Browse files

Merge pull request #11927 from ljleb/fix-AND 

Fix composable diffusion weight parsing
parent 704628b9

modules/prompt_parser.py

+1 −1
Original line number Diff line number Diff line
@@ -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]):

CRA Git | Maintained and supported by SUSTech CRA and CCSE