feat: PreviewBridgeLatent supports TAEF1

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

README.md

@@ -7,6 +7,7 @@ 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.
@@ -193,11 +194,8 @@ This custom node helps to conveniently enhance images through Detector, Detailer
 ### 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}`.
@@ -280,6 +278,8 @@ This custom node helps to conveniently enhance images through Detector, Detailer
   * `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

@@ -281,6 +281,7 @@ NODE_CLASS_MAPPINGS = {
     "ImpactStringSelector": StringSelector,
     "StringListToString": StringListToString,
     "WildcardPromptFromString": WildcardPromptFromString,
+    "ImpactExecutionOrderController": ImpactExecutionOrderController,
 
     "RemoveNoiseMask": RemoveNoiseMask,
 
@@ -397,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",

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]
@@ -169,16 +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",
-                                        "Latent2RGB-FLUX.1",
-                                        "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", )
@@ -230,9 +233,9 @@ 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 or 'FLUX.1' 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, SC-B and FLUX.1 are not compatible with each other.")
@@ -286,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 = [6, 0, 1]
+version_code = [7, 1]
 version = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 
 dependency_version = 22

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/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')
 
@@ -968,7 +969,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,6 +6,7 @@ import latent_preview
 import comfy
 import torch
 import math
+import comfy.model_management as mm
 
 
 try:
@@ -142,16 +143,27 @@ def sample_with_custom_noise(model, add_noise, noise_seed, cfg, positive, negati
 
     disable_pbar = not comfy.utils.PROGRESS_BAR_ENABLED
 
+    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':
-        guider = comfy.samplers.CFGGuider(model)
-        guider.set_conds(positive, negative)
-        guider.set_cfg(cfg)
+        # 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 = 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

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/logics.py

@@ -86,11 +86,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 +109,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,)
@@ -699,6 +706,24 @@ class ImpactControlBridge:
         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/util_nodes.py

@@ -6,29 +6,47 @@ 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": {
+        dyn_inputs = {"input1": (any_typ, {"lazy": True}), }
+        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}),
-                    "sel_mode": ("BOOLEAN", {"default": True, "label_on": "select_on_prompt", "label_off": "select_on_execution", "forceInput": False}),
-                    },
-                "optional": {
-                    "input1": (any_typ,),
+                    "sel_mode": ("BOOLEAN", {"default": False, "label_on": "select_on_prompt", "label_off": "select_on_execution", "forceInput": False}),
                     },
+                "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")
     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 +68,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
@@ -129,7 +146,9 @@ class GeneralInversedSwitch:
                     "select": ("INT", {"default": 1, "min": 1, "max": 999999, "step": 1}),
                     "input": (any_typ,),
                     },
-                "hidden": {"unique_id": "UNIQUE_ID"},
+                "optional": {
+                    "sel_mode": ("BOOLEAN", {"default": False, "label_on": "select_on_prompt", "label_off": "select_on_execution", "forceInput": False}),
+                    },
                 }
 
     RETURN_TYPES = ByPassTypeTuple((any_typ, ))
@@ -137,7 +156,7 @@ class GeneralInversedSwitch:
 
     CATEGORY = "ImpactPack/Util"
 
-    def doit(self, select, input, unique_id):
+    def doit(self, select, input, **kwargs):
         res = []
 
         for i in range(0, select):

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)
 
 

pyproject.toml

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