Merge branch 'release_candidate'

1 files changed, 17 insertions, 41 deletions

diff --git a/modules/img2img.py b/modules/img2img.py
index a811e7a4..1519e132 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -3,14 +3,13 @@ from contextlib import closing
 from pathlib import Path

 

 import numpy as np

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

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

 import gradio as gr

 

-from modules import sd_samplers, images as imgutil

+from modules import 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

-from modules.images import save_image

 import modules.shared as shared

 import modules.processing as processing

 from modules.ui import plaintext_to_html

@@ -18,9 +17,10 @@ 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):

+    output_dir = output_dir.strip()

     processing.fix_seed(p)

 

-    images = list(shared.walk_files(input_dir, allowed_extensions=(".png", ".jpg", ".jpeg", ".webp")))

+    images = list(shared.walk_files(input_dir, allowed_extensions=(".png", ".jpg", ".jpeg", ".webp", ".tif", ".tiff")))

 

     is_inpaint_batch = False

     if inpaint_mask_dir:

@@ -32,11 +32,6 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
 

     print(f"Will process {len(images)} images, creating {p.n_iter * p.batch_size} new images for each.")

 

-    save_normally = output_dir == ''

-

-    p.do_not_save_grid = True

-    p.do_not_save_samples = not save_normally

-

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

 

     # extract "default" params to use in case getting png info fails

@@ -111,40 +106,30 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args, to_scale=Fal
 

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

         if proc is None:

-            proc = process_images(p)

-

-        for n, processed_image in enumerate(proc.images):

-            filename = image_path.stem

-            infotext = proc.infotext(p, n)

-            relpath = os.path.dirname(os.path.relpath(image, input_dir))

-

-            if n > 0:

-                filename += f"-{n}"

-

-            if not save_normally:

-                os.makedirs(os.path.join(output_dir, relpath), exist_ok=True)

-                if processed_image.mode == 'RGBA':

-                    processed_image = processed_image.convert("RGB")

-                save_image(processed_image, os.path.join(output_dir, relpath), None, extension=opts.samples_format, info=infotext, forced_filename=filename, save_to_dirs=False)

+            if output_dir:

+                p.outpath_samples = output_dir

+                p.override_settings['save_to_dirs'] = False

+                if p.n_iter > 1 or p.batch_size > 1:

+                    p.override_settings['samples_filename_pattern'] = f'{image_path.stem}-[generation_number]'

+                else:

+                    p.override_settings['samples_filename_pattern'] = f'{image_path.stem}'

+            process_images(p)

 

 

-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, img2img_batch_use_png_info: bool, img2img_batch_png_info_props: list, img2img_batch_png_info_dir: str, request: gr.Request, *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_name: str, mask_blur: int, mask_alpha: float, inpainting_fill: int, n_iter: int, batch_size: int, cfg_scale: float, image_cfg_scale: float, denoising_strength: float, 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, img2img_batch_use_png_info: bool, img2img_batch_png_info_props: list, img2img_batch_png_info_dir: str, request: gr.Request, *args):

     override_settings = create_override_settings_dict(override_settings_texts)

 

     is_batch = mode == 5

 

     if mode == 0:  # img2img

-        image = init_img.convert("RGB")

+        image = init_img

         mask = None

     elif mode == 1:  # img2img sketch

-        image = sketch.convert("RGB")

+        image = sketch

         mask = None

     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 = 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")

+        mask = processing.create_binary_mask(mask)

     elif mode == 3:  # inpaint sketch

         image = inpaint_color_sketch

         orig = inpaint_color_sketch_orig or inpaint_color_sketch

@@ -153,7 +138,6 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s
         mask = ImageEnhance.Brightness(mask).enhance(1 - mask_alpha / 100)

         blur = ImageFilter.GaussianBlur(mask_blur)

         image = Image.composite(image.filter(blur), orig, mask.filter(blur))

-        image = image.convert("RGB")

     elif mode == 4:  # inpaint upload mask

         image = init_img_inpaint

         mask = init_mask_inpaint

@@ -180,21 +164,13 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s
         prompt=prompt,

         negative_prompt=negative_prompt,

         styles=prompt_styles,

-        seed=seed,

-        subseed=subseed,

-        subseed_strength=subseed_strength,

-        seed_resize_from_h=seed_resize_from_h,

-        seed_resize_from_w=seed_resize_from_w,

-        seed_enable_extras=seed_enable_extras,

-        sampler_name=sd_samplers.samplers_for_img2img[sampler_index].name,

+        sampler_name=sampler_name,

         batch_size=batch_size,

         n_iter=n_iter,

         steps=steps,

         cfg_scale=cfg_scale,

         width=width,

         height=height,

-        restore_faces=restore_faces,

-        tiling=tiling,

         init_images=[image],

         mask=mask,

         mask_blur=mask_blur,