From 762265eab58cdb8f2d6398769bab43d8b8db0075 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Wed, 10 May 2023 07:52:45 +0300
Subject: autofixes from ruff

---
 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 9fc3a698..cdae301a 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -59,7 +59,7 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
             # try to find corresponding mask for an image using simple filename matching
             mask_image_path = os.path.join(inpaint_mask_dir, os.path.basename(image))
             # if not found use first one ("same mask for all images" use-case)
-            if not mask_image_path in inpaint_masks:
+            if mask_image_path not in inpaint_masks:
                 mask_image_path = inpaint_masks[0]
             mask_image = Image.open(mask_image_path)
             p.image_mask = mask_image
-- 
cgit v1.2.1


From 96d6ca4199e7c5eee8d451618de5161cea317c40 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Wed, 10 May 2023 08:25:25 +0300
Subject: manual fixes for ruff

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

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index cdae301a..32b1ecd6 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -13,7 +13,6 @@ from modules.shared import opts, state
 import modules.shared as shared
 import modules.processing as processing
 from modules.ui import plaintext_to_html
-import modules.images as images
 import modules.scripts
 
 
-- 
cgit v1.2.1


From f741a98baccae100fcfb40c017b5c35c5cba1b0c Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Wed, 10 May 2023 08:43:42 +0300
Subject: imports cleanup for ruff

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

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 32b1ecd6..d704bf90 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -1,12 +1,9 @@
-import math
 import os
-import sys
-import traceback
 
 import numpy as np
 from PIL import Image, ImageOps, ImageFilter, ImageEnhance, ImageChops, UnidentifiedImageError
 
-from modules import devices, sd_samplers
+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
-- 
cgit v1.2.1


From e1c44267ea239d0903202c41f9e75c864e31227f Mon Sep 17 00:00:00 2001
From: ArthurHeitmann <37270165+ArthurHeitmann@users.noreply.github.com>
Date: Mon, 22 May 2023 21:56:26 +0200
Subject: Fix for #10643 (pixel noise in webui inpainting canvas breaking
 inpainting, so that it behaves like plain img2img)

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

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index d704bf90..4c12c2c5 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -92,7 +92,8 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s
     elif mode == 2:  # inpaint
         image, mask = init_img_with_mask["image"], init_img_with_mask["mask"]
         alpha_mask = ImageOps.invert(image.split()[-1]).convert('L').point(lambda x: 255 if x > 0 else 0, mode='1')
-        mask = ImageChops.lighter(alpha_mask, mask.convert('L')).convert('L')
+        mask = mask.convert('L').point(lambda x: 255 if x > 128 else 0, mode='1')
+        mask = ImageChops.lighter(alpha_mask, mask).convert('L')
         image = image.convert("RGB")
     elif mode == 3:  # inpaint sketch
         image = inpaint_color_sketch
-- 
cgit v1.2.1


From c8e67b67320f5d090b758303e675c1e5586575a5 Mon Sep 17 00:00:00 2001
From: Artem Kotov <breengles@gmail.com>
Date: Mon, 29 May 2023 20:39:24 +0400
Subject: improve filename matching for mask

we should not rely that mask filename will be of the same extension
as the image filename so better pattern matching is added
---
 modules/img2img.py | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index d704bf90..bc79ea1f 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -1,4 +1,5 @@
 import os
+from pathlib import Path
 
 import numpy as np
 from PIL import Image, ImageOps, ImageFilter, ImageEnhance, ImageChops, UnidentifiedImageError
@@ -53,7 +54,11 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
 
         if is_inpaint_batch:
             # try to find corresponding mask for an image using simple filename matching
-            mask_image_path = os.path.join(inpaint_mask_dir, os.path.basename(image))
+            path = Path(os.path.join(inpaint_mask_dir, os.path.basename(image)))
+            mask_image_path = list(path.parent.glob(f"**/{path.stem}*"))
+            if len(mask_image_path) > 0:
+                mask_image_path = str(mask_image_path[0])
+            
             # if not found use first one ("same mask for all images" use-case)
             if mask_image_path not in inpaint_masks:
                 mask_image_path = inpaint_masks[0]
-- 
cgit v1.2.1


From 6c610a8a951ea8141024dbb659c2528bf24225ec Mon Sep 17 00:00:00 2001
From: Artem Kotov <breengles@gmail.com>
Date: Mon, 29 May 2023 20:47:20 +0400
Subject: add scale_by to batch processing

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

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index bc79ea1f..5d6ad520 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -14,7 +14,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, input_dir, output_dir, inpaint_mask_dir, args, to_scale=False, scale_by=1.0):
     processing.fix_seed(p)
 
     images = shared.listfiles(input_dir)
@@ -50,6 +50,11 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
             continue
         # Use the EXIF orientation of photos taken by smartphones.
         img = ImageOps.exif_transpose(img)
