fix: PreviewDetailerHookProvider - invalid behavior since PR2666

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

README.md

@@ -7,6 +7,8 @@ This custom node helps to conveniently enhance images through Detector, Detailer
 
 
 ## NOTICE 
+* V7.0: Supports Switch based on Execution Model Inversion.
+* V6.0: Supports FLUX.1 model in Impact KSampler, Detailers, PreviewBridgeLatent
 * V5.0: It is no longer compatible with versions of ComfyUI before 2024.04.08. 
 * V4.87.4: Update to a version of ComfyUI after 2024.04.08 for proper functionality.
 * V4.85: Incompatible with the outdated **ComfyUI IPAdapter Plus**. (A version dated March 24th or later is required.)
@@ -189,15 +191,11 @@ This custom node helps to conveniently enhance images through Detector, Detailer
     * Furthermore, LatentSender is implemented with PreviewLatent, which stores the latent in payload form within the image thumbnail.
     * Due to the current structure of ComfyUI, it is unable to distinguish between SDXL latent and SD1.5/SD2.1 latent. Therefore, it generates thumbnails by decoding them using the SD1.5 method.
 
-
 ### Switch nodes
   * `Switch (image,mask)`, `Switch (latent)`, `Switch (SEGS)` - Among multiple inputs, it selects the input designated by the selector and outputs it. The first input must be provided, while the others are optional. However, if the input specified by the selector is not connected, an error may occur.
   * `Switch (Any)` - This is a Switch node that takes an arbitrary number of inputs and produces a single output. Its type is determined when connected to any node, and connecting inputs increases the available slots for connections.
-  * `Inversed Switch (Any)` - In contrast to `Switch (Any)`, it takes a single input and outputs one of many. Due to ComfyUI's functional limitations, the value of `select` must be determined at the time of queuing a prompt, and while it can serve as a `Primitive Node` or `ImpactInt`, it cannot function properly when connected through other nodes. 
-  * Guide
-    * When the `Switch (Any)` and `Inversed Switch (Any)` selects are transformed into primitives, it's important to be cautious because the select range is not appropriately constrained, potentially leading to unintended behavior.   
-    * `Switch (image,mask)`, `Switch (latent)`, `Switch (SEGS)`, `Switch (Any)` supports `sel_mode` param. The `sel_mode` sets the moment at which the `select` parameter is determined. `select_on_prompt` determines the `select` at the time of queuing the prompt, while `select_on_execution` determines it during the execution of the workflow. While `select_on_execution` offers more flexibility, it can potentially trigger workflow execution errors due to running nodes that may be impossible to execute within the limitations of ComfyUI. `select_on_prompt` bypasses this constraint by treating any inputs not selected as if they were disconnected. However, please note that when using `select_on_prompt`, the `select` can only be used with widgets or `Primitive Nodes` determined at the queue prompt.
-    * There is an issue when connecting the built-in reroute node with the switch's input/output slots. it can lead to forced disconnections during workflow loading. Therefore, it is advisable not to use reroute for making connections in such cases. However, there are no issues when using the reroute node in Pythongossss.
+  * `Inversed Switch (Any)` - In contrast to `Switch (Any)`, it takes a single input and outputs one of many.
+  * NOTE: See this [tutorial](https://github.com/ltdrdata/ComfyUI-extension-tutorials/blob/Main/ComfyUI-Impact-Pack/tutorial/switch.md) 
 
 ### [Wildcards](http://github.com/ltdrdata/ComfyUI-extension-tutorials/blob/Main/ComfyUI-Impact-Pack/tutorial/ImpactWildcard.md) nodes
   * These are nodes that supports syntax in the form of `__wildcard-name__` and dynamic prompt syntax like `{a|b|c}`.
@@ -220,6 +218,7 @@ This custom node helps to conveniently enhance images through Detector, Detailer
   * `RegionalSamplerAdvanced` - This is the Advanced version of the RegionalSampler. You can control it using `step` instead of `denoise`.
     > NOTE: The `sde` sampler and `uni_pc` sampler introduce additional noise during each step of the sampling process. To mitigate this, when sampling each region, the `uni_pc` sampler applies additional `dpmpp_fast`, and the sde sampler applies the `dpmpp_2m` sampler as an additional measure.
 
+
 ### Impact KSampler
   * These samplers support basic_pipe and AYS scheduler
   * `KSampler (pipe)` - pipe version of KSampler
@@ -278,6 +277,9 @@ This custom node helps to conveniently enhance images through Detector, Detailer
   * `String Selector` - It selects and returns a portion of the string. When `multiline` mode is disabled, it simply returns the string of the line pointed to by the selector. When `multiline` mode is enabled, it divides the string based on lines that start with `#` and returns them. If the `select` value is larger than the number of items, it will start counting from the first line again and return accordingly.
   * `Combine Conditionings` - It takes multiple conditionings as input and combines them into a single conditioning.
   * `Concat Conditionings` - It takes multiple conditionings as input and concat them into a single conditioning.
+  * `Negative Cond Placeholder` - Models like FLUX.1 do not use Negative Conditioning. This is a placeholder node for them. You can use FLUX.1 by replacing the Negative Conditioning used in Impact KSampler, KSampler (Inspire), and Detailer with this node.
+  * `Execution Order Controller` - A helper node that can forcibly control the execution order of nodes.
+    * Connect the output of the node that should be executed first to the signal, and make the input of the node that should be executed later pass through this node.
 
 
 ## MMDet nodes (DEPRECATED) - Don't use these nodes

__init__.py

@@ -208,6 +208,8 @@ NODE_CLASS_MAPPINGS = {
     "KSamplerAdvancedProvider": KSamplerAdvancedProvider,
     "TwoAdvancedSamplersForMask": TwoAdvancedSamplersForMask,
 
+    "ImpactNegativeConditioningPlaceholder": NegativeConditioningPlaceholder,
+
     "PreviewBridge": PreviewBridge,
     "PreviewBridgeLatent": PreviewBridgeLatent,
     "ImageSender": ImageSender,
@@ -279,6 +281,7 @@ NODE_CLASS_MAPPINGS = {
     "ImpactStringSelector": StringSelector,
     "StringListToString": StringListToString,
     "WildcardPromptFromString": WildcardPromptFromString,
+    "ImpactExecutionOrderController": ImpactExecutionOrderController,
 
     "RemoveNoiseMask": RemoveNoiseMask,
 
@@ -395,6 +398,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
     "ImageMaskSwitch": "Switch (images, mask)",
     "ImpactSwitch": "Switch (Any)",
     "ImpactInversedSwitch": "Inversed Switch (Any)",
+    "ImpactExecutionOrderController": "Execution Order Controller",
 
     "MasksToMaskList": "Masks to Mask List",
     "MaskListToMaskBatch": "Mask List to Masks",
@@ -433,6 +437,7 @@ NODE_DISPLAY_NAME_MAPPINGS = {
 
     "ImpactSchedulerAdapter": "Impact Scheduler Adapter",
     "GITSSchedulerFuncProvider": "GITSScheduler Func Provider",
+    "ImpactNegativeConditioningPlaceholder": "Negative Cond Placeholder"
 }
 
 if not impact.config.get_config()['mmdet_skip']:

js/impact-pack.js

@@ -507,7 +507,7 @@ app.registerExtension({
 						!stackTrace.includes('LGraphNode.connect') && // for mouse device
 						!stackTrace.includes('loadGraphData') &&
 						this.inputs[index].name != 'select') {
-						this.removeInput(index);
+						    this.removeInput(index);
 					}
 				}
 

modules/impact/bridge_nodes.py

@@ -3,6 +3,7 @@ from PIL import ImageOps
 from impact.utils import *
 import latent_preview
 
+
 # NOTE: this should not be `from . import core`.
 # I don't know why but... 'from .' and 'from impact' refer to different core modules.
 # This separates global variables of the core module and breaks the preview bridge.
@@ -18,7 +19,7 @@ class PreviewBridge:
                     "images": ("IMAGE",),
                     "image": ("STRING", {"default": ""}),
                     },
-                "hidden": {"unique_id": "UNIQUE_ID"},
+                "hidden": {"unique_id": "UNIQUE_ID", "extra_pnginfo": "EXTRA_PNGINFO"},
                 }
 
     RETURN_TYPES = ("IMAGE", "MASK", )
@@ -69,7 +70,7 @@ class PreviewBridge:
 
         return image, mask.unsqueeze(0), ui_item
 
-    def doit(self, images, image, unique_id):
+    def doit(self, images, image, unique_id, prompt=None, extra_pnginfo=None):
         need_refresh = False
 
         if unique_id not in core.preview_bridge_cache:
@@ -82,7 +83,7 @@ class PreviewBridge:
             pixels, mask, path_item = PreviewBridge.load_image(image)
             image = [path_item]
         else:
-            res = nodes.PreviewImage().save_images(images, filename_prefix="PreviewBridge/PB-")
+            res = nodes.PreviewImage().save_images(images, filename_prefix="PreviewBridge/PB-", prompt=prompt, extra_pnginfo=extra_pnginfo)
             image2 = res['ui']['images']
             pixels = images
             mask = torch.zeros((64, 64), dtype=torch.float32, device="cpu")
@@ -118,6 +119,8 @@ def decode_latent(latent, preview_method, vae_opt=None):
             decoder_name = "taesdxl"
         elif preview_method == 'TAESD3':
             decoder_name = "taesd3"
+        elif preview_method == 'TAEF1':
+            decoder_name = "taef1"
 
         if decoder_name:
             vae = nodes.VAELoader().load_vae(decoder_name)[0]
@@ -145,6 +148,9 @@ def decode_latent(latent, preview_method, vae_opt=None):
     elif preview_method == "Latent2RGB-SC-B":
         latent_format = latent_formats.SC_B()
         method = LatentPreviewMethod.Latent2RGB
+    elif preview_method == "Latent2RGB-FLUX.1":
+        latent_format = latent_formats.Flux()
+        method = LatentPreviewMethod.Latent2RGB
     else:
         print(f"[Impact Pack] PreviewBridgeLatent: '{preview_method}' is unsupported preview method.")
         latent_format = latent_formats.SD15()
@@ -166,15 +172,16 @@ class PreviewBridgeLatent:
         return {"required": {
                     "latent": ("LATENT",),
                     "image": ("STRING", {"default": ""}),
-                    "preview_method": (["Latent2RGB-SD3", "Latent2RGB-SDXL", "Latent2RGB-SD15",
+                    "preview_method": (["Latent2RGB-FLUX.1",
+                                        "Latent2RGB-SDXL", "Latent2RGB-SD15", "Latent2RGB-SD3",
                                         "Latent2RGB-SD-X4", "Latent2RGB-Playground-2.5",
                                         "Latent2RGB-SC-Prior", "Latent2RGB-SC-B",
-                                        "TAESD3", "TAESDXL", "TAESD15"],),
+                                        "TAEF1", "TAESDXL", "TAESD15", "TAESD3"],),
                     },
                 "optional": {
                     "vae_opt": ("VAE", )
                 },
-                "hidden": {"unique_id": "UNIQUE_ID"},
+                "hidden": {"unique_id": "UNIQUE_ID", "prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"},
                 }
 
     RETURN_TYPES = ("LATENT", "MASK", )
@@ -226,13 +233,13 @@ class PreviewBridgeLatent:
 
         return image, mask, ui_item
 
-    def doit(self, latent, image, preview_method, vae_opt=None, unique_id=None):
+    def doit(self, latent, image, preview_method, vae_opt=None, unique_id=None, prompt=None, extra_pnginfo=None):
         latent_channels = latent['samples'].shape[1]
-        preview_method_channels = 16 if 'SD3' in preview_method or 'SC-Prior' in preview_method else 4
+        preview_method_channels = 16 if 'SD3' in preview_method or 'SC-Prior' in preview_method or 'FLUX.1' in preview_method or 'TAEF1' == preview_method else 4
 
         if vae_opt is None and latent_channels != preview_method_channels:
-            print(f"[PreviewBridgeLatent] The version of latent is not compatible with preview_method.\nSD3, SD1/SD2, SDXL, SC-Prior, and SC-B are not compatible with each other.")
-            raise Exception("The version of latent is not compatible with preview_method.<BR>SD3, SD1/SD2, SDXL, SC-Prior, and SC-B are not compatible with each other.")
+            print(f"[PreviewBridgeLatent] The version of latent is not compatible with preview_method.\nSD3, SD1/SD2, SDXL, SC-Prior, SC-B and FLUX.1 are not compatible with each other.")
+            raise Exception("The version of latent is not compatible with preview_method.<BR>SD3, SD1/SD2, SDXL, SC-Prior, SC-B and FLUX.1 are not compatible with each other.")
 
         need_refresh = False
 
@@ -282,7 +289,7 @@ class PreviewBridgeLatent:
                             }]
             else:
                 mask = torch.ones(latent['samples'].shape[2:], dtype=torch.float32, device="cpu").unsqueeze(0)
