put V1 nodes back

comfy_extras/nodes_mask.py

@@ -3,7 +3,10 @@ import scipy.ndimage
 import torch
 import comfy.utils
 import node_helpers
+import folder_paths
+import random
 
+import nodes
 from nodes import MAX_RESOLUTION
 
 def composite(destination, source, x, y, mask = None, multiplier = 8, resize_source = False):
@@ -362,6 +365,30 @@ class ThresholdMask:
         mask = (mask > value).float()
         return (mask,)
 
+# Mask Preview - original implement from
+# https://github.com/cubiq/ComfyUI_essentials/blob/9d9f4bedfc9f0321c19faf71855e228c93bd0dc9/mask.py#L81
+# upstream requested in https://github.com/Kosinkadink/rfcs/blob/main/rfcs/0000-corenodes.md#preview-nodes
+class MaskPreview(nodes.SaveImage):
+    def __init__(self):
+        self.output_dir = folder_paths.get_temp_directory()
+        self.type = "temp"
+        self.prefix_append = "_temp_" + ''.join(random.choice("abcdefghijklmnopqrstupvxyz") for x in range(5))
+        self.compress_level = 4
+
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {"mask": ("MASK",), },
+            "hidden": {"prompt": "PROMPT", "extra_pnginfo": "EXTRA_PNGINFO"},
+        }
+
+    FUNCTION = "execute"
+    CATEGORY = "mask"
+
+    def execute(self, mask, filename_prefix="ComfyUI", prompt=None, extra_pnginfo=None):
+        preview = mask.reshape((-1, 1, mask.shape[-2], mask.shape[-1])).movedim(1, -1).expand(-1, -1, -1, 3)
+        return self.save_images(preview, filename_prefix, prompt, extra_pnginfo)
+
 
 NODE_CLASS_MAPPINGS = {
     "LatentCompositeMasked": LatentCompositeMasked,
@@ -376,8 +403,10 @@ NODE_CLASS_MAPPINGS = {
     "FeatherMask": FeatherMask,
     "GrowMask": GrowMask,
     "ThresholdMask": ThresholdMask,
+    "MaskPreview": MaskPreview
 }
 
 NODE_DISPLAY_NAME_MAPPINGS = {
     "ImageToMask": "Convert Image to Mask",
+    "MaskToImage": "Convert Mask to Image",
 }

comfy_extras/nodes_webcam.py

@@ -0,0 +1,37 @@
+import nodes
+import folder_paths
+
+MAX_RESOLUTION = nodes.MAX_RESOLUTION
+
+
+class WebcamCapture(nodes.LoadImage):
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "image": ("WEBCAM", {}),
+                "width": ("INT", {"default": 0, "min": 0, "max": MAX_RESOLUTION, "step": 1}),
+                "height": ("INT", {"default": 0, "min": 0, "max": MAX_RESOLUTION, "step": 1}),
+                "capture_on_queue": ("BOOLEAN", {"default": True}),
+            }
+        }
+    RETURN_TYPES = ("IMAGE",)
+    FUNCTION = "load_capture"
+
+    CATEGORY = "image"
+
+    def load_capture(self, image, **kwargs):
+        return super().load_image(folder_paths.get_annotated_filepath(image))
+
+    @classmethod
+    def IS_CHANGED(cls, image, width, height, capture_on_queue):
+        return super().IS_CHANGED(image)
+
+
+NODE_CLASS_MAPPINGS = {
+    "WebcamCapture": WebcamCapture,
+}
+
+NODE_DISPLAY_NAME_MAPPINGS = {
+    "WebcamCapture": "Webcam Capture",
+}

comfy_extras/v3/nodes_images.py

@@ -13,12 +13,12 @@ import folder_paths
 import node_helpers
 
 
