From bbce167305091b34795284cabca7ab2fd56469b6 Mon Sep 17 00:00:00 2001
From: lenankamp <31517075+lenankamp@users.noreply.github.com>
Date: Tue, 16 May 2023 14:37:45 -0400
Subject: Recursive batch img2img.py

Searches sub directories and performs img2img batch processing, also limits inputs to jpg, webp, and png. Then saves to putput directory with relative paths.
---
 modules/img2img.py | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 9fc3a698..ad5f2e73 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -20,7 +20,13 @@ import modules.scripts
 def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
     processing.fix_seed(p)
 
-    images = shared.listfiles(input_dir)
+# recursive batch, as written limits potential inputs to common image formats, may e better to just check if isfile for general use
+images = []
+    for root, directories, files in os.walk(input_dir):
+        for filename in files:
+            filepath = os.path.join(root, filename)
+            if filepath.endswith(".jpg") or filepath.endswith(".jpeg") or filepath.endswith(".png") or filepath.endswith(".webp"):
+                images.append(filepath)
 
     is_inpaint_batch = False
     if inpaint_mask_dir:
@@ -70,16 +76,17 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
 
         for n, processed_image in enumerate(proc.images):
             filename = os.path.basename(image)
+            relpath = os.path.dirname(os.path.relpath(image, input_dir))
 
             if n > 0:
                 left, right = os.path.splitext(filename)
                 filename = f"{left}-{n}{right}"
 
             if not save_normally:
-                os.makedirs(output_dir, exist_ok=True)
+                os.makedirs(os.path.join(output_dir, relpath), exist_ok=True)
                 if processed_image.mode == 'RGBA':
                     processed_image = processed_image.convert("RGB")
-                processed_image.save(os.path.join(output_dir, filename))
+                processed_image.save(os.path.join(output_dir, relpath, 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):
-- 
cgit v1.2.3


From ff6acd35d0807a4e0c3ee86cdb1520a4a3a11cdd Mon Sep 17 00:00:00 2001
From: lenankamp <31517075+lenankamp@users.noreply.github.com>
Date: Fri, 19 May 2023 03:20:19 -0400
Subject: Update img2img.py

Hopefully corrected the white space issue
---
 modules/img2img.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index ad5f2e73..d1872bed 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -20,14 +20,14 @@ import modules.scripts
 def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
     processing.fix_seed(p)
 
-# recursive batch, as written limits potential inputs to common image formats, may e better to just check if isfile for general use
-images = []
+    images = []
     for root, directories, files in os.walk(input_dir):
         for filename in files:
             filepath = os.path.join(root, filename)
             if filepath.endswith(".jpg") or filepath.endswith(".jpeg") or filepath.endswith(".png") or filepath.endswith(".webp"):
                 images.append(filepath)
 
+
     is_inpaint_batch = False
     if inpaint_mask_dir:
         inpaint_masks = shared.listfiles(inpaint_mask_dir)
-- 
cgit v1.2.3


From d3c86e5178725b11a4679097f0aefb0a9fc90014 Mon Sep 17 00:00:00 2001
From: Jared Deckard <jared@shademaps.com>
Date: Wed, 14 Jun 2023 14:03:44 -0500
Subject: Note the Gradio user in the Exif data

---
 modules/img2img.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index d704bf90..83bd7857 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -2,6 +2,7 @@ import os
 
 import numpy as np
 from PIL import Image, ImageOps, ImageFilter, ImageEnhance, ImageChops, UnidentifiedImageError
+import gradio as gr
 
 from modules import sd_samplers
 from modules.generation_parameters_copypaste import create_override_settings_dict
@@ -78,7 +79,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_input_dir: str, img2img_batch_output_dir: str, img2img_batch_inpaint_mask_dir: str, override_settings_texts, request: gr.Request, *args):
     override_settings = create_override_settings_dict(override_settings_texts)
 
     is_batch = mode == 5
@@ -160,6 +161,8 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s
     p.scripts = modules.scripts.scripts_img2img
     p.script_args = args
 
+    p.user = request.username
+
     if shared.cmd_opts.enable_console_prompts:
         print(f"\nimg2img: {prompt}", file=shared.progress_print_out)
 
-- 
cgit v1.2.3


From 928bd42da46683315c9f4498f6fbd5c59279da18 Mon Sep 17 00:00:00 2001
From: Ferdinand Weynschenk <flweynschenk@gmail.com>
Date: Tue, 20 Jun 2023 13:33:36 +0200
Subject: PNG info support at img2img batch

---
 modules/img2img.py | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

(limited to 'modules/img2img.py')

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:
-- 
cgit v1.2.3


From 7ad48120d45e678b6343f7d95a1f97607858009a Mon Sep 17 00:00:00 2001
From: Ferdinand Weynschenk <flweynschenk@gmail.com>
Date: Tue, 20 Jun 2023 13:50:02 +0200
Subject: use ui params when retreiving png info fails

