mrq/stable-diffusion-webui
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add extra generation params

Browse Source
This commit is contained in:
AUTOMATIC 2022-09-20 19:07:09 +03:00
parent 90401d96a6
commit b9674e2900
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/img2img.py
View File

@ -63,6 +63,8 @@ def img2img(prompt: str, negative_prompt: str, prompt_style: str, prompt_style2:
) )
print(f"\nimg2img: {prompt}", file=shared.progress_print_out) print(f"\nimg2img: {prompt}", file=shared.progress_print_out)
p.extra_generation_params["Mask blur"] = mask_blur
if is_upscale: if is_upscale:
initial_info = None initial_info = None

3
modules/processing.py
View File

@ -70,7 +70,7 @@ class StableDiffusionProcessing:
self.tiling: bool = tiling self.tiling: bool = tiling
self.do_not_save_samples: bool = do_not_save_samples self.do_not_save_samples: bool = do_not_save_samples
self.do_not_save_grid: bool = do_not_save_grid self.do_not_save_grid: bool = do_not_save_grid
self.extra_generation_params: dict = extra_generation_params self.extra_generation_params: dict = extra_generation_params or {}
self.overlay_images = overlay_images self.overlay_images = overlay_images
self.paste_to = None self.paste_to = None
self.color_corrections = None self.color_corrections = None
@ -248,7 +248,6 @@ def create_infotext(p, all_prompts, all_seeds, all_subseeds, comments, iteration
"Denoising strength": getattr(p, 'denoising_strength', None), "Denoising strength": getattr(p, 'denoising_strength', None),
} }
if p.extra_generation_params is not None:
generation_params.update(p.extra_generation_params) generation_params.update(p.extra_generation_params)
generation_params_text = ", ".join([k if k == v else f'{k}: {v}' for k, v in generation_params.items() if v is not None]) generation_params_text = ", ".join([k if k == v else f'{k}: {v}' for k, v in generation_params.items() if v is not None])

14
scripts/img2imgalt.py
View File

@ -77,13 +77,14 @@ class Script(scripts.Script):
original_negative_prompt = gr.Textbox(label="Original negative prompt", lines=1) original_negative_prompt = gr.Textbox(label="Original negative prompt", lines=1)
cfg = gr.Slider(label="Decode CFG scale", minimum=0.0, maximum=15.0, step=0.1, value=1.0) cfg = gr.Slider(label="Decode CFG scale", minimum=0.0, maximum=15.0, step=0.1, value=1.0)
st = gr.Slider(label="Decode steps", minimum=1, maximum=150, step=1, value=50) st = gr.Slider(label="Decode steps", minimum=1, maximum=150, step=1, value=50)
randomness = gr.Slider(label="randomness", minimum=0.0, maximum=1.0, step=0.01, value=0.0) randomness = gr.Slider(label="Randomness", minimum=0.0, maximum=1.0, step=0.01, value=0.0)
return [original_prompt, original_negative_prompt, cfg, st, randomness] return [original_prompt, original_negative_prompt, cfg, st, randomness]
def run(self, p, original_prompt, original_negative_prompt, cfg, st, randomness): def run(self, p, original_prompt, original_negative_prompt, cfg, st, randomness):
p.batch_size = 1 p.batch_size = 1
p.batch_count = 1 p.batch_count = 1
def sample_extra(conditioning, unconditional_conditioning, seeds, subseeds, subseed_strength): def sample_extra(conditioning, unconditional_conditioning, seeds, subseeds, subseed_strength):
lat = (p.init_latent.cpu().numpy() * 10).astype(int) lat = (p.init_latent.cpu().numpy() * 10).astype(int)
@ -113,14 +114,13 @@ class Script(scripts.Script):
return sampler.sample_img2img(p, p.init_latent, noise_dt, conditioning, unconditional_conditioning) return sampler.sample_img2img(p, p.init_latent, noise_dt, conditioning, unconditional_conditioning)
p.sample = sample_extra p.sample = sample_extra
p.extra_generation_params = { p.extra_generation_params["Decode prompt"] = original_prompt
"Decode prompt": original_prompt, p.extra_generation_params["Decode negative prompt"] = original_negative_prompt
"Decode CFG scale": cfg, p.extra_generation_params["Decode CFG scale"] = cfg
"Decode steps": st, p.extra_generation_params["Decode steps"] = st
} p.extra_generation_params["Randomness"] = randomness
processed = processing.process_images(p) processed = processing.process_images(p)