-                res = nodes.PreviewImage().save_images(decoded_image, filename_prefix="PreviewBridge/PBL-")
+                res = nodes.PreviewImage().save_images(decoded_image, filename_prefix="PreviewBridge/PBL-", prompt=prompt, extra_pnginfo=extra_pnginfo)
                 res_image = res['ui']['images']
 
             path = os.path.join(folder_paths.get_temp_directory(), 'PreviewBridge', res_image[0]['filename'])

modules/impact/config.py

@@ -1,7 +1,7 @@
 import configparser
 import os
 
-version_code = [5, 18, 13]
+version_code = [7, 3, 2]
 version = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 dependency_version = 22
@@ -32,6 +32,10 @@ def read_config():
         config.read(config_path)
         default_conf = config['default']
 
+        if not os.path.exists(default_conf['custom_wildcards']):
+            print(f"[WARN] ComfyUI-Impact-Pack: custom_wildcards path not found: {default_conf['custom_wildcards']}. Using default path.")
+            default_conf['custom_wildcards'] = os.path.join(my_path, "..", "..", "custom_wildcards")
+
         return {
                     'dependency_version': int(default_conf['dependency_version']),
                     'mmdet_skip': default_conf['mmdet_skip'].lower() == 'true' if 'mmdet_skip' in default_conf else True,

modules/impact/core.py

@@ -45,6 +45,14 @@ current_prompt = None
 SCHEDULERS = comfy.samplers.KSampler.SCHEDULERS + ['AYS SDXL', 'AYS SD1', 'AYS SVD', 'GITS[coeff=1.2]']
 
 
+def is_execution_model_version_supported():
+    try:
+        import comfy_execution
+        return True
+    except:
+        return False
+
+
 def set_previewbridge_image(node_id, file, item):
     global pb_id_cnt
 

modules/impact/detectors.py

@@ -5,21 +5,31 @@ import impact.utils as utils
 import torch
 from impact.core import SEG
 
+SAM_MODEL_TOOLTIP = {"tooltip": "Segment Anything Model for Silhouette Detection.\nBe sure to use the SAM_MODEL loaded through the SAMLoader (Impact) node as input."}
+SAM_MODEL_TOOLTIP_OPTIONAL = {"tooltip": "[OPTIONAL]\nSegment Anything Model for Silhouette Detection.\nBe sure to use the SAM_MODEL loaded through the SAMLoader (Impact) node as input.\nGiven this input, it refines the rectangular areas detected by BBOX_DETECTOR into silhouette shapes through SAM.\nsam_model_opt takes priority over segm_detector_opt."}
+
+MASK_HINT_THRESHOLD_TOOLTIP = "When detection_hint is mask-area, the mask of SEGS is used as a point hint for SAM (Segment Anything).\nIn this case, only the areas of the mask with brightness values equal to or greater than mask_hint_threshold are used as hints."
+MASK_HINT_USE_NEGATIVE_TOOLTIP = "When detecting with SAM (Segment Anything), negative hints are applied as follows:\nSmall: When the SEGS is smaller than 10 pixels in size\nOuter: Sampling the image area outside the SEGS region at regular intervals"
+
+DILATION_TOOLTIP = "Set the value to dilate the result mask. If the value is negative, it erodes the mask."
+DETECTION_HINT_TOOLTIP = {"tooltip": "It is recommended to use only center-1.\nWhen refining the mask of SEGS with the SAM (Segment Anything) model, center-1 uses only the rectangular area of SEGS and a single point at the exact center as hints.\nOther options were added during the experimental stage and do not work well."}
+
+BBOX_EXPANSION_TOOLTIP = "When performing SAM (Segment Anything) detection within the SEGS area, the rectangular area of SEGS is expanded and used as a hint."
 
 class SAMDetectorCombined:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                        "sam_model": ("SAM_MODEL", ),
-                        "segs": ("SEGS", ),
-                        "image": ("IMAGE", ),
+                        "sam_model": ("SAM_MODEL", SAM_MODEL_TOOLTIP),
+                        "segs": ("SEGS", {"tooltip": "This is the segment information detected by the detector.\nIt refines the Mask through the SAM (Segment Anything) detector for all areas pointed to by SEGS, and combines all Masks to return as a single Mask."}),
+                        "image": ("IMAGE", {"tooltip": "It is assumed that segs contains only the information about the detected areas, and does not include the image. SAM (Segment Anything) operates by referencing this image."}),
                         "detection_hint": (["center-1", "horizontal-2", "vertical-2", "rect-4", "diamond-4", "mask-area",
-                                            "mask-points", "mask-point-bbox", "none"],),
-                        "dilation": ("INT", {"default": 0, "min": -512, "max": 512, "step": 1}),
-                        "threshold": ("FLOAT", {"default": 0.93, "min": 0.0, "max": 1.0, "step": 0.01}),
-                        "bbox_expansion": ("INT", {"default": 0, "min": 0, "max": 1000, "step": 1}),
-                        "mask_hint_threshold": ("FLOAT", {"default": 0.7, "min": 0.0, "max": 1.0, "step": 0.01}),
-                        "mask_hint_use_negative": (["False", "Small", "Outter"], )
+                                            "mask-points", "mask-point-bbox", "none"], DETECTION_HINT_TOOLTIP),
+                        "dilation": ("INT", {"default": 0, "min": -512, "max": 512, "step": 1, "tooltip": DILATION_TOOLTIP}),
+                        "threshold": ("FLOAT", {"default": 0.93, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "Set the sensitivity threshold for the mask detected by SAM (Segment Anything). A higher value generates a more specific mask with a narrower range. For example, when pointing to a person's area, it might detect clothes, which is a narrower range, instead of the entire person."}),
+                        "bbox_expansion": ("INT", {"default": 0, "min": 0, "max": 1000, "step": 1, "tooltip": BBOX_EXPANSION_TOOLTIP}),
+                        "mask_hint_threshold": ("FLOAT", {"default": 0.7, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": MASK_HINT_THRESHOLD_TOOLTIP}),
+                        "mask_hint_use_negative": (["False", "Small", "Outter"], {"tooltip": MASK_HINT_USE_NEGATIVE_TOOLTIP})
                       }
                 }
 
@@ -38,16 +48,16 @@ class SAMDetectorSegmented:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                        "sam_model": ("SAM_MODEL", ),
-                        "segs": ("SEGS", ),
-                        "image": ("IMAGE", ),
+                        "sam_model": ("SAM_MODEL", SAM_MODEL_TOOLTIP),
+                        "segs": ("SEGS", {"tooltip": "This is the segment information detected by the detector.\nFor the SEGS region, the masks detected by SAM (Segment Anything) are created as a unified mask and a batch of individual masks."}),
+                        "image": ("IMAGE", {"tooltip": "It is assumed that segs contains only the information about the detected areas, and does not include the image. SAM (Segment Anything) operates by referencing this image."}),
                         "detection_hint": (["center-1", "horizontal-2", "vertical-2", "rect-4", "diamond-4", "mask-area",
-                                            "mask-points", "mask-point-bbox", "none"],),
-                        "dilation": ("INT", {"default": 0, "min": -512, "max": 512, "step": 1}),
+                                            "mask-points", "mask-point-bbox", "none"], DETECTION_HINT_TOOLTIP),
+                        "dilation": ("INT", {"default": 0, "min": -512, "max": 512, "step": 1, "tooltip": DILATION_TOOLTIP}),
                         "threshold": ("FLOAT", {"default": 0.93, "min": 0.0, "max": 1.0, "step": 0.01}),
-                        "bbox_expansion": ("INT", {"default": 0, "min": 0, "max": 1000, "step": 1}),
-                        "mask_hint_threshold": ("FLOAT", {"default": 0.7, "min": 0.0, "max": 1.0, "step": 0.01}),
-                        "mask_hint_use_negative": (["False", "Small", "Outter"], )
+                        "bbox_expansion": ("INT", {"default": 0, "min": 0, "max": 1000, "step": 1, "tooltip": BBOX_EXPANSION_TOOLTIP}),
+                        "mask_hint_threshold": ("FLOAT", {"default": 0.7, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": MASK_HINT_THRESHOLD_TOOLTIP}),
+                        "mask_hint_use_negative": (["False", "Small", "Outter"], {"tooltip": MASK_HINT_USE_NEGATIVE_TOOLTIP})
                       }
                 }
 
@@ -199,7 +209,7 @@ class SimpleDetectorForEach:
                       },
                 "optional": {
                         "post_dilation": ("INT", {"default": 0, "min": -512, "max": 512, "step": 1}),
-                        "sam_model_opt": ("SAM_MODEL", ),
+                        "sam_model_opt": ("SAM_MODEL", SAM_MODEL_TOOLTIP_OPTIONAL),
                         "segm_detector_opt": ("SEGM_DETECTOR", ),
                       }
                 }
@@ -311,7 +321,7 @@ class SimpleDetectorForAnimateDiff:
                 "optional": {
                         "masking_mode": (["Pivot SEGS", "Combine neighboring frames", "Don't combine"],),
                         "segs_pivot": (["Combined mask", "1st frame mask"],),
-                        "sam_model_opt": ("SAM_MODEL", ),
+                        "sam_model_opt": ("SAM_MODEL", SAM_MODEL_TOOLTIP_OPTIONAL),
                         "segm_detector_opt": ("SEGM_DETECTOR", ),
                  }
                 }

modules/impact/hook_nodes.py

@@ -78,6 +78,8 @@ class PreviewDetailerHookProvider:
 
     CATEGORY = "ImpactPack/Util"
 
+    NOT_IDEMPOTENT = True
+
     def doit(self, quality, unique_id):
         hook = hooks.PreviewDetailerHook(unique_id, quality)
-        return (hook, hook)
+        return hook, hook

modules/impact/impact_pack.py

@@ -27,6 +27,7 @@ import comfy.model_management
 import base64
 import impact.wildcards as wildcards
 from . import hooks
+from . import utils
 
 warnings.filterwarnings('ignore', category=UserWarning, message='TypedStorage is deprecated')
 
@@ -237,11 +238,16 @@ class DetailerForEach:
         else:
             wmode, wildcard_chooser = None, None
 
-        if wmode in ['ASC', 'DSC']:
+        if wmode in ['ASC', 'DSC', 'ASC-SIZE', 'DSC-SIZE']:
             if wmode == 'ASC':
                 ordered_segs = sorted(segs[1], key=lambda x: (x.bbox[0], x.bbox[1]))
-            else:
+            elif wmode == 'DSC':
                 ordered_segs = sorted(segs[1], key=lambda x: (x.bbox[0], x.bbox[1]), reverse=True)
+            elif wmode == 'ASC-SIZE':
+                ordered_segs = sorted(segs[1], key=lambda x: (x.bbox[2]-x.bbox[0]) * (x.bbox[3]-x.bbox[1]))
+
+            else:   # wmode == 'DSC-SIZE'
+                ordered_segs = sorted(segs[1], key=lambda x: (x.bbox[2]-x.bbox[0]) * (x.bbox[3]-x.bbox[1]), reverse=True)
         else:
             ordered_segs = segs[1]
 
@@ -278,13 +284,23 @@ class DetailerForEach:
                 for condition, details in positive
             ]
 
-            cropped_negative = [
-                [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 negative
-            ]
+            if not isinstance(negative, str):
+                cropped_negative = [
+                    [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 negative
+                ]
+            else:
+                # Negative Conditioning is placeholder such as FLUX.1
+                cropped_negative = negative
+
+            if wildcard_item and wildcard_item.strip() == '[SKIP]':
+                continue
+
+            if wildcard_item and wildcard_item.strip() == '[STOP]':
+                break
 
             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,
@@ -964,7 +980,10 @@ class PixelTiledKSampleUpscalerProvider:
                                                       tile_size=max(tile_width, tile_height), tile_cnet_strength=tile_cnet_strength)
             return (upscaler, )
         else:
-            print("[ERROR] PixelTiledKSampleUpscalerProvider: ComfyUI_TiledKSampler custom node isn't installed. You must install BlenderNeko/ComfyUI_TiledKSampler extension to use this node.")
+            utils.try_install_custom_node('https://github.com/BlenderNeko/ComfyUI_TiledKSampler',
+                                          "To use 'PixelTiledKSampleUpscalerProvider' node, 'BlenderNeko/ComfyUI_TiledKSampler' extension is required.")
+
+            raise Exception("[ERROR] PixelTiledKSampleUpscalerProvider: ComfyUI_TiledKSampler custom node isn't installed. You must install BlenderNeko/ComfyUI_TiledKSampler extension to use this node.")
 
 
 class PixelTiledKSampleUpscalerProviderPipe:

modules/impact/impact_sampling.py

@@ -6,10 +6,12 @@ import latent_preview
 import comfy
 import torch
 import math
+import comfy.model_management as mm
 
 
 try:
     from comfy_extras.nodes_custom_sampler import Noise_EmptyNoise, Noise_RandomNoise
+    import node_helpers
 except:
     print(f"\n#############################################\n[Impact Pack] ComfyUI is an outdated version.\n#############################################\n")
     raise Exception("[Impact Pack] ComfyUI is an outdated version.")
@@ -140,7 +142,29 @@ def sample_with_custom_noise(model, add_noise, noise_seed, cfg, positive, negati
         touched_callback = preview_callback
 
     disable_pbar = not comfy.utils.PROGRESS_BAR_ENABLED
-    samples = comfy.sample.sample_custom(model, noise, cfg, sampler, sigmas, positive, negative, latent_image, noise_mask=noise_mask, callback=touched_callback, disable_pbar=disable_pbar, seed=noise_seed)
+
+    device = mm.get_torch_device()
+
+    noise = noise.to(device)
+    latent_image = latent_image.to(device)
+    if noise_mask is not None:
+        noise_mask = noise_mask.to(device)
+
+    if negative != 'NegativePlaceholder':
+        # This way is incompatible with Advanced ControlNet, yet.
+        # guider = comfy.samplers.CFGGuider(model)
+        # guider.set_conds(positive, negative)
+        # guider.set_cfg(cfg)
+        samples = comfy.sample.sample_custom(model, noise, cfg, sampler, sigmas, positive, negative, latent_image,
+                                             noise_mask=noise_mask, callback=touched_callback,
+                                             disable_pbar=disable_pbar, seed=noise_seed)
+    else:
+        guider = nodes_custom_sampler.Guider_Basic(model)
+        positive = node_helpers.conditioning_set_values(positive, {"guidance": cfg})
+        guider.set_conds(positive)
+        samples = guider.sample(noise, latent_image, sampler, sigmas, denoise_mask=noise_mask, callback=touched_callback, disable_pbar=disable_pbar, seed=noise_seed)
+
+    samples = samples.to(comfy.model_management.intermediate_device())
 
     out["samples"] = samples
     if "x0" in x0_output:

modules/impact/impact_server.py

@@ -353,13 +353,16 @@ def onprompt_for_switch(json_data):
 
         cls = v['class_type']
         if cls == 'ImpactInversedSwitch':
-            select_input = v['inputs']['select']
-            if isinstance(select_input, list) and len(select_input) == 2:
-                input_node = json_data['prompt'][select_input[0]]
-                if input_node['class_type'] == 'ImpactInt' and 'inputs' in input_node and 'value' in input_node['inputs']:
-                    inversed_switch_info[k] = input_node['inputs']['value']
-            else:
-                inversed_switch_info[k] = select_input
+            if 'sel_mode' in v['inputs'] and v['inputs']['sel_mode'] and 'select' in v['inputs']:
+                select_input = v['inputs']['select']
+                if isinstance(select_input, list) and len(select_input) == 2:
+                    input_node = json_data['prompt'][select_input[0]]
+                    if input_node['class_type'] == 'ImpactInt' and 'inputs' in input_node and 'value' in input_node['inputs']:
+                        inversed_switch_info[k] = input_node['inputs']['value']
+                    else:
+                        print(f"\n##### ##### #####\n[WARN] {cls}: For the 'select' operation, only 'select_index' of the 'ImpactInversedSwitch', which is not an input, or 'ImpactInt' and 'Primitive' are allowed as inputs if 'select_on_prompt' is selected.\n##### ##### #####\n")
+                else:
+                    inversed_switch_info[k] = select_input
 
         elif cls in ['ImpactSwitch', 'LatentSwitch', 'SEGSSwitch', 'ImpactMakeImageList']:
             if 'sel_mode' in v['inputs'] and v['inputs']['sel_mode'] and 'select' in v['inputs']:
@@ -372,7 +375,7 @@ def onprompt_for_switch(json_data):
                         if isinstance(input_node['inputs']['select'], int):
                             onprompt_switch_info[k] = input_node['inputs']['select']
                         else:
-                            print(f"\n##### ##### #####\n[WARN] {cls}: For the 'select' operation, only 'select_index' of the 'ImpactSwitch', which is not an input, or 'ImpactInt' and 'Primitive' are allowed as inputs.\n##### ##### #####\n")
+                            print(f"\n##### ##### #####\n[WARN] {cls}: For the 'select' operation, only 'select_index' of the 'ImpactSwitch', which is not an input, or 'ImpactInt' and 'Primitive' are allowed as inputs if 'select_on_prompt' is selected.\n##### ##### #####\n")
                 else:
                     onprompt_switch_info[k] = select_input
 

modules/impact/legacy_nodes.py

@@ -25,6 +25,8 @@ class MMDetLoader:
 
     CATEGORY = "ImpactPack/Legacy"
 
+    DEPRECATED = True
+
     def load_mmdet(self, model_name):
         mmdet_path = folder_paths.get_full_path("mmdets", model_name)
         model = mmdet_nodes.load_mmdet(mmdet_path)
@@ -52,6 +54,8 @@ class BboxDetectorForEach:
 
     CATEGORY = "ImpactPack/Legacy"
 
+    DEPRECATED = True
+
     @staticmethod
     def detect(bbox_model, image, threshold, dilation, crop_factor, drop_size=1, detailer_hook=None):
         mmdet_results = mmdet_nodes.inference_bbox(bbox_model, image, threshold)
@@ -102,6 +106,8 @@ class SegmDetectorCombined:
 
     CATEGORY = "ImpactPack/Legacy"
 
+    DEPRECATED = True
+
     def doit(self, segm_model, image, threshold, dilation):
         mmdet_results = mmdet_nodes.inference_segm(image, segm_model, threshold)
         segmasks = core.create_segmasks(mmdet_results)
@@ -150,6 +156,8 @@ class SegmDetectorForEach:
 
     CATEGORY = "ImpactPack/Legacy"
 
+    DEPRECATED = True
+
     def doit(self, segm_model, image, threshold, dilation, crop_factor):
         mmdet_results = mmdet_nodes.inference_segm(image, segm_model, threshold)
         segmasks = core.create_segmasks(mmdet_results)
@@ -190,6 +198,8 @@ class SegsMaskCombine:
 
     CATEGORY = "ImpactPack/Legacy"
 
+    DEPRECATED = True
+
     @staticmethod
     def combine(segs, image):
         h = image.shape[1]
@@ -226,6 +236,8 @@ class MaskPainter(nodes.PreviewImage):
 
     CATEGORY = "ImpactPack/Legacy"
 
+    DEPRECATED = True
+
     def save_painted_images(self, images, filename_prefix="impact-mask",
                             prompt=None, extra_pnginfo=None, mask_image=None, image=None):
         if image == "#placeholder" or image['image_hash'] != id(images):

modules/impact/logics.py

@@ -10,7 +10,6 @@ import re
 import nodes
 import traceback
 
-
 class ImpactCompare:
     @classmethod
     def INPUT_TYPES(cls):
@@ -66,8 +65,8 @@ class ImpactConditionalBranch:
         return {
             "required": {
                 "cond": ("BOOLEAN",),
-                "tt_value": (any_typ,),
-                "ff_value": (any_typ,),
+                "tt_value": (any_typ,{"lazy": True}),
+                "ff_value": (any_typ,{"lazy": True}),
             },
         }
 
@@ -76,7 +75,13 @@ class ImpactConditionalBranch:
 
     RETURN_TYPES = (any_typ, )
 
-    def doit(self, cond, tt_value, ff_value):
+    def check_lazy_status(self, cond, tt_value=None, ff_value=None):
+        if cond and tt_value is None:
+            return ["tt_value"]
+        if not cond and ff_value is None:
+            return ["ff_value"]
+
+    def doit(self, cond, tt_value=None, ff_value=None):
         if cond:
             return (tt_value,)
         else:
@@ -86,11 +91,18 @@ class ImpactConditionalBranch:
 class ImpactConditionalBranchSelMode:
     @classmethod
     def INPUT_TYPES(cls):
-        return {
-            "required": {
+        if not core.is_execution_model_version_supported():
+            required_inputs = {
                 "cond": ("BOOLEAN",),
                 "sel_mode": ("BOOLEAN", {"default": True, "label_on": "select_on_prompt", "label_off": "select_on_execution"}),
-            },
+                }
+        else:
+            required_inputs = {
+                "cond": ("BOOLEAN",),
+                }
+
+        return {
+            "required": required_inputs,
             "optional": {
                 "tt_value": (any_typ,),
                 "ff_value": (any_typ,),
@@ -102,7 +114,7 @@ class ImpactConditionalBranchSelMode:
 
     RETURN_TYPES = (any_typ, )
 
-    def doit(self, cond, sel_mode, tt_value=None, ff_value=None):
+    def doit(self, cond, tt_value=None, ff_value=None, **kwargs):
         print(f'tt={tt_value is None}\nff={ff_value is None}')
         if cond:
             return (tt_value,)
@@ -618,85 +630,122 @@ class ImpactControlBridge:
     def INPUT_TYPES(cls):
         return {"required": {
                       "value": (any_typ,),
-                      "mode": ("BOOLEAN", {"default": True, "label_on": "Active", "label_off": "Mute/Bypass"}),
-                      "behavior": ("BOOLEAN", {"default": True, "label_on": "Mute", "label_off": "Bypass"}),
+                      "mode": ("BOOLEAN", {"default": True, "label_on": "Active", "label_off": "Stop/Mute/Bypass"}),
+                      "behavior": (["Stop", "Mute", "Bypass"], ),
                     },
                 "hidden": {"unique_id": "UNIQUE_ID", "prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"}
                 }
 
     FUNCTION = "doit"
 
-    CATEGORY = "ImpactPack/Logic/_for_test"
+    CATEGORY = "ImpactPack/Logic"
     RETURN_TYPES = (any_typ,)
     RETURN_NAMES = ("value",)
     OUTPUT_NODE = True
 
+    DESCRIPTION = ("When behavior is Stop and mode is active, the input value is passed directly to the output.\n"
+                   "When behavior is Mute/Bypass and mode is active, the node connected to the output is changed to active state.\n"
+                   "When behavior is Stop and mode is Stop/Mute/Bypass, the workflow execution of the current node is halted.\n"
+                   "When behavior is Mute/Bypass and mode is Stop/Mute/Bypass, the node connected to the output is changed to Mute/Bypass state.")
+
     @classmethod
-    def IS_CHANGED(self, value, mode, behavior=True, unique_id=None, prompt=None, extra_pnginfo=None):
-        # NOTE: extra_pnginfo is not populated for IS_CHANGED.
-        #       so extra_pnginfo is useless in here
-        try:
-            workflow = core.current_prompt['extra_data']['extra_pnginfo']['workflow']
-        except:
-            print(f"[Impact Pack] core.current_prompt['extra_data']['extra_pnginfo']['workflow']")
-            return 0
+    def IS_CHANGED(self, value, mode, behavior="Stop", unique_id=None, prompt=None, extra_pnginfo=None):
+        if behavior == "Stop":
+            return value, mode, behavior
+        else:
+            # NOTE: extra_pnginfo is not populated for IS_CHANGED.
+            #       so extra_pnginfo is useless in here
+            try:
+                workflow = core.current_prompt['extra_data']['extra_pnginfo']['workflow']
+            except:
+                print(f"[Impact Pack] core.current_prompt['extra_data']['extra_pnginfo']['workflow']")
+                return 0
 
-        nodes, links = workflow_to_map(workflow)
-        next_nodes = []
+            nodes, links = workflow_to_map(workflow)
+            next_nodes = []
 
-        for link in nodes[unique_id]['outputs'][0]['links']:
-            node_id = str(links[link][2])
-            impact.utils.collect_non_reroute_nodes(nodes, links, next_nodes, node_id)
+            for link in nodes[unique_id]['outputs'][0]['links']:
+                node_id = str(links[link][2])
+                impact.utils.collect_non_reroute_nodes(nodes, links, next_nodes, node_id)
 
         return next_nodes
 
-    def doit(self, value, mode, behavior=True, unique_id=None, prompt=None, extra_pnginfo=None):
+    def doit(self, value, mode, behavior="Stop", unique_id=None, prompt=None, extra_pnginfo=None):
         global error_skip_flag
 
-        workflow_nodes, links = workflow_to_map(extra_pnginfo['workflow'])
-
-        active_nodes = []
-        mute_nodes = []
-        bypass_nodes = []
-
-        for link in workflow_nodes[unique_id]['outputs'][0]['links']:
-            node_id = str(links[link][2])
-
-            next_nodes = []
-            impact.utils.collect_non_reroute_nodes(workflow_nodes, links, next_nodes, node_id)
-
-            for next_node_id in next_nodes:
-                node_mode = workflow_nodes[next_node_id]['mode']
-
-                if node_mode == 0:
-                    active_nodes.append(next_node_id)
-                elif node_mode == 2:
-                    mute_nodes.append(next_node_id)
-                elif node_mode == 4:
-                    bypass_nodes.append(next_node_id)
-
-        if mode:
-            # active
-            should_be_active_nodes = mute_nodes + bypass_nodes
-            if len(should_be_active_nodes) > 0:
-                PromptServer.instance.send_sync("impact-bridge-continue", {"node_id": unique_id, 'actives': list(should_be_active_nodes)})
-                nodes.interrupt_processing()
-
-        elif behavior:
-            # mute
-            should_be_mute_nodes = active_nodes + bypass_nodes
-            if len(should_be_mute_nodes) > 0:
-                PromptServer.instance.send_sync("impact-bridge-continue", {"node_id": unique_id, 'mutes': list(should_be_mute_nodes)})
-                nodes.interrupt_processing()
-
+        if core.is_execution_model_version_supported:
+            from comfy_execution.graph import ExecutionBlocker
         else:
-            # bypass
-            should_be_bypass_nodes = active_nodes + mute_nodes
-            if len(should_be_bypass_nodes) > 0:
-                PromptServer.instance.send_sync("impact-bridge-continue", {"node_id": unique_id, 'bypasses': list(should_be_bypass_nodes)})
-                nodes.interrupt_processing()
+            print("[Impact Pack] ImpactControlBridge: ComfyUI is outdated. The 'Stop' behavior cannot function properly.")
 
-        return (value, )
+        if behavior == "Stop":
+            if mode:
+                return (value, )
+            else:
+                return (ExecutionBlocker(None), )
+        else:
+            workflow_nodes, links = workflow_to_map(extra_pnginfo['workflow'])
+
+            active_nodes = []
+            mute_nodes = []
+            bypass_nodes = []
+
+            for link in workflow_nodes[unique_id]['outputs'][0]['links']:
+                node_id = str(links[link][2])
+
+                next_nodes = []
+                impact.utils.collect_non_reroute_nodes(workflow_nodes, links, next_nodes, node_id)
+
+                for next_node_id in next_nodes:
+                    node_mode = workflow_nodes[next_node_id]['mode']
+
+                    if node_mode == 0:
+                        active_nodes.append(next_node_id)
+                    elif node_mode == 2:
+                        mute_nodes.append(next_node_id)
+                    elif node_mode == 4:
+                        bypass_nodes.append(next_node_id)
+
+            if mode:
+                # active
+                should_be_active_nodes = mute_nodes + bypass_nodes
+                if len(should_be_active_nodes) > 0:
+                    PromptServer.instance.send_sync("impact-bridge-continue", {"node_id": unique_id, 'actives': list(should_be_active_nodes)})
+                    nodes.interrupt_processing()
+
+            elif behavior == "Mute" or behavior == True:
+                # mute
+                should_be_mute_nodes = active_nodes + bypass_nodes
+                if len(should_be_mute_nodes) > 0:
+                    PromptServer.instance.send_sync("impact-bridge-continue", {"node_id": unique_id, 'mutes': list(should_be_mute_nodes)})
+                    nodes.interrupt_processing()
+
+            else:
+                # bypass
+                should_be_bypass_nodes = active_nodes + mute_nodes
+                if len(should_be_bypass_nodes) > 0:
+                    PromptServer.instance.send_sync("impact-bridge-continue", {"node_id": unique_id, 'bypasses': list(should_be_bypass_nodes)})
+                    nodes.interrupt_processing()
+
+            return (value, )
+
+
+class ImpactExecutionOrderController:
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {"required": {
+                    "signal": (any_typ,),
+                    "value": (any_typ,),
+                    }}
+
+    FUNCTION = "doit"
+
+    CATEGORY = "ImpactPack/Util"
+    RETURN_TYPES = (any_typ, any_typ)
+    RETURN_NAMES = ("signal", "value")
+
+    def doit(self, signal, value):
+        return signal, value
 
 
 original_handle_execution = execution.PromptExecutor.handle_execution_error

modules/impact/special_samplers.py

@@ -5,39 +5,25 @@ from impact.utils import *
 from nodes import MAX_RESOLUTION
 import nodes
 from impact.impact_sampling import KSamplerWrapper, KSamplerAdvancedWrapper, separated_sample, impact_sample
-
+import comfy
 
 class TiledKSamplerProvider:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                    "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
-                    "steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
-                    "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0}),
-                    "sampler_name": (comfy.samplers.KSampler.SAMPLERS, ),
-                    "scheduler": (comfy.samplers.KSampler.SCHEDULERS, ),
-                    "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}),
-                    "tile_width": ("INT", {"default": 512, "min": 320, "max": MAX_RESOLUTION, "step": 64}),
-                    "tile_height": ("INT", {"default": 512, "min": 320, "max": MAX_RESOLUTION, "step": 64}),
-                    "tiling_strategy": (["random", "padded", 'simple'], ),
-                    "basic_pipe": ("BASIC_PIPE", )
+                    "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff, "tooltip": "Random seed to use for generating CPU noise for sampling."}),
+                    "steps": ("INT", {"default": 20, "min": 1, "max": 10000, "tooltip": "total sampling steps"}),
+                    "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0, "tooltip": "classifier free guidance value"}),
+                    "sampler_name": (comfy.samplers.KSampler.SAMPLERS, {"tooltip": "sampler"}),
+                    "scheduler": (comfy.samplers.KSampler.SCHEDULERS, {"tooltip": "noise schedule"}),
+                    "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "The amount of noise to remove. This amount is the noise added at the start, and the higher it is, the more the input latent will be modified before being returned."}),
+                    "tile_width": ("INT", {"default": 512, "min": 320, "max": MAX_RESOLUTION, "step": 64, "tooltip": "Sets the width of the tile to be used in TiledKSampler."}),
+                    "tile_height": ("INT", {"default": 512, "min": 320, "max": MAX_RESOLUTION, "step": 64, "tooltip": "Sets the height of the tile to be used in TiledKSampler."}),
+                    "tiling_strategy": (["random", "padded", 'simple'], {"tooltip": "Sets the tiling strategy for TiledKSampler."} ),
+                    "basic_pipe": ("BASIC_PIPE", {"tooltip": "basic_pipe input for sampling"})
                     }}
 
-    TOOLTIPS = {
-        "input": {
-            "seed": "Random seed to use for generating CPU noise for sampling.",
-            "steps": "total sampling steps",
-            "cfg": "classifier free guidance value",
-            "sampler_name": "sampler",
-            "scheduler": "noise schedule",
-            "denoise": "The amount of noise to remove. This amount is the noise added at the start, and the higher it is, the more the input latent will be modified before being returned.",
-            "tile_width": "Sets the width of the tile to be used in TiledKSampler.",
-            "tile_height": "Sets the height of the tile to be used in TiledKSampler.",
-            "tiling_strategy": "Sets the tiling strategy for TiledKSampler.",
-            "basic_pipe": "basic_pipe input for sampling",
-        },
-        "output": ("sampler wrapper. (Can be used when generating a regional_prompt.)", )
-    }
+    OUTPUT_TOOLTIPS = ("sampler wrapper. (Can be used when generating a regional_prompt.)", )
 
     RETURN_TYPES = ("KSAMPLER",)
     FUNCTION = "doit"
@@ -57,32 +43,20 @@ class KSamplerProvider:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                                "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
-                                "steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
-                                "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0}),
-                                "sampler_name": (comfy.samplers.KSampler.SAMPLERS, ),
-                                "scheduler": (core.SCHEDULERS, ),
-                                "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}),
-                                "basic_pipe": ("BASIC_PIPE", )
+                                "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff, "tooltip": "Random seed to use for generating CPU noise for sampling."}),
+                                "steps": ("INT", {"default": 20, "min": 1, "max": 10000, "tooltip": "total sampling steps"}),
+                                "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0, "tooltip": "classifier free guidance value"}),
+                                "sampler_name": (comfy.samplers.KSampler.SAMPLERS, {"tooltip": "sampler"}),
+                                "scheduler": (core.SCHEDULERS, {"tooltip": "noise schedule"}),
+                                "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "The amount of noise to remove. This amount is the noise added at the start, and the higher it is, the more the input latent will be modified before being returned."}),
+                                "basic_pipe": ("BASIC_PIPE", {"tooltip": "basic_pipe input for sampling"})
                              },
                 "optional": {
-                    "scheduler_func_opt": ("SCHEDULER_FUNC",),
+                    "scheduler_func_opt": ("SCHEDULER_FUNC", {"tooltip": "[OPTIONAL] Noise schedule generation function. If this is set, the scheduler widget will be ignored."}),
                     }
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "seed": "Random seed to use for generating CPU noise for sampling.",
-            "steps": "total sampling steps",
-            "cfg": "classifier free guidance value",
-            "sampler_name": "sampler",
-            "scheduler": "noise schedule",
-            "denoise": "The amount of noise to remove. This amount is the noise added at the start, and the higher it is, the more the input latent will be modified before being returned.",
-            "basic_pipe": "basic_pipe input for sampling",
-            "scheduler_func_opt": "[OPTIONAL] Noise schedule generation function. If this is set, the scheduler widget will be ignored.",
-        },
-        "output": ("sampler wrapper. (Can be used when generating a regional_prompt.)", )
-    }
+    OUTPUT_TOOLTIPS = ("sampler wrapper. (Can be used when generating a regional_prompt.)",)
 
     RETURN_TYPES = ("KSAMPLER",)
     FUNCTION = "doit"
@@ -100,30 +74,19 @@ class KSamplerAdvancedProvider:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                                "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0}),
-                                "sampler_name": (comfy.samplers.KSampler.SAMPLERS, ),
-                                "scheduler": (core.SCHEDULERS, ),
-                                "sigma_factor": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01}),
-                                "basic_pipe": ("BASIC_PIPE", )
+                                "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0, "toolip": "classifier free guidance value"}),
+                                "sampler_name": (comfy.samplers.KSampler.SAMPLERS, {"toolip": "sampler"}),
+                                "scheduler": (core.SCHEDULERS, {"toolip": "noise schedule"}),
+                                "sigma_factor": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 10.0, "step": 0.01, "toolip": "Multiplier of noise schedule"}),
+                                "basic_pipe": ("BASIC_PIPE", {"toolip": "basic_pipe input for sampling"})
                              },
                 "optional": {
-                                "sampler_opt": ("SAMPLER", ),
-                                "scheduler_func_opt": ("SCHEDULER_FUNC",),
+                                "sampler_opt": ("SAMPLER", {"toolip": "[OPTIONAL] Uses the passed sampler instead of internal impact_sampler."}),
+                                "scheduler_func_opt": ("SCHEDULER_FUNC", {"toolip": "[OPTIONAL] Noise schedule generation function. If this is set, the scheduler widget will be ignored."}),
                             }
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "cfg": "classifier free guidance value",
-            "sampler_name": "sampler",
-            "scheduler": "noise schedule",
-            "sigma_factor": "Multiplier of noise schedule",
-            "basic_pipe": "basic_pipe input for sampling",
-            "sampler_opt": "[OPTIONAL] Uses the passed sampler instead of internal impact_sampler.",
-            "scheduler_func_opt": "[OPTIONAL] Noise schedule generation function. If this is set, the scheduler widget will be ignored.",
-        },
-        "output": ("sampler wrapper. (Can be used when generating a regional_prompt.)", )
-    }
+    OUTPUT_TOOLTIPS = ("sampler wrapper. (Can be used when generating a regional_prompt.)", )
 
     RETURN_TYPES = ("KSAMPLER_ADVANCED",)
     FUNCTION = "doit"
@@ -141,22 +104,14 @@ class TwoSamplersForMask:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                     "latent_image": ("LATENT", ),
-                     "base_sampler": ("KSAMPLER", ),
-                     "mask_sampler": ("KSAMPLER", ),
-                     "mask": ("MASK", )
+                     "latent_image": ("LATENT", {"tooltip": "input latent image"}),
+                     "base_sampler": ("KSAMPLER", {"tooltip": "Sampler to apply to the region outside the mask."}),
+                     "mask_sampler": ("KSAMPLER", {"tooltip": "Sampler to apply to the masked region."}),
+                     "mask": ("MASK", {"tooltip": "region mask"})
                      },
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "latent_image": "input latent image",
-            "base_sampler": "Sampler to apply to the region outside the mask.",
-            "mask_sampler": "Sampler to apply to the masked region.",
-            "mask": "region mask",
-        },
-        "output": ("result latent", )
-    }
+    OUTPUT_TOOLTIPS = ("result latent", )
 
     RETURN_TYPES = ("LATENT", )
     FUNCTION = "doit"
@@ -182,102 +137,50 @@ class TwoAdvancedSamplersForMask:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                     "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
-                     "steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
-                     "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}),
-                     "samples": ("LATENT", ),
-                     "base_sampler": ("KSAMPLER_ADVANCED", ),
-                     "mask_sampler": ("KSAMPLER_ADVANCED", ),
-                     "mask": ("MASK", ),
-                     "overlap_factor": ("INT", {"default": 10, "min": 0, "max": 10000})
+                     "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff, "tooltip": "Random seed to use for generating CPU noise for sampling."}),
+                     "steps": ("INT", {"default": 20, "min": 1, "max": 10000, "tooltip": "total sampling steps"}),
+                     "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "The amount of noise to remove. This amount is the noise added at the start, and the higher it is, the more the input latent will be modified before being returned."}),
+                     "samples": ("LATENT", {"tooltip": "input latent image"}),
+                     "base_sampler": ("KSAMPLER_ADVANCED", {"tooltip": "Sampler to apply to the region outside the mask."}),
+                     "mask_sampler": ("KSAMPLER_ADVANCED", {"tooltip": "Sampler to apply to the masked region."}),
+                     "mask": ("MASK", {"tooltip": "region mask"}),
+                     "overlap_factor": ("INT", {"default": 10, "min": 0, "max": 10000, "tooltip": "To smooth the seams of the region boundaries, expand the mask by the overlap_factor amount to overlap with other regions."})
                      },
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "seed": "Random seed to use for generating CPU noise for sampling.",
-            "steps": "total sampling steps",
-            "denoise": "The amount of noise to remove. This amount is the noise added at the start, and the higher it is, the more the input latent will be modified before being returned.",
-            "samples": "input latent image",
-            "base_sampler": "Sampler to apply to the region outside the mask.",
-            "mask_sampler": "Sampler to apply to the masked region.",
-            "mask": "region mask",
-            "overlap_factor": "To smooth the seams of the region boundaries, expand the mask by the overlap_factor amount to overlap with other regions.",
-        },
-        "output": ("result latent", )
-    }
+    OUTPUT_TOOLTIPS = ("result latent", )
 
     RETURN_TYPES = ("LATENT", )
     FUNCTION = "doit"
 
     CATEGORY = "ImpactPack/Sampler"
 
-    @staticmethod
-    def mask_erosion(samples, mask, grow_mask_by):
-        mask = mask.clone()
-
-        w = samples['samples'].shape[3]
-        h = samples['samples'].shape[2]
-
-        mask2 = torch.nn.functional.interpolate(mask.reshape((-1, 1, mask.shape[-2], mask.shape[-1])), size=(w, h), mode="bilinear")
-        if grow_mask_by == 0:
-            mask_erosion = mask2
-        else:
-            kernel_tensor = torch.ones((1, 1, grow_mask_by, grow_mask_by))
-            padding = math.ceil((grow_mask_by - 1) / 2)
-
-            mask_erosion = torch.clamp(torch.nn.functional.conv2d(mask2.round(), kernel_tensor, padding=padding), 0, 1)
-
-        return mask_erosion[:, :, :w, :h].round()
-
     @staticmethod
     def doit(seed, steps, denoise, samples, base_sampler, mask_sampler, mask, overlap_factor):
+        regional_prompts = RegionalPrompt().doit(mask=mask, advanced_sampler=mask_sampler)[0]
 
-        inv_mask = torch.where(mask != 1.0, torch.tensor(1.0), torch.tensor(0.0))
-
-        adv_steps = int(steps / denoise)
-        start_at_step = adv_steps - steps
-
-        new_latent_image = samples.copy()
-
-        mask_erosion = TwoAdvancedSamplersForMask.mask_erosion(samples, mask, overlap_factor)
-
-        for i in range(start_at_step, adv_steps):
-            add_noise = "enable" if i == start_at_step else "disable"
-            return_with_leftover_noise = "enable" if i+1 != adv_steps else "disable"
-
-            new_latent_image['noise_mask'] = inv_mask
-            new_latent_image = base_sampler.sample_advanced(add_noise, seed, adv_steps, new_latent_image, i, i + 1, "enable", recovery_mode="ratio additional")
-
-            new_latent_image['noise_mask'] = mask_erosion
-            new_latent_image = mask_sampler.sample_advanced("disable", seed, adv_steps, new_latent_image, i, i + 1, return_with_leftover_noise, recovery_mode="ratio additional")
-
-        del new_latent_image['noise_mask']
-
-        return (new_latent_image, )
+        return RegionalSampler().doit(seed=seed, seed_2nd=0, seed_2nd_mode="ignore", steps=steps, base_only_steps=1,
+                                      denoise=denoise, samples=samples, base_sampler=base_sampler,
+                                      regional_prompts=regional_prompts, overlap_factor=overlap_factor,
+                                      restore_latent=True, additional_mode="ratio between",
+                                      additional_sampler="AUTO", additional_sigma_ratio=0.3)
 
 
 class RegionalPrompt:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                    "mask": ("MASK", ),
-                    "advanced_sampler": ("KSAMPLER_ADVANCED", ),
+                    "mask": ("MASK", {"tooltip": "region mask"}),
+                    "advanced_sampler": ("KSAMPLER_ADVANCED", {"tooltip": "sampler for specified region"}),
                     },
                 "optional": {
-                    "variation_seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
-                    "variation_strength": ("FLOAT", {"default": 0.0, "min": 0.0, "max": 1.0, "step": 0.01}),
-                    "variation_method": (["linear", "slerp"],),
+                    "variation_seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff, "tooltip": "Sets the extra seed to be used for noise variation."}),
+                    "variation_strength": ("FLOAT", {"default": 0.0, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "Sets the strength of the noise variation."}),
+                    "variation_method": (["linear", "slerp"], {"tooltip": "Sets how the original noise and extra noise are blended together."}),
                     }
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "mask": "region mask",
-            "advanced_sampler": "sampler for specified region",
-        },
-        "output": ("regional prompts. (Can be used in the RegionalSampler.)", )
-    }
+    OUTPUT_TOOLTIPS = ("regional prompts. (Can be used in the RegionalSampler.)", )
 
     RETURN_TYPES = ("REGIONAL_PROMPTS", )
     FUNCTION = "doit"
@@ -294,16 +197,11 @@ class CombineRegionalPrompts:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                     "regional_prompts1": ("REGIONAL_PROMPTS", ),
+                     "regional_prompts1": ("REGIONAL_PROMPTS", {"tooltip": "input regional_prompts. (Connecting to the input slot increases the number of additional slots.)"}),
                      },
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "regional_prompts1": "input regional_prompts. (Connecting to the input slot increases the number of additional slots.)",
-        },
-        "output": ("Combined REGIONAL_PROMPTS", )
-    }
+    OUTPUT_TOOLTIPS = ("Combined REGIONAL_PROMPTS", )
 
     RETURN_TYPES = ("REGIONAL_PROMPTS", )
     FUNCTION = "doit"
@@ -323,16 +221,11 @@ class CombineConditionings:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                     "conditioning1": ("CONDITIONING", ),
+                     "conditioning1": ("CONDITIONING", { "tooltip": "input conditionings. (Connecting to the input slot increases the number of additional slots.)" }),
                      },
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "conditioning1": "input conditionings. (Connecting to the input slot increases the number of additional slots.)",
-        },
-        "output": ("Combined conditioning", )
-    }
+    OUTPUT_TOOLTIPS = ("Combined conditioning", )
 
     RETURN_TYPES = ("CONDITIONING", )
     FUNCTION = "doit"
@@ -352,16 +245,11 @@ class ConcatConditionings:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                     "conditioning1": ("CONDITIONING", ),
+                     "conditioning1": ("CONDITIONING", { "tooltip": "input conditionings. (Connecting to the input slot increases the number of additional slots.)" }),
                      },
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "conditioning1": "input conditionings. (Connecting to the input slot increases the number of additional slots.)",
-        },
-        "output": ("Concatenated conditioning", )
-    }
+    OUTPUT_TOOLTIPS = ("Concatenated conditioning", )
 
     RETURN_TYPES = ("CONDITIONING", )
     FUNCTION = "doit"
