StableDiffusion/WebUI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

small rework for img2img PNG info

Browse Source
This commit is contained in:
AUTOMATIC1111 2023-07-08 15:42:00 +03:00
parent 1d71c36de2
commit 274a3e21ba
1 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/img2img.py
View File

@ -96,27 +96,16 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
info_img = Image.open(info_img_path) info_img = Image.open(info_img_path)
geninfo, _ = imgutil.read_info_from_image(info_img) geninfo, _ = imgutil.read_info_from_image(info_img)
parsed_parameters = parse_generation_parameters(geninfo) parsed_parameters = parse_generation_parameters(geninfo)
if("Prompt" in png_info_props): parsed_parameters = {k: v for k, v in parsed_parameters.items() if k in (png_info_props or {})}
p.prompt = prompt + " " + parsed_parameters["Prompt"] except Exception:
if("Negative prompt" in png_info_props): parsed_parameters = {}
p.negative_prompt = negative_prompt + " " + parsed_parameters["Negative prompt"]
if("Seed" in png_info_props): p.prompt = prompt + (" " + parsed_parameters["Prompt"] if "Prompt" in parsed_parameters else "")
p.seed = int(parsed_parameters["Seed"]) p.negative_prompt = negative_prompt + (" " + parsed_parameters["Negative prompt"] if "Negative prompt" in parsed_parameters else "")
if("CFG scale" in png_info_props): p.seed = int(parsed_parameters.get("Seed", seed))
p.cfg_scale = float(parsed_parameters["CFG scale"]) p.cfg_scale = float(parsed_parameters.get("CFG scale", cfg_scale))
if("Sampler" in png_info_props): p.sampler_name = parsed_parameters.get("Sampler", sampler_name)
p.sampler_name = parsed_parameters["Sampler"] p.steps = int(parsed_parameters.get("Steps", steps))
if("Steps" in png_info_props):
p.steps = int(parsed_parameters["Steps"])
except Exception as e:
print(f"batch png info: using ui set prompts; failed to get png info for {image}")
print(e)
p.prompt = prompt
p.negative_prompt = negative_prompt
p.seed = seed
p.cfg_scale = cfg_scale
p.sampler_name = sampler_name
p.steps = steps
proc = modules.scripts.scripts_img2img.run(p, *args) proc = modules.scripts.scripts_img2img.run(p, *args)
if proc is None: if proc is None: