improved: tooltips

Now refresh feature is moved to menu item.
`Edit > Impact: Refresh Wildcard`

.gitignore

@@ -7,3 +7,5 @@ subpack
 impact_subpack
 *.txt
 *.yaml
+!requirements.txt
+!LICENSE.txt

install.py

@@ -69,7 +69,6 @@ def process_wrap(cmd_str, cwd=None, handler=None, env=None):
 
 try:
     import platform
-    import folder_paths
     from torchvision.datasets.utils import download_url
     import impact.config
 

js/impact-pack.js

@@ -222,6 +222,31 @@ api.addEventListener("executed", progressExecuteHandler);
 
 app.registerExtension({
 	name: "Comfy.Impack",
+
+    commands: [
+      {
+        id: 'refresh-impact-wildcard',
+        label: 'Impact: Refresh Wildcard',
+        function: async () => {
+        	await api.fetchApi('/impact/wildcards/refresh');
+        	await load_wildcards();
+        	app.extensionManager.toast.add({
+				severity: 'info',
+				summary: 'Refreshed!',
+				detail: 'Impact Wildcard List is refreshed!!',
+				life: 3000
+			});
+        }
+      }
+    ],
+
+    menuCommands: [
+      {
+        path: ['Edit'],
+        commands: ['refresh-impact-wildcard']
+      }
+    ],
+
 	loadedGraphNode(node, app) {
 		if (node.comfyClass == "MaskPainter") {
 			input_dirty[node.id + ""] = true;

js/impact-wildcard.js

@@ -1,20 +0,0 @@
-import { ComfyApp, app } from "../../scripts/app.js";
-import { api } from "../../scripts/api.js";
-
-let refresh_btn = document.getElementById('comfy-refresh-button');
-let refresh_btn2 = document.querySelector('button[title="Refresh widgets in nodes to find new models or files"]');
-
-let orig = refresh_btn.onclick;
-
-if(refresh_btn) {
-    refresh_btn.onclick = function() {
-        orig();
-        api.fetchApi('/impact/wildcards/refresh');
-    };
-}
-
-if(refresh_btn2) {
-    refresh_btn2?.addEventListener('click', function() {
-        api.fetchApi('/impact/wildcards/refresh');
-    });
-}

modules/impact/animatediff_nodes.py

@@ -27,7 +27,7 @@ class SEGSDetailerForAnimateDiff:
                      "sampler_name": (comfy.samplers.KSampler.SAMPLERS,),
                      "scheduler": (core.SCHEDULERS,),
                      "denoise": ("FLOAT", {"default": 0.5, "min": 0.0001, "max": 1.0, "step": 0.01}),
-                     "basic_pipe": ("BASIC_PIPE",),
+                     "basic_pipe": ("BASIC_PIPE", {"tooltip": "If the `ImpactDummyInput` is connected to the model in the basic_pipe, the inference stage is skipped."}),
                      "refiner_ratio": ("FLOAT", {"default": 0.2, "min": 0.0, "max": 1.0}),
                      },
                 "optional": {
@@ -60,7 +60,7 @@ class SEGSDetailerForAnimateDiff:
         new_segs = []
         cnet_image_list = []
 
-        if noise_mask_feather > 0 and 'denoise_mask_function' not in model.model_options:
+        if not (isinstance(model, str) and model == "DUMMY") and noise_mask_feather > 0 and 'denoise_mask_function' not in model.model_options:
             model = nodes_differential_diffusion.DifferentialDiffusion().apply(model)[0]
 
         for seg in segs[1]:
@@ -94,13 +94,18 @@ class SEGSDetailerForAnimateDiff:
                 for condition, details in negative
             ]
 
-            enhanced_image_tensor, cnet_images = core.enhance_detail_for_animatediff(cropped_image_frames, model, clip, vae, guide_size, guide_size_for, max_size,
-                                                                                     seg.bbox, seed, steps, cfg, sampler_name, scheduler,
-                                                                                     cropped_positive, cropped_negative, denoise, seg.cropped_mask,
-                                                                                     refiner_ratio=refiner_ratio, refiner_model=refiner_model,
-                                                                                     refiner_clip=refiner_clip, refiner_positive=refiner_positive,
-                                                                                     refiner_negative=refiner_negative, control_net_wrapper=seg.control_net_wrapper,
-                                                                                     noise_mask_feather=noise_mask_feather, scheduler_func=scheduler_func_opt)
+            if not (isinstance(model, str) and model == "DUMMY"):
+                enhanced_image_tensor, cnet_images = core.enhance_detail_for_animatediff(cropped_image_frames, model, clip, vae, guide_size, guide_size_for, max_size,
+                                                                                         seg.bbox, seed, steps, cfg, sampler_name, scheduler,
+                                                                                         cropped_positive, cropped_negative, denoise, seg.cropped_mask,
+                                                                                         refiner_ratio=refiner_ratio, refiner_model=refiner_model,
+                                                                                         refiner_clip=refiner_clip, refiner_positive=refiner_positive,
+                                                                                         refiner_negative=refiner_negative, control_net_wrapper=seg.control_net_wrapper,
+                                                                                         noise_mask_feather=noise_mask_feather, scheduler_func=scheduler_func_opt)
+            else:
+                enhanced_image_tensor = cropped_image_frames
+                cnet_images = None
+
             if cnet_images is not None:
                 cnet_image_list.extend(cnet_images)
 
@@ -143,7 +148,7 @@ class DetailerForEachPipeForAnimateDiff:
                       "scheduler": (core.SCHEDULERS,),
                       "denoise": ("FLOAT", {"default": 0.5, "min": 0.0001, "max": 1.0, "step": 0.01}),
                       "feather": ("INT", {"default": 5, "min": 0, "max": 100, "step": 1}),
-                      "basic_pipe": ("BASIC_PIPE", ),
+                      "basic_pipe": ("BASIC_PIPE", {"tooltip": "If the `ImpactDummyInput` is connected to the model in the basic_pipe, the inference stage is skipped."}),
                       "refiner_ratio": ("FLOAT", {"default": 0.2, "min": 0.0, "max": 1.0}),
                       },
                 "optional": {

modules/impact/config.py

@@ -1,7 +1,7 @@
 import configparser
 import os
 
-version_code = [8, 1, 4]
+version_code = [8, 3, 1]
 version = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 dependency_version = 24

modules/impact/core.py

@@ -1953,7 +1953,7 @@ class PixelTiledKSampleUpscaler:
     def __init__(self, scale_method, model, vae, seed, steps, cfg, sampler_name, scheduler, positive, negative,
                  denoise,
                  tile_width, tile_height, tiling_strategy,
-                 upscale_model_opt=None, hook_opt=None, tile_cnet_opt=None, tile_size=512, tile_cnet_strength=1.0):
+                 upscale_model_opt=None, hook_opt=None, tile_cnet_opt=None, tile_size=512, tile_cnet_strength=1.0, overlap=64):
         self.params = scale_method, model, vae, seed, steps, cfg, sampler_name, scheduler, positive, negative, denoise
         self.vae = vae
         self.tile_params = tile_width, tile_height, tiling_strategy
@@ -1963,6 +1963,7 @@ class PixelTiledKSampleUpscaler:
         self.tile_size = tile_size
         self.is_tiled = True
         self.tile_cnet_strength = tile_cnet_strength
+        self.overlap = overlap
 
     def tiled_ksample(self, latent, images):
         if "BNK_TiledKSampler" in nodes.NODE_CLASS_MAPPINGS:

modules/impact/impact_pack.py

@@ -28,6 +28,7 @@ import base64
 import impact.wildcards as wildcards
 from . import hooks
 from . import utils
+import inspect
 
 
 try:
@@ -191,7 +192,7 @@ class DetailerForEach:
         return {"required": {
                     "image": ("IMAGE", ),
                     "segs": ("SEGS", ),
-                    "model": ("MODEL",),
+                    "model": ("MODEL", {"tooltip": "If the `ImpactDummyInput` is connected to the model, the inference stage is skipped."}),
                     "clip": ("CLIP",),
                     "vae": ("VAE",),
                     "guide_size": ("FLOAT", {"default": 512, "min": 64, "max": nodes.MAX_RESOLUTION, "step": 8}),
@@ -269,7 +270,7 @@ class DetailerForEach:
         else:
             ordered_segs = segs[1]
 
-        if noise_mask_feather > 0 and 'denoise_mask_function' not in model.model_options:
+        if not (isinstance(model, str) and model == "DUMMY") and noise_mask_feather > 0 and 'denoise_mask_function' not in model.model_options:
             model = nodes_differential_diffusion.DifferentialDiffusion().apply(model)[0]
 
         for i, seg in enumerate(ordered_segs):
@@ -297,13 +298,16 @@ class DetailerForEach:
 
             seg_seed = seed + i if seg_seed is None else seg_seed
 
-            cropped_positive = [
-                [condition, {
-                    k: core.crop_condition_mask(v, image, seg.crop_region) if k == "mask" else v
-                    for k, v in details.items()
-                }]
-                for condition, details in positive
-            ]
+            if not isinstance(positive, str):
+                cropped_positive = [
+                    [condition, {
+                        k: core.crop_condition_mask(v, image, seg.crop_region) if k == "mask" else v
+                        for k, v in details.items()
+                    }]
+                    for condition, details in positive
+                ]
+            else:
+                cropped_positive = positive
 
             if not isinstance(negative, str):
                 cropped_negative = [
@@ -324,16 +328,20 @@ class DetailerForEach:
                 break
 
             orig_cropped_image = cropped_image.clone()
-            enhanced_image, cnet_pils = core.enhance_detail(cropped_image, model, clip, vae, guide_size, guide_size_for_bbox, max_size,
-                                                            seg.bbox, seg_seed, steps, cfg, sampler_name, scheduler,
-                                                            cropped_positive, cropped_negative, denoise, cropped_mask, force_inpaint,
-                                                            wildcard_opt=wildcard_item, wildcard_opt_concat_mode=wildcard_concat_mode,
-                                                            detailer_hook=detailer_hook,
-                                                            refiner_ratio=refiner_ratio, refiner_model=refiner_model,
-                                                            refiner_clip=refiner_clip, refiner_positive=refiner_positive,
-                                                            refiner_negative=refiner_negative, control_net_wrapper=seg.control_net_wrapper,
-                                                            cycle=cycle, inpaint_model=inpaint_model, noise_mask_feather=noise_mask_feather,
-                                                            scheduler_func=scheduler_func_opt)
+            if not (isinstance(model, str) and model == "DUMMY"):
+                enhanced_image, cnet_pils = core.enhance_detail(cropped_image, model, clip, vae, guide_size, guide_size_for_bbox, max_size,
+                                                                seg.bbox, seg_seed, steps, cfg, sampler_name, scheduler,
+                                                                cropped_positive, cropped_negative, denoise, cropped_mask, force_inpaint,
+                                                                wildcard_opt=wildcard_item, wildcard_opt_concat_mode=wildcard_concat_mode,
+                                                                detailer_hook=detailer_hook,
+                                                                refiner_ratio=refiner_ratio, refiner_model=refiner_model,
+                                                                refiner_clip=refiner_clip, refiner_positive=refiner_positive,
+                                                                refiner_negative=refiner_negative, control_net_wrapper=seg.control_net_wrapper,
+                                                                cycle=cycle, inpaint_model=inpaint_model, noise_mask_feather=noise_mask_feather,
+                                                                scheduler_func=scheduler_func_opt)
+            else:
+                enhanced_image = cropped_image
+                cnet_pils = None
 
             if cnet_pils is not None:
                 cnet_pil_list.extend(cnet_pils)
@@ -405,7 +413,7 @@ class DetailerForEachPipe:
                       "feather": ("INT", {"default": 5, "min": 0, "max": 100, "step": 1}),
                       "noise_mask": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled"}),
                       "force_inpaint": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled"}),
-                      "basic_pipe": ("BASIC_PIPE", ),
+                      "basic_pipe": ("BASIC_PIPE", {"tooltip": "If the `ImpactDummyInput` is connected to the model in the basic_pipe, the inference stage is skipped."}),
                       "wildcard": ("STRING", {"multiline": True, "dynamicPrompts": False}),
                       "refiner_ratio": ("FLOAT", {"default": 0.2, "min": 0.0, "max": 1.0}),
 
@@ -462,7 +470,7 @@ class FaceDetailer:
     def INPUT_TYPES(s):
         return {"required": {
                      "image": ("IMAGE", ),
-                     "model": ("MODEL",),
+                     "model": ("MODEL", {"tooltip": "If the `ImpactDummyInput` is connected to the model, the inference stage is skipped."}),
                      "clip": ("CLIP",),
                      "vae": ("VAE",),
                      "guide_size": ("FLOAT", {"default": 512, "min": 64, "max": nodes.MAX_RESOLUTION, "step": 8}),
@@ -986,6 +994,7 @@ class PixelTiledKSampleUpscalerProvider:
                         "pk_hook_opt": ("PK_HOOK", ),
                         "tile_cnet_opt": ("CONTROL_NET", ),
                         "tile_cnet_strength": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}),
+                        "overlap": ("INT", {"default": 64, "min": 0, "max": 4096, "step": 32}),
                     }
                 }
 
@@ -995,11 +1004,11 @@ class PixelTiledKSampleUpscalerProvider:
     CATEGORY = "ImpactPack/Upscale"
 
     def doit(self, scale_method, model, vae, seed, steps, cfg, sampler_name, scheduler, positive, negative, denoise, tile_width, tile_height, tiling_strategy, upscale_model_opt=None,
-             pk_hook_opt=None, tile_cnet_opt=None, tile_cnet_strength=1.0):
+             pk_hook_opt=None, tile_cnet_opt=None, tile_cnet_strength=1.0, overlap=64):
         if "BNK_TiledKSampler" in nodes.NODE_CLASS_MAPPINGS:
             upscaler = core.PixelTiledKSampleUpscaler(scale_method, model, vae, seed, steps, cfg, sampler_name, scheduler, positive, negative, denoise,
                                                       tile_width, tile_height, tiling_strategy, upscale_model_opt, pk_hook_opt, tile_cnet_opt,
-                                                      tile_size=max(tile_width, tile_height), tile_cnet_strength=tile_cnet_strength)
+                                                      tile_size=max(tile_width, tile_height), tile_cnet_strength=tile_cnet_strength, overlap=overlap)
             return (upscaler, )
         else:
             utils.try_install_custom_node('https://github.com/BlenderNeko/ComfyUI_TiledKSampler',
@@ -1312,7 +1321,11 @@ class IterativeImageUpscale:
 
         core.update_node_status(unique_id, "VAEEncode (first)", 0)
         if upscaler.is_tiled:
-            latent = nodes.VAEEncodeTiled().encode(vae, pixels, upscaler.tile_size)[0]
+            encoder = nodes.VAEEncodeTiled()
+            if 'overlap' in inspect.signature(encoder.encode).parameters:
+                latent = encoder.encode(vae, pixels, upscaler.tile_size, overlap=upscaler.overlap)[0]
+            else:
+                latent = encoder.encode(vae, pixels, upscaler.tile_size)[0]
         else:
             latent = nodes.VAEEncode().encode(vae, pixels)[0]
 
@@ -1334,7 +1347,7 @@ class FaceDetailerPipe:
     def INPUT_TYPES(s):
         return {"required": {
                     "image": ("IMAGE", ),
-                    "detailer_pipe": ("DETAILER_PIPE",),
+                    "detailer_pipe": ("DETAILER_PIPE", {"tooltip": "If the `ImpactDummyInput` is connected to the model in the detailer_pipe, the inference stage is skipped."}),
                     "guide_size": ("FLOAT", {"default": 512, "min": 64, "max": nodes.MAX_RESOLUTION, "step": 8}),
                     "guide_size_for": ("BOOLEAN", {"default": True, "label_on": "bbox", "label_off": "crop_region"}),
                     "max_size": ("FLOAT", {"default": 1024, "min": 64, "max": nodes.MAX_RESOLUTION, "step": 8}),

modules/impact/segs_nodes.py

@@ -38,7 +38,7 @@ class SEGSDetailer:
                      "denoise": ("FLOAT", {"default": 0.5, "min": 0.0001, "max": 1.0, "step": 0.01}),
                      "noise_mask": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled"}),
                      "force_inpaint": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled"}),
-                     "basic_pipe": ("BASIC_PIPE",),
+                     "basic_pipe": ("BASIC_PIPE", {"tooltip": "If the `ImpactDummyInput` is connected to the model in the basic_pipe, the inference stage is skipped."}),
                      "refiner_ratio": ("FLOAT", {"default": 0.2, "min": 0.0, "max": 1.0}),
                      "batch_size": ("INT", {"default": 1, "min": 1, "max": 100}),
 
@@ -76,7 +76,7 @@ class SEGSDetailer:
         new_segs = []
         cnet_pil_list = []
 
-        if noise_mask_feather > 0 and 'denoise_mask_function' not in model.model_options:
+        if not (isinstance(model, str) and model == "DUMMY") and noise_mask_feather > 0 and 'denoise_mask_function' not in model.model_options:
             model = nodes_differential_diffusion.DifferentialDiffusion().apply(model)[0]
 
         for i in range(batch_size):
@@ -113,13 +113,17 @@ class SEGSDetailer:
                     for condition, details in negative
                 ]
 
-                enhanced_image, cnet_pils = core.enhance_detail(cropped_image, model, clip, vae, guide_size, guide_size_for, max_size,
-                                                                seg.bbox, seed, steps, cfg, sampler_name, scheduler,
-                                                                cropped_positive, cropped_negative, denoise, cropped_mask, force_inpaint,
-                                                                refiner_ratio=refiner_ratio, refiner_model=refiner_model,
-                                                                refiner_clip=refiner_clip, refiner_positive=refiner_positive, refiner_negative=refiner_negative,
-                                                                control_net_wrapper=seg.control_net_wrapper, cycle=cycle,
-                                                                inpaint_model=inpaint_model, noise_mask_feather=noise_mask_feather, scheduler_func=scheduler_func_opt)
+                if not (isinstance(model, str) and model == "DUMMY"):
+                    enhanced_image, cnet_pils = core.enhance_detail(cropped_image, model, clip, vae, guide_size, guide_size_for, max_size,
+                                                                    seg.bbox, seed, steps, cfg, sampler_name, scheduler,
+                                                                    cropped_positive, cropped_negative, denoise, cropped_mask, force_inpaint,
+                                                                    refiner_ratio=refiner_ratio, refiner_model=refiner_model,
+                                                                    refiner_clip=refiner_clip, refiner_positive=refiner_positive, refiner_negative=refiner_negative,
+                                                                    control_net_wrapper=seg.control_net_wrapper, cycle=cycle,
+                                                                    inpaint_model=inpaint_model, noise_mask_feather=noise_mask_feather, scheduler_func=scheduler_func_opt)
+                else:
+                    enhanced_image = cropped_image
+                    cnet_pils = None
 
                 if cnet_pils is not None:
                     cnet_pil_list.extend(cnet_pils)

modules/impact/util_nodes.py

@@ -526,6 +526,9 @@ class ReencodeLatent:
                         "output_vae": ("VAE", ),
                         "tile_size": ("INT", {"default": 512, "min": 320, "max": 4096, "step": 64}),
                     },
+                "optional": {
+                    "overlap": ("INT", {"default": 64, "min": 0, "max": 4096, "step": 32, "tooltip": "This setting applies when 'tile_mode' is enabled."}),
+                    }
                 }
 
     CATEGORY = "ImpactPack/Util"
@@ -533,14 +536,22 @@ class ReencodeLatent:
     RETURN_TYPES = ("LATENT", )
     FUNCTION = "doit"
 
-    def doit(self, samples, tile_mode, input_vae, output_vae, tile_size=512):
+    def doit(self, samples, tile_mode, input_vae, output_vae, tile_size=512, overlap=64):
         if tile_mode in ["Both", "Decode(input) only"]:
-            pixels = nodes.VAEDecodeTiled().decode(input_vae, samples, tile_size)[0]
+            decoder = nodes.VAEDecodeTiled()
+            if 'overlap' in inspect.signature(decoder.decode).parameters:
+                pixels = decoder.decode(input_vae, samples, tile_size, overlap=overlap)[0]
+            else:
+                pixels = decoder.decode(input_vae, samples, tile_size, overlap=overlap)[0]
         else:
             pixels = nodes.VAEDecode().decode(input_vae, samples)[0]
 
         if tile_mode in ["Both", "Encode(output) only"]:
-            return nodes.VAEEncodeTiled().encode(output_vae, pixels, tile_size)
+            encoder = nodes.VAEEncodeTiled()
+            if 'overlap' in inspect.signature(encoder.encode).parameters:
+                return encoder.encode(output_vae, pixels, tile_size, overlap=overlap)
+            else:
+                return encoder.encode(output_vae, pixels, tile_size)
         else:
             return nodes.VAEEncode().encode(output_vae, pixels)
 

pyproject.toml

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