mirror of
https://git.datalinker.icu/comfyanonymous/ComfyUI
synced 2026-07-15 09:26:59 +08:00
chore(api-nodes): replace deprecated V1 imports
This commit is contained in:
parent
70467023e9
commit
c82deb32e9
@ -11,8 +11,7 @@ import torch
|
|||||||
from PIL import Image
|
from PIL import Image
|
||||||
|
|
||||||
from comfy.utils import common_upscale
|
from comfy.utils import common_upscale
|
||||||
from comfy_api.latest import Input, InputImpl
|
from comfy_api.latest import Input, InputImpl, Types
|
||||||
from comfy_api.util import VideoCodec, VideoContainer
|
|
||||||
|
|
||||||
from ._helpers import mimetype_to_extension
|
from ._helpers import mimetype_to_extension
|
||||||
|
|
||||||
@ -176,8 +175,8 @@ def audio_to_base64_string(audio: Input.Audio, container_format: str = "mp4", co
|
|||||||
|
|
||||||
def video_to_base64_string(
|
def video_to_base64_string(
|
||||||
video: Input.Video,
|
video: Input.Video,
|
||||||
container_format: VideoContainer = None,
|
container_format: Types.VideoContainer | None = None,
|
||||||
codec: VideoCodec = None,
|
codec: Types.VideoCodec | None = None,
|
||||||
) -> str:
|
) -> str:
|
||||||
"""
|
"""
|
||||||
Converts a video input to a base64 string.
|
Converts a video input to a base64 string.
|
||||||
@ -188,12 +187,11 @@ def video_to_base64_string(
|
|||||||
codec: Optional codec to use (defaults to video.codec if available)
|
codec: Optional codec to use (defaults to video.codec if available)
|
||||||
"""
|
"""
|
||||||
video_bytes_io = BytesIO()
|
video_bytes_io = BytesIO()
|
||||||
|
video.save_to(
|
||||||
# Use provided format/codec if specified, otherwise use video's own if available
|
video_bytes_io,
|
||||||
format_to_use = container_format if container_format is not None else getattr(video, "container", VideoContainer.MP4)
|
format=container_format or getattr(video, "container", Types.VideoContainer.MP4),
|
||||||
codec_to_use = codec if codec is not None else getattr(video, "codec", VideoCodec.H264)
|
codec=codec or getattr(video, "codec", Types.VideoCodec.H264),
|
||||||
|
)
|
||||||
video.save_to(video_bytes_io, format=format_to_use, codec=codec_to_use)
|
|
||||||
video_bytes_io.seek(0)
|
video_bytes_io.seek(0)
|
||||||
return base64.b64encode(video_bytes_io.getvalue()).decode("utf-8")
|
return base64.b64encode(video_bytes_io.getvalue()).decode("utf-8")
|
||||||
|
|
||||||
|
|||||||
@ -10,8 +10,8 @@ import aiohttp
|
|||||||
import torch
|
import torch
|
||||||
from aiohttp.client_exceptions import ClientError, ContentTypeError
|
from aiohttp.client_exceptions import ClientError, ContentTypeError
|
||||||
|
|
||||||
from comfy_api.input_impl import VideoFromFile
|
|
||||||
from comfy_api.latest import IO as COMFY_IO
|
from comfy_api.latest import IO as COMFY_IO
|
||||||
|
from comfy_api.latest import InputImpl
|
||||||
|
|
||||||
from . import request_logger
|
from . import request_logger
|
||||||
from ._helpers import (
|
from ._helpers import (
|
||||||
@ -234,11 +234,11 @@ async def download_url_to_video_output(
|
|||||||
timeout: float = None,
|
timeout: float = None,
|
||||||
max_retries: int = 5,
|
max_retries: int = 5,
|
||||||
cls: type[COMFY_IO.ComfyNode] = None,
|
cls: type[COMFY_IO.ComfyNode] = None,
|
||||||
) -> VideoFromFile:
|
) -> InputImpl.VideoFromFile:
|
||||||
"""Downloads a video from a URL and returns a `VIDEO` output."""
|
"""Downloads a video from a URL and returns a `VIDEO` output."""
|
||||||
result = BytesIO()
|
result = BytesIO()
|
||||||
await download_url_to_bytesio(video_url, result, timeout=timeout, max_retries=max_retries, cls=cls)
|
await download_url_to_bytesio(video_url, result, timeout=timeout, max_retries=max_retries, cls=cls)
|
||||||
return VideoFromFile(result)
|
return InputImpl.VideoFromFile(result)
|
||||||
|
|
||||||
|
|
||||||
async def download_url_as_bytesio(
|
async def download_url_as_bytesio(
|
||||||
|
|||||||
@ -10,8 +10,7 @@ import aiohttp
|
|||||||
import torch
|
import torch
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import BaseModel, Field
|
||||||
|
|
||||||
from comfy_api.latest import IO, Input
|
from comfy_api.latest import IO, Input, Types
|
||||||
from comfy_api.util import VideoCodec, VideoContainer
|
|
||||||
|
|
||||||
from . import request_logger
|
from . import request_logger
|
||||||
from ._helpers import is_processing_interrupted, sleep_with_interrupt
|
from ._helpers import is_processing_interrupted, sleep_with_interrupt
|
||||||
@ -55,7 +54,7 @@ async def upload_images_to_comfyapi(
|
|||||||
Uploads images to ComfyUI API and returns download URLs.
|
Uploads images to ComfyUI API and returns download URLs.
|
||||||
To upload multiple images, stack them in the batch dimension first.
|
To upload multiple images, stack them in the batch dimension first.
|
||||||
"""
|
"""
|
||||||
# if batch, try to upload each file if max_images is greater than 0
|
# if batched, try to upload each file if max_images is greater than 0
|
||||||
download_urls: list[str] = []
|
download_urls: list[str] = []
|
||||||
is_batch = len(image.shape) > 3
|
is_batch = len(image.shape) > 3
|
||||||
batch_len = image.shape[0] if is_batch else 1
|
batch_len = image.shape[0] if is_batch else 1
|
||||||
@ -99,8 +98,8 @@ async def upload_video_to_comfyapi(
|
|||||||
cls: type[IO.ComfyNode],
|
cls: type[IO.ComfyNode],
|
||||||
video: Input.Video,
|
video: Input.Video,
|
||||||
*,
|
*,
|
||||||
container: VideoContainer = VideoContainer.MP4,
|
container: Types.VideoContainer = Types.VideoContainer.MP4,
|
||||||
codec: VideoCodec = VideoCodec.H264,
|
codec: Types.VideoCodec = Types.VideoCodec.H264,
|
||||||
max_duration: int | None = None,
|
max_duration: int | None = None,
|
||||||
wait_label: str | None = "Uploading",
|
wait_label: str | None = "Uploading",
|
||||||
) -> str:
|
) -> str:
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user