@@ -394,43 +282,25 @@ class RegionalSampler:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                     "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
-                     "seed_2nd": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
-                     "seed_2nd_mode": (["ignore", "fixed", "seed+seed_2nd", "seed-seed_2nd", "increment", "decrement", "randomize"], ),
-                     "steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
-                     "base_only_steps": ("INT", {"default": 2, "min": 0, "max": 10000}),
-                     "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}),
-                     "samples": ("LATENT", ),
-                     "base_sampler": ("KSAMPLER_ADVANCED", ),
-                     "regional_prompts": ("REGIONAL_PROMPTS", ),
-                     "overlap_factor": ("INT", {"default": 10, "min": 0, "max": 10000}),
-                     "restore_latent": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled"}),
-                     "additional_mode": (["DISABLE", "ratio additional", "ratio between"], {"default": "ratio between"}),
-                     "additional_sampler": (["AUTO", "euler", "heun", "heunpp2", "dpm_2", "dpm_fast", "dpmpp_2m", "ddpm"],),
-                     "additional_sigma_ratio": ("FLOAT", {"default": 0.3, "min": 0.0, "max": 1.0, "step": 0.01}),
+                     "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff, "tooltip": "Random seed to use for generating CPU noise for sampling."}),
+                     "seed_2nd": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff, "tooltip": "Additional noise seed. The behavior is determined by seed_2nd_mode."}),
+                     "seed_2nd_mode": (["ignore", "fixed", "seed+seed_2nd", "seed-seed_2nd", "increment", "decrement", "randomize"], {"tooltip": "application method of seed_2nd. 1) ignore: Do not use seed_2nd. In the base only sampling stage, the seed is applied as a noise seed, and in the regional sampling stage, denoising is performed as it is without additional noise. 2) Others: In the base only sampling stage, the seed is applied as a noise seed, and once it is closed so that there is no leftover noise, new noise is added with seed_2nd and the regional samping stage is performed. a) fixed: Use seed_2nd as it is as an additional noise seed. b) seed+seed_2nd: Apply the value of seed+seed_2nd as an additional noise seed. c) seed-seed_2nd: Apply the value of seed-seed_2nd as an additional noise seed. d) increment: Not implemented yet. Same with fixed. e) decrement: Not implemented yet. Same with fixed. f) randomize: Not implemented yet. Same with fixed."}),
+                     "steps": ("INT", {"default": 20, "min": 1, "max": 10000, "tooltip": "total sampling steps"}),
+                     "base_only_steps": ("INT", {"default": 2, "min": 0, "max": 10000, "tooltip": "total sampling steps"}),
+                     "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "The amount of noise to remove. This amount is the noise added at the start, and the higher it is, the more the input latent will be modified before being returned."}),
+                     "samples": ("LATENT", {"tooltip": "input latent image"}),
+                     "base_sampler": ("KSAMPLER_ADVANCED", {"tooltip": "The sampler applied outside the area set by the regional_prompt."}),
+                     "regional_prompts": ("REGIONAL_PROMPTS", {"tooltip": "The prompt applied to each region"}),
+                     "overlap_factor": ("INT", {"default": 10, "min": 0, "max": 10000, "tooltip": "To smooth the seams of the region boundaries, expand the mask set in regional_prompts by the overlap_factor amount to overlap with other regions."}),
+                     "restore_latent": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled", "tooltip": "At each step, restore the noise outside the mask area to its original state, as per the principle of inpainting. This option is provided for backward compatibility, and it is recommended to always set it to true."}),
+                     "additional_mode": (["DISABLE", "ratio additional", "ratio between"], {"default": "ratio between", "tooltip": "..._sde or uni_pc and other special samplers are used, the region is not properly denoised, and it causes a phenomenon that destroys the overall harmony. To compensate for this, a recovery operation is performed using another sampler. This requires a longer time for sampling because a second sampling is performed at each step in each region using a special sampler. 1) DISABLE: Disable this feature. 2) ratio additional: After performing the denoise amount to be performed in the step with the sampler set in the region, the recovery sampler is additionally applied by the additional_sigma_ratio. If you use this option, the total denoise amount increases by additional_sigma_ratio. 3) ratio between: The denoise amount to be performed in the step with the sampler set in the region and the denoise amount to be applied to the recovery sampler are divided by additional_sigma_ratio, and denoise is performed for each denoise amount. If you use this option, the total denoise amount does not change."}),
+                     "additional_sampler": (["AUTO", "euler", "heun", "heunpp2", "dpm_2", "dpm_fast", "dpmpp_2m", "ddpm"], {"tooltip": "1) AUTO: Automatically set the recovery sampler. If the sampler is uni_pc, uni_pc_bh2, dpmpp_sde, dpmpp_sde_gpu, the dpm_fast sampler is selected If the sampler is dpmpp_2m_sde, dpmpp_2m_sde_gpu, dpmpp_3m_sde, dpmpp_3m_sde_gpu, the dpmpp_2m sampler is selected. 2) Others: Manually set the recovery sampler."}),
+                     "additional_sigma_ratio": ("FLOAT", {"default": 0.3, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "Multiplier of noise schedule to be applied according to additional_mode."}),
                      },
-                 "hidden": {"unique_id": "UNIQUE_ID"},
+                "hidden": {"unique_id": "UNIQUE_ID"},
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "seed": "Random seed to use for generating CPU noise for sampling.",
-            "seed_2nd": "Additional noise seed. The behavior is determined by seed_2nd_mode.",
-            "seed_2nd_mode": "application method of seed_2nd. 1) ignore: Do not use seed_2nd. In the base only sampling stage, the seed is applied as a noise seed, and in the regional sampling stage, denoising is performed as it is without additional noise. 2) Others: In the base only sampling stage, the seed is applied as a noise seed, and once it is closed so that there is no leftover noise, new noise is added with seed_2nd and the regional samping stage is performed. a) fixed: Use seed_2nd as it is as an additional noise seed. b) seed+seed_2nd: Apply the value of seed+seed_2nd as an additional noise seed. c) seed-seed_2nd: Apply the value of seed-seed_2nd as an additional noise seed. d) increment: Not implemented yet. Same with fixed. e) decrement: Not implemented yet. Same with fixed. f) randomize: Not implemented yet. Same with fixed.",
-            "steps": "total sampling steps",
-            "base_only_steps": "total sampling steps",
-            "denoise": "The amount of noise to remove. This amount is the noise added at the start, and the higher it is, the more the input latent will be modified before being returned.",
-            "samples": "input latent image",
-            "base_sampler": "The sampler applied outside the area set by the regional_prompt.",
-            "regional_prompts": "The prompt applied to each region",
-            "overlap_factor": "To smooth the seams of the region boundaries, expand the mask set in regional_prompts by the overlap_factor amount to overlap with other regions.",
-            "restore_latent": "At each step, restore the noise outside the mask area to its original state, as per the principle of inpainting. This option is provided for backward compatibility, and it is recommended to always set it to true.",
-            "additional_mode": "..._sde or uni_pc and other special samplers are used, the region is not properly denoised, and it causes a phenomenon that destroys the overall harmony. To compensate for this, a recovery operation is performed using another sampler. This requires a longer time for sampling because a second sampling is performed at each step in each region using a special sampler. 1) DISABLE: Disable this feature. 2) ratio additional: After performing the denoise amount to be performed in the step with the sampler set in the region, the recovery sampler is additionally applied by the additional_sigma_ratio. If you use this option, the total denoise amount increases by additional_sigma_ratio. 3) ratio between: The denoise amount to be performed in the step with the sampler set in the region and the denoise amount to be applied to the recovery sampler are divided by additional_sigma_ratio, and denoise is performed for each denoise amount. If you use this option, the total denoise amount does not change.",
-            "additional_sampler": "1) AUTO: Automatically set the recovery sampler. If the sampler is uni_pc, uni_pc_bh2, dpmpp_sde, dpmpp_sde_gpu, the dpm_fast sampler is selected If the sampler is dpmpp_2m_sde, dpmpp_2m_sde_gpu, dpmpp_3m_sde, dpmpp_3m_sde_gpu, the dpmpp_2m sampler is selected. 2) Others: Manually set the recovery sampler.",
-            "additional_sigma_ratio": "Multiplier of noise schedule to be applied according to additional_mode.",
-        },
-        "output": ("result latent", )
-    }
+    OUTPUT_TOOLTIPS = ("result latent", )
 
     RETURN_TYPES = ("LATENT", )
     FUNCTION = "doit"
@@ -462,6 +332,10 @@ class RegionalSampler:
     @staticmethod
     def doit(seed, seed_2nd, seed_2nd_mode, steps, base_only_steps, denoise, samples, base_sampler, regional_prompts, overlap_factor, restore_latent,
              additional_mode, additional_sampler, additional_sigma_ratio, unique_id=None):
+
+        samples = samples.copy()
+        samples['samples'] = comfy.sample.fix_empty_latent_channels(base_sampler.params[0], samples['samples'])
+
         if restore_latent:
             latent_compositor = nodes.NODE_CLASS_MAPPINGS['LatentCompositeMasked']()
         else:
@@ -519,7 +393,8 @@ class RegionalSampler:
             core.update_node_status(unique_id, f"{i}/{steps} steps  |         ", ((i-start_at_step)*region_len)/total)
 
             new_latent_image['noise_mask'] = inv_mask
