Skip to content

Commit

Permalink
toml fix (2), class renames
Browse files Browse the repository at this point in the history
Converted package name in toml to be all lowercase to satisfy registry. Renamed classes that are reported as conflicting by the comfyui manager.
  • Loading branch information
ryanontheinstide committed Jan 22, 2025
1 parent 479c96c commit f693c2c
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 10 deletions.
19 changes: 13 additions & 6 deletions __init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def end_progress(self):
AudioVolumeNormalization,
Audio_Combine,
AudioSubtract,
AudioConcatenate,
Audio_Concatenate,
AudioDither,
AudioInfo,
)
Expand Down Expand Up @@ -313,7 +313,7 @@ def end_progress(self):

from .nodes.preprocessors.pose import PoseInterpolator

from .nodes.doom.doom import Doom
from .nodes.doom.doom import Doom_

# from .nodes.models.flex_model_base import FlexFeatureAttentionControl

Expand Down Expand Up @@ -364,7 +364,7 @@ def end_progress(self):
"FeatureInterpolator": FeatureInterpolator,
"FeaturePeakDetector": FeaturePeakDetector,

"Doom": Doom,
"Doom_": Doom_,
"WhisperToPromptTravel": WhisperToPromptTravel,
"ManualFeaturePipe": ManualFeaturePipe,
"ManualFeatureFromPipe": ManualFeatureFromPipe,
Expand Down Expand Up @@ -439,9 +439,9 @@ def end_progress(self):
"EmptyMaskFromAudio": EmptyMaskFromAudio,
"EmptyImageFromAudio": EmptyImageFromAudio,
"EmptyImageAndMaskFromAudio": EmptyImageAndMaskFromAudio,
"AudioCombine": Audio_Combine,
"Audio_Combine": Audio_Combine,
"AudioSubtract": AudioSubtract,
"AudioConcatenate": AudioConcatenate,
"Audio_Concatenate": Audio_Concatenate,
"AudioPitchShift": AudioPitchShift,
"AudioTimeStretch": AudioTimeStretch,
"AudioDither": AudioDither,
Expand Down Expand Up @@ -569,7 +569,7 @@ def end_progress(self):
"ImageInterval": ImageIntervalSelect,
"VideoChunk": VideoChunks,
"ImageDifference": ImageDifference,
"ImageShuffle": Image_Shuffle,
"Image_Shuffle": Image_Shuffle,
"SwapDevice": SwapDevice,
"ImageIntervalSelectPercentage":ImageIntervalSelectPercentage,

Expand Down Expand Up @@ -607,12 +607,19 @@ def end_progress(self):
"MaskRings": "Mask Rings [DEPRECATED]",
"MaskWarp": "Mask Warp [DEPRECATED]",

"Image_Shuffle": "Image Shuffle ROTI",
"Audio_Combine": "Audio Combine ROTI",
"Audio_Concatenate": "Audio Concatenate ROTI",
"Doom_": "DOOM",
}



# Update NODE_CLASS_MAPPINGS with external nodes
NODE_CLASS_MAPPINGS.update(EXTERNAL_NODE_CLASS_MAPPINGS)



import re

suffix = " ⚡🅡🅞🅣🅘"
Expand Down
2 changes: 1 addition & 1 deletion nodes/audio/audio_nodes_utility.py
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ def split_channels_node(self, audio):
return (audio_list,)

@apply_tooltips
class AudioConcatenate(AudioUtility):
class Audio_Concatenate(AudioUtility):
@classmethod
def INPUT_TYPES(cls):
return {
Expand Down
2 changes: 1 addition & 1 deletion nodes/doom/doom.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import cv2
import torch

class Doom:
class Doom_:
@classmethod
def INPUT_TYPES(cls):
return {
Expand Down
5 changes: 3 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
[project]
name = "ComfyUI_RyanOnTheInside"
name = "comfyui_ryanontheinside"
description = "Custom nodes introducing everything-reactivity and timelines to ComfyUI"
version = "2.0.1"
version = "2.0.2"
license = {file = "LICENSE"}

dependencies = ["pygame","opencv-python==4.10.0","scipy","torchaudio", "pillow","librosa==0.10.2","pymunk==6.8.1","matplotlib","openunmix","mido","scikit-image"]

[project.urls]
Expand Down

0 comments on commit f693c2c

Please sign in to comment.