+        
+        if to_scale:
+            p.width = int(img.width * scale_by)
+            p.height = int(img.height * scale_by)
+        
         p.init_images = [img] * p.batch_size
 
         if is_inpaint_batch:
@@ -119,7 +124,7 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s
     if image is not None:
         image = ImageOps.exif_transpose(image)
 
-    if selected_scale_tab == 1:
+    if selected_scale_tab == 1 and not is_batch:
         assert image, "Can't scale by because no image is selected"
 
         width = int(image.width * scale_by)
@@ -174,7 +179,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_input_dir, img2img_batch_output_dir, img2img_batch_inpaint_mask_dir, args, to_scale=selected_scale_tab == 1, scale_by=scale_by)
 
         processed = Processed(p, [], p.seed, "")
     else:
-- 
cgit v1.2.1


From 23314a6e27a24fc8bf98717ddc180aec06674abd Mon Sep 17 00:00:00 2001
From: Artem Kotov <breengles@gmail.com>
Date: Mon, 29 May 2023 21:38:49 +0400
Subject: ruffed

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

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 5d6ad520..a29add3a 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -50,11 +50,11 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
             continue
         # Use the EXIF orientation of photos taken by smartphones.
         img = ImageOps.exif_transpose(img)
-        
+
         if to_scale:
             p.width = int(img.width * scale_by)
             p.height = int(img.height * scale_by)
-        
+
         p.init_images = [img] * p.batch_size
 
         if is_inpaint_batch:
@@ -63,7 +63,7 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
             mask_image_path = list(path.parent.glob(f"**/{path.stem}*"))
             if len(mask_image_path) > 0:
                 mask_image_path = str(mask_image_path[0])
-            
+
             # if not found use first one ("same mask for all images" use-case)
             if mask_image_path not in inpaint_masks:
                 mask_image_path = inpaint_masks[0]
-- 
cgit v1.2.1


From 49f4b4be67fa97306f99a461dc76de901d7499d2 Mon Sep 17 00:00:00 2001
From: Artem Kotov <breengles@gmail.com>
Date: Thu, 1 Jun 2023 11:29:56 +0400
Subject: add subdir support for images, masks and output; search mask only in
 subdir

---
 modules/img2img.py | 37 +++++++++++++++++++++++++------------
 1 file changed, 25 insertions(+), 12 deletions(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index a29add3a..abf7960f 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -17,11 +17,12 @@ import modules.scripts
 def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=False, scale_by=1.0):
     processing.fix_seed(p)
 
-    images = shared.listfiles(input_dir)
+    allowed_extensions = [ext for ext, f in Image.registered_extensions().items() if f in Image.OPEN]
+    images = list(shared.walk_files(input_dir, allowed_extensions=allowed_extensions))
 
     is_inpaint_batch = False
     if inpaint_mask_dir:
-        inpaint_masks = shared.listfiles(inpaint_mask_dir)
+        inpaint_masks = list(shared.walk_files(inpaint_mask_dir, allowed_extensions=allowed_extensions))
         is_inpaint_batch = len(inpaint_masks) > 0
     if is_inpaint_batch:
         print(f"\nInpaint batch is enabled. {len(inpaint_masks)} masks found.")
@@ -57,16 +58,28 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
 
         p.init_images = [img] * p.batch_size
 
+        image_path = Path(image)
+        if image_path.parent == Path(input_dir):
+            image_subpath = ""
+        else:
+            image_subpath = str(image_path.parent).replace(f"{input_dir}/", "")
+
         if is_inpaint_batch:
             # try to find corresponding mask for an image using simple filename matching
-            path = Path(os.path.join(inpaint_mask_dir, os.path.basename(image)))
-            mask_image_path = list(path.parent.glob(f"**/{path.stem}*"))
-            if len(mask_image_path) > 0:
-                mask_image_path = str(mask_image_path[0])
-
-            # if not found use first one ("same mask for all images" use-case)
-            if mask_image_path not in inpaint_masks:
+            if len(inpaint_masks) == 1:
                 mask_image_path = inpaint_masks[0]
+            else:
+                # try to find corresponding mask for an image using simple filename matching
+                mask_image_dir = Path(inpaint_mask_dir).joinpath(image_subpath)
+                masks_found = list(mask_image_dir.glob(f"{image_path.stem}.*"))
+
+                if len(masks_found) == 0:
+                    raise ValueError(f"Mask is not found for {image_path} in {mask_image_dir}")
+
+                # it should contain only 1 matching mask
+                # otherwise user has many masks with the same name but different extensions
+                mask_image_path = masks_found[0]
+
             mask_image = Image.open(mask_image_path)
             p.image_mask = mask_image
 
@@ -75,17 +88,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 = os.path.basename(image)
+            filename = image_path.name
 
             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, image_subpath), 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, image_subpath, 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.1


From ba110bf09302ec6aed10a69016d96912e39c7c05 Mon Sep 17 00:00:00 2001
From: Artem Kotov <breengles@gmail.com>
Date: Thu, 1 Jun 2023 15:44:55 +0400
Subject: fallback to original file retrieving; skip img if mask not found

usage of `shared.walk_files` breaks controlnet extension
images are processed in different order
which leads to unmatched img file used for img2img and img file used for controlnet
(if no folder is specified for control net
or the same as img2img input dir used for it)
---
 modules/img2img.py | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index abf7960f..3af6dac8 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -17,12 +17,11 @@ import modules.scripts
 def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=False, scale_by=1.0):
     processing.fix_seed(p)
 
-    allowed_extensions = [ext for ext, f in Image.registered_extensions().items() if f in Image.OPEN]
-    images = list(shared.walk_files(input_dir, allowed_extensions=allowed_extensions))
+    images = shared.listfiles(input_dir)
 
     is_inpaint_batch = False
     if inpaint_mask_dir:
-        inpaint_masks = list(shared.walk_files(inpaint_mask_dir, allowed_extensions=allowed_extensions))
+        inpaint_masks = shared.listfiles(inpaint_mask_dir)
         is_inpaint_batch = len(inpaint_masks) > 0
     if is_inpaint_batch:
         print(f"\nInpaint batch is enabled. {len(inpaint_masks)} masks found.")
@@ -59,22 +58,18 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
         p.init_images = [img] * p.batch_size
 
         image_path = Path(image)
-        if image_path.parent == Path(input_dir):
-            image_subpath = ""
-        else:
-            image_subpath = str(image_path.parent).replace(f"{input_dir}/", "")
-
         if is_inpaint_batch:
             # try to find corresponding mask for an image using simple filename matching
             if len(inpaint_masks) == 1:
                 mask_image_path = inpaint_masks[0]
             else:
                 # try to find corresponding mask for an image using simple filename matching
-                mask_image_dir = Path(inpaint_mask_dir).joinpath(image_subpath)
+                mask_image_dir = Path(inpaint_mask_dir)
                 masks_found = list(mask_image_dir.glob(f"{image_path.stem}.*"))
 
                 if len(masks_found) == 0:
-                    raise ValueError(f"Mask is not found for {image_path} in {mask_image_dir}")
+                    print(f"Warning: mask is not found for {image_path} in {mask_image_dir}. Skipping it.")
+                    continue
 
                 # it should contain only 1 matching mask
                 # otherwise user has many masks with the same name but different extensions
@@ -95,10 +90,10 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
                 filename = f"{left}-{n}{right}"
 
             if not save_normally:
-                os.makedirs(os.path.join(output_dir, image_subpath), exist_ok=True)
+                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, image_subpath, filename))
+                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):
-- 
cgit v1.2.1


From 51864790fd72386fbbbb015d24a43ce501ecaa4b Mon Sep 17 00:00:00 2001
From: Aarni Koskela <akx@iki.fi>
Date: Fri, 2 Jun 2023 14:58:10 +0300
Subject: Simplify a bunch of `len(x) > 0`/`len(x) == 0` style expressions

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

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 4c12c2c5..35c4facc 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -21,8 +21,7 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
     is_inpaint_batch = False
     if inpaint_mask_dir:
         inpaint_masks = shared.listfiles(inpaint_mask_dir)
-        is_inpaint_batch = len(inpaint_masks) > 0
-    if is_inpaint_batch:
+        is_inpaint_batch = bool(inpaint_masks)
         print(f"\nInpaint batch is enabled. {len(inpaint_masks)} masks found.")
 
     print(f"Will process {len(images)} images, creating {p.n_iter * p.batch_size} new images for each.")
-- 
cgit v1.2.1


From 18acc0b30d9184702a772287ed8197385e0aed98 Mon Sep 17 00:00:00 2001
From: AUTOMATIC <16777216c@gmail.com>
Date: Mon, 5 Jun 2023 11:08:57 +0300
Subject: revert the message to how it was

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

(limited to 'modules/img2img.py')

diff --git a/modules/img2img.py b/modules/img2img.py
index 3981b783..2c497020 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -23,7 +23,9 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
     if inpaint_mask_dir:
         inpaint_masks = shared.listfiles(inpaint_mask_dir)
         is_inpaint_batch = bool(inpaint_masks)
-        print(f"\nInpaint batch is enabled. {len(inpaint_masks)} masks found.")
+
+        if is_inpaint_batch:
+            print(f"\nInpaint batch is enabled. {len(inpaint_masks)} masks found.")
 
     print(f"Will process {len(images)} images, creating {p.n_iter * p.batch_size} new images for each.")
 
-- 
cgit v1.2.1


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.1


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.1


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.1


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.1


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.1


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.1


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.1