Skip to content

Commit 1aaf1dc

Browse files
Yourzampcode-com
andcommitted
refactor: replace essentials_category string literals with constants
Amp-Thread-ID: https://ampcode.com/threads/T-019c7303-ab53-7341-be76-a5da1f7a657e Co-authored-by: Amp <amp@ampcode.com>
1 parent 52cb6b3 commit 1aaf1dc

14 files changed

Lines changed: 46 additions & 24 deletions

comfy/essentials_category.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
ESSENTIALS_BASICS = "Basics"
2+
ESSENTIALS_IMAGE_GENERATION = "Image Generation"
3+
ESSENTIALS_IMAGE_TOOLS = "Image Tools"
4+
ESSENTIALS_TEXT_GENERATION = "Text Generation"
5+
ESSENTIALS_VIDEO_GENERATION = "Video Generation"
6+
ESSENTIALS_VIDEO_TOOLS = "Video Tools"
7+
ESSENTIALS_AUDIO = "Audio"
8+
ESSENTIALS_3D = "3D"

comfy_api_nodes/nodes_hunyuan3d.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
from typing_extensions import override
22

3+
from comfy.essentials_category import ESSENTIALS_3D
34
from comfy_api.latest import IO, ComfyExtension, Input, Types
45
from comfy_api_nodes.apis.hunyuan3d import (
56
Hunyuan3DViewImage,
@@ -54,7 +55,7 @@ def define_schema(cls):
5455
node_id="TencentTextToModelNode",
5556
display_name="Text to 3D model",
5657
category="api node/3d/Tencent",
57-
essentials_category="3D",
58+
essentials_category=ESSENTIALS_3D,
5859
inputs=[
5960
IO.Combo.Input(
6061
"model",
@@ -169,7 +170,7 @@ def define_schema(cls):
169170
node_id="TencentImageToModelNode",
170171
display_name="Image to 3D Model",
171172
category="api node/3d/Tencent",
172-
essentials_category="3D",
173+
essentials_category=ESSENTIALS_3D,
173174
inputs=[
174175
IO.Combo.Input(
175176
"model",

comfy_api_nodes/nodes_kling.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import torch
1212
from typing_extensions import override
1313

14+
from comfy.essentials_category import ESSENTIALS_VIDEO_GENERATION
1415
from comfy_api.latest import IO, ComfyExtension, Input, InputImpl
1516
from comfy_api_nodes.apis import (
1617
KlingCameraControl,
@@ -2262,7 +2263,7 @@ def define_schema(cls) -> IO.Schema:
22622263
node_id="KlingLipSyncAudioToVideoNode",
22632264
display_name="Lipsync",
22642265
category="api node/video/Kling",
2265-
essentials_category="Video Generation",
2266+
essentials_category=ESSENTIALS_VIDEO_GENERATION,
22662267
description="Kling Lip Sync Audio to Video Node. Syncs mouth movements in a video file to the audio content of an audio file. When using, ensure that the audio contains clearly distinguishable vocals and that the video contains a distinct face. The audio file should not be larger than 5MB. The video file should not be larger than 100MB, should have height/width between 720px and 1920px, and should be between 2s and 10s in length.",
22672268
inputs=[
22682269
IO.Video.Input("video"),

comfy_api_nodes/nodes_openai.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
from typing_extensions import override
1010

1111
import folder_paths
12+
from comfy.essentials_category import ESSENTIALS_TEXT_GENERATION
1213
from comfy_api.latest import IO, ComfyExtension, Input
1314
from comfy_api_nodes.apis.openai import (
1415
InputFileContent,
@@ -575,7 +576,7 @@ def define_schema(cls):
575576
node_id="OpenAIChatNode",
576577
display_name="Text generation (LLM)",
577578
category="api node/text/OpenAI",
578-
essentials_category="Text Generation",
579+
essentials_category=ESSENTIALS_TEXT_GENERATION,
579580
description="Generate text responses from an OpenAI model.",
580581
inputs=[
581582
IO.String.Input(

comfy_api_nodes/nodes_recraft.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from typing_extensions import override
77

88
from comfy.utils import ProgressBar
9+
from comfy.essentials_category import ESSENTIALS_IMAGE_TOOLS
910
from comfy_api.latest import IO, ComfyExtension
1011
from comfy_api_nodes.apis.recraft import (
1112
RECRAFT_V4_PRO_SIZES,
@@ -963,7 +964,7 @@ def define_schema(cls):
963964
node_id="RecraftRemoveBackgroundNode",
964965
display_name="Remove Background",
965966
category="api node/image/Recraft",
966-
essentials_category="Image Tools",
967+
essentials_category=ESSENTIALS_IMAGE_TOOLS,
967968
description="Remove background from image, and return processed image and mask.",
968969
inputs=[
969970
IO.Image.Input("image"),

comfy_api_nodes/nodes_stability.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from typing import Optional
33
from typing_extensions import override
44

5+
from comfy.essentials_category import ESSENTIALS_AUDIO
56
from comfy_api.latest import ComfyExtension, Input, IO
67
from comfy_api_nodes.apis.stability import (
78
StabilityUpscaleConservativeRequest,
@@ -624,7 +625,7 @@ def define_schema(cls):
624625
node_id="StabilityTextToAudio",
625626
display_name="Music generation",
626627
category="api node/audio/Stability AI",
627-
essentials_category="Audio",
628+
essentials_category=ESSENTIALS_AUDIO,
628629
description=cleandoc(cls.__doc__ or ""),
629630
inputs=[
630631
IO.Combo.Input(

comfy_extras/nodes_audio.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import torch
66
import comfy.model_management
77
import folder_paths
8+
from comfy.essentials_category import ESSENTIALS_AUDIO
89
import os
910
import hashlib
1011
import node_helpers
@@ -159,7 +160,7 @@ def define_schema(cls):
159160
search_aliases=["export flac"],
160161
display_name="Save Audio",
161162
category="audio",
162-
essentials_category="Audio",
163+
essentials_category=ESSENTIALS_AUDIO,
163164
inputs=[
164165
IO.Audio.Input("audio"),
165166
IO.String.Input("filename_prefix", default="audio/ComfyUI"),
@@ -301,7 +302,7 @@ def define_schema(cls):
301302
search_aliases=["import audio", "open audio", "audio file"],
302303
display_name="Load Audio",
303304
category="audio",
304-
essentials_category="Audio",
305+
essentials_category=ESSENTIALS_AUDIO,
305306
inputs=[
306307
IO.Combo.Input("audio", upload=IO.UploadType.audio, options=sorted(files)),
307308
],

comfy_extras/nodes_canny.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
from typing_extensions import override
33

44
import comfy.model_management
5+
from comfy.essentials_category import ESSENTIALS_IMAGE_TOOLS
56
from comfy_api.latest import ComfyExtension, io
67

78

@@ -12,7 +13,7 @@ def define_schema(cls):
1213
node_id="Canny",
1314
search_aliases=["edge detection", "outline", "contour detection", "line art"],
1415
category="image/preprocessors",
15-
essentials_category="Image Tools",
16+
essentials_category=ESSENTIALS_IMAGE_TOOLS,
1617
inputs=[
1718
io.Image.Input("image"),
1819
io.Float.Input("low_threshold", default=0.4, min=0.01, max=0.99, step=0.01),

comfy_extras/nodes_hunyuan3d.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
import struct
55
import numpy as np
66
from comfy.ldm.modules.diffusionmodules.mmdit import get_1d_sincos_pos_embed_from_grid_torch
7+
from comfy.essentials_category import ESSENTIALS_BASICS
78
import folder_paths
89
import comfy.model_management
910
from comfy.cli_args import args
@@ -621,7 +622,7 @@ def define_schema(cls):
621622
display_name="Save 3D Model",
622623
search_aliases=["export 3d model", "save mesh"],
623624
category="3d",
624-
essentials_category="Basic",
625+
essentials_category=ESSENTIALS_BASICS,
625626
is_output_node=True,
626627
inputs=[
627628
IO.MultiType.Input(

comfy_extras/nodes_images.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import nodes
44
import folder_paths
5+
from comfy.essentials_category import ESSENTIALS_IMAGE_TOOLS
56

67
import json
78
import os
@@ -26,7 +27,7 @@ def define_schema(cls):
2627
display_name="Crop Image (Deprecated)",
2728
category="image/transform",
2829
is_deprecated=True,
29-
essentials_category="Image Tools",
30+
essentials_category=ESSENTIALS_IMAGE_TOOLS,
3031
inputs=[
3132
IO.Image.Input("image"),
3233
IO.Int.Input("width", default=512, min=1, max=nodes.MAX_RESOLUTION, step=1),
@@ -591,7 +592,7 @@ def define_schema(cls):
591592
display_name="Rotate",
592593
search_aliases=["turn", "flip orientation"],
593594
category="image/transform",
594-
essentials_category="Image Tools",
595+
essentials_category=ESSENTIALS_IMAGE_TOOLS,
595596
inputs=[
596597
IO.Image.Input("image"),
597598
IO.Combo.Input("rotation", options=["none", "90 degrees", "180 degrees", "270 degrees"]),

0 commit comments

Comments
 (0)