Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to be compatible with other extensions(e.g. Dynamic prompt) #46

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix to be compatible with other extensions(e.g. Dynamic prompt) #46

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6266ea
fix to use the result prompt by other Extensions(e.g. Dynamic prompt)
Apr 17, 2023
357f1ed
fix typo, save metadata correctly
Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 16 additions & 2 deletions scripts/ddetailer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,6 +230,12 @@ def run(self, p, info,
masks_a = []
masks_b_pre = []

init_prompts = init_image.info['parameters'].split('Negative prompt:')
init_pos_prompt = init_prompts[0].rstrip('\n')
init_neg_prompt = ''
if len(init_prompts) > 1:
init_neg_prompt = init_prompts[1].split('Steps:')[0].lstrip().rstrip('\n')

# Optional secondary pre-processing run
if (dd_model_b != "None" and dd_preprocess_b):
label_b_pre = "B"
Expand All @@ -253,7 +259,11 @@ def run(self, p, info,
p.image_mask = masks_b_pre[i]
if ( opts.dd_save_masks):
images.save_image(masks_b_pre[i], opts.outdir_ddetailer_masks, "", start_seed, p.prompt, opts.samples_format, p=p)
p.prompt = init_pos_prompt
p.negative_prompt = init_neg_prompt
processed = processing.process_images(p)
p.prompt = p_txt.prompt
p.negative_prompt = p_txt.negative_prompt
p.seed = processed.seed + 1
p.init_images = processed.images

Expand Down Expand Up @@ -313,8 +323,12 @@ def run(self, p, info,
if ( opts.dd_save_masks):
images.save_image(masks_a[i], opts.outdir_ddetailer_masks, "", start_seed, p.prompt, opts.samples_format, p=p)

p.prompt = init_pos_prompt
p.negative_prompt = init_neg_prompt
processed = processing.process_images(p)
if initial_info is None:
p.prompt = p_txt.prompt
p.negative_prompt = p_txt.negative_prompt
if initial_info is None or initial_info != processed.info:
initial_info = processed.info
p.seed = processed.seed + 1
p.init_images = processed.images
Expand All @@ -330,7 +344,7 @@ def run(self, p, info,
if (initial_info is None):
initial_info = "No detections found."

return Processed(p, output_images, seed, initial_info)
return Processed(p, output_images, seed, p_txt.prompt)

def modeldataset(model_shortname):
path = modelpath(model_shortname)
Expand Down