Merge branch 'js/core-api-framework' into v3-definition

comfy_api/latest/__init__.py

@@ -4,12 +4,14 @@ from typing import Type, TYPE_CHECKING
 from comfy_api.internal import ComfyAPIBase
 from comfy_api.internal.singleton import ProxiedSingleton
 from comfy_api.internal.async_to_sync import create_sync_class
-from comfy_api.latest.input import ImageInput
+from comfy_api.latest._input import ImageInput, AudioInput, MaskInput, LatentInput, VideoInput
+from comfy_api.latest._input_impl import VideoFromFile, VideoFromComponents
+from comfy_api.latest._util import VideoCodec, VideoContainer, VideoComponents
 from comfy_api.latest._io import _IO as io  #noqa: F401
 from comfy_api.latest._ui import _UI as ui  #noqa: F401
 from comfy_api.latest._resources import _RESOURCES as resources  #noqa: F401
 from comfy_execution.utils import get_executing_context
-from comfy_execution.progress import get_progress_state
+from comfy_execution.progress import get_progress_state, PreviewImageTuple
 from PIL import Image
 from comfy.cli_args import args
 import numpy as np
@@ -43,35 +45,51 @@ class ComfyAPI_latest(ComfyAPIBase):
                 raise ValueError("node_id must be provided if not in executing context")
 
             # Convert preview_image to PreviewImageTuple if needed
-            if preview_image is not None:
+            to_display: PreviewImageTuple | Image.Image | ImageInput | None = preview_image
+            if to_display is not None:
                 # First convert to PIL Image if needed
-                if isinstance(preview_image, ImageInput):
+                if isinstance(to_display, ImageInput):
                     # Convert ImageInput (torch.Tensor) to PIL Image
                     # Handle tensor shape [B, H, W, C] -> get first image if batch
-                    tensor = preview_image
+                    tensor = to_display
                     if len(tensor.shape) == 4:
                         tensor = tensor[0]
 
                     # Convert to numpy array and scale to 0-255
                     image_np = (tensor.cpu().numpy() * 255).astype(np.uint8)
-                    preview_image = Image.fromarray(image_np)
+                    to_display = Image.fromarray(image_np)
 
-                if isinstance(preview_image, Image.Image):
+                if isinstance(to_display, Image.Image):
                     # Detect image format from PIL Image
-                    image_format = preview_image.format if preview_image.format else "JPEG"
+                    image_format = to_display.format if to_display.format else "JPEG"
                     # Use None for preview_size if ignore_size_limit is True
                     preview_size = None if ignore_size_limit else args.preview_size
-                    preview_image = (image_format, preview_image, preview_size)
+                    to_display = (image_format, to_display, preview_size)
 
             get_progress_state().update_progress(
                 node_id=node_id,
                 value=value,
                 max_value=max_value,
-                image=preview_image,
+                image=to_display,
             )
 
     execution: Execution
 
+class Input:
+    Image = ImageInput
+    Audio = AudioInput
+    Mask = MaskInput
+    Latent = LatentInput
+    Video = VideoInput
+
+class InputImpl:
+    VideoFromFile = VideoFromFile
+    VideoFromComponents = VideoFromComponents
+
+class Types:
+    VideoCodec = VideoCodec
+    VideoContainer = VideoContainer
+    VideoComponents = VideoComponents
 
 ComfyAPI = ComfyAPI_latest
 
@@ -82,3 +100,10 @@ if TYPE_CHECKING:
     ComfyAPISync: Type[comfy_api.latest.generated.ComfyAPISyncStub.ComfyAPISyncStub]
 ComfyAPISync = create_sync_class(ComfyAPI_latest)
 
+__all__ = [
+    "ComfyAPI",
+    "ComfyAPISync",
+    "Input",
+    "InputImpl",
+    "Types",
+]

comfy_api/latest/_input_impl/video_types.py

@@ -3,13 +3,13 @@ from av.container import InputContainer
 from av.subtitles.stream import SubtitleStream
 from fractions import Fraction
 from typing import Optional
-from comfy_api.latest.input import AudioInput, VideoInput
+from comfy_api.latest._input import AudioInput, VideoInput
 import av
 import io
 import json
 import numpy as np
 import torch
-from comfy_api.latest.util import VideoContainer, VideoCodec, VideoComponents
+from comfy_api.latest._util import VideoContainer, VideoCodec, VideoComponents
 
 
 def container_to_output_format(container_format: str | None) -> str | None:

comfy_api/latest/_util/video_types.py

@@ -3,7 +3,7 @@ from dataclasses import dataclass
 from enum import Enum
 from fractions import Fraction
 from typing import Optional
-from comfy_api.latest.input import ImageInput, AudioInput
+from comfy_api.latest._input import ImageInput, AudioInput
 
 class VideoCodec(str, Enum):
     AUTO = "auto"

comfy_api/latest/generated/ComfyAPISyncStub.pyi

@@ -15,6 +15,6 @@ class ComfyAPISyncStub:
 
         Migration from previous API: comfy.utils.PROGRESS_BAR_HOOK
         """
-        def set_progress(self, value: float, max_value: float, node_id: Union[str, None] = None, preview_image: Union[tuple[str, Image, Union[int, None]], Image, Tensor, None] = None) -> None: ...
+        def set_progress(self, value: float, max_value: float, node_id: Union[str, None] = None, preview_image: Union[Image, Tensor, None] = None, ignore_size_limit: bool = False) -> None: ...
 
     execution: ExecutionSync