PNG info support at img2img batch

1 files changed, 33 insertions, 5 deletions

diff --git a/modules/img2img.py b/modules/img2img.py
index d704bf90..88e172ff 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -3,8 +3,8 @@ import os
 import numpy as np

 from PIL import Image, ImageOps, ImageFilter, ImageEnhance, ImageChops, UnidentifiedImageError

 

-from modules import sd_samplers

-from modules.generation_parameters_copypaste import create_override_settings_dict

+from modules import sd_samplers, images as imgutil

+from modules.generation_parameters_copypaste import create_override_settings_dict, parse_generation_parameters

 from modules.processing import Processed, StableDiffusionProcessingImg2Img, process_images

 from modules.shared import opts, state

 import modules.shared as shared

@@ -13,7 +13,7 @@ from modules.ui import plaintext_to_html
 import modules.scripts

 

 

-def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):

+def process_batch(p, use_png_info, png_info_props, png_info_dir, input_dir, output_dir, inpaint_mask_dir, args):

     processing.fix_seed(p)

 

     images = shared.listfiles(input_dir)

@@ -34,6 +34,9 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
 

     state.job_count = len(images) * p.n_iter

 

+    prompt = p.prompt

+    negative_prompt = p.negative_prompt

+

     for i, image in enumerate(images):

         state.job = f"{i+1} out of {len(images)}"

         if state.skipped:

@@ -59,6 +62,31 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
                 mask_image_path = inpaint_masks[0]

             mask_image = Image.open(mask_image_path)

             p.image_mask = mask_image

+        

+        if use_png_info:

+            try:

+                info_img = img

+                if png_info_dir:

+                    info_img_path = os.path.join(png_info_dir, os.path.basename(image))

+                    info_img = Image.open(info_img_path)

+                geninfo, _ = imgutil.read_info_from_image(info_img)

+                parsed_parameters = parse_generation_parameters(geninfo)

+                if("Prompt" in png_info_props):

+                    p.prompt = prompt + " " + parsed_parameters["Prompt"]

+                if("Negative prompt" in png_info_props):

+                    p.negative_prompt = negative_prompt + " " + parsed_parameters["Negative prompt"]

+                if("Seed" in png_info_props):

+                    p.seed = int(parsed_parameters["Seed"])

+                if("CFG scale" in png_info_props):

+                    p.cfg_scale = float(parsed_parameters["CFG scale"])

+                if("Sampler" in png_info_props):

+                    p.sampler_name = parsed_parameters["Sampler"]

+                if("Steps" in png_info_props):

+                    p.steps = int(parsed_parameters["Steps"])

+            except: 

+                p.prompt = prompt

+                p.negative_prompt = negative_prompt

+                print(f"batch png info: using ui set prompts; failed to get png info for {image}")

 

         proc = modules.scripts.scripts_img2img.run(p, *args)

         if proc is None:

@@ -78,7 +106,7 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
                 processed_image.save(os.path.join(output_dir, filename))

 

 

-def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_styles, init_img, sketch, init_img_with_mask, inpaint_color_sketch, inpaint_color_sketch_orig, init_img_inpaint, init_mask_inpaint, steps: int, sampler_index: int, mask_blur: int, mask_alpha: float, inpainting_fill: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, image_cfg_scale: float, denoising_strength: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, selected_scale_tab: int, height: int, width: int, scale_by: float, resize_mode: int, inpaint_full_res: bool, inpaint_full_res_padding: int, inpainting_mask_invert: int, img2img_batch_input_dir: str, img2img_batch_output_dir: str, img2img_batch_inpaint_mask_dir: str, override_settings_texts, *args):

+def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_styles, init_img, sketch, init_img_with_mask, inpaint_color_sketch, inpaint_color_sketch_orig, init_img_inpaint, init_mask_inpaint, steps: int, sampler_index: int, mask_blur: int, mask_alpha: float, inpainting_fill: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, cfg_scale: float, image_cfg_scale: float, denoising_strength: float, seed: int, subseed: int, subseed_strength: float, seed_resize_from_h: int, seed_resize_from_w: int, seed_enable_extras: bool, selected_scale_tab: int, height: int, width: int, scale_by: float, resize_mode: int, inpaint_full_res: bool, inpaint_full_res_padding: int, inpainting_mask_invert: int, img2img_batch_use_png_info: bool, img2img_batch_png_info_props: list, img2img_batch_png_info_dir: str, img2img_batch_input_dir: str, img2img_batch_output_dir: str, img2img_batch_inpaint_mask_dir: str, override_settings_texts, *args):

     override_settings = create_override_settings_dict(override_settings_texts)

 

     is_batch = mode == 5

@@ -169,7 +197,7 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s
     if is_batch:

         assert not shared.cmd_opts.hide_ui_dir_config, "Launched with --hide-ui-dir-config, batch img2img disabled"

 

-        process_batch(p, img2img_batch_input_dir, img2img_batch_output_dir, img2img_batch_inpaint_mask_dir, args)

+        process_batch(p, img2img_batch_use_png_info, img2img_batch_png_info_props, img2img_batch_png_info_dir, img2img_batch_input_dir, img2img_batch_output_dir, img2img_batch_inpaint_mask_dir, args)

 

         processed = Processed(p, [], p.seed, "")

     else: