Skip to content

Commit 15a4494

Browse files
alexisrollandalexisrolland
authored
chore: Update display names and categories (CORE-151) (#13693)
* Standardize DEPRECATED label in node display name * Promote category image/video to root level video/ * Update images and masks names and categories
1 parent 1265955 commit 15a4494

9 files changed

Lines changed: 50 additions & 32 deletions

File tree

‎comfy_api_nodes/nodes_sora.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ class OpenAIVideoSora2(IO.ComfyNode):
3333
def define_schema(cls):
3434
return IO.Schema(
3535
node_id="OpenAIVideoSora2",
36-
display_name="OpenAI Sora - Video (Deprecated)",
36+
display_name="OpenAI Sora - Video (DEPRECATED)",
3737
category="api node/video/Sora",
3838
description=(
3939
"OpenAI video and audio generation.\n\n"

‎comfy_extras/nodes_frame_interpolation.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ def define_schema(cls):
7878
return io.Schema(
7979
node_id="FrameInterpolate",
8080
display_name="Frame Interpolate",
81-
category="image/video",
81+
category="video",
8282
search_aliases=["rife", "film", "frame interpolation", "slow motion", "interpolate frames", "vfi"],
8383
inputs=[
8484
FrameInterpolationModel.Input("interp_model"),

‎comfy_extras/nodes_image_compare.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class ImageCompare(IO.ComfyNode):
1111
def define_schema(cls):
1212
return IO.Schema(
1313
node_id="ImageCompare",
14-
display_name="Image Compare",
14+
display_name="Compare Images",
1515
description="Compares two images side by side with a slider.",
1616
category="image",
1717
essentials_category="Image Tools",

‎comfy_extras/nodes_images.py‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def define_schema(cls):
2424
return IO.Schema(
2525
node_id="ImageCrop",
2626
search_aliases=["trim"],
27-
display_name="Image Crop (Deprecated)",
27+
display_name="Crop Image (DEPRECATED)",
2828
category="image/transform",
2929
is_deprecated=True,
3030
essentials_category="Image Tools",
@@ -56,7 +56,7 @@ def define_schema(cls):
5656
return IO.Schema(
5757
node_id="ImageCropV2",
5858
search_aliases=["trim"],
59-
display_name="Image Crop",
59+
display_name="Crop Image",
6060
category="image/transform",
6161
essentials_category="Image Tools",
6262
has_intermediate_output=True,
@@ -109,6 +109,7 @@ def define_schema(cls):
109109
return IO.Schema(
110110
node_id="RepeatImageBatch",
111111
search_aliases=["duplicate image", "clone image"],
112+
display_name="Repeat Image Batch",
112113
category="image/batch",
113114
inputs=[
114115
IO.Image.Input("image"),
@@ -131,6 +132,7 @@ def define_schema(cls):
131132
return IO.Schema(
132133
node_id="ImageFromBatch",
133134
search_aliases=["select image", "pick from batch", "extract image"],
135+
display_name="Get Image from Batch",
134136
category="image/batch",
135137
inputs=[
136138
IO.Image.Input("image"),
@@ -157,7 +159,8 @@ def define_schema(cls):
157159
return IO.Schema(
158160
node_id="ImageAddNoise",
159161
search_aliases=["film grain"],
160-
category="image",
162+
display_name="Add Noise to Image",
163+
category="image/postprocessing",
161164
inputs=[
162165
IO.Image.Input("image"),
163166
IO.Int.Input(
@@ -259,7 +262,7 @@ def define_schema(cls):
259262
return IO.Schema(
260263
node_id="ImageStitch",
261264
search_aliases=["combine images", "join images", "concatenate images", "side by side"],
262-
display_name="Image Stitch",
265+
display_name="Stitch Images",
263266
description="Stitches image2 to image1 in the specified direction.\n"
264267
"If image2 is not provided, returns image1 unchanged.\n"
265268
"Optional spacing can be added between images.",
@@ -434,6 +437,7 @@ def define_schema(cls):
434437
return IO.Schema(
435438
node_id="ResizeAndPadImage",
436439
search_aliases=["fit to size"],
440+
display_name="Resize And Pad Image",
437441
category="image/transform",
438442
inputs=[
439443
IO.Image.Input("image"),
@@ -485,6 +489,7 @@ def define_schema(cls):
485489
return IO.Schema(
486490
node_id="SaveSVGNode",
487491
search_aliases=["export vector", "save vector graphics"],
492+
display_name="Save SVG",
488493
description="Save SVG files on disk.",
489494
category="image/save",
490495
inputs=[
@@ -591,7 +596,7 @@ class ImageRotate(IO.ComfyNode):
591596
def define_schema(cls):
592597
return IO.Schema(
593598
node_id="ImageRotate",
594-
display_name="Image Rotate",
599+
display_name="Rotate Image",
595600
search_aliases=["turn", "flip orientation"],
596601
category="image/transform",
597602
essentials_category="Image Tools",
@@ -624,6 +629,7 @@ def define_schema(cls):
624629
return IO.Schema(
625630
node_id="ImageFlip",
626631
search_aliases=["mirror", "reflect"],
632+
display_name="Flip Image",
627633
category="image/transform",
628634
inputs=[
629635
IO.Image.Input("image"),
@@ -650,6 +656,7 @@ class ImageScaleToMaxDimension(IO.ComfyNode):
650656
def define_schema(cls):
651657
return IO.Schema(
652658
node_id="ImageScaleToMaxDimension",
659+
display_name="Scale Image to Max Dimension",
653660
category="image/upscaling",
654661
inputs=[
655662
IO.Image.Input("image"),

‎comfy_extras/nodes_mask.py‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ class ImageCompositeMasked(IO.ComfyNode):
8080
def define_schema(cls):
8181
return IO.Schema(
8282
node_id="ImageCompositeMasked",
83-
search_aliases=["paste image", "overlay", "layer"],
83+
search_aliases=["overlay", "layer", "paste image", "images composition"],
84+
display_name="Image Composite Masked",
8485
category="image",
8586
inputs=[
8687
IO.Image.Input("destination"),
@@ -201,6 +202,7 @@ def define_schema(cls):
201202
return IO.Schema(
202203
node_id="InvertMask",
203204
search_aliases=["reverse mask", "flip mask"],
205+
display_name="Invert Mask",
204206
category="mask",
205207
inputs=[
206208
IO.Mask.Input("mask"),
@@ -222,6 +224,7 @@ def define_schema(cls):
222224
return IO.Schema(
223225
node_id="CropMask",
224226
search_aliases=["cut mask", "extract mask region", "mask slice"],
227+
display_name="Crop Mask",
225228
category="mask",
226229
inputs=[
227230
IO.Mask.Input("mask"),
@@ -247,7 +250,8 @@ class MaskComposite(IO.ComfyNode):
247250
def define_schema(cls):
248251
return IO.Schema(
249252
node_id="MaskComposite",
250-
search_aliases=["combine masks", "blend masks", "layer masks"],
253+
search_aliases=["combine masks", "blend masks", "layer masks", "masks composition"],
254+
display_name="Combine Masks",
251255
category="mask",
252256
inputs=[
253257
IO.Mask.Input("destination"),
@@ -298,6 +302,7 @@ def define_schema(cls):
298302
return IO.Schema(
299303
node_id="FeatherMask",
300304
search_aliases=["soft edge mask", "blur mask edges", "gradient mask edge"],
305+
display_name="Feather Mask",
301306
category="mask",
302307
inputs=[
303308
IO.Mask.Input("mask"),

‎comfy_extras/nodes_morphology.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@ def define_schema(cls):
5959
return io.Schema(
6060
node_id="ImageRGBToYUV",
6161
search_aliases=["color space conversion"],
62-
category="image/batch",
62+
display_name="Image RGB to YUV",
63+
category="image/color",
6364
inputs=[
6465
io.Image.Input("image"),
6566
],
@@ -81,7 +82,8 @@ def define_schema(cls):
8182
return io.Schema(
8283
node_id="ImageYUVToRGB",
8384
search_aliases=["color space conversion"],
84-
category="image/batch",
85+
display_name="Image YUV to RGB",
86+
category="image/color",
8587
inputs=[
8688
io.Image.Input("Y"),
8789
io.Image.Input("U"),

‎comfy_extras/nodes_post_processing.py‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ class Blend(io.ComfyNode):
2020
def define_schema(cls):
2121
return io.Schema(
2222
node_id="ImageBlend",
23-
display_name="Image Blend",
23+
search_aliases=["mix images"],
24+
display_name="Blend Images",
2425
category="image/postprocessing",
2526
essentials_category="Image Tools",
2627
inputs=[
@@ -224,6 +225,7 @@ class ImageScaleToTotalPixels(io.ComfyNode):
224225
def define_schema(cls):
225226
return io.Schema(
226227
node_id="ImageScaleToTotalPixels",
228+
display_name="Scale Image to Total Pixels",
227229
category="image/upscaling",
228230
inputs=[
229231
io.Image.Input("image"),
@@ -568,7 +570,7 @@ def define_schema(cls):
568570
return io.Schema(
569571
node_id="BatchImagesNode",
570572
display_name="Batch Images",
571-
category="image",
573+
category="image/batch",
572574
essentials_category="Image Tools",
573575
search_aliases=["batch", "image batch", "batch images", "combine images", "merge images", "stack images"],
574576
inputs=[

‎comfy_extras/nodes_video.py‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ def define_schema(cls):
1717
return io.Schema(
1818
node_id="SaveWEBM",
1919
search_aliases=["export webm"],
20-
category="image/video",
20+
display_name="Save WEBM",
21+
category="video",
2122
is_experimental=True,
2223
inputs=[
2324
io.Image.Input("images"),
@@ -72,7 +73,7 @@ def define_schema(cls):
7273
node_id="SaveVideo",
7374
search_aliases=["export video"],
7475
display_name="Save Video",
75-
category="image/video",
76+
category="video",
7677
essentials_category="Basics",
7778
description="Saves the input images to your ComfyUI output directory.",
7879
inputs=[
@@ -121,7 +122,7 @@ def define_schema(cls):
121122
node_id="CreateVideo",
122123
search_aliases=["images to video"],
123124
display_name="Create Video",
124-
category="image/video",
125+
category="video",
125126
description="Create a video from images.",
126127
inputs=[
127128
io.Image.Input("images", tooltip="The images to create a video from."),
@@ -146,7 +147,7 @@ def define_schema(cls):
146147
node_id="GetVideoComponents",
147148
search_aliases=["extract frames", "split video", "video to images", "demux"],
148149
display_name="Get Video Components",
149-
category="image/video",
150+
category="video",
150151
description="Extracts all components from a video: frames, audio, and framerate.",
151152
inputs=[
152153
io.Video.Input("video", tooltip="The video to extract components from."),
@@ -174,7 +175,7 @@ def define_schema(cls):
174175
node_id="LoadVideo",
175176
search_aliases=["import video", "open video", "video file"],
176177
display_name="Load Video",
177-
category="image/video",
178+
category="video",
178179
essentials_category="Basics",
179180
inputs=[
180181
io.Combo.Input("file", options=sorted(files), upload=io.UploadType.video),
@@ -216,7 +217,7 @@ def define_schema(cls):
216217
"frame load cap",
217218
"start time",
218219
],
219-
category="image/video",
220+
category="video",
220221
essentials_category="Video Tools",
221222
inputs=[
222223
io.Video.Input("video"),

‎nodes.py‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1887,7 +1887,7 @@ def INPUT_TYPES(s):
18871887
RETURN_TYPES = ("IMAGE",)
18881888
FUNCTION = "invert"
18891889

1890-
CATEGORY = "image"
1890+
CATEGORY = "image/color"
18911891

18921892
def invert(self, image):
18931893
s = 1.0 - image
@@ -1903,7 +1903,7 @@ def INPUT_TYPES(s):
19031903
RETURN_TYPES = ("IMAGE",)
19041904
FUNCTION = "batch"
19051905

1906-
CATEGORY = "image"
1906+
CATEGORY = "image/batch"
19071907
DEPRECATED = True
19081908

19091909
def batch(self, image1, image2):
@@ -1960,7 +1960,7 @@ def INPUT_TYPES(s):
19601960
RETURN_TYPES = ("IMAGE", "MASK")
19611961
FUNCTION = "expand_image"
19621962

1963-
CATEGORY = "image"
1963+
CATEGORY = "image/transform"
19641964

19651965
def expand_image(self, image, left, top, right, bottom, feathering):
19661966
d1, d2, d3, d4 = image.size()
@@ -2103,7 +2103,7 @@ def expand_image(self, image, left, top, right, bottom, feathering):
21032103
"ConditioningSetArea": "Conditioning (Set Area)",
21042104
"ConditioningSetAreaPercentage": "Conditioning (Set Area with Percentage)",
21052105
"ConditioningSetMask": "Conditioning (Set Mask)",
2106-
"ControlNetApply": "Apply ControlNet (OLD)",
2106+
"ControlNetApply": "Apply ControlNet (DEPRECATED)",
21072107
"ControlNetApplyAdvanced": "Apply ControlNet",
21082108
# Latent
21092109
"VAEEncodeForInpaint": "VAE Encode (for Inpainting)",
@@ -2121,22 +2121,23 @@ def expand_image(self, image, left, top, right, bottom, feathering):
21212121
"LatentFromBatch" : "Latent From Batch",
21222122
"RepeatLatentBatch": "Repeat Latent Batch",
21232123
# Image
2124+
"EmptyImage": "Empty Image",
21242125
"SaveImage": "Save Image",
21252126
"PreviewImage": "Preview Image",
21262127
"LoadImage": "Load Image",
21272128
"LoadImageMask": "Load Image (as Mask)",
21282129
"LoadImageOutput": "Load Image (from Outputs)",
21292130
"ImageScale": "Upscale Image",
21302131
"ImageScaleBy": "Upscale Image By",
2131-
"ImageInvert": "Invert Image",
2132+
"ImageInvert": "Invert Image Colors",
21322133
"ImagePadForOutpaint": "Pad Image for Outpainting",
2133-
"ImageBatch": "Batch Images",
2134-
"ImageCrop": "Image Crop",
2135-
"ImageStitch": "Image Stitch",
2136-
"ImageBlend": "Image Blend",
2137-
"ImageBlur": "Image Blur",
2138-
"ImageQuantize": "Image Quantize",
2139-
"ImageSharpen": "Image Sharpen",
2134+
"ImageBatch": "Batch Images (DEPRECATED)",
2135+
"ImageCrop": "Crop Image",
2136+
"ImageStitch": "Stitch Images",
2137+
"ImageBlend": "Blend Images",
2138+
"ImageBlur": "Blur Image",
2139+
"ImageQuantize": "Quantize Image",
2140+
"ImageSharpen": "Sharpen Image",
21402141
"ImageScaleToTotalPixels": "Scale Image to Total Pixels",
21412142
"GetImageSize": "Get Image Size",
21422143
# _for_testing

0 commit comments

Comments
 (0)