Don't want to interrupt the process since batches can be huge. This makes more sense to me than using the previous images parameters
---
 modules/img2img.py | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 88e172ff..e46a6fde 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -34,8 +34,13 @@ def process_batch(p, use_png_info, png_info_props, png_info_dir, input_dir, outp
 
     state.job_count = len(images) * p.n_iter
 
+    # extract "default" params to use in case getting png info fails
     prompt = p.prompt
     negative_prompt = p.negative_prompt
+    seed = p.seed
+    cfg_scale = p.cfg_scale
+    sampler_name = p.sampler_name
+    steps = p.steps
 
     for i, image in enumerate(images):
         state.job = f"{i+1} out of {len(images)}"
@@ -86,6 +91,10 @@ def process_batch(p, use_png_info, png_info_props, png_info_dir, input_dir, outp
             except: 
                 p.prompt = prompt
                 p.negative_prompt = negative_prompt
+                p.seed = seed
+                p.cfg_scale = cfg_scale
+                p.sampler_name = sampler_name
+                p.steps = steps
                 print(f"batch png info: using ui set prompts; failed to get png info for {image}")
 
         proc = modules.scripts.scripts_img2img.run(p, *args)
-- 
cgit v1.2.3


From c4c63dd5e4760c56405cef2e71abc5c3604c4578 Mon Sep 17 00:00:00 2001
From: Ferdinand Weynschenk <flweynschenk@gmail.com>
Date: Tue, 20 Jun 2023 14:03:42 +0200
Subject: resolve linter

---
 modules/img2img.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index e46a6fde..f77dfd9f 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -67,7 +67,7 @@ def process_batch(p, use_png_info, png_info_props, png_info_dir, input_dir, outp
                 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
@@ -88,14 +88,15 @@ def process_batch(p, use_png_info, png_info_props, png_info_dir, input_dir, outp
                     p.sampler_name = parsed_parameters["Sampler"]
                 if("Steps" in png_info_props):
                     p.steps = int(parsed_parameters["Steps"])
-            except: 
+            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
-                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:
-- 
cgit v1.2.3


From b88645d9ebddfa26aaf6ee25519a95c967a23138 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 8 Jul 2023 15:14:14 +0300
Subject: additional changes for merge conflict for #11337

---
 modules/img2img.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index b8ea3a3c..5e18bab9 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -230,7 +230,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, to_scale=selected_scale_tab == 1, scale_by=scale_by, img2img_batch_input_dir, img2img_batch_output_dir, img2img_batch_inpaint_mask_dir)
+        process_batch(p, img2img_batch_input_dir, img2img_batch_output_dir, img2img_batch_inpaint_mask_dir, args, to_scale=selected_scale_tab == 1, scale_by=scale_by, use_png_info=img2img_batch_input_dir, png_info_props=img2img_batch_output_dir, png_info_dir=img2img_batch_inpaint_mask_dir)
 
         processed = Processed(p, [], p.seed, "")
     else:
-- 
cgit v1.2.3


From 1d71c36de2d7bbbcd290ba4dc5afd8ba909c74f8 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 8 Jul 2023 15:21:29 +0300
Subject: third time's the charm

---
 modules/img2img.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 5e18bab9..881212fc 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -230,7 +230,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, to_scale=selected_scale_tab == 1, scale_by=scale_by, use_png_info=img2img_batch_input_dir, png_info_props=img2img_batch_output_dir, png_info_dir=img2img_batch_inpaint_mask_dir)
+        process_batch(p, img2img_batch_input_dir, img2img_batch_output_dir, img2img_batch_inpaint_mask_dir, args, to_scale=selected_scale_tab == 1, scale_by=scale_by, use_png_info=img2img_batch_use_png_info, png_info_props=img2img_batch_png_info_props, png_info_dir=img2img_batch_png_info_dir)
 
         processed = Processed(p, [], p.seed, "")
     else:
-- 
cgit v1.2.3


From 274a3e21babe5fa913b4a34d49b5d7cd72c5fa89 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 8 Jul 2023 15:42:00 +0300
Subject: small rework for img2img PNG info

---
 modules/img2img.py | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 881212fc..a5f1c148 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -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)
                 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 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
+                parsed_parameters = {k: v for k, v in parsed_parameters.items() if k in (png_info_props or {})}
+            except Exception:
+                parsed_parameters = {}
+
+            p.prompt = prompt + (" " + parsed_parameters["Prompt"] if "Prompt" in parsed_parameters else "")
+            p.negative_prompt = negative_prompt + (" " + parsed_parameters["Negative prompt"] if "Negative prompt" in parsed_parameters else "")
+            p.seed = int(parsed_parameters.get("Seed", seed))
+            p.cfg_scale = float(parsed_parameters.get("CFG scale", cfg_scale))
+            p.sampler_name = parsed_parameters.get("Sampler", sampler_name)
+            p.steps = int(parsed_parameters.get("Steps", steps))
 
         proc = modules.scripts.scripts_img2img.run(p, *args)
         if proc is None:
-- 
cgit v1.2.3


From e161b5a0259c870b9d01408d02c504c3281dbdb1 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 8 Jul 2023 16:54:03 +0300
Subject: rework #10436 to use shared.walk_files

---
 modules/img2img.py | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 3b83814b..ef87eb0f 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -18,13 +18,7 @@ import modules.scripts
 def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=False, scale_by=1.0, use_png_info=False, png_info_props=None, png_info_dir=None):
     processing.fix_seed(p)
 
