Skip to content

Commit ec156e7

Browse files
committed
Merge branch 'master' into flipflop-stream
2 parents 01f4512 + 6380978 commit ec156e7

File tree

8 files changed

+55
-30
lines changed

8 files changed

+55
-30
lines changed

README.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,12 @@ Simply download, extract with [7-Zip](https://7-zip.org) and run. Make sure you
176176

177177
If you have trouble extracting it, right click the file -> properties -> unblock
178178

179+
#### Alternative Downloads:
180+
181+
[Experimental portable for AMD GPUs](https://github.com/comfyanonymous/ComfyUI/releases/latest/download/ComfyUI_windows_portable_amd.7z)
182+
183+
[Portable with pytorch cuda 12.8 and python 3.12](https://github.com/comfyanonymous/ComfyUI/releases/latest/download/ComfyUI_windows_portable_nvidia_cu128.7z) (Supports Nvidia 10 series and older GPUs).
184+
179185
#### How do I share models between another UI and ComfyUI?
180186

181187
See the [Config file](extra_model_paths.yaml.example) to set the search paths for models. In the standalone windows build you can find this file in the ComfyUI directory. Rename this file to extra_model_paths.yaml and edit it with your favorite text editor.

comfy_api/latest/_io.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,6 +1605,7 @@ class _IO:
16051605
Model = Model
16061606
ClipVision = ClipVision
16071607
ClipVisionOutput = ClipVisionOutput
1608+
AudioEncoder = AudioEncoder
16081609
AudioEncoderOutput = AudioEncoderOutput
16091610
StyleModel = StyleModel
16101611
Gligen = Gligen

comfy_api_nodes/nodes_bytedance.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,7 @@ def define_schema(cls):
920920
inputs=[
921921
comfy_io.Combo.Input(
922922
"model",
923-
options=[Image2VideoModelName.seedance_1_lite.value],
923+
options=[model.value for model in Image2VideoModelName],
924924
default=Image2VideoModelName.seedance_1_lite.value,
925925
tooltip="Model name",
926926
),

comfy_api_nodes/nodes_rodin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -540,7 +540,7 @@ async def api_call(
540540
**kwargs)
541541
await self.poll_for_task_status(subscription_key, **kwargs)
542542
download_list = await self.get_rodin_download_list(task_uuid, **kwargs)
543-
model = await self.download_files(download_list)
543+
model = await self.download_files(download_list, task_uuid)
544544

545545
return (model,)
546546

Lines changed: 43 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,62 @@
11
import folder_paths
22
import comfy.audio_encoders.audio_encoders
33
import comfy.utils
4+
from typing_extensions import override
5+
from comfy_api.latest import ComfyExtension, io
46

57

6-
class AudioEncoderLoader:
8+
class AudioEncoderLoader(io.ComfyNode):
79
@classmethod
8-
def INPUT_TYPES(s):
9-
return {"required": { "audio_encoder_name": (folder_paths.get_filename_list("audio_encoders"), ),
10-
}}
11-
RETURN_TYPES = ("AUDIO_ENCODER",)
12-
FUNCTION = "load_model"
10+
def define_schema(cls) -> io.Schema:
11+
return io.Schema(
12+
node_id="AudioEncoderLoader",
13+
category="loaders",
14+
inputs=[
15+
io.Combo.Input(
16+
"audio_encoder_name",
17+
options=folder_paths.get_filename_list("audio_encoders"),
18+
),
19+
],
20+
outputs=[io.AudioEncoder.Output()],
21+
)
1322

14-
CATEGORY = "loaders"
15-
16-
def load_model(self, audio_encoder_name):
23+
@classmethod
24+
def execute(cls, audio_encoder_name) -> io.NodeOutput:
1725
audio_encoder_name = folder_paths.get_full_path_or_raise("audio_encoders", audio_encoder_name)
1826
sd = comfy.utils.load_torch_file(audio_encoder_name, safe_load=True)
1927
audio_encoder = comfy.audio_encoders.audio_encoders.load_audio_encoder_from_sd(sd)
2028
if audio_encoder is None:
2129
raise RuntimeError("ERROR: audio encoder file is invalid and does not contain a valid model.")
22-
return (audio_encoder,)
30+
return io.NodeOutput(audio_encoder)
2331

2432

25-
class AudioEncoderEncode:
33+
class AudioEncoderEncode(io.ComfyNode):
2634
@classmethod
27-
def INPUT_TYPES(s):
28-
return {"required": { "audio_encoder": ("AUDIO_ENCODER",),
29-
"audio": ("AUDIO",),
30-
}}
31-
RETURN_TYPES = ("AUDIO_ENCODER_OUTPUT",)
32-
FUNCTION = "encode"
33-
34-
CATEGORY = "conditioning"
35+
def define_schema(cls) -> io.Schema:
36+
return io.Schema(
37+
node_id="AudioEncoderEncode",
38+
category="conditioning",
39+
inputs=[
40+
io.AudioEncoder.Input("audio_encoder"),
41+
io.Audio.Input("audio"),
42+
],
43+
outputs=[io.AudioEncoderOutput.Output()],
44+
)
3545

36-
def encode(self, audio_encoder, audio):
46+
@classmethod
47+
def execute(cls, audio_encoder, audio) -> io.NodeOutput:
3748
output = audio_encoder.encode_audio(audio["waveform"], audio["sample_rate"])
38-
return (output,)
49+
return io.NodeOutput(output)
50+
51+
52+
class AudioEncoder(ComfyExtension):
53+
@override
54+
async def get_node_list(self) -> list[type[io.ComfyNode]]:
55+
return [
56+
AudioEncoderLoader,
57+
AudioEncoderEncode,
58+
]
3959

4060

41-
NODE_CLASS_MAPPINGS = {
42-
"AudioEncoderLoader": AudioEncoderLoader,
43-
"AudioEncoderEncode": AudioEncoderEncode,
44-
}
61+
async def comfy_entrypoint() -> AudioEncoder:
62+
return AudioEncoder()

comfyui_version.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# This file is automatically generated by the build process when version is
22
# updated in pyproject.toml.
3-
__version__ = "0.3.61"
3+
__version__ = "0.3.62"

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[project]
22
name = "ComfyUI"
3-
version = "0.3.61"
3+
version = "0.3.62"
44
readme = "README.md"
55
license = { file = "LICENSE" }
66
requires-python = ">=3.9"

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
comfyui-frontend-package==1.26.13
1+
comfyui-frontend-package==1.27.7
22
comfyui-workflow-templates==0.1.91
33
comfyui-embedded-docs==0.2.6
44
torch

0 commit comments

Comments
 (0)