refactor: change type name NOISE to NOISE_IMAGE.

ltdrdata · Dec 20, 2024 · bcbed07 · bcbed07
1 parent 685c5c0
commit bcbed07
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 This repository offers various extension nodes for ComfyUI. Nodes here have different characteristics compared to those in the ComfyUI Impact Pack. The Impact Pack has become too large now...
 
 ## Notice:
+* v1.9.1 To avoid confusion with the `NOISE` type in core, the type name has been changed to `NOISE_IMAGE`.
 * V0.73 The Variation Seed feature is added to Regional Prompt nodes, and it is only compatible with versions Impact Pack V5.10 and above.
 * V0.69 incompatible with the outdated **ComfyUI IPAdapter Plus**. (A version dated March 24th or later is required.)
 * V0.64 add sigma_factor to RegionalPrompt... nodes required Impact Pack V4.76 or later.

diff --git a/__init__.py b/__init__.py
@@ -7,7 +7,7 @@
 
 import importlib
 
-version_code = [1, 9]
+version_code = [1, 9, 1]
 version_str = f"V{version_code[0]}.{version_code[1]}" + (f'.{version_code[2]}' if len(version_code) > 2 else '')
 print(f"### Loading: ComfyUI-Inspire-Pack ({version_str})")
 

diff --git a/inspire/a1111_compat.py b/inspire/a1111_compat.py
@@ -162,7 +162,7 @@ def INPUT_TYPES(s):
                 "optional":
                     {
                         "variation_method": (["linear", "slerp"],),
-                        "noise_opt": ("NOISE",),
+                        "noise_opt": ("NOISE_IMAGE",),
                         "scheduler_func_opt": ("SCHEDULER_FUNC",),
                     }
                 }
@@ -253,7 +253,7 @@ def INPUT_TYPES(s):
                      },
                 "optional":
                     {
-                        "noise_opt": ("NOISE",),
+                        "noise_opt": ("NOISE_IMAGE",),
                         "scheduler_func_opt": ("SCHEDULER_FUNC",),
                     }
                 }

diff --git a/inspire/prompt_support.py b/inspire/prompt_support.py
@@ -687,7 +687,7 @@ def INPUT_TYPES(s):
                 }
         }
 
-    RETURN_TYPES = ("NOISE",)
+    RETURN_TYPES = ("NOISE_IMAGE",)
     FUNCTION = "doit"
 
     CATEGORY = "InspirePack/Prompt"
@@ -762,15 +762,15 @@ class CompositeNoise:
     def INPUT_TYPES(s):
         return {
             "required": {
-                "destination": ("NOISE",),
-                "source": ("NOISE",),
+                "destination": ("NOISE_IMAGE",),
+                "source": ("NOISE_IMAGE",),
                 "mode": (["center", "left-top", "right-top", "left-bottom", "right-bottom", "xy"], ),
                 "x": ("INT", {"default": 0, "min": 0, "max": nodes.MAX_RESOLUTION, "step": 8}),
                 "y": ("INT", {"default": 0, "min": 0, "max": nodes.MAX_RESOLUTION, "step": 8}),
             },
         }
 
-    RETURN_TYPES = ("NOISE",)
+    RETURN_TYPES = ("NOISE_IMAGE",)
     FUNCTION = "doit"
 
     CATEGORY = "InspirePack/Prompt"

diff --git a/inspire/regional_nodes.py b/inspire/regional_nodes.py
@@ -460,7 +460,7 @@ def INPUT_TYPES(s):
             "required": {
                 "mask": ("MASK",),
 
-                "noise": ("NOISE",),
+                "noise": ("NOISE_IMAGE",),
                 "seed_prompt": ("STRING", {"multiline": True, "dynamicPrompts": False, "pysssss.autocomplete": False}),
                 "enable_additional": ("BOOLEAN", {"default": True, "label_on": "true", "label_off": "false"}),
                 "additional_seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
@@ -471,7 +471,7 @@ def INPUT_TYPES(s):
                 {"variation_method": (["linear", "slerp"],), }
         }
 
-    RETURN_TYPES = ("NOISE",)
+    RETURN_TYPES = ("NOISE_IMAGE",)
     FUNCTION = "doit"
 
     CATEGORY = "InspirePack/Regional"
@@ -517,7 +517,7 @@ def INPUT_TYPES(s):
                 "color_mask": ("IMAGE",),
                 "mask_color": ("STRING", {"multiline": False, "default": "#FFFFFF"}),
 
-                "noise": ("NOISE",),
+                "noise": ("NOISE_IMAGE",),
                 "seed_prompt": ("STRING", {"multiline": True, "dynamicPrompts": False, "pysssss.autocomplete": False}),
                 "enable_additional": ("BOOLEAN", {"default": True, "label_on": "true", "label_off": "false"}),
                 "additional_seed": ("INT", {"default": 0, "min": 0, "max": 0xffffffffffffffff}),
@@ -528,7 +528,7 @@ def INPUT_TYPES(s):
                 {"variation_method": (["linear", "slerp"],), }
         }
 
-    RETURN_TYPES = ("NOISE", "MASK")
+    RETURN_TYPES = ("NOISE_IMAGE", "MASK")
     FUNCTION = "doit"
 
     CATEGORY = "InspirePack/Regional"

diff --git a/pyproject.toml b/pyproject.toml
@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-inspire-pack"
 description = "This extension provides various nodes to support Lora Block Weight, Regional Nodes, Backend Cache, Prompt Utils, List Utils, Noise(Seed) Utils, ... and the Impact Pack."
-version = "1.9"
+version = "1.9.1"
 license = { file = "LICENSE" }
 dependencies = ["matplotlib", "cachetools"]