Mirrors
/
stable-diffusion-webui
mirror of https://github.com/AUTOMATIC1111/stable-diffusion-webui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hr-fix separate prompt experimentation

This commit is contained in:
invincibledude 2023-01-22 14:52:01 +03:00
parent 81e0723d65
commit f774a8d24e
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
modules/processing.py
View File

@ -516,25 +516,25 @@ def process_images_inner(p: StableDiffusionProcessing) -> Processed:
else: else:
p.all_negative_prompts = p.batch_size * p.n_iter * [shared.prompt_styles.apply_negative_styles_to_prompt(p.negative_prompt, p.styles)] p.all_negative_prompts = p.batch_size * p.n_iter * [shared.prompt_styles.apply_negative_styles_to_prompt(p.negative_prompt, p.styles)]
if type(p) == StableDiffusionProcessingTxt2Img: # if type(p) == StableDiffusionProcessingTxt2Img:
if p.enable_hr and p.is_hr_pass: # if p.enable_hr and p.is_hr_pass:
logging.info("Running hr pass with custom prompt") # logging.info("Running hr pass with custom prompt")
if p.hr_prompt: # if p.hr_prompt:
if type(p.prompt) == list: # if type(p.prompt) == list:
p.all_prompts = [shared.prompt_styles.apply_styles_to_prompt(x, p.styles) for x in p.hr_prompt] # p.all_prompts = [shared.prompt_styles.apply_styles_to_prompt(x, p.styles) for x in p.hr_prompt]
else: # else:
p.all_prompts = p.batch_size * p.n_iter * [ # p.all_prompts = p.batch_size * p.n_iter * [
shared.prompt_styles.apply_styles_to_prompt(p.hr_prompt, p.styles)] # shared.prompt_styles.apply_styles_to_prompt(p.hr_prompt, p.styles)]
logging.info(p.all_prompts) # logging.info(p.all_prompts)
#
if p.hr_negative_prompt: # if p.hr_negative_prompt:
if type(p.negative_prompt) == list: # if type(p.negative_prompt) == list:
p.all_negative_prompts = [shared.prompt_styles.apply_negative_styles_to_prompt(x, p.styles) for x in # p.all_negative_prompts = [shared.prompt_styles.apply_negative_styles_to_prompt(x, p.styles) for x in
p.hr_negative_prompt] # p.hr_negative_prompt]
else: # else:
p.all_negative_prompts = p.batch_size * p.n_iter * [ # p.all_negative_prompts = p.batch_size * p.n_iter * [
shared.prompt_styles.apply_negative_styles_to_prompt(p.hr_negative_prompt, p.styles)] # shared.prompt_styles.apply_negative_styles_to_prompt(p.hr_negative_prompt, p.styles)]
logging.info(p.all_negative_prompts) # logging.info(p.all_negative_prompts)
if type(seed) == list: if type(seed) == list:
p.all_seeds = seed p.all_seeds = seed
@ -744,7 +744,6 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
self.hr_sampler = hr_sampler self.hr_sampler = hr_sampler
self.hr_prompt = hr_prompt if hr_prompt != '' else self.prompt self.hr_prompt = hr_prompt if hr_prompt != '' else self.prompt
self.hr_negative_prompt = hr_negative_prompt if hr_negative_prompt != '' else self.negative_prompt self.hr_negative_prompt = hr_negative_prompt if hr_negative_prompt != '' else self.negative_prompt
self.is_hr_pass = False
if firstphase_width != 0 or firstphase_height != 0: if firstphase_width != 0 or firstphase_height != 0:
self.hr_upscale_to_x = self.width self.hr_upscale_to_x = self.width
@ -831,7 +830,9 @@ class StableDiffusionProcessingTxt2Img(StableDiffusionProcessing):
if not self.enable_hr: if not self.enable_hr:
return samples return samples
self.is_hr_pass = True self.prompt = self.hr_prompt
self.negative_prompt = self.hr_negative_prompt
target_width = self.hr_upscale_to_x target_width = self.hr_upscale_to_x
target_height = self.hr_upscale_to_y target_height = self.hr_upscale_to_y