The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
improve UX for batch uploads in upload_images_to_comfyapi (#10913)
Alexander Piskun1105e0d13900
diff --git a/comfy_api_nodes/util/upload_helpers.py b/comfy_api_nodes/util/upload_helpers.pyindex 632450d9b..b9019841f 100644--- a/comfy_api_nodes/util/upload_helpers.py+++ b/comfy_api_nodes/util/upload_helpers.py@@ -4,7 +4,7 @@ import loggingimport timeimport uuidfrom io import BytesIO-from typing import Optional, Union+from typing import Optionalfrom urllib.parse import urlparseimport aiohttp@@ -48,8 +48,9 @@ async def upload_images_to_comfyapi(image: torch.Tensor,*,max_images: int = 8,- mime_type: Optional[str] = None,- wait_label: Optional[str] = "Uploading",+ mime_type: str | None = None,+ wait_label: str | None = "Uploading",+ show_batch_index: bool = True,) -> list[str]:"""Uploads images to ComfyUI API and returns download URLs.@@ -59,11 +60,18 @@ async def upload_images_to_comfyapi(download_urls: list[str] = []is_batch = len(image.shape) > 3batch_len = image.shape[0] if is_batch else 1+ num_to_upload = min(batch_len, max_images)+ batch_start_ts = time.monotonic()- for idx in range(min(batch_len, max_images)):+ for idx in range(num_to_upload):tensor = image[idx] if is_batch else imageimg_io = tensor_to_bytesio(tensor, mime_type=mime_type)- url = await upload_file_to_comfyapi(cls, img_io, img_io.name, mime_type, wait_label)++ effective_label = wait_label+ if wait_label and show_batch_index and num_to_upload > 1:+ effective_label = f"{wait_label} ({idx + 1}/{num_to_upload})"++ url = await upload_file_to_comfyapi(cls, img_io, img_io.name, mime_type, effective_label, batch_start_ts)download_urls.append(url)return download_urls@@ -126,8 +134,9 @@ async def upload_file_to_comfyapi(cls: type[IO.ComfyNode],file_bytes_io: BytesIO,filename: str,- upload_mime_type: Optional[str],- wait_label: Optional[str] = "Uploading",+ upload_mime_type: str | None,+ wait_label: str | None = "Uploading",+ progress_origin_ts: float | None = None,) -> str:"""Uploads a single file to ComfyUI API and returns its download URL."""if upload_mime_type is None:@@ -148,6 +157,7 @@ async def upload_file_to_comfyapi(file_bytes_io,content_type=upload_mime_type,wait_label=wait_label,+ progress_origin_ts=progress_origin_ts,)return create_resp.download_url@@ -155,27 +165,18 @@ async def upload_file_to_comfyapi(async def upload_file(cls: type[IO.ComfyNode],upload_url: str,- file: Union[BytesIO, str],+ file: BytesIO | str,*,- content_type: Optional[str] = None,+ content_type: str | None = None,max_retries: int = 3,retry_delay: float = 1.0,retry_backoff: float = 2.0,- wait_label: Optional[str] = None,+ wait_label: str | None = None,+ progress_origin_ts: float | None = None,) -> None:"""Upload a file to a signed URL (e.g., S3 pre-signed PUT) with retries, Comfy progress display, and interruption.- Args:- cls: Node class (provides auth context + UI progress hooks).- upload_url: Pre-signed PUT URL.- file: BytesIO or path string.- content_type: Explicit MIME type. If None, we *suppress* Content-Type.- max_retries: Maximum retry attempts.- retry_delay: Initial delay in seconds.- retry_backoff: Exponential backoff factor.- wait_label: Progress label shown in Comfy UI.-Raises:ProcessingInterrupted, LocalNetworkError, ApiServerError, Exception"""@@ -198,7 +199,7 @@ async def upload_file(attempt = 0delay = retry_delay- start_ts = time.monotonic()+ start_ts = progress_origin_ts if progress_origin_ts is not None else time.monotonic()op_uuid = uuid.uuid4().hex[:8]while True:attempt += 1