-            new_latent_image = base_sampler.sample_advanced(add_noise, seed, adv_steps, new_latent_image, i, i + 1, True,
+            new_latent_image = base_sampler.sample_advanced(add_noise, seed, adv_steps, new_latent_image,
+                                                            start_at_step=i, end_at_step=i + 1, return_with_leftover_noise=True,
                                                             recovery_mode=additional_mode, recovery_sampler=additional_sampler, recovery_sigma_ratio=additional_sigma_ratio, noise=noise)
 
             if restore_latent:
@@ -576,44 +451,25 @@ class RegionalSamplerAdvanced:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                     "add_noise": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled"}),
-                     "noise_seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
-                     "steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
-                     "start_at_step": ("INT", {"default": 0, "min": 0, "max": 10000}),
-                     "end_at_step": ("INT", {"default": 10000, "min": 0, "max": 10000}),
-                     "overlap_factor": ("INT", {"default": 10, "min": 0, "max": 10000}),
-                     "restore_latent": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled"}),
-                     "return_with_leftover_noise": ("BOOLEAN", {"default": False, "label_on": "enabled", "label_off": "disabled"}),
-                     "latent_image": ("LATENT", ),
-                     "base_sampler": ("KSAMPLER_ADVANCED", ),
-                     "regional_prompts": ("REGIONAL_PROMPTS", ),
-                     "additional_mode": (["DISABLE", "ratio additional", "ratio between"], {"default": "ratio between"}),
-                     "additional_sampler": (["AUTO", "euler", "heun", "heunpp2", "dpm_2", "dpm_fast", "dpmpp_2m", "ddpm"],),
-                     "additional_sigma_ratio": ("FLOAT", {"default": 0.3, "min": 0.0, "max": 1.0, "step": 0.01}),
+                     "add_noise": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled", "tooltip": "Whether to add noise"}),
+                     "noise_seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff, "tooltip": "Random seed to use for generating CPU noise for sampling."}),
+                     "steps": ("INT", {"default": 20, "min": 1, "max": 10000, "tooltip": "total sampling steps"}),
+                     "start_at_step": ("INT", {"default": 0, "min": 0, "max": 10000, "tooltip": "The starting step of the sampling to be applied at this node within the range of 'steps'."}),
+                     "end_at_step": ("INT", {"default": 10000, "min": 0, "max": 10000, "tooltip": "The step at which sampling applied at this node will stop within the range of steps (if greater than steps, sampling will continue only up to steps)."}),
+                     "overlap_factor": ("INT", {"default": 10, "min": 0, "max": 10000, "tooltip": "To smooth the seams of the region boundaries, expand the mask set in regional_prompts by the overlap_factor amount to overlap with other regions."}),
+                     "restore_latent": ("BOOLEAN", {"default": True, "label_on": "enabled", "label_off": "disabled", "tooltip": "At each step, restore the noise outside the mask area to its original state, as per the principle of inpainting. This option is provided for backward compatibility, and it is recommended to always set it to true."}),
+                     "return_with_leftover_noise": ("BOOLEAN", {"default": False, "label_on": "enabled", "label_off": "disabled", "tooltip": "Whether to return the latent with noise remaining if the noise has not been completely removed according to the noise schedule, or to completely remove the noise before returning it."}),
+                     "latent_image": ("LATENT", {"tooltip": "input latent image"}),
+                     "base_sampler": ("KSAMPLER_ADVANCED", {"tooltip": "The sampler applied outside the area set by the regional_prompt."}),
+                     "regional_prompts": ("REGIONAL_PROMPTS", {"tooltip": "The prompt applied to each region"}),
+                     "additional_mode": (["DISABLE", "ratio additional", "ratio between"], {"default": "ratio between", "tooltip": "..._sde or uni_pc and other special samplers are used, the region is not properly denoised, and it causes a phenomenon that destroys the overall harmony. To compensate for this, a recovery operation is performed using another sampler. This requires a longer time for sampling because a second sampling is performed at each step in each region using a special sampler. 1) DISABLE: Disable this feature. 2) ratio additional: After performing the denoise amount to be performed in the step with the sampler set in the region, the recovery sampler is additionally applied by the additional_sigma_ratio. If you use this option, the total denoise amount increases by additional_sigma_ratio. 3) ratio between: The denoise amount to be performed in the step with the sampler set in the region and the denoise amount to be applied to the recovery sampler are divided by additional_sigma_ratio, and denoise is performed for each denoise amount. If you use this option, the total denoise amount does not change."}),
+                     "additional_sampler": (["AUTO", "euler", "heun", "heunpp2", "dpm_2", "dpm_fast", "dpmpp_2m", "ddpm"], {"tooltip": "1) AUTO: Automatically set the recovery sampler. If the sampler is uni_pc, uni_pc_bh2, dpmpp_sde, dpmpp_sde_gpu, the dpm_fast sampler is selected If the sampler is dpmpp_2m_sde, dpmpp_2m_sde_gpu, dpmpp_3m_sde, dpmpp_3m_sde_gpu, the dpmpp_2m sampler is selected. 2) Others: Manually set the recovery sampler."}),
+                     "additional_sigma_ratio": ("FLOAT", {"default": 0.3, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "Multiplier of noise schedule to be applied according to additional_mode."}),
                      },
                  "hidden": {"unique_id": "UNIQUE_ID"},
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "add_noise": "Whether to add noise",
-            "noise_seed": "Random seed to use for generating CPU noise for sampling.",
-            "steps": "total sampling steps",
-            "start_at_step": "The starting step of the sampling to be applied at this node within the range of 'steps'.",
-            "end_at_step": "The step at which sampling applied at this node will stop within the range of steps (if greater than steps, sampling will continue only up to steps).",
-            "overlap_factor": "To smooth the seams of the region boundaries, expand the mask set in regional_prompts by the overlap_factor amount to overlap with other regions.",
-            "restore_latent": "At each step, restore the noise outside the mask area to its original state, as per the principle of inpainting. This option is provided for backward compatibility, and it is recommended to always set it to true.",
-            "return_with_leftover_noise": "Whether to return the latent with noise remaining if the noise has not been completely removed according to the noise schedule, or to completely remove the noise before returning it.",
-            "latent_image": "input latent image",
-            "base_sampler": "The sampler applied outside the area set by the regional_prompt.",
-            "regional_prompts": "The prompt applied to each region",
-            "additional_mode": "..._sde or uni_pc and other special samplers are used, the region is not properly denoised, and it causes a phenomenon that destroys the overall harmony. To compensate for this, a recovery operation is performed using another sampler. This requires a longer time for sampling because a second sampling is performed at each step in each region using a special sampler. 1) DISABLE: Disable this feature. 2) ratio additional: After performing the denoise amount to be performed in the step with the sampler set in the region, the recovery sampler is additionally applied by the additional_sigma_ratio. If you use this option, the total denoise amount increases by additional_sigma_ratio. 3) ratio between: The denoise amount to be performed in the step with the sampler set in the region and the denoise amount to be applied to the recovery sampler are divided by additional_sigma_ratio, and denoise is performed for each denoise amount. If you use this option, the total denoise amount does not change.",
-            "additional_sampler": "1) AUTO: Automatically set the recovery sampler. If the sampler is uni_pc, uni_pc_bh2, dpmpp_sde, dpmpp_sde_gpu, the dpm_fast sampler is selected If the sampler is dpmpp_2m_sde, dpmpp_2m_sde_gpu, dpmpp_3m_sde, dpmpp_3m_sde_gpu, the dpmpp_2m sampler is selected. 2) Others: Manually set the recovery sampler.",
-            "additional_sigma_ratio": "Multiplier of noise schedule to be applied according to additional_mode.",
-        },
-        "output": ("result latent", )
-    }
-
+    OUTPUT_TOOLTIPS = ("result latent", )
 
     RETURN_TYPES = ("LATENT", )
     FUNCTION = "doit"
@@ -624,6 +480,9 @@ class RegionalSamplerAdvanced:
     def doit(add_noise, noise_seed, steps, start_at_step, end_at_step, overlap_factor, restore_latent, return_with_leftover_noise, latent_image, base_sampler, regional_prompts,
              additional_mode, additional_sampler, additional_sigma_ratio, unique_id):
 
+        new_latent_image = latent_image.copy()
+        new_latent_image['samples'] = comfy.sample.fix_empty_latent_channels(base_sampler.params[0], new_latent_image['samples'])
+
         if restore_latent:
             latent_compositor = nodes.NODE_CLASS_MAPPINGS['LatentCompositeMasked']()
         else:
@@ -639,7 +498,6 @@ class RegionalSamplerAdvanced:
         end_at_step = min(steps, end_at_step)
         total = (end_at_step - start_at_step) * region_len
 
-        new_latent_image = latent_image.copy()
         base_latent_image = None
         region_masks = {}
 
@@ -714,35 +572,22 @@ class KSamplerBasicPipe:
     @classmethod
     def INPUT_TYPES(s):
         return {"required":
-                    {"basic_pipe": ("BASIC_PIPE",),
-                     "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
-                     "steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
-                     "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0}),
-                     "sampler_name": (comfy.samplers.KSampler.SAMPLERS, ),
-                     "scheduler": (core.SCHEDULERS, ),
-                     "latent_image": ("LATENT", ),
-                     "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}),
+                    {"basic_pipe": ("BASIC_PIPE", {"tooltip": "basic_pipe input for sampling"}),
+                     "seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff, "tooltip": "Random seed to use for generating CPU noise for sampling."}),
+                     "steps": ("INT", {"default": 20, "min": 1, "max": 10000, "tooltip": "total sampling steps"}),
+                     "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0, "tooltip": "classifier free guidance value"}),
+                     "sampler_name": (comfy.samplers.KSampler.SAMPLERS, {"tooltip": "sampler"}),
+                     "scheduler": (core.SCHEDULERS, {"tooltip": "noise schedule"}),
+                     "latent_image": ("LATENT", {"tooltip": "input latent image"}),
+                     "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "The amount of noise to remove. This amount is the noise added at the start, and the higher it is, the more the input latent will be modified before being returned."}),
                      },
                 "optional":
                     {
-                        "scheduler_func_opt": ("SCHEDULER_FUNC", ),
+                        "scheduler_func_opt": ("SCHEDULER_FUNC", {"tooltip": "[OPTIONAL] Noise schedule generation function. If this is set, the scheduler widget will be ignored."}),
                     }
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "basic_pipe": "basic_pipe input for sampling",
-            "seed": "Random seed to use for generating CPU noise for sampling.",
-            "steps": "total sampling steps",
-            "cfg": "classifier free guidance value",
-            "sampler_name": "sampler",
-            "scheduler": "noise schedule",
-            "latent_image": "input latent image",
-            "denoise": "The amount of noise to remove. This amount is the noise added at the start, and the higher it is, the more the input latent will be modified before being returned.",
-            "scheduler_func_opt": "[OPTIONAL] Noise schedule generation function. If this is set, the scheduler widget will be ignored.",
-        },
-        "output": ("passthrough input basic_pipe", "result latent", "VAE in basic_pipe")
-    }
+    OUTPUT_TOOLTIPS = ("passthrough input basic_pipe", "result latent", "VAE in basic_pipe")
 
     RETURN_TYPES = ("BASIC_PIPE", "LATENT", "VAE")
     FUNCTION = "sample"
@@ -760,41 +605,25 @@ class KSamplerAdvancedBasicPipe:
     @classmethod
     def INPUT_TYPES(s):
         return {"required":
-                    {"basic_pipe": ("BASIC_PIPE",),
-                     "add_noise": ("BOOLEAN", {"default": True, "label_on": "enable", "label_off": "disable"}),
-                     "noise_seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
-                     "steps": ("INT", {"default": 20, "min": 1, "max": 10000}),
-                     "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0}),
-                     "sampler_name": (comfy.samplers.KSampler.SAMPLERS, ),
-                     "scheduler": (core.SCHEDULERS, ),
-                     "latent_image": ("LATENT", ),
-                     "start_at_step": ("INT", {"default": 0, "min": 0, "max": 10000}),
-                     "end_at_step": ("INT", {"default": 10000, "min": 0, "max": 10000}),
-                     "return_with_leftover_noise": ("BOOLEAN", {"default": False, "label_on": "enable", "label_off": "disable"}),
+                    {"basic_pipe": ("BASIC_PIPE", {"tooltip": "basic_pipe input for sampling"}),
+                     "add_noise": ("BOOLEAN", {"default": True, "label_on": "enable", "label_off": "disable", "tooltip": "Whether to add noise"}),
+                     "noise_seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff, "tooltip": "Random seed to use for generating CPU noise for sampling."}),
+                     "steps": ("INT", {"default": 20, "min": 1, "max": 10000, "tooltip": "total sampling steps"}),
+                     "cfg": ("FLOAT", {"default": 8.0, "min": 0.0, "max": 100.0, "tooltip": "classifier free guidance value"}),
+                     "sampler_name": (comfy.samplers.KSampler.SAMPLERS, {"tooltip": "sampler"}),
+                     "scheduler": (core.SCHEDULERS, {"tooltip": "noise schedule"}),
+                     "latent_image": ("LATENT", {"tooltip": "input latent image"}),
+                     "start_at_step": ("INT", {"default": 0, "min": 0, "max": 10000, "tooltip": "The starting step of the sampling to be applied at this node within the range of 'steps'."}),
+                     "end_at_step": ("INT", {"default": 10000, "min": 0, "max": 10000, "tooltip": "The step at which sampling applied at this node will stop within the range of steps (if greater than steps, sampling will continue only up to steps)."}),
+                     "return_with_leftover_noise": ("BOOLEAN", {"default": False, "label_on": "enable", "label_off": "disable", "tooltip": "Whether to return the latent with noise remaining if the noise has not been completely removed according to the noise schedule, or to completely remove the noise before returning it."}),
                      },
                 "optional":
                     {
-                        "scheduler_func_opt": ("SCHEDULER_FUNC", ),
+                        "scheduler_func_opt": ("SCHEDULER_FUNC", {"tooltip": "[OPTIONAL] Noise schedule generation function. If this is set, the scheduler widget will be ignored."}),
                     }
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "basic_pipe": "basic_pipe input for sampling",
-            "add_noise": "Whether to add noise",
-            "noise_seed": "Random seed to use for generating CPU noise for sampling.",
-            "steps": "total sampling steps",
-            "cfg": "classifier free guidance value",
-            "sampler_name": "sampler",
-            "scheduler": "noise schedule",
-            "latent_image": "input latent image",
-            "start_at_step": "The starting step of the sampling to be applied at this node within the range of 'steps'.",
-            "end_at_step": "The step at which sampling applied at this node will stop within the range of steps (if greater than steps, sampling will continue only up to steps).",
-            "return_with_leftover_noise": "Whether to return the latent with noise remaining if the noise has not been completely removed according to the noise schedule, or to completely remove the noise before returning it.",
-            "scheduler_func_opt": "[OPTIONAL] Noise schedule generation function. If this is set, the scheduler widget will be ignored.",
-        },
-        "output": ("passthrough input basic_pipe", "result latent", "VAE in basic_pipe")
-    }
+    OUTPUT_TOOLTIPS = ("passthrough input basic_pipe", "result latent", "VAE in basic_pipe")
 
     RETURN_TYPES = ("BASIC_PIPE", "LATENT", "VAE")
     FUNCTION = "sample"
@@ -813,25 +642,20 @@ class GITSSchedulerFuncProvider:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                        "coeff": ("FLOAT", {"default": 1.20, "min": 0.80, "max": 1.50, "step": 0.05}),
-                        "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01}),
+                        "coeff": ("FLOAT", {"default": 1.20, "min": 0.80, "max": 1.50, "step": 0.05, "tooltip": "coeff factor of GITS Scheduler"}),
+                        "denoise": ("FLOAT", {"default": 1.0, "min": 0.0, "max": 1.0, "step": 0.01, "tooltip": "denoise amount for noise schedule"}),
                     }
                 }
 
