Skip to content

Commit 965f019

Browse files
Yourzampcode-com
andcommitted
refactor: revert constants, use string literals for essentials_category
Amp-Thread-ID: https://ampcode.com/threads/T-019c7303-ab53-7341-be76-a5da1f7a657e Co-authored-by: Amp <amp@ampcode.com>
1 parent 1aaf1dc commit 965f019

14 files changed

Lines changed: 24 additions & 45 deletions

comfy/essentials_category.py

Lines changed: 0 additions & 8 deletions
This file was deleted.

comfy_api_nodes/nodes_hunyuan3d.py

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

3-
from comfy.essentials_category import ESSENTIALS_3D
43
from comfy_api.latest import IO, ComfyExtension, Input, Types
54
from comfy_api_nodes.apis.hunyuan3d import (
65
Hunyuan3DViewImage,
@@ -55,7 +54,7 @@ def define_schema(cls):
5554
node_id="TencentTextToModelNode",
5655
display_name="Text to 3D model",
5756
category="api node/3d/Tencent",
58-
essentials_category=ESSENTIALS_3D,
57+
essentials_category="3D",
5958
inputs=[
6059
IO.Combo.Input(
6160
"model",
@@ -170,7 +169,7 @@ def define_schema(cls):
170169
node_id="TencentImageToModelNode",
171170
display_name="Image to 3D Model",
172171
category="api node/3d/Tencent",
173-
essentials_category=ESSENTIALS_3D,
172+
essentials_category="3D",
174173
inputs=[
175174
IO.Combo.Input(
176175
"model",

comfy_api_nodes/nodes_kling.py

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

14-
from comfy.essentials_category import ESSENTIALS_VIDEO_GENERATION
1514
from comfy_api.latest import IO, ComfyExtension, Input, InputImpl
1615
from comfy_api_nodes.apis import (
1716
KlingCameraControl,
@@ -2263,7 +2262,7 @@ def define_schema(cls) -> IO.Schema:
22632262
node_id="KlingLipSyncAudioToVideoNode",
22642263
display_name="Lipsync",
22652264
category="api node/video/Kling",
2266-
essentials_category=ESSENTIALS_VIDEO_GENERATION,
2265+
essentials_category="Video Generation",
22672266
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.",
22682267
inputs=[
22692268
IO.Video.Input("video"),

comfy_api_nodes/nodes_openai.py

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

1111
import folder_paths
12-
from comfy.essentials_category import ESSENTIALS_TEXT_GENERATION
1312
from comfy_api.latest import IO, ComfyExtension, Input
1413
from comfy_api_nodes.apis.openai import (
1514
InputFileContent,
@@ -576,7 +575,7 @@ def define_schema(cls):
576575
node_id="OpenAIChatNode",
577576
display_name="Text generation (LLM)",
578577
category="api node/text/OpenAI",
579-
essentials_category=ESSENTIALS_TEXT_GENERATION,
578+
essentials_category="Text Generation",
580579
description="Generate text responses from an OpenAI model.",
581580
inputs=[
582581
IO.String.Input(

comfy_api_nodes/nodes_recraft.py

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

88
from comfy.utils import ProgressBar
9-
from comfy.essentials_category import ESSENTIALS_IMAGE_TOOLS
109
from comfy_api.latest import IO, ComfyExtension
1110
from comfy_api_nodes.apis.recraft import (
1211
RECRAFT_V4_PRO_SIZES,
@@ -964,7 +963,7 @@ def define_schema(cls):
964963
node_id="RecraftRemoveBackgroundNode",
965964
display_name="Remove Background",
966965
category="api node/image/Recraft",
967-
essentials_category=ESSENTIALS_IMAGE_TOOLS,
966+
essentials_category="Image Tools",
968967
description="Remove background from image, and return processed image and mask.",
969968
inputs=[
970969
IO.Image.Input("image"),

comfy_api_nodes/nodes_stability.py

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

5-
from comfy.essentials_category import ESSENTIALS_AUDIO
65
from comfy_api.latest import ComfyExtension, Input, IO
76
from comfy_api_nodes.apis.stability import (
87
StabilityUpscaleConservativeRequest,
@@ -625,7 +624,7 @@ def define_schema(cls):
625624
node_id="StabilityTextToAudio",
626625
display_name="Music generation",
627626
category="api node/audio/Stability AI",
628-
essentials_category=ESSENTIALS_AUDIO,
627+
essentials_category="Audio",
629628
description=cleandoc(cls.__doc__ or ""),
630629
inputs=[
631630
IO.Combo.Input(

comfy_extras/nodes_audio.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import torch
66
import comfy.model_management
77
import folder_paths
8-
from comfy.essentials_category import ESSENTIALS_AUDIO
98
import os
109
import hashlib
1110
import node_helpers
@@ -160,7 +159,7 @@ def define_schema(cls):
160159
search_aliases=["export flac"],
161160
display_name="Save Audio",
162161
category="audio",
163-
essentials_category=ESSENTIALS_AUDIO,
162+
essentials_category="Audio",
164163
inputs=[
165164
IO.Audio.Input("audio"),
166165
IO.String.Input("filename_prefix", default="audio/ComfyUI"),
@@ -302,7 +301,7 @@ def define_schema(cls):
302301
search_aliases=["import audio", "open audio", "audio file"],
303302
display_name="Load Audio",
304303
category="audio",
305-
essentials_category=ESSENTIALS_AUDIO,
304+
essentials_category="Audio",
306305
inputs=[
307306
IO.Combo.Input("audio", upload=IO.UploadType.audio, options=sorted(files)),
308307
],

comfy_extras/nodes_canny.py

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

44
import comfy.model_management
5-
from comfy.essentials_category import ESSENTIALS_IMAGE_TOOLS
65
from comfy_api.latest import ComfyExtension, io
76

87

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

comfy_extras/nodes_hunyuan3d.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
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
87
import folder_paths
98
import comfy.model_management
109
from comfy.cli_args import args
@@ -622,7 +621,7 @@ def define_schema(cls):
622621
display_name="Save 3D Model",
623622
search_aliases=["export 3d model", "save mesh"],
624623
category="3d",
625-
essentials_category=ESSENTIALS_BASICS,
624+
essentials_category="Basic",
626625
is_output_node=True,
627626
inputs=[
628627
IO.MultiType.Input(

comfy_extras/nodes_images.py

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

33
import nodes
44
import folder_paths
5-
from comfy.essentials_category import ESSENTIALS_IMAGE_TOOLS
65

76
import json
87
import os
@@ -27,7 +26,7 @@ def define_schema(cls):
2726
display_name="Crop Image (Deprecated)",
2827
category="image/transform",
2928
is_deprecated=True,
30-
essentials_category=ESSENTIALS_IMAGE_TOOLS,
29+
essentials_category="Image Tools",
3130
inputs=[
3231
IO.Image.Input("image"),
3332
IO.Int.Input("width", default=512, min=1, max=nodes.MAX_RESOLUTION, step=1),
@@ -592,7 +591,7 @@ def define_schema(cls):
592591
display_name="Rotate",
593592
search_aliases=["turn", "flip orientation"],
594593
category="image/transform",
595-
essentials_category=ESSENTIALS_IMAGE_TOOLS,
594+
essentials_category="Image Tools",
596595
inputs=[
597596
IO.Image.Input("image"),
598597
IO.Combo.Input("rotation", options=["none", "90 degrees", "180 degrees", "270 degrees"]),

0 commit comments

Comments
 (0)