fix: compatibility patch for updated ComfyUI

https://github.com/comfyanonymous/ComfyUI/commit/156a28786be9ba6352061090096462bfb1b485bb

https://github.com/ltdrdata/ComfyUI-Impact-Pack/issues/821

modules/impact/config.py

@@ -1,10 +1,10 @@
 import configparser
 import os
 
-version_code = [7, 11]
+version_code = [7, 11, 4]
 version = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
-dependency_version = 23
+dependency_version = 24
 
 my_path = os.path.dirname(__file__)
 old_config_path = os.path.join(my_path, "impact-pack.ini")

modules/impact/core.py

@@ -319,7 +319,12 @@ def enhance_detail(image, model, clip, vae, guide_size, guide_size_for_bbox, max
 
     # prepare mask
     if noise_mask is not None and inpaint_model:
-        positive, negative, latent_image = nodes.InpaintModelConditioning().encode(positive, negative, upscaled_image, vae, noise_mask)
+        imc_encode = nodes.InpaintModelConditioning().encode
+        if 'noise_mask' in inspect.signature(imc_encode).parameters:
+            positive, negative, latent_image = imc_encode(positive, negative, upscaled_image, vae, mask=noise_mask, noise_mask=True)
+        else:
+            print(f"[Impact Pack] ComfyUI is an outdated version.")
+            positive, negative, latent_image = imc_encode(positive, negative, upscaled_image, vae, noise_mask)
     else:
         latent_image = to_latent_image(upscaled_image, vae)
         if noise_mask is not None:
@@ -1354,9 +1359,14 @@ def segs_to_masklist(segs):
     return masks
 
 
-def vae_decode(vae, samples, use_tile, hook, tile_size=512):
+def vae_decode(vae, samples, use_tile, hook, tile_size=512, overlap=64):
     if use_tile:
-        pixels = nodes.VAEDecodeTiled().decode(vae, samples, tile_size)[0]
+        decoder = nodes.VAEDecodeTiled()
+        if 'overlap' in inspect.signature(decoder.decode).parameters:
+            pixels = decoder.decode(vae, samples, tile_size, overlap=overlap)[0]
+        else:
+            print(f"[Impact Pack] Your ComfyUI is outdated.")
+            pixels = decoder.decode(vae, samples, tile_size)[0]
     else:
         pixels = nodes.VAEDecode().decode(vae, samples)[0]
 
@@ -1378,12 +1388,12 @@ def vae_encode(vae, pixels, use_tile, hook, tile_size=512):
     return samples
 
 
-def latent_upscale_on_pixel_space_shape(samples, scale_method, w, h, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None):
-    return latent_upscale_on_pixel_space_shape2(samples, scale_method, w, h, vae, use_tile, tile_size, save_temp_prefix, hook)[0]
+def latent_upscale_on_pixel_space_shape(samples, scale_method, w, h, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None, overlap=64):
+    return latent_upscale_on_pixel_space_shape2(samples, scale_method, w, h, vae, use_tile, tile_size, save_temp_prefix, hook, overlap=overlap)[0]
 
 
-def latent_upscale_on_pixel_space_shape2(samples, scale_method, w, h, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None):
-    pixels = vae_decode(vae, samples, use_tile, hook, tile_size=tile_size)
+def latent_upscale_on_pixel_space_shape2(samples, scale_method, w, h, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None, overlap=64):
+    pixels = vae_decode(vae, samples, use_tile, hook, tile_size=tile_size, overlap=overlap)
 
     if save_temp_prefix is not None:
         nodes.PreviewImage().save_images(pixels, filename_prefix=save_temp_prefix)
@@ -1397,12 +1407,12 @@ def latent_upscale_on_pixel_space_shape2(samples, scale_method, w, h, vae, use_t
     return (vae_encode(vae, pixels, use_tile, hook, tile_size=tile_size), old_pixels)
 
 
-def latent_upscale_on_pixel_space(samples, scale_method, scale_factor, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None):
-    return latent_upscale_on_pixel_space2(samples, scale_method, scale_factor, vae, use_tile, tile_size, save_temp_prefix, hook)[0]
+def latent_upscale_on_pixel_space(samples, scale_method, scale_factor, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None, overlap=64):
+    return latent_upscale_on_pixel_space2(samples, scale_method, scale_factor, vae, use_tile, tile_size, save_temp_prefix, hook, overlap=overlap)[0]
 
 
-def latent_upscale_on_pixel_space2(samples, scale_method, scale_factor, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None):
-    pixels = vae_decode(vae, samples, use_tile, hook, tile_size=tile_size)
+def latent_upscale_on_pixel_space2(samples, scale_method, scale_factor, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None, overlap=64):
+    pixels = vae_decode(vae, samples, use_tile, hook, tile_size=tile_size, overlap=overlap)
 
     if save_temp_prefix is not None:
         nodes.PreviewImage().save_images(pixels, filename_prefix=save_temp_prefix)
@@ -1418,12 +1428,12 @@ def latent_upscale_on_pixel_space2(samples, scale_method, scale_factor, vae, use
     return (vae_encode(vae, pixels, use_tile, hook, tile_size=tile_size), old_pixels)
 
 
-def latent_upscale_on_pixel_space_with_model_shape(samples, scale_method, upscale_model, new_w, new_h, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None):
-    return latent_upscale_on_pixel_space_with_model_shape2(samples, scale_method, upscale_model, new_w, new_h, vae, use_tile, tile_size, save_temp_prefix, hook)[0]
+def latent_upscale_on_pixel_space_with_model_shape(samples, scale_method, upscale_model, new_w, new_h, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None, overlap=64):
+    return latent_upscale_on_pixel_space_with_model_shape2(samples, scale_method, upscale_model, new_w, new_h, vae, use_tile, tile_size, save_temp_prefix, hook, overlap=overlap)[0]
 
 
-def latent_upscale_on_pixel_space_with_model_shape2(samples, scale_method, upscale_model, new_w, new_h, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None):
-    pixels = vae_decode(vae, samples, use_tile, hook, tile_size=tile_size)
+def latent_upscale_on_pixel_space_with_model_shape2(samples, scale_method, upscale_model, new_w, new_h, vae, use_tile=False, tile_size=512, save_temp_prefix=None, hook=None, overlap=64):
+    pixels = vae_decode(vae, samples, use_tile, hook, tile_size=tile_size, overlap=overlap)
 
     if save_temp_prefix is not None:
         nodes.PreviewImage().save_images(pixels, filename_prefix=save_temp_prefix)
@@ -1450,12 +1460,12 @@ def latent_upscale_on_pixel_space_with_model_shape2(samples, scale_method, upsca
 
 
 def latent_upscale_on_pixel_space_with_model(samples, scale_method, upscale_model, scale_factor, vae, use_tile=False,
-                                             tile_size=512, save_temp_prefix=None, hook=None):
-    return latent_upscale_on_pixel_space_with_model2(samples, scale_method, upscale_model, scale_factor, vae, use_tile, tile_size, save_temp_prefix, hook)[0]
+                                             tile_size=512, save_temp_prefix=None, hook=None, overlap=64):
+    return latent_upscale_on_pixel_space_with_model2(samples, scale_method, upscale_model, scale_factor, vae, use_tile, tile_size, save_temp_prefix, hook, overlap=overlap)[0]
 
 def latent_upscale_on_pixel_space_with_model2(samples, scale_method, upscale_model, scale_factor, vae, use_tile=False,
-                                              tile_size=512, save_temp_prefix=None, hook=None):
-    pixels = vae_decode(vae, samples, use_tile, hook, tile_size=tile_size)
+                                              tile_size=512, save_temp_prefix=None, hook=None, overlap=64):
+    pixels = vae_decode(vae, samples, use_tile, hook, tile_size=tile_size, overlap=overlap)
 
     if save_temp_prefix is not None:
         nodes.PreviewImage().save_images(pixels, filename_prefix=save_temp_prefix)

modules/impact/segs_nodes.py

@@ -896,7 +896,7 @@ class From_SEG_ELT_bbox:
     CATEGORY = "ImpactPack/Util"
 
     def doit(self, bbox):
-        return bbox
+        return [int(c) for c in bbox]
 
 
 class From_SEG_ELT_crop_region:
@@ -1101,10 +1101,10 @@ class SEG_ELT_BBOX_ScaleBy:
         x1, y1, x2, y2 = x1-cx1, y1-cy1, x2-cx1, y2-cy1
         h, w = mask.shape
 
-        x1 = min(w-1, max(0, x1))
-        x2 = min(w-1, max(0, x2))
-        y1 = min(h-1, max(0, y1))
-        y2 = min(h-1, max(0, y2))
+        x1 = int(min(w-1, max(0, x1)))
+        x2 = int(min(w-1, max(0, x2)))
+        y1 = int(min(h-1, max(0, y1)))
+        y2 = int(min(h-1, max(0, y2)))
 
         mask_cropped = mask.copy()
         mask_cropped[:, :x1] = 0  # zero fill left side

modules/impact/segs_upscaler.py

@@ -106,7 +106,12 @@ def img2img_segs(image, model, clip, vae, seed, steps, cfg, sampler_name, schedu
 
     # prepare mask
     if noise_mask is not None and inpaint_model:
-        positive, negative, latent_image = nodes.InpaintModelConditioning().encode(positive, negative, image, vae, noise_mask)
+        imc_encode = nodes.InpaintModelConditioning().encode
+        if 'noise_mask' in inspect.signature(imc_encode).parameters:
+            positive, negative, latent_image = imc_encode(positive, negative, image, vae, mask=noise_mask, noise_mask=True)
+        else:
+            print(f"[Impact Pack] ComfyUI is an outdated version.")
+            positive, negative, latent_image = imc_encode(positive, negative, image, vae, noise_mask)
     else:
         latent_image = to_latent_image(image, vae)
         if noise_mask is not None:

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-impact-pack"
 description = "This extension offers various detector nodes and detailer nodes that allow you to configure a workflow that automatically enhances facial details. And provide iterative upscaler."
-version = "7.11"
+version = "7.11.4"
 license = { file = "LICENSE.txt" }
 dependencies = ["segment-anything", "scikit-image", "piexif", "transformers", "opencv-python-headless", "GitPython", "scipy>=1.11.4"]