-    TOOLTIPS = {
-        "input": {
-            "coeff": "coeff factor of GITS Scheduler",
-            "denoise": "denoise amount for noise schedule",
-        },
-        "output": ("Returns a function that generates a noise schedule using GITSScheduler. This can be used in place of a predetermined noise schedule to dynamically generate a noise schedule based on the steps.",)
-    }
+    OUTPUT_TOOLTIPS = ("Returns a function that generates a noise schedule using GITSScheduler. This can be used in place of a predetermined noise schedule to dynamically generate a noise schedule based on the steps.",)
 
     RETURN_TYPES = ("SCHEDULER_FUNC",)
     CATEGORY = "ImpactPack/sampling"
 
     FUNCTION = "doit"
 
-    def doit(self, coeff, denoise):
+    @staticmethod
+    def doit(coeff, denoise):
         def f(model, sampler, steps):
             if 'GITSScheduler' not in nodes.NODE_CLASS_MAPPINGS:
                 raise Exception("[Impact Pack] ComfyUI is an outdated version. Cannot use GITSScheduler.")
@@ -840,3 +664,20 @@ class GITSSchedulerFuncProvider:
             return scheduler.get_sigmas(coeff, steps, denoise)[0]
 
         return (f, )
+
+
+class NegativeConditioningPlaceholder:
+    @classmethod
+    def INPUT_TYPES(s):
+        return {"required": {}}
+
+    OUTPUT_TOOLTIPS = ("This is a Placeholder for the FLUX model that does not use Negative Conditioning.",)
+
+    RETURN_TYPES = ("CONDITIONING",)
+    CATEGORY = "ImpactPack/sampling"
+
+    FUNCTION = "doit"
+
+    @staticmethod
+    def doit():
+        return ("NegativePlaceholder", )

modules/impact/util_nodes.py

@@ -6,29 +6,49 @@ import comfy
 import sys
 import nodes
 import re
+import impact.core as core
 from server import PromptServer
+import inspect
 
 
 class GeneralSwitch:
     @classmethod
     def INPUT_TYPES(s):
-        return {"required": {
-                    "select": ("INT", {"default": 1, "min": 1, "max": 999999, "step": 1}),
-                    "sel_mode": ("BOOLEAN", {"default": True, "label_on": "select_on_prompt", "label_off": "select_on_execution", "forceInput": False}),
-                    },
-                "optional": {
-                    "input1": (any_typ,),
+        dyn_inputs = {"input1": (any_typ, {"lazy": True, "tooltip": "Any input. When connected, one more input slot is added."}), }
+        if core.is_execution_model_version_supported():
+            stack = inspect.stack()
+            if stack[2].function == 'get_input_info' and stack[3].function == 'add_node':
+                for x in range(2, 200):
+                    dyn_inputs[f"input{x}"] = (any_typ, {"lazy": True})
+
+        inputs = {"required": {
+                    "select": ("INT", {"default": 1, "min": 1, "max": 999999, "step": 1, "tooltip": "The input number you want to output among the inputs"}),
+                    "sel_mode": ("BOOLEAN", {"default": False, "label_on": "select_on_prompt", "label_off": "select_on_execution", "forceInput": False,
+                                             "tooltip": "In the case of 'select_on_execution', the selection is dynamically determined at the time of workflow execution. 'select_on_prompt' is an option that exists for older versions of ComfyUI, and it makes the decision before the workflow execution."}),
                     },
+                "optional": dyn_inputs,
                 "hidden": {"unique_id": "UNIQUE_ID", "extra_pnginfo": "EXTRA_PNGINFO"}
                 }
 
+        return inputs
+
     RETURN_TYPES = (any_typ, "STRING", "INT")
     RETURN_NAMES = ("selected_value", "selected_label", "selected_index")
+    OUTPUT_TOOLTIPS = ("Output is generated only from the input chosen by the 'select' value.", "Slot label of the selected input slot", "Outputs the select value as is")
     FUNCTION = "doit"
 
     CATEGORY = "ImpactPack/Util"
 
-    def doit(self, *args, **kwargs):
+    def check_lazy_status(self, *args, **kwargs):
+        selected_index = int(kwargs['select'])
+        input_name = f"input{selected_index}"
+
+        print(f"SELECTED: {input_name}")
+
+        return [input_name]
+
+    @staticmethod
+    def doit(*args, **kwargs):
         selected_index = int(kwargs['select'])
         input_name = f"input{selected_index}"
 
@@ -50,11 +70,10 @@ class GeneralSwitch:
             print(f"[Impact-Pack] The switch node does not guarantee proper functioning in API mode.")
 
         if input_name in kwargs:
-            return (kwargs[input_name], selected_label, selected_index)
+            return kwargs[input_name], selected_label, selected_index
         else:
             print(f"ImpactSwitch: invalid select index (ignored)")
-            return (None, "", selected_index)
-
+            return None, "", selected_index
 
 class LatentSwitch:
     @classmethod
@@ -126,23 +145,44 @@ class GeneralInversedSwitch:
     @classmethod
     def INPUT_TYPES(s):
         return {"required": {
-                    "select": ("INT", {"default": 1, "min": 1, "max": 999999, "step": 1}),
-                    "input": (any_typ,),
+                    "select": ("INT", {"default": 1, "min": 1, "max": 999999, "step": 1, "tooltip": "The output number you want to send from the input"}),
+                    "input": (any_typ, {"tooltip": "Any input. When connected, one more input slot is added."}),
+
                     },
-                "hidden": {"unique_id": "UNIQUE_ID"},
+                "optional": {
+                    "sel_mode": ("BOOLEAN", {"default": False, "label_on": "select_on_prompt", "label_off": "select_on_execution", "forceInput": False,
+                                             "tooltip": "In the case of 'select_on_execution', the selection is dynamically determined at the time of workflow execution. 'select_on_prompt' is an option that exists for older versions of ComfyUI, and it makes the decision before the workflow execution."}),
+                    },
+                "hidden": {"prompt": "PROMPT", "unique_id": "UNIQUE_ID"},
                 }
 
     RETURN_TYPES = ByPassTypeTuple((any_typ, ))
+    OUTPUT_TOOLTIPS = ("Output occurs only from the output selected by the 'select' value.\nWhen slots are connected, additional slots are created.", )
     FUNCTION = "doit"
 
     CATEGORY = "ImpactPack/Util"
 
-    def doit(self, select, input, unique_id):
+    def doit(self, select, prompt, unique_id, input, **kwargs):
+        if core.is_execution_model_version_supported:
+            from comfy_execution.graph import ExecutionBlocker
+        else:
+            print("[Impact Pack] InversedSwitch: ComfyUI is outdated. The 'select_on_execution' mode cannot function properly.")
+
         res = []
 
-        for i in range(0, select):
+        # search max output count in prompt
+        cnt = 0
+        for x in prompt.values():
+            for y in x.get('inputs', {}).values():
+                if isinstance(y, list) and len(y) == 2:
+                    if y[0] == unique_id:
+                        cnt = max(cnt, y[1])
+
+        for i in range(0, cnt + 1):
             if select == i+1:
                 res.append(input)
+            elif core.is_execution_model_version_supported:
+                res.append(ExecutionBlocker(None))
             else:
                 res.append(None)
 

modules/impact/utils.py

@@ -537,6 +537,16 @@ def make_3d_mask(mask):
     return mask
 
 
+def make_4d_mask(mask):
+    if len(mask.shape) == 3:
+        return mask.unsqueeze(0)
+
+    elif len(mask.shape) == 2:
+        return mask.unsqueeze(0).unsqueeze(0)
+
+    return mask
+
+
 def is_same_device(a, b):
     a_device = torch.device(a) if isinstance(a, str) else a
     b_device = torch.device(b) if isinstance(b, str) else b
@@ -556,7 +566,8 @@ from torchvision.transforms.functional import to_pil_image
 
 
 def resize_mask(mask, size):
-    resized_mask = torch.nn.functional.interpolate(mask.unsqueeze(0), size=size, mode='bilinear', align_corners=False)
+    mask = make_4d_mask(mask)
+    resized_mask = torch.nn.functional.interpolate(mask, size=size, mode='bilinear', align_corners=False)
     return resized_mask.squeeze(0)
 
 

modules/impact/wildcards.py

@@ -29,7 +29,7 @@ def get_wildcard_dict():
 
 
 def wildcard_normalize(x):
-    return x.replace("\\", "/").lower()
+    return x.replace("\\", "/").replace(' ', '-').lower()
 
 
 def read_wildcard(k, v):
@@ -53,23 +53,28 @@ def read_wildcard_dict(wildcard_path):
             if file.endswith('.txt'):
                 file_path = os.path.join(root, file)
                 rel_path = os.path.relpath(file_path, wildcard_path)
-                key = os.path.splitext(rel_path)[0].replace('\\', '/').lower()
+                key = wildcard_normalize(os.path.splitext(rel_path)[0])
 
                 try:
                     with open(file_path, 'r', encoding="ISO-8859-1") as f:
                         lines = f.read().splitlines()
                         wildcard_dict[key] = lines
-                except UnicodeDecodeError:
+                except yaml.reader.ReaderError:
                     with open(file_path, 'r', encoding="UTF-8", errors="ignore") as f:
                         lines = f.read().splitlines()
                         wildcard_dict[key] = lines
             elif file.endswith('.yaml'):
                 file_path = os.path.join(root, file)
-                with open(file_path, 'r') as f:
-                    yaml_data = yaml.load(f, Loader=yaml.FullLoader)
 
-                    for k, v in yaml_data.items():
-                        read_wildcard(k, v)
+                try:
+                    with open(file_path, 'r', encoding="ISO-8859-1") as f:
+                        yaml_data = yaml.load(f, Loader=yaml.FullLoader)
+                except yaml.reader.ReaderError as e:
+                    with open(file_path, 'r', encoding="UTF-8", errors="ignore") as f:
+                        yaml_data = yaml.load(f, Loader=yaml.FullLoader)
+
+                for k, v in yaml_data.items():
+                    read_wildcard(k, v)
 
     return wildcard_dict
 
@@ -420,7 +425,7 @@ def process_with_loras(wildcard_opt, model, clip, clip_encoder=None, seed=None,
 
 def starts_with_regex(pattern, text):
     regex = re.compile(pattern)
-    return bool(regex.match(text))
+    return regex.match(text)
 
 
 def split_to_dict(text):
@@ -502,18 +507,21 @@ def process_wildcard_for_segs(wildcard):
 
         return 'LAB', WildcardChooserDict(items)
 
-    elif starts_with_regex(r"\[(ASC|DSC|RND)\]", wildcard):
-        mode = wildcard[1:4]
-        items = split_string_with_sep(wildcard[5:])
-
-        if mode == 'RND':
-            random.shuffle(items)
-            return mode, WildcardChooser(items, True)
-        else:
-            return mode, WildcardChooser(items, False)
-
     else:
-        return None, WildcardChooser([(None, wildcard)], False)
+        match = starts_with_regex(r"\[(ASC-SIZE|DSC-SIZE|ASC|DSC|RND)\]", wildcard)
+
+        if match:
+            mode = match[1]
+            items = split_string_with_sep(wildcard[len(match[0]):])
+
+            if mode == 'RND':
+                random.shuffle(items)
+                return mode, WildcardChooser(items, True)
+            else:
+                return mode, WildcardChooser(items, False)
+
+        else:
+            return None, WildcardChooser([(None, wildcard)], False)
 
 
 def wildcard_load():

pyproject.toml

@@ -1,8 +1,8 @@
 [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 = "5.18.13"
-license = "LICENSE"
+version = "7.3.2"
+license = { file = "LICENSE.txt" }
 dependencies = ["segment-anything", "scikit-image", "piexif", "transformers", "opencv-python-headless", "GitPython", "scipy>=1.11.4"]
 
 [project.urls]