-class SaveImage(io.ComfyNodeV3):
+class SaveImage_V3(io.ComfyNodeV3):
     @classmethod
     def DEFINE_SCHEMA(cls):
         return io.SchemaV3(
-            node_id="SaveImage",
-            display_name="Save Image",
+            node_id="SaveImage_V3",
+            display_name="Save Image _V3",
             description="Saves the input images to your ComfyUI output directory.",
             category="image",
             inputs=[
@@ -68,12 +68,12 @@ class SaveImage(io.ComfyNodeV3):
         return io.NodeOutput(ui={"images": results})
 
 
-class PreviewImage(io.ComfyNodeV3):
+class PreviewImage_V3(io.ComfyNodeV3):
     @classmethod
     def DEFINE_SCHEMA(cls):
         return io.SchemaV3(
-            node_id="PreviewImage",
-            display_name="Preview Image",
+            node_id="PreviewImage_V3",
+            display_name="Preview Image _V3",
             description="Preview the input images.",
             category="image",
             inputs=[
@@ -92,12 +92,12 @@ class PreviewImage(io.ComfyNodeV3):
         return io.NodeOutput(ui=ui.PreviewImage(images))
 
 
-class LoadImage(io.ComfyNodeV3):
+class LoadImage_V3(io.ComfyNodeV3):
     @classmethod
     def DEFINE_SCHEMA(cls):
         return io.SchemaV3(
-            node_id="LoadImage",
-            display_name="Load Image",
+            node_id="LoadImage_V3",
+            display_name="Load Image _V3",
             category="image",
             inputs=[
                 io.Combo.Input(
@@ -186,12 +186,12 @@ class LoadImage(io.ComfyNodeV3):
         return True
 
 
-class LoadImageOutput(io.ComfyNodeV3):
+class LoadImageOutput_V3(io.ComfyNodeV3):
     @classmethod
     def DEFINE_SCHEMA(cls):
         return io.SchemaV3(
-            node_id="LoadImageOutput",
-            display_name="Load Image (from Outputs)",
+            node_id="LoadImageOutput_V3",
+            display_name="Load Image (from Outputs) _V3",
             description="Load an image from the output folder. "
                         "When the refresh button is clicked, the node will update the image list "
                         "and automatically select the first image, allowing for easy iteration.",
@@ -283,8 +283,8 @@ class LoadImageOutput(io.ComfyNodeV3):
 
 
 NODES_LIST: list[type[io.ComfyNodeV3]] = [
-    SaveImage,
-    PreviewImage,
-    LoadImage,
-    LoadImageOutput,
+    SaveImage_V3,
+    PreviewImage_V3,
+    LoadImage_V3,
+    LoadImageOutput_V3,
 ]

comfy_extras/v3/nodes_mask.py

@@ -1,7 +1,7 @@
 from comfy_api.v3 import io, ui
 
 
-class MaskPreview(io.ComfyNodeV3):
+class MaskPreview_V3(io.ComfyNodeV3):
     """Mask Preview - original implement in ComfyUI_essentials.
 
     https://github.com/cubiq/ComfyUI_essentials/blob/9d9f4bedfc9f0321c19faf71855e228c93bd0dc9/mask.py#L81
@@ -11,8 +11,8 @@ class MaskPreview(io.ComfyNodeV3):
     @classmethod
     def DEFINE_SCHEMA(cls):
         return io.SchemaV3(
-            node_id="MaskPreview",
-            display_name="Convert Mask to Image",
+            node_id="MaskPreview_V3",
+            display_name="Convert Mask to Image _V3",
             category="mask",
             inputs=[
                 io.Mask.Input(
@@ -29,4 +29,4 @@ class MaskPreview(io.ComfyNodeV3):
         return io.NodeOutput(ui=ui.PreviewMask(masks))
 
 
-NODES_LIST: list[type[io.ComfyNodeV3]] = [MaskPreview]
+NODES_LIST: list[type[io.ComfyNodeV3]] = [MaskPreview_V3]

comfy_extras/v3/nodes_webcam.py

@@ -13,12 +13,12 @@ import node_helpers
 MAX_RESOLUTION = nodes.MAX_RESOLUTION
 
 
-class WebcamCapture(io.ComfyNodeV3):
+class WebcamCapture_V3(io.ComfyNodeV3):
     @classmethod
     def DEFINE_SCHEMA(cls):
         return io.SchemaV3(
-            node_id="WebcamCapture",
-            display_name="Webcam Capture",
+            node_id="WebcamCapture_V3",
+            display_name="Webcam Capture _V3",
             category="image",
             inputs=[
                 io.Webcam.Input(
@@ -114,4 +114,4 @@ class WebcamCapture(io.ComfyNodeV3):
         return True
 
 
-NODES_LIST: list[type[io.ComfyNodeV3]] = [WebcamCapture]
+NODES_LIST: list[type[io.ComfyNodeV3]] = [WebcamCapture_V3]