Merge branch 'dev' into tooltip

1 files changed, 13 insertions, 4 deletions

diff --git a/modules/img2img.py b/modules/img2img.py
index 953ac5d2..56c846d6 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -4,7 +4,7 @@ import sys
 import traceback

 

 import numpy as np

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

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

 

 from modules import devices, sd_samplers

 from modules.generation_parameters_copypaste import create_override_settings_dict

@@ -46,7 +46,10 @@ def process_batch(p, input_dir, output_dir, inpaint_mask_dir, args):
         if state.interrupted:

             break

 

-        img = Image.open(image)

+        try:

+            img = Image.open(image)

+        except UnidentifiedImageError:

+            continue

         # Use the EXIF orientation of photos taken by smartphones.

         img = ImageOps.exif_transpose(img)

         p.init_images = [img] * p.batch_size

@@ -78,7 +81,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, height: int, width: int, 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, *args):

     override_settings = create_override_settings_dict(override_settings_texts)

 

     is_batch = mode == 5

@@ -114,6 +117,12 @@ 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:

+        assert image, "Can't scale by because no image is selected"

+

+        width = int(image.width * scale_by)

+        height = int(image.height * scale_by)

+

     assert 0. <= denoising_strength <= 1., 'can only work with strength in [0.0, 1.0]'

 

     p = StableDiffusionProcessingImg2Img(

@@ -151,7 +160,7 @@ def img2img(id_task: str, mode: int, prompt: str, negative_prompt: str, prompt_s
         override_settings=override_settings,

     )

 

-    p.scripts = modules.scripts.scripts_txt2img

+    p.scripts = modules.scripts.scripts_img2img

     p.script_args = args

 

     if shared.cmd_opts.enable_console_prompts: