add gradio-inpaint-tool; color-sketch

1 files changed, 13 insertions, 6 deletions

diff --git a/modules/img2img.py b/modules/img2img.py
index be9f3653..00c6f827 100644
--- a/modules/img2img.py
+++ b/modules/img2img.py
@@ -59,18 +59,25 @@ def process_batch(p, input_dir, output_dir, args):
                 processed_image.save(os.path.join(output_dir, filename))

 

 

-def img2img(mode: int, prompt: str, negative_prompt: str, prompt_style: str, prompt_style2: str, init_img, init_img_with_mask, init_img_inpaint, init_mask_inpaint, mask_mode, steps: int, sampler_index: int, mask_blur: int, inpainting_fill: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, 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, *args):

+def img2img(mode: int, prompt: str, negative_prompt: str, prompt_style: str, prompt_style2: str, init_img, init_img_with_mask, init_img_with_mask_orig, init_img_inpaint, init_mask_inpaint, mask_mode, steps: int, sampler_index: int, mask_blur: int, inpainting_fill: int, restore_faces: bool, tiling: bool, n_iter: int, batch_size: int, 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, *args):

     is_inpaint = mode == 1

     is_batch = mode == 2

 

     if is_inpaint:

         # Drawn mask

         if mask_mode == 0:

-            image = init_img_with_mask['image']

-            mask = 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')

-            image = image.convert('RGB')

+            image = init_img_with_mask

+            is_mask_sketch = isinstance(image, dict)

+            if is_mask_sketch:  

+                # Sketch: mask iff. not transparent

+                image, mask = image["image"], image["mask"]

+                mask = np.array(mask)[..., -1] > 0

+            else:

+                # Color-sketch: mask iff. painted over

+                orig = init_img_with_mask_orig or image

+                mask = np.any(np.array(image) != np.array(orig), axis=-1)

+            mask = Image.fromarray(mask.astype(np.uint8) * 255, "L")

+            image = image.convert("RGB")

         # Uploaded mask

         else:

             image = init_img_inpaint