V3: primitive nodes; additional ruff rules for V3 nodes

comfy_extras/v3/nodes_audio.py

@@ -250,7 +250,7 @@ def _save_audio(cls, audio, filename_prefix="ComfyUI", format="flac", quality="1
     OPUS_RATES = [8000, 12000, 16000, 24000, 48000]
 
     results = []
-    for (batch_number, waveform) in enumerate(audio["waveform"].cpu()):
+    for batch_number, waveform in enumerate(audio["waveform"].cpu()):
         filename_with_batch_num = filename.replace("%batch_num%", str(batch_number))
         file = f"{filename_with_batch_num}_{counter:05}_.{format}"
         output_path = os.path.join(full_output_folder, file)
@@ -277,7 +277,7 @@ def _save_audio(cls, audio, filename_prefix="ComfyUI", format="flac", quality="1
 
         # Create output with specified format
         output_buffer = BytesIO()
-        output_container = av.open(output_buffer, mode='w', format=format)
+        output_container = av.open(output_buffer, mode="w", format=format)
 
         # Set metadata on the container
         for key, value in metadata.items():
@@ -310,8 +310,8 @@ def _save_audio(cls, audio, filename_prefix="ComfyUI", format="flac", quality="1
 
         frame = av.AudioFrame.from_ndarray(
             waveform.movedim(0, 1).reshape(1, -1).float().numpy(),
-            format='flt',
+            format="flt",
-            layout='mono' if waveform.shape[0] == 1 else 'stereo',
+            layout="mono" if waveform.shape[0] == 1 else "stereo",
         )
         frame.sample_rate = sample_rate
         frame.pts = 0
@@ -325,7 +325,7 @@ def _save_audio(cls, audio, filename_prefix="ComfyUI", format="flac", quality="1
 
         # Write the output to file
         output_buffer.seek(0)
-        with open(output_path, 'wb') as f:
+        with open(output_path, "wb") as f:
             f.write(output_buffer.getbuffer())
 
         results.append(ui.SavedResult(file, subfolder, io.FolderType.output))

comfy_extras/v3/nodes_controlnet.py

@@ -1,5 +1,5 @@
-from comfy.cldm.control_types import UNION_CONTROLNET_TYPES
 import comfy.utils
+from comfy.cldm.control_types import UNION_CONTROLNET_TYPES
 from comfy_api.v3 import io
 
 
@@ -27,7 +27,9 @@ class ControlNetApplyAdvanced_V3(io.ComfyNodeV3):
         )
 
     @classmethod
-    def execute(cls, positive, negative, control_net, image, strength, start_percent, end_percent, vae=None, extra_concat=[]) -> io.NodeOutput:
+    def execute(
+        cls, positive, negative, control_net, image, strength, start_percent, end_percent, vae=None, extra_concat=[]
+    ) -> io.NodeOutput:
         if strength == 0:
             return io.NodeOutput(positive, negative)
 
@@ -40,16 +42,18 @@ class ControlNetApplyAdvanced_V3(io.ComfyNodeV3):
             for t in conditioning:
                 d = t[1].copy()
 
-                prev_cnet = d.get('control', None)
+                prev_cnet = d.get("control", None)
                 if prev_cnet in cnets:
                     c_net = cnets[prev_cnet]
                 else:
-                    c_net = control_net.copy().set_cond_hint(control_hint, strength, (start_percent, end_percent), vae=vae, extra_concat=extra_concat)
+                    c_net = control_net.copy().set_cond_hint(
+                        control_hint, strength, (start_percent, end_percent), vae=vae, extra_concat=extra_concat
+                    )
                     c_net.set_previous_controlnet(prev_cnet)
                     cnets[prev_cnet] = c_net
 
-                d['control'] = c_net
+                d["control"] = c_net
-                d['control_apply_to_uncond'] = False
+                d["control_apply_to_uncond"] = False
                 n = [t[0], d]
                 c.append(n)
             out.append(c)
@@ -107,7 +111,9 @@ class ControlNetInpaintingAliMamaApply_V3(ControlNetApplyAdvanced_V3):
         )
 
     @classmethod
-    def execute(cls, positive, negative, control_net, vae, image, mask, strength, start_percent, end_percent) -> io.NodeOutput:
+    def execute(
+        cls, positive, negative, control_net, vae, image, mask, strength, start_percent, end_percent
+    ) -> io.NodeOutput:
         extra_concat = []
         if control_net.concat_mask:
             mask = 1.0 - mask.reshape((-1, 1, mask.shape[-2], mask.shape[-1]))
@@ -115,7 +121,17 @@ class ControlNetInpaintingAliMamaApply_V3(ControlNetApplyAdvanced_V3):
             image = image * mask_apply.movedim(1, -1).repeat(1, 1, 1, image.shape[3])
             extra_concat = [mask]
 
-        return super().execute(positive, negative, control_net, image, strength, start_percent, end_percent, vae=vae, extra_concat=extra_concat)
+        return super().execute(
+            positive,
+            negative,
+            control_net,
+            image,
+            strength,
+            start_percent,
+            end_percent,
+            vae=vae,
+            extra_concat=extra_concat,
+        )
 
 
 NODES_LIST: list[type[io.ComfyNodeV3]] = [

comfy_extras/v3/nodes_images.py

@@ -1,16 +1,16 @@
+import hashlib
 import json
 import os
-import torch
-import hashlib
 
 import numpy as np
+import torch
 from PIL import Image, ImageOps, ImageSequence
 from PIL.PngImagePlugin import PngInfo
 
-from comfy_api.v3 import io, ui
-from comfy.cli_args import args
 import folder_paths
 import node_helpers
+from comfy.cli_args import args
+from comfy_api.v3 import io, ui
 
 
 class SaveImage_V3(io.ComfyNodeV3):
@@ -29,7 +29,8 @@ class SaveImage_V3(io.ComfyNodeV3):
                 io.String.Input(
                     "filename_prefix",
                     default="ComfyUI",
-                    tooltip="The prefix for the file to save. This may include formatting information such as %date:yyyy-MM-dd% or %Empty Latent Image.width% to include values from nodes.",
+                    tooltip="The prefix for the file to save. This may include formatting information "
+                    "such as %date:yyyy-MM-dd% or %Empty Latent Image.width% to include values from nodes.",
                 ),
             ],
             hidden=[io.Hidden.prompt, io.Hidden.extra_pnginfo],
@@ -42,8 +43,8 @@ class SaveImage_V3(io.ComfyNodeV3):
             filename_prefix, folder_paths.get_output_directory(), images[0].shape[1], images[0].shape[0]
         )
         results = []
-        for (batch_number, image) in enumerate(images):
+        for batch_number, image in enumerate(images):
-            i = 255. * image.cpu().numpy()
+            i = 255.0 * image.cpu().numpy()
             img = Image.fromarray(np.clip(i, 0, 255).astype(np.uint8))
             metadata = None
             if not args.disable_metadata:
@@ -82,13 +83,13 @@ class SaveAnimatedPNG_V3(io.ComfyNodeV3):
 
     @classmethod
     def execute(cls, images, fps, compress_level, filename_prefix="ComfyUI") -> io.NodeOutput:
-        full_output_folder, filename, counter, subfolder, filename_prefix = (
+        full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(
-            folder_paths.get_save_image_path(filename_prefix, folder_paths.get_output_directory(), images[0].shape[1], images[0].shape[0])
+            filename_prefix, folder_paths.get_output_directory(), images[0].shape[1], images[0].shape[0]
         )
         results = []
         pil_images = []
         for image in images:
-            img = Image.fromarray(np.clip(255. * image.cpu().numpy(), 0, 255).astype(np.uint8))
+            img = Image.fromarray(np.clip(255.0 * image.cpu().numpy(), 0, 255).astype(np.uint8))
             pil_images.append(img)
 
         metadata = None
@@ -96,16 +97,31 @@ class SaveAnimatedPNG_V3(io.ComfyNodeV3):
             metadata = PngInfo()
             if cls.hidden.prompt is not None:
                 metadata.add(
-                    b"comf", "prompt".encode("latin-1", "strict") + b"\0" + json.dumps(cls.hidden.prompt).encode("latin-1", "strict"), after_idat=True
+                    b"comf",
+                    "prompt".encode("latin-1", "strict")
+                    + b"\0"
+                    + json.dumps(cls.hidden.prompt).encode("latin-1", "strict"),
+                    after_idat=True,
                 )
             if cls.hidden.extra_pnginfo is not None:
                 for x in cls.hidden.extra_pnginfo:
                     metadata.add(
-                        b"comf", x.encode("latin-1", "strict") + b"\0" + json.dumps(cls.hidden.extra_pnginfo[x]).encode("latin-1", "strict"), after_idat=True
+                        b"comf",
+                        x.encode("latin-1", "strict")
+                        + b"\0"
+                        + json.dumps(cls.hidden.extra_pnginfo[x]).encode("latin-1", "strict"),
+                        after_idat=True,
                     )
 
         file = f"{filename}_{counter:05}_.png"
-        pil_images[0].save(os.path.join(full_output_folder, file), pnginfo=metadata, compress_level=compress_level, save_all=True, duration=int(1000.0/fps), append_images=pil_images[1:])
+        pil_images[0].save(
+            os.path.join(full_output_folder, file),
+            pnginfo=metadata,
+            compress_level=compress_level,
+            save_all=True,
+            duration=int(1000.0 / fps),
+            append_images=pil_images[1:],
+        )
         results.append(ui.SavedResult(file, subfolder, io.FolderType.output))
 
         return io.NodeOutput(ui={"images": results, "animated": (True,)})
@@ -136,11 +152,13 @@ class SaveAnimatedWEBP_V3(io.ComfyNodeV3):
     @classmethod
     def execute(cls, images, fps, filename_prefix, lossless, quality, method, num_frames=0) -> io.NodeOutput:
         method = cls.COMPRESS_METHODS.get(method)
-        full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix, folder_paths.get_output_directory(), images[0].shape[1], images[0].shape[0])
+        full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(
+            filename_prefix, folder_paths.get_output_directory(), images[0].shape[1], images[0].shape[0]
+        )
         results = []
         pil_images = []
         for image in images:
-            img = Image.fromarray(np.clip(255. * image.cpu().numpy(), 0, 255).astype(np.uint8))
+            img = Image.fromarray(np.clip(255.0 * image.cpu().numpy(), 0, 255).astype(np.uint8))
             pil_images.append(img)
 
         metadata = pil_images[0].getexif()
@@ -148,7 +166,7 @@ class SaveAnimatedWEBP_V3(io.ComfyNodeV3):
             if cls.hidden.prompt is not None:
                 metadata[0x0110] = "prompt:{}".format(json.dumps(cls.hidden.prompt))
             if cls.hidden.extra_pnginfo is not None:
-                inital_exif = 0x010f
+                inital_exif = 0x010F
                 for x in cls.hidden.extra_pnginfo:
                     metadata[inital_exif] = "{}:{}".format(x, json.dumps(cls.hidden.extra_pnginfo[x]))
                     inital_exif -= 1
@@ -160,7 +178,8 @@ class SaveAnimatedWEBP_V3(io.ComfyNodeV3):
             file = f"{filename}_{counter:05}_.webp"
             pil_images[i].save(
                 os.path.join(full_output_folder, file),
-                save_all=True, duration=int(1000.0/fps),
+                save_all=True,
+                duration=int(1000.0 / fps),
                 append_images=pil_images[i + 1 : i + num_frames],
                 exif=metadata,
                 lossless=lossless,
@@ -228,12 +247,12 @@ class LoadImage_V3(io.ComfyNodeV3):
         output_masks = []
         w, h = None, None
 
-        excluded_formats = ['MPO']
+        excluded_formats = ["MPO"]
 
         for i in ImageSequence.Iterator(img):
             i = node_helpers.pillow(ImageOps.exif_transpose, i)
 
-            if i.mode == 'I':
+            if i.mode == "I":
                 i = i.point(lambda i: i * (1 / 255))
             image = i.convert("RGB")
 
@@ -246,12 +265,12 @@ class LoadImage_V3(io.ComfyNodeV3):
 
             image = np.array(image).astype(np.float32) / 255.0
             image = torch.from_numpy(image)[None,]
-            if 'A' in i.getbands():
+            if "A" in i.getbands():
-                mask = np.array(i.getchannel('A')).astype(np.float32) / 255.0
+                mask = np.array(i.getchannel("A")).astype(np.float32) / 255.0
-                mask = 1. - torch.from_numpy(mask)
+                mask = 1.0 - torch.from_numpy(mask)
-            elif i.mode == 'P' and 'transparency' in i.info:
+            elif i.mode == "P" and "transparency" in i.info:
-                mask = np.array(i.convert('RGBA').getchannel('A')).astype(np.float32) / 255.0
+                mask = np.array(i.convert("RGBA").getchannel("A")).astype(np.float32) / 255.0
-                mask = 1. - torch.from_numpy(mask)
+                mask = 1.0 - torch.from_numpy(mask)
             else:
                 mask = torch.zeros((64, 64), dtype=torch.float32, device="cpu")
             output_images.append(image)
@@ -270,7 +289,7 @@ class LoadImage_V3(io.ComfyNodeV3):
     def fingerprint_inputs(s, image):
         image_path = folder_paths.get_annotated_filepath(image)
         m = hashlib.sha256()
-        with open(image_path, 'rb') as f:
+        with open(image_path, "rb") as f:
             m.update(f.read())
         return m.digest().hex()
 
@@ -317,12 +336,12 @@ class LoadImageOutput_V3(io.ComfyNodeV3):
         output_masks = []
         w, h = None, None
 
-        excluded_formats = ['MPO']
+        excluded_formats = ["MPO"]
 
         for i in ImageSequence.Iterator(img):
             i = node_helpers.pillow(ImageOps.exif_transpose, i)
 
-            if i.mode == 'I':
+            if i.mode == "I":
                 i = i.point(lambda i: i * (1 / 255))
             image = i.convert("RGB")
 
@@ -335,12 +354,12 @@ class LoadImageOutput_V3(io.ComfyNodeV3):
 
             image = np.array(image).astype(np.float32) / 255.0
             image = torch.from_numpy(image)[None,]
-            if 'A' in i.getbands():
+            if "A" in i.getbands():
-                mask = np.array(i.getchannel('A')).astype(np.float32) / 255.0
+                mask = np.array(i.getchannel("A")).astype(np.float32) / 255.0
-                mask = 1. - torch.from_numpy(mask)
+                mask = 1.0 - torch.from_numpy(mask)
-            elif i.mode == 'P' and 'transparency' in i.info:
+            elif i.mode == "P" and "transparency" in i.info:
-                mask = np.array(i.convert('RGBA').getchannel('A')).astype(np.float32) / 255.0
+                mask = np.array(i.convert("RGBA").getchannel("A")).astype(np.float32) / 255.0
-                mask = 1. - torch.from_numpy(mask)
+                mask = 1.0 - torch.from_numpy(mask)
             else:
                 mask = torch.zeros((64, 64), dtype=torch.float32, device="cpu")
             output_images.append(image)
@@ -359,7 +378,7 @@ class LoadImageOutput_V3(io.ComfyNodeV3):
     def fingerprint_inputs(s, image):
         image_path = folder_paths.get_annotated_filepath(image)
         m = hashlib.sha256()
-        with open(image_path, 'rb') as f:
+        with open(image_path, "rb") as f:
             m.update(f.read())
         return m.digest().hex()
 

comfy_extras/v3/nodes_primitive.py

@@ -0,0 +1,104 @@
+from __future__ import annotations
+
+import sys
+
+from comfy_api.v3 import io
+
+
+class String_V3(io.ComfyNodeV3):
+    @classmethod
+    def DEFINE_SCHEMA(cls):
+        return io.SchemaV3(
+            node_id="PrimitiveString_V3",
+            display_name="String _V3",
+            category="utils/primitive",
+            inputs=[
+                io.String.Input("value"),
+            ],
+            outputs=[io.String.Output()],
+        )
+
+    @classmethod
+    def execute(cls, value: str) -> io.NodeOutput:
+        return io.NodeOutput(value)
+
+
+class StringMultiline_V3(io.ComfyNodeV3):
+    @classmethod
+    def DEFINE_SCHEMA(cls):
+        return io.SchemaV3(
+            node_id="PrimitiveStringMultiline_V3",
+            display_name="String (Multiline) _V3",
+            category="utils/primitive",
+            inputs=[
+                io.String.Input("value", multiline=True),
+            ],
+            outputs=[io.String.Output()],
+        )
+
+    @classmethod
+    def execute(cls, value: str) -> io.NodeOutput:
+        return io.NodeOutput(value)
+
+
+class Int_V3(io.ComfyNodeV3):
+    @classmethod
+    def DEFINE_SCHEMA(cls):
+        return io.SchemaV3(
+            node_id="PrimitiveInt_V3",
+            display_name="Int _V3",
+            category="utils/primitive",
+            inputs=[
+                io.Int.Input("value", min=-sys.maxsize, max=sys.maxsize, control_after_generate=True),
+            ],
+            outputs=[io.Int.Output()],
+        )
+
+    @classmethod
+    def execute(cls, value: int) -> io.NodeOutput:
+        return io.NodeOutput(value)
+
+
+class Float_V3(io.ComfyNodeV3):
+    @classmethod
+    def DEFINE_SCHEMA(cls):
+        return io.SchemaV3(
+            node_id="PrimitiveFloat_V3",
+            display_name="Float _V3",
+            category="utils/primitive",
+            inputs=[
+                io.Float.Input("value", min=-sys.maxsize, max=sys.maxsize),
+            ],
+            outputs=[io.Float.Output()],
+        )
+
+    @classmethod
+    def execute(cls, value: float) -> io.NodeOutput:
+        return io.NodeOutput(value)
+
+
+class Boolean_V3(io.ComfyNodeV3):
+    @classmethod
+    def DEFINE_SCHEMA(cls):
+        return io.SchemaV3(
+            node_id="PrimitiveBoolean_V3",
+            display_name="Boolean _V3",
+            category="utils/primitive",
+            inputs=[
+                io.Boolean.Input("value"),
+            ],
+            outputs=[io.Boolean.Output()],
+        )
+
+    @classmethod
+    def execute(cls, value: bool) -> io.NodeOutput:
+        return io.NodeOutput(value)
+
+
+NODES_LIST: list[type[io.ComfyNodeV3]] = [
+    String_V3,
+    StringMultiline_V3,
+    Int_V3,
+    Float_V3,
+    Boolean_V3,
+]

comfy_extras/v3/nodes_stable_cascade.py

@@ -17,9 +17,9 @@
 """
 
 import torch
-import nodes
-import comfy.utils
 
+import comfy.utils
+import nodes
 from comfy_api.v3 import io
 
 
@@ -99,7 +99,7 @@ class StableCascade_StageB_Conditioning_V3(io.ComfyNodeV3):
         c = []
         for t in conditioning:
             d = t[1].copy()
-            d['stable_cascade_prior'] = stage_c['samples']
+            d["stable_cascade_prior"] = stage_c["samples"]
             n = [t[0], d]
             c.append(n)
         return io.NodeOutput(c)

comfy_extras/v3/nodes_webcam.py

@@ -1,14 +1,13 @@
 import hashlib
-import torch
 
 import numpy as np
+import torch
 from PIL import Image, ImageOps, ImageSequence
 
-from comfy_api.v3 import io
-import nodes
 import folder_paths
 import node_helpers
-
+import nodes
+from comfy_api.v3 import io
 
 MAX_RESOLUTION = nodes.MAX_RESOLUTION
 
@@ -51,12 +50,12 @@ class WebcamCapture_V3(io.ComfyNodeV3):
         output_masks = []
         w, h = None, None
 
-        excluded_formats = ['MPO']
+        excluded_formats = ["MPO"]
 
         for i in ImageSequence.Iterator(img):
             i = node_helpers.pillow(ImageOps.exif_transpose, i)
 
-            if i.mode == 'I':
+            if i.mode == "I":
                 i = i.point(lambda i: i * (1 / 255))
             image = i.convert("RGB")
 
@@ -69,12 +68,12 @@ class WebcamCapture_V3(io.ComfyNodeV3):
 
             image = np.array(image).astype(np.float32) / 255.0
             image = torch.from_numpy(image)[None,]
-            if 'A' in i.getbands():
+            if "A" in i.getbands():
-                mask = np.array(i.getchannel('A')).astype(np.float32) / 255.0
+                mask = np.array(i.getchannel("A")).astype(np.float32) / 255.0
-                mask = 1. - torch.from_numpy(mask)
+                mask = 1.0 - torch.from_numpy(mask)
-            elif i.mode == 'P' and 'transparency' in i.info:
+            elif i.mode == "P" and "transparency" in i.info:
-                mask = np.array(i.convert('RGBA').getchannel('A')).astype(np.float32) / 255.0
+                mask = np.array(i.convert("RGBA").getchannel("A")).astype(np.float32) / 255.0
-                mask = 1. - torch.from_numpy(mask)
+                mask = 1.0 - torch.from_numpy(mask)
             else:
                 mask = torch.zeros((64, 64), dtype=torch.float32, device="cpu")
             output_images.append(image)
@@ -93,7 +92,7 @@ class WebcamCapture_V3(io.ComfyNodeV3):
     def fingerprint_inputs(s, image, width, height, capture_on_queue):
         image_path = folder_paths.get_annotated_filepath(image)
         m = hashlib.sha256()
-        with open(image_path, 'rb') as f:
+        with open(image_path, "rb") as f:
             m.update(f.read())
         return m.digest().hex()
 

nodes.py

@@ -2303,6 +2303,7 @@ def init_builtin_extra_nodes():
         "v3/nodes_controlnet.py",
         "v3/nodes_images.py",
         "v3/nodes_mask.py",
+        "v3/nodes_primitive.py",
         "v3/nodes_webcam.py",
         "v3/nodes_stable_cascade.py",
     ]

pyproject.toml

@@ -12,6 +12,8 @@ documentation = "https://docs.comfy.org/"
 
 [tool.ruff]
 lint.select = [
+  "E",    # pycodestyle errors
+  "I",    # isort
   "N805", # invalid-first-argument-name-for-method
   "S307", # suspicious-eval-usage
   "S102", # exec
@@ -22,3 +24,8 @@ lint.select = [
   "F",
 ]
 exclude = ["*.ipynb"]
+line-length = 120
+lint.pycodestyle.ignore-overlong-task-comments = true
+
+[tool.ruff.lint.per-file-ignores]
+"!comfy_extras/v3/*" = ["E", "I"]  # enable these rules only for V3 nodes