-    images = []
-    for root, directories, files in os.walk(input_dir):
-        for filename in files:
-            filepath = os.path.join(root, filename)
-            if filepath.endswith(".jpg") or filepath.endswith(".jpeg") or filepath.endswith(".png") or filepath.endswith(".webp"):
-                images.append(filepath)
-
+    images = list(shared.walk_files(input_dir, allowed_extensions=(".png", ".jpg", ".jpeg", ".webp")))
 
     is_inpaint_batch = False
     if inpaint_mask_dir:
-- 
cgit v1.2.3


From 44c27ebc7393ea793245aa565ace6c9bf1313980 Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Mon, 10 Jul 2023 20:08:23 +0300
Subject: Use closing() with processing classes everywhere

Follows up on #11569
---
 modules/img2img.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index ef87eb0f..4d9a02cc 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -1,4 +1,5 @@
 import os
+from contextlib import closing
 from pathlib import Path
 
 import numpy as np
@@ -217,18 +218,17 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s
     if mask:
         p.extra_generation_params["Mask blur"] = mask_blur
 
-    if is_batch:
-        assert not shared.cmd_opts.hide_ui_dir_config, "Launched with --hide-ui-dir-config, batch img2img disabled"
+    with closing(p):
+        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, to_scale=selected_scale_tab == 1, scale_by=scale_by, use_png_info=img2img_batch_use_png_info, png_info_props=img2img_batch_png_info_props, png_info_dir=img2img_batch_png_info_dir)
+            process_batch(p, img2img_batch_input_dir, img2img_batch_output_dir, img2img_batch_inpaint_mask_dir, args, to_scale=selected_scale_tab == 1, scale_by=scale_by, use_png_info=img2img_batch_use_png_info, png_info_props=img2img_batch_png_info_props, png_info_dir=img2img_batch_png_info_dir)
 
-        processed = Processed(p, [], p.seed, "")
-    else:
-        processed = modules.scripts.scripts_img2img.run(p, *args)
-        if processed is None:
-            processed = process_images(p)
-
-    p.close()
+            processed = Processed(p, [], p.seed, "")
+        else:
+            processed = modules.scripts.scripts_img2img.run(p, *args)
+            if processed is None:
+                processed = process_images(p)
 
     shared.total_tqdm.clear()
 
-- 
cgit v1.2.3


From 3fee3c34f1b01d21770ab0a226b432cdd8444792 Mon Sep 17 00:00:00 2001
From: missionfloyd <missionfloyd@users.noreply.github.com>
Date: Wed, 12 Jul 2023 02:45:03 -0600
Subject: Save img2img batch with images.save_image()

---
 modules/img2img.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 2c497020..15306972 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -8,6 +8,7 @@ from modules import sd_samplers
 from modules.generation_parameters_copypaste import create_override_settings_dict
 from modules.processing import Processed, StableDiffusionProcessingImg2Img, process_images
 from modules.shared import opts, state
+from modules.images import save_image
 import modules.shared as shared
 import modules.processing as processing
 from modules.ui import plaintext_to_html
@@ -84,17 +85,17 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
             proc = process_images(p)
 
         for n, processed_image in enumerate(proc.images):
-            filename = image_path.name
+            filename = image_path.stem
+            infotext = proc.infotext(p, n)
 
             if n > 0:
-                left, right = os.path.splitext(filename)
-                filename = f"{left}-{n}{right}"
+                filename += f"-{n}"
 
             if not save_normally:
                 os.makedirs(output_dir, exist_ok=True)
                 if processed_image.mode == 'RGBA':
                     processed_image = processed_image.convert("RGB")
-                processed_image.save(os.path.join(output_dir, filename))
+                save_image(processed_image, output_dir, None, extension=opts.samples_format, info=infotext, forced_filename=filename, save_to_dirs=False)
 
 
 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):
-- 
cgit v1.2.3


From 127635409a7959f6c057a68ccb8e70734cbaf9f3 Mon Sep 17 00:00:00 2001
From: AUTOMATIC1111 <16777216c@gmail.com>
Date: Sat, 15 Jul 2023 08:07:25 +0300
Subject: add padding and identification to generation log section (Failed to
 find Loras, Used embeddings, etc...)

---
 modules/img2img.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 664e2688..a811e7a4 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -240,4 +240,4 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s
     if opts.do_not_show_images:
         processed.images = []
 
-    return processed.images, generation_info_js, plaintext_to_html(processed.info), plaintext_to_html(processed.comments)
+    return processed.images, generation_info_js, plaintext_to_html(processed.info), plaintext_to_html(processed.comments, classname="comments")
-- 
cgit v1.2.3