The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
chore: replace imports of deprecated V1 classes (#11127)
Alexander Piskun85c4b4ae262c
diff --git a/comfy_api_nodes/apis/veo_api.py b/comfy_api_nodes/apis/veo_api.pyindex 8328d1aa4..23ca725b7 100644--- a/comfy_api_nodes/apis/veo_api.py+++ b/comfy_api_nodes/apis/veo_api.py@@ -85,7 +85,7 @@ class Response1(BaseModel):raiMediaFilteredReasons: Optional[list[str]] = Field(None, description='Reasons why media was filtered by responsible AI policies')- videos: Optional[list[Video]] = None+ videos: Optional[list[Video]] = Field(None)class VeoGenVidPollResponse(BaseModel):diff --git a/comfy_api_nodes/nodes_gemini.py b/comfy_api_nodes/nodes_gemini.pyindex 08f7b0f64..0b7422ef7 100644--- a/comfy_api_nodes/nodes_gemini.py+++ b/comfy_api_nodes/nodes_gemini.py@@ -13,8 +13,7 @@ import torchfrom typing_extensions import overrideimport folder_paths-from comfy_api.latest import IO, ComfyExtension, Input-from comfy_api.util import VideoCodec, VideoContainer+from comfy_api.latest import IO, ComfyExtension, Input, Typesfrom comfy_api_nodes.apis.gemini_api import (GeminiContent,GeminiFileData,@@ -68,7 +67,7 @@ class GeminiImageModel(str, Enum):async def create_image_parts(cls: type[IO.ComfyNode],- images: torch.Tensor,+ images: Input.Image,image_limit: int = 0,) -> list[GeminiPart]:image_parts: list[GeminiPart] = []@@ -154,8 +153,8 @@ def get_text_from_response(response: GeminiGenerateContentResponse) -> str:return "\n".join([part.text for part in parts])-def get_image_from_response(response: GeminiGenerateContentResponse) -> torch.Tensor:- image_tensors: list[torch.Tensor] = []+def get_image_from_response(response: GeminiGenerateContentResponse) -> Input.Image:+ image_tensors: list[Input.Image] = []parts = get_parts_by_type(response, "image/png")for part in parts:image_data = base64.b64decode(part.inlineData.data)@@ -293,7 +292,9 @@ class GeminiNode(IO.ComfyNode):def create_video_parts(cls, video_input: Input.Video) -> list[GeminiPart]:"""Convert video input to Gemini API compatible parts."""- base_64_string = video_to_base64_string(video_input, container_format=VideoContainer.MP4, codec=VideoCodec.H264)+ base_64_string = video_to_base64_string(+ video_input, container_format=Types.VideoContainer.MP4, codec=Types.VideoCodec.H264+ )return [GeminiPart(inlineData=GeminiInlineData(@@ -343,7 +344,7 @@ class GeminiNode(IO.ComfyNode):prompt: str,model: str,seed: int,- images: torch.Tensor | None = None,+ images: Input.Image | None = None,audio: Input.Audio | None = None,video: Input.Video | None = None,files: list[GeminiPart] | None = None,@@ -542,7 +543,7 @@ class GeminiImage(IO.ComfyNode):prompt: str,model: str,seed: int,- images: torch.Tensor | None = None,+ images: Input.Image | None = None,files: list[GeminiPart] | None = None,aspect_ratio: str = "auto",response_modalities: str = "IMAGE+TEXT",@@ -662,7 +663,7 @@ class GeminiImage2(IO.ComfyNode):aspect_ratio: str,resolution: str,response_modalities: str,- images: torch.Tensor | None = None,+ images: Input.Image | None = None,files: list[GeminiPart] | None = None,) -> IO.NodeOutput:validate_string(prompt, strip_whitespace=True, min_length=1)diff --git a/comfy_api_nodes/nodes_ltxv.py b/comfy_api_nodes/nodes_ltxv.pyindex 0b757a62b..7e61560dc 100644--- a/comfy_api_nodes/nodes_ltxv.py+++ b/comfy_api_nodes/nodes_ltxv.py@@ -1,12 +1,9 @@from io import BytesIO-from typing import Optional-import torchfrom pydantic import BaseModel, Fieldfrom typing_extensions import override-from comfy_api.input_impl import VideoFromFile-from comfy_api.latest import IO, ComfyExtension+from comfy_api.latest import IO, ComfyExtension, Input, InputImplfrom comfy_api_nodes.util import (ApiEndpoint,get_number_of_images,@@ -26,9 +23,9 @@ class ExecuteTaskRequest(BaseModel):model: str = Field(...)duration: int = Field(...)resolution: str = Field(...)- fps: Optional[int] = Field(25)- generate_audio: Optional[bool] = Field(True)- image_uri: Optional[str] = Field(None)+ fps: int | None = Field(25)+ generate_audio: bool | None = Field(True)+ image_uri: str | None = Field(None)class TextToVideoNode(IO.ComfyNode):@@ -103,7 +100,7 @@ class TextToVideoNode(IO.ComfyNode):as_binary=True,max_retries=1,)- return IO.NodeOutput(VideoFromFile(BytesIO(response)))+ return IO.NodeOutput(InputImpl.VideoFromFile(BytesIO(response)))class ImageToVideoNode(IO.ComfyNode):@@ -153,7 +150,7 @@ class ImageToVideoNode(IO.ComfyNode):@classmethodasync def execute(cls,- image: torch.Tensor,+ image: Input.Image,model: str,prompt: str,duration: int,@@ -183,7 +180,7 @@ class ImageToVideoNode(IO.ComfyNode):as_binary=True,max_retries=1,)- return IO.NodeOutput(VideoFromFile(BytesIO(response)))+ return IO.NodeOutput(InputImpl.VideoFromFile(BytesIO(response)))class LtxvApiExtension(ComfyExtension):diff --git a/comfy_api_nodes/nodes_moonvalley.py b/comfy_api_nodes/nodes_moonvalley.pyindex 7c31d95b3..2771e4790 100644--- a/comfy_api_nodes/nodes_moonvalley.py+++ b/comfy_api_nodes/nodes_moonvalley.py@@ -1,11 +1,8 @@import logging-from typing import Optional-import torchfrom typing_extensions import override-from comfy_api.input import VideoInput-from comfy_api.latest import IO, ComfyExtension+from comfy_api.latest import IO, ComfyExtension, Inputfrom comfy_api_nodes.apis import (MoonvalleyPromptResponse,MoonvalleyTextToVideoInferenceParams,@@ -61,7 +58,7 @@ def validate_task_creation_response(response) -> None:raise RuntimeError(error_msg)-def validate_video_to_video_input(video: VideoInput) -> VideoInput:+def validate_video_to_video_input(video: Input.Video) -> Input.Video:"""Validates and processes video input for Moonvalley Video-to-Video generation.@@ -82,7 +79,7 @@ def validate_video_to_video_input(video: VideoInput) -> VideoInput:return _validate_and_trim_duration(video)-def _get_video_dimensions(video: VideoInput) -> tuple[int, int]:+def _get_video_dimensions(video: Input.Video) -> tuple[int, int]:"""Extracts video dimensions with error handling."""try:return video.get_dimensions()@@ -106,7 +103,7 @@ def _validate_video_dimensions(width: int, height: int) -> None:raise ValueError(f"Resolution {width}x{height} not supported. Supported: {supported_list}")-def _validate_and_trim_duration(video: VideoInput) -> VideoInput:+def _validate_and_trim_duration(video: Input.Video) -> Input.Video:"""Validates video duration and trims to 5 seconds if needed."""duration = video.get_duration()_validate_minimum_duration(duration)@@ -119,7 +116,7 @@ def _validate_minimum_duration(duration: float) -> None:raise ValueError("Input video must be at least 5 seconds long.")-def _trim_if_too_long(video: VideoInput, duration: float) -> VideoInput:+def _trim_if_too_long(video: Input.Video, duration: float) -> Input.Video:"""Trims video to 5 seconds if longer."""if duration > 5:return trim_video(video, 5)@@ -241,7 +238,7 @@ class MoonvalleyImg2VideoNode(IO.ComfyNode):@classmethodasync def execute(cls,- image: torch.Tensor,+ image: Input.Image,prompt: str,negative_prompt: str,resolution: str,@@ -362,9 +359,9 @@ class MoonvalleyVideo2VideoNode(IO.ComfyNode):prompt: str,negative_prompt: str,seed: int,- video: Optional[VideoInput] = None,+ video: Input.Video | None = None,control_type: str = "Motion Transfer",- motion_intensity: Optional[int] = 100,+ motion_intensity: int | None = 100,steps=33,prompt_adherence=4.5,) -> IO.NodeOutput:diff --git a/comfy_api_nodes/nodes_runway.py b/comfy_api_nodes/nodes_runway.pyindex 2fdafbbfe..3c55039c9 100644--- a/comfy_api_nodes/nodes_runway.py+++ b/comfy_api_nodes/nodes_runway.py@@ -11,12 +11,11 @@ User Guides:"""-from typing import Union, Optional-from typing_extensions import overridefrom enum import Enum-import torch+from typing_extensions import override+from comfy_api.latest import IO, ComfyExtension, Input, InputImplfrom comfy_api_nodes.apis import (RunwayImageToVideoRequest,RunwayImageToVideoResponse,@@ -44,8 +43,6 @@ from comfy_api_nodes.util import (sync_op,poll_op,)-from comfy_api.input_impl import VideoFromFile-from comfy_api.latest import ComfyExtension, IOPATH_IMAGE_TO_VIDEO = "/proxy/runway/image_to_video"PATH_TEXT_TO_IMAGE = "/proxy/runway/text_to_image"@@ -80,7 +77,7 @@ class RunwayGen3aAspectRatio(str, Enum):field_1280_768 = "1280:768"-def get_video_url_from_task_status(response: TaskStatusResponse) -> Union[str, None]:+def get_video_url_from_task_status(response: TaskStatusResponse) -> str | None:"""Returns the video URL from the task status response if it exists."""if hasattr(response, "output") and len(response.output) > 0:return response.output[0]@@ -89,13 +86,13 @@ def get_video_url_from_task_status(response: TaskStatusResponse) -> Union[str, Ndef extract_progress_from_task_status(response: TaskStatusResponse,-) -> Union[float, None]:+) -> float | None:if hasattr(response, "progress") and response.progress is not None:return response.progress * 100return None-def get_image_url_from_task_status(response: TaskStatusResponse) -> Union[str, None]:+def get_image_url_from_task_status(response: TaskStatusResponse) -> str | None:"""Returns the image URL from the task status response if it exists."""if hasattr(response, "output") and len(response.output) > 0:return response.output[0]@@ -103,7 +100,7 @@ def get_image_url_from_task_status(response: TaskStatusResponse) -> Union[str, Nasync def get_response(- cls: type[IO.ComfyNode], task_id: str, estimated_duration: Optional[int] = None+ cls: type[IO.ComfyNode], task_id: str, estimated_duration: int | None = None) -> TaskStatusResponse:"""Poll the task status until it is finished then get the response."""return await poll_op(@@ -119,8 +116,8 @@ async def get_response(async def generate_video(cls: type[IO.ComfyNode],request: RunwayImageToVideoRequest,- estimated_duration: Optional[int] = None,-) -> VideoFromFile:+ estimated_duration: int | None = None,+) -> InputImpl.VideoFromFile:initial_response = await sync_op(cls,endpoint=ApiEndpoint(path=PATH_IMAGE_TO_VIDEO, method="POST"),@@ -193,7 +190,7 @@ class RunwayImageToVideoNodeGen3a(IO.ComfyNode):async def execute(cls,prompt: str,- start_frame: torch.Tensor,+ start_frame: Input.Image,duration: str,ratio: str,seed: int,@@ -283,7 +280,7 @@ class RunwayImageToVideoNodeGen4(IO.ComfyNode):async def execute(cls,prompt: str,- start_frame: torch.Tensor,+ start_frame: Input.Image,duration: str,ratio: str,seed: int,@@ -381,8 +378,8 @@ class RunwayFirstLastFrameNode(IO.ComfyNode):async def execute(cls,prompt: str,- start_frame: torch.Tensor,- end_frame: torch.Tensor,+ start_frame: Input.Image,+ end_frame: Input.Image,duration: str,ratio: str,seed: int,@@ -467,7 +464,7 @@ class RunwayTextToImageNode(IO.ComfyNode):cls,prompt: str,ratio: str,- reference_image: Optional[torch.Tensor] = None,+ reference_image: Input.Image | None = None,) -> IO.NodeOutput:validate_string(prompt, min_length=1)diff --git a/comfy_api_nodes/nodes_veo2.py b/comfy_api_nodes/nodes_veo2.pyindex a54dc13ab..e165b8380 100644--- a/comfy_api_nodes/nodes_veo2.py+++ b/comfy_api_nodes/nodes_veo2.py@@ -1,11 +1,9 @@import base64from io import BytesIO-import torchfrom typing_extensions import override-from comfy_api.input_impl.video_types import VideoFromFile-from comfy_api.latest import IO, ComfyExtension+from comfy_api.latest import IO, ComfyExtension, Input, InputImplfrom comfy_api_nodes.apis.veo_api import (VeoGenVidPollRequest,VeoGenVidPollResponse,@@ -232,7 +230,7 @@ class VeoVideoGenerationNode(IO.ComfyNode):# Check if video is provided as base64 or URLif hasattr(video, "bytesBase64Encoded") and video.bytesBase64Encoded:- return IO.NodeOutput(VideoFromFile(BytesIO(base64.b64decode(video.bytesBase64Encoded))))+ return IO.NodeOutput(InputImpl.VideoFromFile(BytesIO(base64.b64decode(video.bytesBase64Encoded))))if hasattr(video, "gcsUri") and video.gcsUri:return IO.NodeOutput(await download_url_to_video_output(video.gcsUri))@@ -431,8 +429,8 @@ class Veo3FirstLastFrameNode(IO.ComfyNode):aspect_ratio: str,duration: int,seed: int,- first_frame: torch.Tensor,- last_frame: torch.Tensor,+ first_frame: Input.Image,+ last_frame: Input.Image,model: str,generate_audio: bool,):@@ -493,7 +491,7 @@ class Veo3FirstLastFrameNode(IO.ComfyNode):if response.videos:video = response.videos[0]if video.bytesBase64Encoded:- return IO.NodeOutput(VideoFromFile(BytesIO(base64.b64decode(video.bytesBase64Encoded))))+ return IO.NodeOutput(InputImpl.VideoFromFile(BytesIO(base64.b64decode(video.bytesBase64Encoded))))if video.gcsUri:return IO.NodeOutput(await download_url_to_video_output(video.gcsUri))raise Exception("Video returned but no data or URL was provided")diff --git a/comfy_extras/nodes_video.py b/comfy_extras/nodes_video.pyindex 6cf6e39bf..c609e03da 100644--- a/comfy_extras/nodes_video.py+++ b/comfy_extras/nodes_video.py@@ -8,10 +8,7 @@ import jsonfrom typing import Optionalfrom typing_extensions import overridefrom fractions import Fraction-from comfy_api.input import AudioInput, ImageInput, VideoInput-from comfy_api.input_impl import VideoFromComponents, VideoFromFile-from comfy_api.util import VideoCodec, VideoComponents, VideoContainer-from comfy_api.latest import ComfyExtension, io, ui+from comfy_api.latest import ComfyExtension, io, ui, Input, InputImpl, Typesfrom comfy.cli_args import argsclass SaveWEBM(io.ComfyNode):@@ -28,7 +25,6 @@ class SaveWEBM(io.ComfyNode):io.Float.Input("fps", default=24.0, min=0.01, max=1000.0, step=0.01),io.Float.Input("crf", default=32.0, min=0, max=63.0, step=1, tooltip="Higher crf means lower quality with a smaller file size, lower crf means higher quality higher filesize."),],- outputs=[],hidden=[io.Hidden.prompt, io.Hidden.extra_pnginfo],is_output_node=True,)@@ -79,16 +75,15 @@ class SaveVideo(io.ComfyNode):inputs=[io.Video.Input("video", tooltip="The video to save."),io.String.Input("filename_prefix", default="video/ComfyUI", tooltip="The prefix for the file to save. This may include formatting information such as %date:yyyy-MM-dd% or %Empty Latent Image.width% to include values from nodes."),- io.Combo.Input("format", options=VideoContainer.as_input(), default="auto", tooltip="The format to save the video as."),- io.Combo.Input("codec", options=VideoCodec.as_input(), default="auto", tooltip="The codec to use for the video."),+ io.Combo.Input("format", options=Types.VideoContainer.as_input(), default="auto", tooltip="The format to save the video as."),+ io.Combo.Input("codec", options=Types.VideoCodec.as_input(), default="auto", tooltip="The codec to use for the video."),],- outputs=[],hidden=[io.Hidden.prompt, io.Hidden.extra_pnginfo],is_output_node=True,)@classmethod- def execute(cls, video: VideoInput, filename_prefix, format: str, codec) -> io.NodeOutput:+ def execute(cls, video: Input.Video, filename_prefix, format: str, codec) -> io.NodeOutput:width, height = video.get_dimensions()full_output_folder, filename, counter, subfolder, filename_prefix = folder_paths.get_save_image_path(filename_prefix,@@ -105,10 +100,10 @@ class SaveVideo(io.ComfyNode):metadata["prompt"] = cls.hidden.promptif len(metadata) > 0:saved_metadata = metadata- file = f"{filename}_{counter:05}_.{VideoContainer.get_extension(format)}"+ file = f"{filename}_{counter:05}_.{Types.VideoContainer.get_extension(format)}"video.save_to(os.path.join(full_output_folder, file),- format=VideoContainer(format),+ format=Types.VideoContainer(format),codec=codec,metadata=saved_metadata)@@ -135,9 +130,9 @@ class CreateVideo(io.ComfyNode):)@classmethod- def execute(cls, images: ImageInput, fps: float, audio: Optional[AudioInput] = None) -> io.NodeOutput:+ def execute(cls, images: Input.Image, fps: float, audio: Optional[Input.Audio] = None) -> io.NodeOutput:return io.NodeOutput(- VideoFromComponents(VideoComponents(images=images, audio=audio, frame_rate=Fraction(fps)))+ InputImpl.VideoFromComponents(Types.VideoComponents(images=images, audio=audio, frame_rate=Fraction(fps))))class GetVideoComponents(io.ComfyNode):@@ -159,11 +154,11 @@ class GetVideoComponents(io.ComfyNode):)@classmethod- def execute(cls, video: VideoInput) -> io.NodeOutput:+ def execute(cls, video: Input.Video) -> io.NodeOutput:components = video.get_components()-return io.NodeOutput(components.images, components.audio, float(components.frame_rate))+class LoadVideo(io.ComfyNode):@classmethoddef define_schema(cls):@@ -185,7 +180,7 @@ class LoadVideo(io.ComfyNode):@classmethoddef execute(cls, file) -> io.NodeOutput:video_path = folder_paths.get_annotated_filepath(file)- return io.NodeOutput(VideoFromFile(video_path))+ return io.NodeOutput(InputImpl.VideoFromFile(video_path))@classmethoddef fingerprint_inputs(s, file):