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

refactor detailer

Browse Source 
Signed-off-by: Vladimir Mandic <mandic00@live.com>
This commit is contained in:
Vladimir Mandic
2025-01-07 10:12:47 -05:00
parent 19d56d3342
commit 5593ea78a9
21 changed files with 142 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/xyz_grid_shared.py
+27 -8
View File
@@ -62,18 +62,37 @@ def apply_seed(p, x, xs):
shared.log.debug(f'XYZ grid apply seed: {x}')
def apply_prompt(p, x, xs):
def apply_prompt(positive, negative, p, x, xs):
for s in xs:
if s in p.prompt:
shared.log.debug(f'XYZ grid apply prompt: "{s}"="{x}"')
p.prompt = p.prompt.replace(s, x)
if s in p.negative_prompt:
shared.log.debug(f'XYZ grid apply negative: "{s}"="{x}"')
p.negative_prompt = p.negative_prompt.replace(s, x)
shared.log.debug(f'XYZ grid apply prompt: fields={positive}/{negative} "{s}"="{x}"')
orig_positive = getattr(p, positive)
orig_negative = getattr(p, negative)
if s in orig_positive:
setattr(p, positive, orig_positive.replace(s, x))
if s in orig_negative:
setattr(p, negative, orig_negative.replace(s, x))
def apply_prompt_primary(p, x, xs):
apply_prompt('prompt', 'negative_prompt', p, x, xs)
p.all_prompts = None
p.all_negative_prompts = None
def apply_prompt_refine(p, x, xs):
apply_prompt('refiner_prompt', 'refiner_negative', p, x, xs)
def apply_prompt_detailer(p, x, xs):
apply_prompt('detailer_prompt', 'detailer_negative', p, x, xs)
def apply_prompt_all(p, x, xs):
apply_prompt('prompt', 'negative_prompt', p, x, xs)
apply_prompt('refiner_prompt', 'refiner_negative', p, x, xs)
apply_prompt('detailer_prompt', 'detailer_negative', p, x, xs)
def apply_order(p, x, xs):
token_order = []
for token in x:
@@ -251,7 +270,7 @@ def apply_detailer(p, opt, x):
p.detailer_model = 'GFPGAN'
else:
is_active = opt in ('true', 'yes', 'y', '1')
p.detailer = is_active
p.detailer_enabled = is_active
shared.log.debug(f'XYZ grid apply face-restore: "{x}"')