mirror of
https://github.com/comfyanonymous/ComfyUI.git
synced 2026-06-28 17:06:38 +08:00
Compare commits
7 Commits
fix/valida
...
v0.24.1
| Author | SHA1 | Date | |
|---|---|---|---|
| ba9ffa0a2b | |||
| be78c12132 | |||
| 4769b22592 | |||
| e3d9db1a96 | |||
| 06756200ac | |||
| ad62624ddf | |||
| eaff18a5a2 |
@ -43,6 +43,7 @@ class BFLFluxEraseRequest(BaseModel):
|
|||||||
"white (255) marks areas to remove, black (0) marks areas to preserve.",
|
"white (255) marks areas to remove, black (0) marks areas to preserve.",
|
||||||
)
|
)
|
||||||
dilate_pixels: int = Field(10)
|
dilate_pixels: int = Field(10)
|
||||||
|
seed: int | None = Field(None)
|
||||||
output_format: str = Field("png")
|
output_format: str = Field("png")
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -97,3 +97,28 @@ class BriaRemoveVideoBackgroundResult(BaseModel):
|
|||||||
class BriaRemoveVideoBackgroundResponse(BaseModel):
|
class BriaRemoveVideoBackgroundResponse(BaseModel):
|
||||||
status: str = Field(...)
|
status: str = Field(...)
|
||||||
result: BriaRemoveVideoBackgroundResult | None = Field(None)
|
result: BriaRemoveVideoBackgroundResult | None = Field(None)
|
||||||
|
|
||||||
|
|
||||||
|
class BriaVideoGreenScreenRequest(BaseModel):
|
||||||
|
video: str = Field(..., description="Publicly accessible URL of the input video.")
|
||||||
|
green_shade: str = Field(
|
||||||
|
default="broadcast_green",
|
||||||
|
description="Solid chroma-key shade applied behind the foreground "
|
||||||
|
"(broadcast_green, chroma_green, or blue_screen).",
|
||||||
|
)
|
||||||
|
output_container_and_codec: str = Field(...)
|
||||||
|
preserve_audio: bool = Field(True)
|
||||||
|
seed: int = Field(...)
|
||||||
|
|
||||||
|
|
||||||
|
class BriaVideoReplaceBackgroundRequest(BaseModel):
|
||||||
|
video: str = Field(..., description="Publicly accessible URL of the input (foreground) video.")
|
||||||
|
background_url: str = Field(
|
||||||
|
...,
|
||||||
|
description="Publicly accessible URL of the background image or video to composite behind "
|
||||||
|
"the foreground. Stretched to the foreground frame; match its aspect ratio for "
|
||||||
|
"undistorted results.",
|
||||||
|
)
|
||||||
|
output_container_and_codec: str = Field(...)
|
||||||
|
preserve_audio: bool = Field(True)
|
||||||
|
seed: int = Field(...)
|
||||||
|
|||||||
@ -534,6 +534,15 @@ class FluxEraseNode(IO.ComfyNode):
|
|||||||
max=25,
|
max=25,
|
||||||
tooltip="Expands the mask boundaries to ensure clean coverage of the object's edges.",
|
tooltip="Expands the mask boundaries to ensure clean coverage of the object's edges.",
|
||||||
),
|
),
|
||||||
|
IO.Int.Input(
|
||||||
|
"seed",
|
||||||
|
default=0,
|
||||||
|
min=0,
|
||||||
|
max=2147483647,
|
||||||
|
control_after_generate=True,
|
||||||
|
tooltip="The random seed used for creating the noise.",
|
||||||
|
optional=True,
|
||||||
|
),
|
||||||
],
|
],
|
||||||
outputs=[IO.Image.Output()],
|
outputs=[IO.Image.Output()],
|
||||||
hidden=[
|
hidden=[
|
||||||
@ -553,6 +562,7 @@ class FluxEraseNode(IO.ComfyNode):
|
|||||||
image: Input.Image,
|
image: Input.Image,
|
||||||
mask: Input.Image,
|
mask: Input.Image,
|
||||||
dilate_pixels: int = 10,
|
dilate_pixels: int = 10,
|
||||||
|
seed: int = 0,
|
||||||
) -> IO.NodeOutput:
|
) -> IO.NodeOutput:
|
||||||
validate_image_dimensions(image, min_width=256, min_height=256)
|
validate_image_dimensions(image, min_width=256, min_height=256)
|
||||||
mask = resize_mask_to_image(mask, image)
|
mask = resize_mask_to_image(mask, image)
|
||||||
@ -565,6 +575,7 @@ class FluxEraseNode(IO.ComfyNode):
|
|||||||
image=tensor_to_base64_string(image[:, :, :, :3]), # make sure image will have alpha channel removed
|
image=tensor_to_base64_string(image[:, :, :, :3]), # make sure image will have alpha channel removed
|
||||||
mask=mask,
|
mask=mask,
|
||||||
dilate_pixels=dilate_pixels,
|
dilate_pixels=dilate_pixels,
|
||||||
|
seed=seed,
|
||||||
),
|
),
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@ -1,14 +1,19 @@
|
|||||||
|
import av
|
||||||
|
import torch
|
||||||
|
from av.codec import CodecContext
|
||||||
from typing_extensions import override
|
from typing_extensions import override
|
||||||
|
|
||||||
from comfy_api.latest import IO, ComfyExtension, Input
|
from comfy_api.latest import IO, ComfyExtension, Input
|
||||||
from comfy_api_nodes.apis.bria import (
|
from comfy_api_nodes.apis.bria import (
|
||||||
BriaEditImageRequest,
|
BriaEditImageRequest,
|
||||||
|
BriaImageEditResponse,
|
||||||
BriaRemoveBackgroundRequest,
|
BriaRemoveBackgroundRequest,
|
||||||
BriaRemoveBackgroundResponse,
|
BriaRemoveBackgroundResponse,
|
||||||
BriaRemoveVideoBackgroundRequest,
|
BriaRemoveVideoBackgroundRequest,
|
||||||
BriaRemoveVideoBackgroundResponse,
|
BriaRemoveVideoBackgroundResponse,
|
||||||
BriaImageEditResponse,
|
|
||||||
BriaStatusResponse,
|
BriaStatusResponse,
|
||||||
|
BriaVideoGreenScreenRequest,
|
||||||
|
BriaVideoReplaceBackgroundRequest,
|
||||||
InputModerationSettings,
|
InputModerationSettings,
|
||||||
)
|
)
|
||||||
from comfy_api_nodes.util import (
|
from comfy_api_nodes.util import (
|
||||||
@ -316,6 +321,248 @@ class BriaRemoveVideoBackground(IO.ComfyNode):
|
|||||||
return IO.NodeOutput(await download_url_to_video_output(response.result.video_url))
|
return IO.NodeOutput(await download_url_to_video_output(response.result.video_url))
|
||||||
|
|
||||||
|
|
||||||
|
class BriaVideoGreenScreen(IO.ComfyNode):
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def define_schema(cls):
|
||||||
|
return IO.Schema(
|
||||||
|
node_id="BriaVideoGreenScreen",
|
||||||
|
display_name="Bria Video Green Screen",
|
||||||
|
category="partner/video/Bria",
|
||||||
|
description="Replace a video's background with a solid chroma-key screen using Bria.",
|
||||||
|
inputs=[
|
||||||
|
IO.Video.Input("video"),
|
||||||
|
IO.Combo.Input(
|
||||||
|
"green_shade",
|
||||||
|
options=["broadcast_green", "chroma_green", "blue_screen"],
|
||||||
|
tooltip="Solid chroma-key shade applied behind the foreground: "
|
||||||
|
"broadcast_green (#00B140), chroma_green (#00FF00), or blue_screen (#0000FF).",
|
||||||
|
),
|
||||||
|
IO.Int.Input(
|
||||||
|
"seed",
|
||||||
|
default=0,
|
||||||
|
min=0,
|
||||||
|
max=2147483647,
|
||||||
|
display_mode=IO.NumberDisplay.number,
|
||||||
|
control_after_generate=True,
|
||||||
|
tooltip="Seed controls whether the node should re-run; "
|
||||||
|
"results are non-deterministic regardless of seed.",
|
||||||
|
),
|
||||||
|
],
|
||||||
|
outputs=[IO.Video.Output()],
|
||||||
|
hidden=[
|
||||||
|
IO.Hidden.auth_token_comfy_org,
|
||||||
|
IO.Hidden.api_key_comfy_org,
|
||||||
|
IO.Hidden.unique_id,
|
||||||
|
],
|
||||||
|
is_api_node=True,
|
||||||
|
price_badge=IO.PriceBadge(
|
||||||
|
expr="""{"type":"usd","usd":0.14,"format":{"suffix":"/second"}}""",
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
async def execute(
|
||||||
|
cls,
|
||||||
|
video: Input.Video,
|
||||||
|
green_shade: str,
|
||||||
|
seed: int,
|
||||||
|
) -> IO.NodeOutput:
|
||||||
|
validate_video_duration(video, max_duration=60.0)
|
||||||
|
response = await sync_op(
|
||||||
|
cls,
|
||||||
|
ApiEndpoint(path="/proxy/bria/v2/video/edit/green_screen", method="POST"),
|
||||||
|
data=BriaVideoGreenScreenRequest(
|
||||||
|
video=await upload_video_to_comfyapi(cls, video),
|
||||||
|
green_shade=green_shade,
|
||||||
|
output_container_and_codec="mp4_h264",
|
||||||
|
seed=seed,
|
||||||
|
),
|
||||||
|
response_model=BriaStatusResponse,
|
||||||
|
)
|
||||||
|
response = await poll_op(
|
||||||
|
cls,
|
||||||
|
ApiEndpoint(path=f"/proxy/bria/v2/status/{response.request_id}"),
|
||||||
|
status_extractor=lambda r: r.status,
|
||||||
|
response_model=BriaRemoveVideoBackgroundResponse,
|
||||||
|
)
|
||||||
|
return IO.NodeOutput(await download_url_to_video_output(response.result.video_url))
|
||||||
|
|
||||||
|
|
||||||
|
class BriaVideoReplaceBackground(IO.ComfyNode):
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def define_schema(cls):
|
||||||
|
return IO.Schema(
|
||||||
|
node_id="BriaVideoReplaceBackground",
|
||||||
|
display_name="Bria Video Replace Background",
|
||||||
|
category="partner/video/Bria",
|
||||||
|
description="Replace a video's background with a supplied image or video using Bria. "
|
||||||
|
"The output keeps the foreground's resolution and frame rate; a background with a "
|
||||||
|
"different aspect ratio is stretched to fit, so match it for undistorted results.",
|
||||||
|
inputs=[
|
||||||
|
IO.Video.Input("video", tooltip="Foreground video whose background is replaced."),
|
||||||
|
IO.Image.Input(
|
||||||
|
"background_image",
|
||||||
|
optional=True,
|
||||||
|
tooltip="Background image to composite behind the foreground. "
|
||||||
|
"Provide either a background image or a background video, not both.",
|
||||||
|
),
|
||||||
|
IO.Video.Input(
|
||||||
|
"background_video",
|
||||||
|
optional=True,
|
||||||
|
tooltip="Background video to composite behind the foreground. "
|
||||||
|
"Provide either a background image or a background video, not both.",
|
||||||
|
),
|
||||||
|
IO.Int.Input(
|
||||||
|
"seed",
|
||||||
|
default=0,
|
||||||
|
min=0,
|
||||||
|
max=2147483647,
|
||||||
|
display_mode=IO.NumberDisplay.number,
|
||||||
|
control_after_generate=True,
|
||||||
|
tooltip="Seed controls whether the node should re-run; "
|
||||||
|
"results are non-deterministic regardless of seed.",
|
||||||
|
),
|
||||||
|
],
|
||||||
|
outputs=[IO.Video.Output()],
|
||||||
|
hidden=[
|
||||||
|
IO.Hidden.auth_token_comfy_org,
|
||||||
|
IO.Hidden.api_key_comfy_org,
|
||||||
|
IO.Hidden.unique_id,
|
||||||
|
],
|
||||||
|
is_api_node=True,
|
||||||
|
price_badge=IO.PriceBadge(
|
||||||
|
expr="""{"type":"usd","usd":0.14,"format":{"suffix":"/second"}}""",
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
async def execute(
|
||||||
|
cls,
|
||||||
|
video: Input.Video,
|
||||||
|
seed: int,
|
||||||
|
background_image: Input.Image | None = None,
|
||||||
|
background_video: Input.Video | None = None,
|
||||||
|
) -> IO.NodeOutput:
|
||||||
|
if (background_image is None) == (background_video is None):
|
||||||
|
raise ValueError("Provide either a background image or a background video, not both.")
|
||||||
|
validate_video_duration(video, max_duration=60.0)
|
||||||
|
if background_video is not None:
|
||||||
|
validate_video_duration(background_video, max_duration=60.0)
|
||||||
|
background_url = await upload_video_to_comfyapi(cls, background_video, wait_label="Uploading background")
|
||||||
|
else:
|
||||||
|
background_url = await upload_image_to_comfyapi(cls, background_image, wait_label="Uploading background")
|
||||||
|
response = await sync_op(
|
||||||
|
cls,
|
||||||
|
ApiEndpoint(path="/proxy/bria/v2/video/edit/replace_background", method="POST"),
|
||||||
|
data=BriaVideoReplaceBackgroundRequest(
|
||||||
|
video=await upload_video_to_comfyapi(cls, video),
|
||||||
|
background_url=background_url,
|
||||||
|
output_container_and_codec="mp4_h264",
|
||||||
|
seed=seed,
|
||||||
|
),
|
||||||
|
response_model=BriaStatusResponse,
|
||||||
|
)
|
||||||
|
response = await poll_op(
|
||||||
|
cls,
|
||||||
|
ApiEndpoint(path=f"/proxy/bria/v2/status/{response.request_id}"),
|
||||||
|
status_extractor=lambda r: r.status,
|
||||||
|
response_model=BriaRemoveVideoBackgroundResponse,
|
||||||
|
)
|
||||||
|
return IO.NodeOutput(await download_url_to_video_output(response.result.video_url))
|
||||||
|
|
||||||
|
|
||||||
|
def _video_to_images_and_mask(video: Input.Video) -> tuple[Input.Image, Input.Mask]:
|
||||||
|
"""Decode a transparent webm (VP9 + alpha) into image frames and an alpha mask.
|
||||||
|
|
||||||
|
VP9 keeps its alpha in a side layer that PyAV's default vp9 decoder drops, so the frames
|
||||||
|
are decoded with libvpx-vp9. Returns RGB images [B,H,W,3] in 0..1 and a mask [B,H,W]
|
||||||
|
following the Load Image convention (1 = transparent) for compositing or Save WEBM.
|
||||||
|
"""
|
||||||
|
rgb_frames: list[torch.Tensor] = []
|
||||||
|
alpha_frames: list[torch.Tensor] = []
|
||||||
|
with av.open(video.get_stream_source(), mode="r") as container:
|
||||||
|
stream = container.streams.video[0]
|
||||||
|
decoder = CodecContext.create("libvpx-vp9", "r") if stream.codec_context.name == "vp9" else None
|
||||||
|
for packet in container.demux(stream):
|
||||||
|
for frame in (decoder.decode(packet) if decoder is not None else packet.decode()):
|
||||||
|
rgba = torch.from_numpy(frame.to_ndarray(format="rgba")).float() / 255.0
|
||||||
|
rgb_frames.append(rgba[..., :3])
|
||||||
|
alpha_frames.append(rgba[..., 3])
|
||||||
|
images = torch.stack(rgb_frames) if rgb_frames else torch.zeros(0, 0, 0, 3)
|
||||||
|
mask = (1.0 - torch.stack(alpha_frames)) if alpha_frames else torch.zeros((images.shape[0], 64, 64))
|
||||||
|
return images, mask
|
||||||
|
|
||||||
|
|
||||||
|
class BriaTransparentVideoBackground(IO.ComfyNode):
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
def define_schema(cls):
|
||||||
|
return IO.Schema(
|
||||||
|
node_id="BriaTransparentVideoBackground",
|
||||||
|
display_name="Bria Remove Video Background (Transparent)",
|
||||||
|
category="partner/video/Bria",
|
||||||
|
description="Remove the background from a video using Bria and return the cut-out frames "
|
||||||
|
"plus an alpha mask. Connect both to a compositing node, or feed them to Save WEBM to "
|
||||||
|
"write a transparent video.",
|
||||||
|
inputs=[
|
||||||
|
IO.Video.Input("video"),
|
||||||
|
IO.Int.Input(
|
||||||
|
"seed",
|
||||||
|
default=0,
|
||||||
|
min=0,
|
||||||
|
max=2147483647,
|
||||||
|
display_mode=IO.NumberDisplay.number,
|
||||||
|
control_after_generate=True,
|
||||||
|
tooltip="Seed controls whether the node should re-run; "
|
||||||
|
"results are non-deterministic regardless of seed.",
|
||||||
|
),
|
||||||
|
],
|
||||||
|
outputs=[
|
||||||
|
IO.Image.Output(display_name="images"),
|
||||||
|
IO.Mask.Output(display_name="mask"),
|
||||||
|
],
|
||||||
|
hidden=[
|
||||||
|
IO.Hidden.auth_token_comfy_org,
|
||||||
|
IO.Hidden.api_key_comfy_org,
|
||||||
|
IO.Hidden.unique_id,
|
||||||
|
],
|
||||||
|
is_api_node=True,
|
||||||
|
price_badge=IO.PriceBadge(
|
||||||
|
expr="""{"type":"usd","usd":0.14,"format":{"suffix":"/second"}}""",
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
@classmethod
|
||||||
|
async def execute(
|
||||||
|
cls,
|
||||||
|
video: Input.Video,
|
||||||
|
seed: int,
|
||||||
|
) -> IO.NodeOutput:
|
||||||
|
validate_video_duration(video, max_duration=60.0)
|
||||||
|
response = await sync_op(
|
||||||
|
cls,
|
||||||
|
ApiEndpoint(path="/proxy/bria/v2/video/edit/remove_background", method="POST"),
|
||||||
|
data=BriaRemoveVideoBackgroundRequest(
|
||||||
|
video=await upload_video_to_comfyapi(cls, video),
|
||||||
|
background_color="Transparent",
|
||||||
|
output_container_and_codec="webm_vp9",
|
||||||
|
seed=seed,
|
||||||
|
),
|
||||||
|
response_model=BriaStatusResponse,
|
||||||
|
)
|
||||||
|
response = await poll_op(
|
||||||
|
cls,
|
||||||
|
ApiEndpoint(path=f"/proxy/bria/v2/status/{response.request_id}"),
|
||||||
|
status_extractor=lambda r: r.status,
|
||||||
|
response_model=BriaRemoveVideoBackgroundResponse,
|
||||||
|
)
|
||||||
|
video_out = await download_url_to_video_output(response.result.video_url)
|
||||||
|
images, mask = _video_to_images_and_mask(video_out)
|
||||||
|
return IO.NodeOutput(images, mask)
|
||||||
|
|
||||||
|
|
||||||
class BriaExtension(ComfyExtension):
|
class BriaExtension(ComfyExtension):
|
||||||
@override
|
@override
|
||||||
async def get_node_list(self) -> list[type[IO.ComfyNode]]:
|
async def get_node_list(self) -> list[type[IO.ComfyNode]]:
|
||||||
@ -323,6 +570,9 @@ class BriaExtension(ComfyExtension):
|
|||||||
BriaImageEditNode,
|
BriaImageEditNode,
|
||||||
BriaRemoveImageBackground,
|
BriaRemoveImageBackground,
|
||||||
BriaRemoveVideoBackground,
|
BriaRemoveVideoBackground,
|
||||||
|
BriaVideoGreenScreen,
|
||||||
|
# BriaVideoReplaceBackground, # server returns Status 500 when we pass background video
|
||||||
|
BriaTransparentVideoBackground,
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@ -7,6 +7,7 @@ from io import BytesIO
|
|||||||
import torch
|
import torch
|
||||||
from typing_extensions import override
|
from typing_extensions import override
|
||||||
|
|
||||||
|
from comfy.utils import common_upscale
|
||||||
from comfy_api.latest import IO, ComfyExtension, Input, Types
|
from comfy_api.latest import IO, ComfyExtension, Input, Types
|
||||||
from comfy_api_nodes.apis.bytedance import (
|
from comfy_api_nodes.apis.bytedance import (
|
||||||
RECOMMENDED_PRESETS,
|
RECOMMENDED_PRESETS,
|
||||||
@ -131,6 +132,44 @@ def _prepare_seedance_image(image: Input.Image) -> Input.Image:
|
|||||||
return image
|
return image
|
||||||
|
|
||||||
|
|
||||||
|
# Supported output aspect ratios, used to pre-size FLF frames to matching pixel pair to avoid the 1080p stretch jump.
|
||||||
|
SEEDANCE2_RATIO_WH = {
|
||||||
|
"16:9": (16, 9),
|
||||||
|
"4:3": (4, 3),
|
||||||
|
"1:1": (1, 1),
|
||||||
|
"3:4": (3, 4),
|
||||||
|
"9:16": (9, 16),
|
||||||
|
"21:9": (21, 9),
|
||||||
|
}
|
||||||
|
SEEDANCE2_RES_SHORT_SIDE = {"480p": 480, "720p": 720, "1080p": 1080}
|
||||||
|
|
||||||
|
|
||||||
|
def _seedance2_target_dims(resolution: str, ratio: str, image: torch.Tensor) -> tuple[int, int]:
|
||||||
|
"""Exact supported output (width, height) for (resolution, ratio).
|
||||||
|
|
||||||
|
The shorter side equals the resolution number (e.g. 1080p 16:9 -> 1920x1080). For ratio
|
||||||
|
"adaptive" (or any unexpected value) the ratio is derived from the image's own aspect, snapped
|
||||||
|
to the nearest supported ratio, so the output keeps the frame's orientation.
|
||||||
|
"""
|
||||||
|
short = SEEDANCE2_RES_SHORT_SIDE[resolution]
|
||||||
|
if ratio not in SEEDANCE2_RATIO_WH:
|
||||||
|
aspect = image.shape[-2] / image.shape[-3] # W / H; tensor is (B, H, W, C)
|
||||||
|
ratio = min(SEEDANCE2_RATIO_WH, key=lambda k: abs(SEEDANCE2_RATIO_WH[k][0] / SEEDANCE2_RATIO_WH[k][1] - aspect))
|
||||||
|
rw, rh = SEEDANCE2_RATIO_WH[ratio]
|
||||||
|
if rw >= rh: # landscape or square: shorter side is the height
|
||||||
|
out_w, out_h = round(short * rw / rh), short
|
||||||
|
else: # portrait: shorter side is the width
|
||||||
|
out_w, out_h = short, round(short * rh / rw)
|
||||||
|
return out_w - out_w % 2, out_h - out_h % 2
|
||||||
|
|
||||||
|
|
||||||
|
def _resize_to_exact(image: torch.Tensor, width: int, height: int) -> torch.Tensor:
|
||||||
|
"""Center-crop to the target aspect and resize to exactly width x height (lanczos)."""
|
||||||
|
samples = image.movedim(-1, 1) # (B, H, W, C) -> (B, C, H, W)
|
||||||
|
resized = common_upscale(samples, width, height, "lanczos", "center")
|
||||||
|
return resized.movedim(1, -1)
|
||||||
|
|
||||||
|
|
||||||
async def _resolve_reference_assets(
|
async def _resolve_reference_assets(
|
||||||
cls: type[IO.ComfyNode],
|
cls: type[IO.ComfyNode],
|
||||||
asset_ids: list[str],
|
asset_ids: list[str],
|
||||||
@ -1790,10 +1829,28 @@ class ByteDance2FirstLastFrameNode(IO.ComfyNode):
|
|||||||
if last_frame is not None and last_frame_asset_id:
|
if last_frame is not None and last_frame_asset_id:
|
||||||
raise ValueError("Provide only one of last_frame or last_frame_asset_id, not both.")
|
raise ValueError("Provide only one of last_frame or last_frame_asset_id, not both.")
|
||||||
|
|
||||||
if first_frame is not None:
|
request_ratio = model["ratio"]
|
||||||
first_frame = _prepare_seedance_image(first_frame)
|
if first_frame_asset_id or last_frame_asset_id:
|
||||||
if last_frame is not None:
|
if first_frame is not None:
|
||||||
last_frame = _prepare_seedance_image(last_frame)
|
first_frame = _prepare_seedance_image(first_frame)
|
||||||
|
if last_frame is not None:
|
||||||
|
last_frame = _prepare_seedance_image(last_frame)
|
||||||
|
else:
|
||||||
|
# The 1080p FLF stretch fix (pre-size frames to a supported pixel pair + submit ratio="adaptive")
|
||||||
|
# only applies to local image inputs we can resize.
|
||||||
|
request_ratio = "adaptive"
|
||||||
|
target_dims: tuple[int, int] | None = None
|
||||||
|
if first_frame is not None:
|
||||||
|
validate_image_aspect_ratio(first_frame, (2, 5), (5, 2), strict=False) # 0.4 to 2.5
|
||||||
|
validate_image_dimensions(first_frame, min_width=300, min_height=300)
|
||||||
|
target_dims = _seedance2_target_dims(model["resolution"], model["ratio"], first_frame)
|
||||||
|
first_frame = _resize_to_exact(first_frame, *target_dims)
|
||||||
|
if last_frame is not None:
|
||||||
|
validate_image_aspect_ratio(last_frame, (2, 5), (5, 2), strict=False) # 0.4 to 2.5
|
||||||
|
validate_image_dimensions(last_frame, min_width=300, min_height=300)
|
||||||
|
if target_dims is None:
|
||||||
|
target_dims = _seedance2_target_dims(model["resolution"], model["ratio"], last_frame)
|
||||||
|
last_frame = _resize_to_exact(last_frame, *target_dims)
|
||||||
|
|
||||||
asset_ids_to_resolve = [a for a in (first_frame_asset_id, last_frame_asset_id) if a]
|
asset_ids_to_resolve = [a for a in (first_frame_asset_id, last_frame_asset_id) if a]
|
||||||
image_assets: dict[str, str] = {}
|
image_assets: dict[str, str] = {}
|
||||||
@ -1844,7 +1901,7 @@ class ByteDance2FirstLastFrameNode(IO.ComfyNode):
|
|||||||
content=content,
|
content=content,
|
||||||
generate_audio=model["generate_audio"],
|
generate_audio=model["generate_audio"],
|
||||||
resolution=model["resolution"],
|
resolution=model["resolution"],
|
||||||
ratio=model["ratio"],
|
ratio=request_ratio,
|
||||||
duration=model["duration"],
|
duration=model["duration"],
|
||||||
seed=seed,
|
seed=seed,
|
||||||
watermark=watermark,
|
watermark=watermark,
|
||||||
|
|||||||
@ -42,9 +42,11 @@ async def _upload_image_to_krea_assets(cls: type[IO.ComfyNode], image: Input.Ima
|
|||||||
|
|
||||||
|
|
||||||
_MODEL_MEDIUM = "Krea 2 Medium"
|
_MODEL_MEDIUM = "Krea 2 Medium"
|
||||||
|
_MODEL_MEDIUM_TURBO = "Krea 2 Medium Turbo"
|
||||||
_MODEL_LARGE = "Krea 2 Large"
|
_MODEL_LARGE = "Krea 2 Large"
|
||||||
_MODEL_ENDPOINTS: dict[str, str] = {
|
_MODEL_ENDPOINTS: dict[str, str] = {
|
||||||
_MODEL_MEDIUM: "/proxy/krea/generate/image/krea/krea-2/medium",
|
_MODEL_MEDIUM: "/proxy/krea/generate/image/krea/krea-2/medium",
|
||||||
|
_MODEL_MEDIUM_TURBO: "/proxy/krea/generate/image/krea/krea-2/medium-turbo",
|
||||||
_MODEL_LARGE: "/proxy/krea/generate/image/krea/krea-2/large",
|
_MODEL_LARGE: "/proxy/krea/generate/image/krea/krea-2/large",
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -57,7 +59,7 @@ _UUID_RE = re.compile(r"^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F
|
|||||||
|
|
||||||
|
|
||||||
def _krea_model_inputs() -> list:
|
def _krea_model_inputs() -> list:
|
||||||
"""Nested inputs shared by both Krea 2 Medium and Large under the DynamicCombo."""
|
"""Nested inputs shared by Krea 2 Medium, Medium Turbo and Large under the DynamicCombo."""
|
||||||
return [
|
return [
|
||||||
IO.Combo.Input(
|
IO.Combo.Input(
|
||||||
"aspect_ratio",
|
"aspect_ratio",
|
||||||
@ -123,6 +125,7 @@ class Krea2ImageNode(IO.ComfyNode):
|
|||||||
"model",
|
"model",
|
||||||
options=[
|
options=[
|
||||||
IO.DynamicCombo.Option(_MODEL_MEDIUM, _krea_model_inputs()),
|
IO.DynamicCombo.Option(_MODEL_MEDIUM, _krea_model_inputs()),
|
||||||
|
IO.DynamicCombo.Option(_MODEL_MEDIUM_TURBO, _krea_model_inputs()),
|
||||||
IO.DynamicCombo.Option(_MODEL_LARGE, _krea_model_inputs()),
|
IO.DynamicCombo.Option(_MODEL_LARGE, _krea_model_inputs()),
|
||||||
],
|
],
|
||||||
tooltip="Krea 2 Medium is best for expressive illustrations; "
|
tooltip="Krea 2 Medium is best for expressive illustrations; "
|
||||||
@ -151,14 +154,15 @@ class Krea2ImageNode(IO.ComfyNode):
|
|||||||
),
|
),
|
||||||
expr="""
|
expr="""
|
||||||
(
|
(
|
||||||
$isLarge := widgets.model = "krea 2 large";
|
$rates := {
|
||||||
|
"krea 2 medium turbo": {"text": 0.015, "style": 0.0175, "moodboard": 0.02},
|
||||||
|
"krea 2 medium": {"text": 0.03, "style": 0.035, "moodboard": 0.04},
|
||||||
|
"krea 2 large": {"text": 0.06, "style": 0.065, "moodboard": 0.07}
|
||||||
|
};
|
||||||
|
$r := $lookup($rates, widgets.model);
|
||||||
$hasMoodboard := $length($lookup(widgets, "model.moodboard_id")) > 0;
|
$hasMoodboard := $length($lookup(widgets, "model.moodboard_id")) > 0;
|
||||||
$hasStyle := $lookup(inputs, "model.style_reference").connected;
|
$hasStyle := $lookup(inputs, "model.style_reference").connected;
|
||||||
$usd := $hasMoodboard
|
$usd := $hasMoodboard ? $r.moodboard : ($hasStyle ? $r.style : $r.text);
|
||||||
? ($isLarge ? 0.07 : 0.04)
|
|
||||||
: ($hasStyle
|
|
||||||
? ($isLarge ? 0.065 : 0.035)
|
|
||||||
: ($isLarge ? 0.06 : 0.03));
|
|
||||||
{"type":"usd","usd": $usd}
|
{"type":"usd","usd": $usd}
|
||||||
)
|
)
|
||||||
""",
|
""",
|
||||||
|
|||||||
@ -19,7 +19,7 @@ class SaveWEBM(io.ComfyNode):
|
|||||||
category="video",
|
category="video",
|
||||||
is_experimental=True,
|
is_experimental=True,
|
||||||
inputs=[
|
inputs=[
|
||||||
io.Image.Input("images"),
|
io.Image.Input("images", tooltip="RGBA images are saved with their alpha channel as transparency (vp9 codec only)."),
|
||||||
io.String.Input("filename_prefix", default="ComfyUI"),
|
io.String.Input("filename_prefix", default="ComfyUI"),
|
||||||
io.Combo.Input("codec", options=["vp9", "av1"]),
|
io.Combo.Input("codec", options=["vp9", "av1"]),
|
||||||
io.Float.Input("fps", default=24.0, min=0.01, max=1000.0, step=0.01),
|
io.Float.Input("fps", default=24.0, min=0.01, max=1000.0, step=0.01),
|
||||||
@ -45,18 +45,25 @@ class SaveWEBM(io.ComfyNode):
|
|||||||
for x in cls.hidden.extra_pnginfo:
|
for x in cls.hidden.extra_pnginfo:
|
||||||
container.metadata[x] = json.dumps(cls.hidden.extra_pnginfo[x])
|
container.metadata[x] = json.dumps(cls.hidden.extra_pnginfo[x])
|
||||||
|
|
||||||
|
# Save transparency when the images carry an alpha channel (RGBA) and the codec supports it.
|
||||||
|
# vp9 -> yuva420p; other codecs have no usable alpha path, so the alpha is ignored.
|
||||||
|
save_alpha = images.shape[-1] == 4 and codec == "vp9"
|
||||||
|
|
||||||
codec_map = {"vp9": "libvpx-vp9", "av1": "libsvtav1"}
|
codec_map = {"vp9": "libvpx-vp9", "av1": "libsvtav1"}
|
||||||
stream = container.add_stream(codec_map[codec], rate=Fraction(round(fps * 1000), 1000))
|
stream = container.add_stream(codec_map[codec], rate=Fraction(round(fps * 1000), 1000))
|
||||||
stream.width = images.shape[-2]
|
stream.width = images.shape[-2]
|
||||||
stream.height = images.shape[-3]
|
stream.height = images.shape[-3]
|
||||||
stream.pix_fmt = "yuv420p10le" if codec == "av1" else "yuv420p"
|
stream.pix_fmt = "yuva420p" if save_alpha else ("yuv420p10le" if codec == "av1" else "yuv420p")
|
||||||
stream.bit_rate = 0
|
stream.bit_rate = 0
|
||||||
stream.options = {'crf': str(crf)}
|
stream.options = {'crf': str(crf)}
|
||||||
if codec == "av1":
|
if codec == "av1":
|
||||||
stream.options["preset"] = "6"
|
stream.options["preset"] = "6"
|
||||||
|
|
||||||
for frame in images:
|
for frame in images:
|
||||||
frame = av.VideoFrame.from_ndarray(torch.clamp(frame[..., :3] * 255, min=0, max=255).to(device=torch.device("cpu"), dtype=torch.uint8).numpy(), format="rgb24")
|
if save_alpha:
|
||||||
|
frame = av.VideoFrame.from_ndarray(torch.clamp(frame[..., :4] * 255, min=0, max=255).to(device=torch.device("cpu"), dtype=torch.uint8).numpy(), format="rgba")
|
||||||
|
else:
|
||||||
|
frame = av.VideoFrame.from_ndarray(torch.clamp(frame[..., :3] * 255, min=0, max=255).to(device=torch.device("cpu"), dtype=torch.uint8).numpy(), format="rgb24")
|
||||||
for packet in stream.encode(frame):
|
for packet in stream.encode(frame):
|
||||||
container.mux(packet)
|
container.mux(packet)
|
||||||
container.mux(stream.encode())
|
container.mux(stream.encode())
|
||||||
|
|||||||
@ -1,3 +1,3 @@
|
|||||||
# This file is automatically generated by the build process when version is
|
# This file is automatically generated by the build process when version is
|
||||||
# updated in pyproject.toml.
|
# updated in pyproject.toml.
|
||||||
__version__ = "0.24.0"
|
__version__ = "0.24.1"
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
[project]
|
[project]
|
||||||
name = "ComfyUI"
|
name = "ComfyUI"
|
||||||
version = "0.24.0"
|
version = "0.24.1"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
license = { file = "LICENSE" }
|
license = { file = "LICENSE" }
|
||||||
requires-python = ">=3.10"
|
requires-python = ">=3.10"
|
||||||
|
|||||||
@ -1,5 +1,5 @@
|
|||||||
comfyui-frontend-package==1.44.19
|
comfyui-frontend-package==1.44.19
|
||||||
comfyui-workflow-templates==0.9.94
|
comfyui-workflow-templates==0.9.98
|
||||||
comfyui-embedded-docs==0.5.2
|
comfyui-embedded-docs==0.5.2
|
||||||
torch
|
torch
|
||||||
torchsde
|
torchsde
|
||||||
|
|||||||
Reference in New Issue
Block a user