Public/automatic
1
0
Fork 0
mirror of https://github.com/vladmandic/automatic synced 2026-09-13 18:18:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix xyz prompt-sr

Browse Source
This commit is contained in:
Vladimir Mandic
2024-09-17 10:37:27 -04:00
parent 8b77b95804
commit fedb35e9d0
3 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extensions-builtin/Lora/extra_networks_lora.py
+6 -5
View File
@@ -64,11 +64,12 @@ class ExtraNetworkLora(extra_networks.ExtraNetwork):
shared.log.debug(f"LoRA apply: max={shared.opts.lora_apply_tags} tags{all_tags}")
all_tags = ', '.join(all_tags)
p.extra_generation_params["LoRA tags"] = all_tags
for i in range(len(p.all_prompts)):
if '_tags_' in p.all_prompts[i]:
p.all_prompts[i] = p.all_prompts[i].replace('_tags_', all_tags)
else:
p.all_prompts[i] = f"{p.all_prompts[i]}, {all_tags}"
if p.all_prompts is not None:
for i in range(len(p.all_prompts)):
if '_tags_' in p.all_prompts[i]:
p.all_prompts[i] = p.all_prompts[i].replace('_tags_', all_tags)
else:
p.all_prompts[i] = f"{p.all_prompts[i]}, {all_tags}"
def infotext(self, p):
names = [i.name for i in networks.loaded_networks]
modules/processing.py
+4 -3
View File
@@ -228,9 +228,10 @@ def process_init(p: StableDiffusionProcessing):
p.all_seeds = [int(seed) + (x if p.subseed_strength == 0 else 0) for x in range(len(p.all_prompts))]
else:
p.all_seeds = []
for i in range(len(p.all_prompts)):
seed = get_fixed_seed(p.seed)
p.all_seeds.append(int(seed) + (i if p.subseed_strength == 0 else 0))
if p.all_prompts is not None:
for i in range(len(p.all_prompts)):
seed = get_fixed_seed(p.seed)
p.all_seeds.append(int(seed) + (i if p.subseed_strength == 0 else 0))
if p.all_subseeds is None:
if type(subseed) == list:
p.all_subseeds = [int(s) for s in subseed]
scripts/xyz_grid_shared.py
+6 -4
View File
@@ -50,11 +50,13 @@ def apply_prompt(p, x, xs):
shared.log.warning(f"XYZ grid: prompt S/R did not find {xs[0]} in prompt or negative prompt.")
else:
p.prompt = p.prompt.replace(xs[0], x)
for i in range(len(p.all_prompts)):
p.all_prompts[i] = p.all_prompts[i].replace(xs[0], x)
if p.all_prompts is not None:
for i in range(len(p.all_prompts)):
p.all_prompts[i] = p.all_prompts[i].replace(xs[0], x)
p.negative_prompt = p.negative_prompt.replace(xs[0], x)
for i in range(len(p.all_negative_prompts)):
p.all_negative_prompts[i] = p.all_negative_prompts[i].replace(xs[0], x)
if p.all_negative_prompts is not None:
for i in range(len(p.all_negative_prompts)):
p.all_negative_prompts[i] = p.all_negative_prompts[i].replace(xs[0], x)
shared.log.debug(f'XYZ grid apply prompt: "{xs[0]}"="{x}"')