The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
[Partner Nodes] feat(client): send Idempotency-Key on partner-proxy calls and collect replays (#16220)
Alexander Piskuna8686f2b33fc
diff --git a/comfy_api_nodes/apis/openrouter.py b/comfy_api_nodes/apis/openrouter.pyindex e8522934c..b65b1c17d 100644--- a/comfy_api_nodes/apis/openrouter.py+++ b/comfy_api_nodes/apis/openrouter.py@@ -104,6 +104,7 @@ class OpenRouterChatResponse(BaseModel):class OpenRouterImageData(BaseModel):b64_json: str | None = Field(None)+ url: str | None = Field(None)media_type: str | None = Field(None)diff --git a/comfy_api_nodes/nodes_bytedance.py b/comfy_api_nodes/nodes_bytedance.pyindex 430860e3d..11a0404a6 100644--- a/comfy_api_nodes/nodes_bytedance.py+++ b/comfy_api_nodes/nodes_bytedance.py@@ -3362,6 +3362,7 @@ class ByteDanceSeedAudioNode(IO.ComfyNode):cls,ApiEndpoint(path="/proxy/byteplus/api/v3/tts/create", method="POST"),response_model=SeedAudioResponse,+ asset_urls=True,data=SeedAudioRequest(model=model,text_prompt=text_prompt,@@ -3374,11 +3375,15 @@ class ByteDanceSeedAudioNode(IO.ComfyNode):),),)- if not response.audio:+ if response.audio:+ audio_bytes = base64.b64decode(response.audio)+ elif response.url:+ audio_bytes = (await download_url_as_bytesio(response.url, cls=cls)).getvalue()+ else:raise Exception(f"Seed Audio returned no audio (code={response.code}): {response.message}")- return IO.NodeOutput(audio_bytes_to_audio_input(base64.b64decode(response.audio)))+ return IO.NodeOutput(audio_bytes_to_audio_input(audio_bytes))_VCUBE_ENHANCE_VIDEO_ENDPOINT = ApiEndpoint(path="/proxy/byteplusmediakit/api/v1/tools/enhance-video", method="POST")diff --git a/comfy_api_nodes/nodes_elevenlabs.py b/comfy_api_nodes/nodes_elevenlabs.pyindex eba578a45..35baa15a8 100644--- a/comfy_api_nodes/nodes_elevenlabs.py+++ b/comfy_api_nodes/nodes_elevenlabs.py@@ -404,6 +404,7 @@ class ElevenLabsTextToSpeech(IO.ComfyNode):),data=request,as_binary=True,+ asset_urls=True,)return IO.NodeOutput(audio_bytes_to_audio_input(response))@@ -449,6 +450,7 @@ class ElevenLabsAudioIsolation(IO.ComfyNode):files={"audio": ("audio.mp4", audio_bytes_io, "audio/mp4")},content_type="multipart/form-data",as_binary=True,+ asset_urls=True,)return IO.NodeOutput(audio_bytes_to_audio_input(response))@@ -545,6 +547,7 @@ class ElevenLabsTextToSoundEffects(IO.ComfyNode):loop=model.get("loop", None),),as_binary=True,+ asset_urls=True,)return IO.NodeOutput(audio_bytes_to_audio_input(response))@@ -762,6 +765,7 @@ class ElevenLabsSpeechToSpeech(IO.ComfyNode):files={"audio": ("audio.mp4", audio_bytes_io.getvalue(), "audio/mp4")},content_type="multipart/form-data",as_binary=True,+ asset_urls=True,)return IO.NodeOutput(audio_bytes_to_audio_input(response))@@ -901,6 +905,7 @@ class ElevenLabsTextToDialogue(IO.ComfyNode):),data=request,as_binary=True,+ asset_urls=True,)return IO.NodeOutput(audio_bytes_to_audio_input(response))diff --git a/comfy_api_nodes/nodes_fishaudio.py b/comfy_api_nodes/nodes_fishaudio.pyindex d40fc2740..3d30190e6 100644--- a/comfy_api_nodes/nodes_fishaudio.py+++ b/comfy_api_nodes/nodes_fishaudio.py@@ -293,6 +293,7 @@ class FishAudioTextToSpeech(IO.ComfyNode):),data=request,as_binary=True,+ asset_urls=True,)return IO.NodeOutput(audio_bytes_to_audio_input(response))diff --git a/comfy_api_nodes/nodes_gemini.py b/comfy_api_nodes/nodes_gemini.pyindex 1408bf36c..0977035ca 100644--- a/comfy_api_nodes/nodes_gemini.py+++ b/comfy_api_nodes/nodes_gemini.py@@ -8,6 +8,7 @@ import osfrom fnmatch import fnmatchfrom io import BytesIOfrom typing import Any, Literal+from urllib.parse import urlparseimport torchfrom typing_extensions import override@@ -277,8 +278,12 @@ async def get_video_from_interaction()+GEMINI_FILES_HOST = "generativelanguage.googleapis.com"++async def download_interaction_video(uri: str, cls: type[IO.ComfyNode] | None = None) -> InputImpl.VideoFromFile:- if "/files/" not in uri:+ parsed = urlparse(uri)+ if parsed.netloc != GEMINI_FILES_HOST or "/files/" not in parsed.path:return await download_url_to_video_output(uri, cls=cls)name = uri.split("?", 1)[0].rsplit("/files/", 1)[-1].split(":", 1)[0]await poll_op(@@ -1921,6 +1926,7 @@ class GeminiVideoOmni(IO.ComfyNode):),),response_model=GeminiInteraction,+ asset_urls=True,)if interaction.status != "completed":model_message = get_text_from_interaction(interaction).strip()@@ -2181,6 +2187,7 @@ class GeminiVideoOmniV2(IO.ComfyNode):response_format=response_format,),response_model=GeminiInteraction,+ asset_urls=True,)if interaction.status != "completed":model_message = get_text_from_interaction(interaction).strip()diff --git a/comfy_api_nodes/nodes_heygen.py b/comfy_api_nodes/nodes_heygen.pyindex 7ebd6a185..b1375d143 100644--- a/comfy_api_nodes/nodes_heygen.py+++ b/comfy_api_nodes/nodes_heygen.py@@ -1,5 +1,3 @@-import uuid-import torchfrom typing_extensions import override@@ -70,7 +68,7 @@ async def _create_and_poll_video(cls: type[IO.ComfyNode], payload: dict) -> dict"""POST a /v3/videos payload, poll until terminal, and return the final video data."""created = await sync_op_raw(cls,- ApiEndpoint(path=_VIDEOS_PATH, method="POST", headers={"Idempotency-Key": uuid.uuid4().hex}),+ ApiEndpoint(path=_VIDEOS_PATH, method="POST"),data=payload,)video_id = (created.get("data") or {}).get("video_id")diff --git a/comfy_api_nodes/nodes_ideogram.py b/comfy_api_nodes/nodes_ideogram.pyindex 2acf77b88..37fcd2a0e 100644--- a/comfy_api_nodes/nodes_ideogram.py+++ b/comfy_api_nodes/nodes_ideogram.py@@ -356,7 +356,6 @@ class IdeogramV3(IO.ComfyNode):data=edit_request,files=files,content_type="multipart/form-data",- max_retries=1,)elif image is not None or mask is not None:@@ -400,7 +399,6 @@ class IdeogramV3(IO.ComfyNode):data=gen_request,files=files if files else None,content_type="multipart/form-data",- max_retries=1,)if not response.data or len(response.data) == 0:@@ -514,7 +512,6 @@ class IdeogramV4(IO.ComfyNode):resolution=resolution.split(" ")[0] if resolution != "Auto" else None,rendering_speed=rendering_speed,),- max_retries=1,)if not response.data or len(response.data) == 0:@@ -649,7 +646,6 @@ class IdeogramPImage(IO.ComfyNode):ApiEndpoint(path="/proxy/ideogram/text-to-image/p-image-ideogram", method="POST"),response_model=IdeogramGenerateResponse,data=request,- max_retries=1,)if not response.data:raise Exception("No images were generated in the response")diff --git a/comfy_api_nodes/nodes_krea.py b/comfy_api_nodes/nodes_krea.pyindex b9e6268f2..fc2ed434b 100644--- a/comfy_api_nodes/nodes_krea.py+++ b/comfy_api_nodes/nodes_krea.py@@ -35,7 +35,6 @@ async def _upload_image_to_krea_assets(cls: type[IO.ComfyNode], image: Input.Imaresponse_model=KreaAssetResponse,files=[("file", (img_io.name, img_io, "image/png"))],content_type="multipart/form-data",- max_retries=1,wait_label="Uploading reference",)return response.image_urldiff --git a/comfy_api_nodes/nodes_ltxv.py b/comfy_api_nodes/nodes_ltxv.pyindex 7804740cc..3b9b51957 100644--- a/comfy_api_nodes/nodes_ltxv.py+++ b/comfy_api_nodes/nodes_ltxv.py@@ -59,7 +59,6 @@ async def _v25_submit_and_poll(cls: type[IO.ComfyNode], route: str, data: BaseMoApiEndpoint(f"/proxy/ltx/v2/{route}", "POST"),response_model=Ltx25SubmitResponse,data=data,- max_retries=1,)job = await poll_op(cls,diff --git a/comfy_api_nodes/nodes_meta.py b/comfy_api_nodes/nodes_meta.pyindex dfba65ff0..e6c1bdc6c 100644--- a/comfy_api_nodes/nodes_meta.py+++ b/comfy_api_nodes/nodes_meta.py@@ -16,6 +16,8 @@ from comfy_api_nodes.apis.meta import (from comfy_api_nodes.util import (ApiEndpoint,bytesio_to_image_tensor,+ download_url_to_image_tensor,+ pad_images_to_common_channels,sync_op,upload_images_to_comfyapi,validate_string,@@ -57,15 +59,16 @@ def _size(aspect_ratio: str) -> str | None:return None if aspect_ratio == "auto" else aspect_ratio.replace(":", "x")-def _decode_images(response: MuseImageResponse) -> torch.Tensor:- images = [- bytesio_to_image_tensor(BytesIO(base64.b64decode(item.b64_json)))- for item in response.data- if item.b64_json- ]+async def _decode_images(cls: type[IO.ComfyNode], response: MuseImageResponse) -> torch.Tensor:+ images = []+ for item in response.data:+ if item.b64_json:+ images.append(bytesio_to_image_tensor(BytesIO(base64.b64decode(item.b64_json))))+ elif item.url:+ images.append(await download_url_to_image_tensor(item.url, cls=cls))if not images:raise Exception("The response contains no images.")- return torch.cat(images)+ return torch.cat(pad_images_to_common_channels(images))def _reasoning_strength_input() -> IO.Combo.Input:@@ -220,6 +223,7 @@ class MetaMuseImageTextToImageApi(IO.ComfyNode):cls,ApiEndpoint(path=GENERATIONS_PATH, method="POST"),response_model=MuseImageResponse,+ asset_urls=True,data=MuseImageRequest(model=model["model"],prompt=model["prompt"],@@ -228,7 +232,7 @@ class MetaMuseImageTextToImageApi(IO.ComfyNode):tool_enablement=_tool_enablement(model),),)- return IO.NodeOutput(_decode_images(response))+ return IO.NodeOutput(await _decode_images(cls, response))class MetaMuseImageEditApi(IO.ComfyNode):@@ -280,6 +284,7 @@ class MetaMuseImageEditApi(IO.ComfyNode):cls,ApiEndpoint(path=EDITS_PATH, method="POST"),response_model=MuseImageResponse,+ asset_urls=True,data=MuseImageEditRequest(model=model["model"],prompt=prompt,@@ -289,7 +294,7 @@ class MetaMuseImageEditApi(IO.ComfyNode):images=[MuseImageInput(image_url=url) for url in urls],),)- return IO.NodeOutput(_decode_images(response))+ return IO.NodeOutput(await _decode_images(cls, response))class MetaApiExtension(ComfyExtension):diff --git a/comfy_api_nodes/nodes_openai.py b/comfy_api_nodes/nodes_openai.pyindex 3d391ed1c..23ba5119b 100644--- a/comfy_api_nodes/nodes_openai.py+++ b/comfy_api_nodes/nodes_openai.py@@ -84,12 +84,15 @@ SUPPORTED_REASONING_EFFORTS: dict[str, tuple[str, ...]] = {}-async def validate_and_cast_response(response, timeout: int = None) -> torch.Tensor:+async def validate_and_cast_response(+ response, timeout: int = None, cls: type[IO.ComfyNode] = None+) -> torch.Tensor:"""Validates and casts a response to a torch.Tensor.Args:response: The response to validate and cast.timeout: Request timeout in seconds. Defaults to None (no timeout).+ cls: The calling node class; required for relative `/proxy/` URLs so they can be expanded and authenticated.Returns:A torch.Tensor of shape (N, H, W, C) with all returned images; images whose@@ -112,7 +115,7 @@ async def validate_and_cast_response(response, timeout: int = None) -> torch.Tenimg_io = BytesIO(base64.b64decode(img_data.b64_json))elif img_data.url:img_io = BytesIO()- await download_url_to_bytesio(img_data.url, img_io, timeout=timeout)+ await download_url_to_bytesio(img_data.url, img_io, timeout=timeout, cls=cls)else:raise ValueError("Invalid image payload – neither URL nor base64 data present.")@@ -367,6 +370,7 @@ class OpenAIGPTImage1(IO.ComfyNode):cls,ApiEndpoint(path="/proxy/openai/images/edits", method="POST"),response_model=OpenAIImageGenerationResponse,+ asset_urls=True,data=OpenAIImageEditRequest(model=model,prompt=prompt,@@ -385,6 +389,7 @@ class OpenAIGPTImage1(IO.ComfyNode):cls,ApiEndpoint(path="/proxy/openai/images/generations", method="POST"),response_model=OpenAIImageGenerationResponse,+ asset_urls=True,data=OpenAIImageGenerationRequest(model=model,prompt=prompt,@@ -396,7 +401,7 @@ class OpenAIGPTImage1(IO.ComfyNode):moderation="low",),)- return IO.NodeOutput(await validate_and_cast_response(response))+ return IO.NodeOutput(await validate_and_cast_response(response, cls=cls))GPT_IMAGE_QUALITIES = ("low", "medium", "high")@@ -732,6 +737,7 @@ class OpenAIGPTImageNodeV2(IO.ComfyNode):cls,ApiEndpoint(path="/proxy/openai/images/edits", method="POST"),response_model=OpenAIImageGenerationResponse,+ asset_urls=True,data=OpenAIImageEditRequest(model=model_id,prompt=prompt,@@ -749,6 +755,7 @@ class OpenAIGPTImageNodeV2(IO.ComfyNode):cls,ApiEndpoint(path="/proxy/openai/images/generations", method="POST"),response_model=OpenAIImageGenerationResponse,+ asset_urls=True,data=OpenAIImageGenerationRequest(model=model_id,prompt=prompt,@@ -759,7 +766,7 @@ class OpenAIGPTImageNodeV2(IO.ComfyNode):moderation="low",),)- return IO.NodeOutput(await validate_and_cast_response(response))+ return IO.NodeOutput(await validate_and_cast_response(response, cls=cls))class OpenAIChatNode(IO.ComfyNode):diff --git a/comfy_api_nodes/nodes_openrouter.py b/comfy_api_nodes/nodes_openrouter.pyindex a27ed13af..04085d338 100644--- a/comfy_api_nodes/nodes_openrouter.py+++ b/comfy_api_nodes/nodes_openrouter.py@@ -29,6 +29,7 @@ from comfy_api_nodes.apis.openrouter import (from comfy_api_nodes.util import (ApiEndpoint,bytesio_to_image_tensor,+ download_url_to_image_tensor,get_number_of_images,pad_images_to_common_channels,sync_op,@@ -279,16 +280,20 @@ def _extract_text(response: OpenRouterChatResponse) -> str:return message.content or ""-def _image_data_to_tensor(item: OpenRouterImageData) -> torch.Tensor:- try:- return bytesio_to_image_tensor(BytesIO(base64.b64decode(item.b64_json)))- except Exception as e:- raise ValueError(f"OpenRouter returned an image that could not be decoded: {e}") from e+async def _image_data_to_tensor(cls: type[IO.ComfyNode], item: OpenRouterImageData) -> torch.Tensor:+ if item.b64_json:+ try:+ return bytesio_to_image_tensor(BytesIO(base64.b64decode(item.b64_json)))+ except Exception as e:+ raise ValueError(f"OpenRouter returned an image that could not be decoded: {e}") from e+ if item.url:+ return await download_url_to_image_tensor(item.url, cls=cls)+ raise ValueError("OpenRouter returned an image with neither inline data nor a URL.")-def _extract_images(response: OpenRouterImageResponse) -> torch.Tensor:+async def _extract_images(cls: type[IO.ComfyNode], response: OpenRouterImageResponse) -> torch.Tensor:_raise_on_error(response.error)- tensors = [_image_data_to_tensor(item) for item in response.data or [] if item.b64_json]+ tensors = [await _image_data_to_tensor(cls, item) for item in response.data or [] if item.b64_json or item.url]if not tensors:raise ValueError("OpenRouter returned no image.")return torch.cat(pad_images_to_common_channels(tensors))@@ -617,6 +622,7 @@ class OpenRouterImageNode(IO.ComfyNode):cls,ApiEndpoint(path=OPENROUTER_IMAGES_ENDPOINT, method="POST"),response_model=OpenRouterImageResponse,+ asset_urls=True,data=OpenRouterImageRequest(model=slug,prompt=prompt,@@ -625,7 +631,7 @@ class OpenRouterImageNode(IO.ComfyNode):input_references=input_references,),)- return IO.NodeOutput(_extract_images(response))+ return IO.NodeOutput(await _extract_images(cls, response))class OpenRouterExtension(ComfyExtension):diff --git a/comfy_api_nodes/nodes_recraft.py b/comfy_api_nodes/nodes_recraft.pyindex 1fc050301..cbad37712 100644--- a/comfy_api_nodes/nodes_recraft.py+++ b/comfy_api_nodes/nodes_recraft.py@@ -66,7 +66,6 @@ async def handle_recraft_file_request(files=files,content_type="multipart/form-data",multipart_parser=recraft_multipart_parser,- max_retries=1,)all_bytesio = []if response.image is not None:@@ -450,7 +449,6 @@ class RecraftCreateStyleNode(IO.ComfyNode):files=files,data=RecraftCreateStyleRequest(style=style),content_type="multipart/form-data",- max_retries=1,)return IO.NodeOutput(response.id)@@ -525,7 +523,6 @@ class RecraftV4CreateStyleNode(IO.ComfyNode):model=model,),content_type="multipart/form-data",- max_retries=1,)return IO.NodeOutput(response.id)@@ -629,7 +626,6 @@ class RecraftTextToImageNode(IO.ComfyNode):style_id=recraft_style.style_id,controls=controls_api,),- max_retries=1,)images = []for data in response.data:@@ -953,7 +949,6 @@ class RecraftTextToVectorNode(IO.ComfyNode):substyle=recraft_style.substyle,controls=controls_api,),- max_retries=1,)svg_data = []for data in response.data:@@ -1440,7 +1435,6 @@ class RecraftV4TextToImageNode(IO.ComfyNode):style_reference_urls=style_reference_urls,controls=recraft_controls.create_api_model() if recraft_controls else None,),- max_retries=1,)images = []for data in response.data:@@ -1682,7 +1676,6 @@ class RecraftV4TextToVectorNode(IO.ComfyNode):style_reference_urls=style_reference_urls,controls=recraft_controls.create_api_model() if recraft_controls else None,),- max_retries=1,)svg_data = []for data in response.data:diff --git a/comfy_api_nodes/util/_helpers.py b/comfy_api_nodes/util/_helpers.pyindex f245e34fc..9dbf25c7c 100644--- a/comfy_api_nodes/util/_helpers.py+++ b/comfy_api_nodes/util/_helpers.py@@ -7,7 +7,10 @@ from collections.abc import Callablefrom datetime import datetime, timezonefrom email.utils import parsedate_to_datetimefrom io import BytesIO+from urllib.parse import urlparse+import aiohttp+from aiohttp.client_exceptions import ClientErrorfrom yarl import URLfrom comfy.cli_args import args@@ -75,6 +78,48 @@ def default_base_url() -> str:return normalize_comfy_api_base(getattr(args, "comfy_api_base", "https://api.comfy.org"))+async def diagnose_connectivity() -> dict[str, bool]:+ """Best-effort connectivity diagnostics to distinguish local vs. server issues."""+ results = {+ "internet_accessible": False,+ "api_accessible": False,+ }+ timeout = aiohttp.ClientTimeout(total=5.0)++ # Probe Google and Baidu in parallel: Google is blocked by the GFW in mainland China, so a Baidu probe is required+ # to correctly detect that Chinese users with working internet do have working internet.+ internet_probe_urls = ("https://www.google.com", "https://www.baidu.com")++ async with aiohttp.ClientSession(timeout=timeout) as session:+ async def _probe(url: str) -> bool:+ try:+ async with session.get(url) as resp:+ return resp.status < 500+ except (ClientError, OSError, asyncio.TimeoutError):+ return False++ probe_tasks = [asyncio.create_task(_probe(u)) for u in internet_probe_urls]+ try:+ for fut in asyncio.as_completed(probe_tasks):+ if await fut:+ results["internet_accessible"] = True+ break+ finally:+ for t in probe_tasks:+ if not t.done():+ t.cancel()+ await asyncio.gather(*probe_tasks, return_exceptions=True)+ if not results["internet_accessible"]:+ return results++ parsed = urlparse(default_base_url())+ health_url = f"{parsed.scheme}://{parsed.netloc}/health"+ with contextlib.suppress(ClientError, OSError):+ async with session.get(health_url) as resp:+ results["api_accessible"] = resp.status < 500+ return results++async def sleep_with_interrupt(seconds: float,node_cls: type[IO.ComfyNode] | None,diff --git a/comfy_api_nodes/util/client.py b/comfy_api_nodes/util/client.pyindex f89221694..0fe3e01be 100644--- a/comfy_api_nodes/util/client.py+++ b/comfy_api_nodes/util/client.py@@ -30,12 +30,14 @@ from . import request_loggerfrom ._helpers import (_retry_after_wait,default_base_url,+ diagnose_connectivity,get_comfy_api_headers,get_node_id,is_processing_interrupted,sleep_with_interrupt,)from .common_exceptions import ApiServerError, LocalNetworkError, ProcessingInterrupted+from .download_helpers import download_url_to_bytesioM = TypeVar("M", bound=BaseModel)@@ -75,6 +77,8 @@ class _RequestConfig:price_extractor: Callable[[dict[str, Any]], float | None] | None = Noneis_rate_limited: Callable[[int, Any], bool] | None = Noneresponse_header_validator: Callable[[dict[str, str]], None] | None = None+ idempotency_key: str | None = None+ asset_urls: bool = False@dataclass@@ -93,6 +97,16 @@ class _PollUIState:_RETRY_STATUS = {408, 500, 502, 503, 504} # status 429 is handled separately_MAX_RETRY_AFTER_WAIT = 150.0 # Cap a server Retry-After at this many seconds so a large hint can't block execution+IDEMPOTENCY_KEY_HEADER = "Idempotency-Key"+ASSET_FORMAT_HEADER = "Comfy-Asset-Format"+ASSET_FORMAT_URL = "url"+_IDEMPOTENT_REPLAYED_HEADER = "Idempotent-Replayed"+_ERROR_TYPE_HEADER = "X-Comfy-Error-Type"+_IDEMPOTENCY_IN_FLIGHT = "idempotency_in_flight"+_IDEMPOTENCY_TERMINAL = frozenset({"idempotency_consumed", "idempotency_mismatch"})+_IDEMPOTENCY_IN_FLIGHT_WAIT = 2.0+_IDEMPOTENCY_IN_FLIGHT_MAX_WAIT = 30.0+PRICE_CREDITS_HEADER = "X-Comfy-Credits-Used""""Proxy response header with the actual cost in Comfy credits. When present on any successful proxied response,it takes precedence over ``price_extractor``."""@@ -183,6 +197,7 @@ async def sync_op(monitor_progress: bool = True,max_retries_on_rate_limit: int = 16,is_rate_limited: Callable[[int, Any], bool] | None = None,+ asset_urls: bool = False,) -> M:raw = await sync_op_raw(cls,@@ -203,6 +218,7 @@ async def sync_op(monitor_progress=monitor_progress,max_retries_on_rate_limit=max_retries_on_rate_limit,is_rate_limited=is_rate_limited,+ asset_urls=asset_urls,)if not isinstance(raw, dict):raise Exception("Expected JSON response to validate into a Pydantic model, got non-JSON (binary or text).")@@ -279,12 +295,16 @@ async def sync_op_raw(max_retries_on_rate_limit: int = 16,is_rate_limited: Callable[[int, Any], bool] | None = None,response_header_validator: Callable[[dict[str, str]], None] | None = None,+ idempotent: bool = True,+ asset_urls: bool = False,) -> dict[str, Any] | bytes:"""Make a single network request.- If as_binary=False (default): returns JSON dict (or {'_raw': '<text>'} if non-JSON).- If as_binary=True: returns bytes.- response_header_validator: optional callback receiving response headers dict+ - asset_urls=True: asks the proxy for Comfy-hosted URLs in place of inline media; a JSON {"url": ...}+ answer to an as_binary request is downloaded and returned as the bytes."""if isinstance(data, BaseModel):data = data.model_dump(exclude_none=True)@@ -310,6 +330,8 @@ async def sync_op_raw(max_retries_on_rate_limit=max_retries_on_rate_limit,is_rate_limited=is_rate_limited,response_header_validator=response_header_validator,+ idempotency_key=uuid.uuid4().hex if idempotent and endpoint.method != "GET" else None,+ asset_urls=asset_urls,)return await _request_base(cfg, expect_binary=as_binary)@@ -418,6 +440,7 @@ async def poll_op_raw(as_binary=False,final_label_on_success=None,monitor_progress=False,+ idempotent=False,)if not isinstance(resp_json, dict):raise Exception("Polling endpoint returned non-JSON response.")@@ -433,6 +456,7 @@ async def poll_op_raw(as_binary=False,final_label_on_success=None,monitor_progress=False,+ idempotent=False,)raise@@ -522,6 +546,7 @@ async def poll_op_raw(as_binary=False,final_label_on_success=None,monitor_progress=False,+ idempotent=False,)raiseif not is_queued:@@ -609,46 +634,50 @@ def _estimate_progress_pct(elapsed_seconds: float, p50_seconds: int | None, p90_return 90 + int(5.0 * (elapsed_seconds - p50_seconds) / (horizon - p50_seconds))-async def _diagnose_connectivity() -> dict[str, bool]:- """Best-effort connectivity diagnostics to distinguish local vs. server issues."""- results = {- "internet_accessible": False,- "api_accessible": False,- }- timeout = aiohttp.ClientTimeout(total=5.0)+def _normalize_files(files: dict[str, Any] | list[tuple[str, Any]]) -> list[tuple[str, str, Any, str]]:+ """Flatten `files` into (field_name, filename, value, content_type) once per request.- # Probe Google and Baidu in parallel: Google is blocked by the GFW in mainland China, so a Baidu probe is required- # to correctly detect that Chinese users with working internet do have working internet.- internet_probe_urls = ("https://www.google.com", "https://www.baidu.com")+ File-like values are read into bytes here because aiohttp closes IOBase payloads+ after sending, which would break re-sending the same body on retry.+ """+ out = []+ file_iter = files if isinstance(files, list) else files.items()+ for field_name, file_obj in file_iter:+ if file_obj is None:+ continue+ if isinstance(file_obj, tuple):+ filename, file_value, content_type = _unpack_tuple(file_obj)+ else:+ filename = getattr(file_obj, "name", field_name)+ file_value = file_obj+ content_type = "application/octet-stream"+ if hasattr(file_value, "read"):+ with contextlib.suppress(Exception):+ file_value.seek(0)+ data = file_value.read()+ if not isinstance(file_value, BytesIO):+ with contextlib.suppress(Exception):+ file_value.close()+ file_value = data+ out.append((field_name, filename, file_value, content_type))+ return out- async with aiohttp.ClientSession(timeout=timeout) as session:- async def _probe(url: str) -> bool:- try:- async with session.get(url) as resp:- return resp.status < 500- except (ClientError, OSError, asyncio.TimeoutError):- return False- probe_tasks = [asyncio.create_task(_probe(u)) for u in internet_probe_urls]- try:- for fut in asyncio.as_completed(probe_tasks):- if await fut:- results["internet_accessible"] = True- break- finally:- for t in probe_tasks:- if not t.done():- t.cancel()- await asyncio.gather(*probe_tasks, return_exceptions=True)- if not results["internet_accessible"]:- return results-- parsed = urlparse(default_base_url())- health_url = f"{parsed.scheme}://{parsed.netloc}/health"- with contextlib.suppress(ClientError, OSError):- async with session.get(health_url) as resp:- results["api_accessible"] = resp.status < 500- return results+def _build_multipart_form(cfg: _RequestConfig, files: list[tuple[str, str, Any, str]]) -> aiohttp.FormData:+ if cfg.multipart_parser and cfg.data:+ form = cfg.multipart_parser(cfg.data)+ if not isinstance(form, aiohttp.FormData):+ raise ValueError("multipart_parser must return aiohttp.FormData")+ else:+ form = aiohttp.FormData(default_to_multipart=True)+ if cfg.data:+ for k, v in cfg.data.items():+ if v is None:+ continue+ form.add_field(k, str(v) if not isinstance(v, (bytes, bytearray)) else v)+ for field_name, filename, file_value, content_type in files:+ form.add_field(field_name, file_value, filename=filename, content_type=content_type)+ return formdef _unpack_tuple(t: tuple) -> tuple[str, Any, str]:@@ -675,7 +704,18 @@ _TERMINAL_SERVICE_REFUSALS = frozenset({"comfy_cloud_provider_disabled"})def _is_terminal_service_refusal(body: Any) -> bool:- return isinstance(body, dict) and body.get("error") in _TERMINAL_SERVICE_REFUSALS+ if not isinstance(body, dict):+ return False+ err = body.get("error")+ return isinstance(err, str) and err in _TERMINAL_SERVICE_REFUSALS+++def _response_detail(body: Any) -> str:+ if isinstance(body, dict):+ for key in ("detail", "message"):+ if isinstance(body.get(key), str) and body[key]:+ return body[key]+ return ""def _provider_error_detail(metadata: Any) -> str | None:@@ -707,6 +747,8 @@ def _friendly_http_message(status: int, body: Any) -> str:return "There is a problem with your account. Please contact [email protected]."if status == 429:return "Rate Limit Exceeded: The server returned 429 after all retry attempts. Please wait and try again."+ if isinstance(body, dict) and body.get("error_type") == "service_unavailable":+ return "The API server could not verify this request right now. Please try again in a moment."try:if isinstance(body, dict):err = body.get("error")@@ -729,6 +771,9 @@ def _friendly_http_message(status: int, body: Any) -> str:return f"API Error: {msg} (Type: {typ})"if msg:return f"API Error: {msg}"+ detail = _response_detail(body)+ if detail:+ return f"API Error: {detail}"return f"API Error: {json.dumps(body)}"else:txt = str(body)@@ -739,6 +784,17 @@ def _friendly_http_message(status: int, body: Any) -> str:return f"HTTP {status}: Unknown error"+def _idempotency_error_message(error_type: str, body: Any) -> str:+ if error_type == "idempotency_consumed":+ return (+ "The server could not return the result of the previous attempt of this request. "+ f"Run the node again. ({error_type})"+ )+ detail = _response_detail(body)+ suffix = f"{error_type}: {detail}" if detail else error_type+ return f"The server rejected the retry of this request as different from the original attempt. ({suffix})"++def _generate_operation_id(method: str, path: str, attempt: int) -> str:slug = path.strip("/").replace("/", "_") or "op"return f"{method}_{slug}_try{attempt}_{uuid.uuid4().hex[:8]}"@@ -771,6 +827,43 @@ def _snapshot_request_body_for_logging(return data or {}+async def _read_binary_body(resp: aiohttp.ClientResponse, cfg: _RequestConfig, start_time: float) -> bytes:+ buff = bytearray()+ last_tick = time.monotonic()+ async for chunk in resp.content.iter_chunked(64 * 1024):+ buff.extend(chunk)+ now = time.monotonic()+ if now - last_tick >= 1.0:+ last_tick = now+ if is_processing_interrupted():+ raise ProcessingInterrupted("Task cancelled")+ if cfg.monitor_progress:+ _display_time_progress(cfg.node_cls, cfg.wait_label, int(now - start_time))+ return bytes(buff)+++def _asset_url_from_envelope(resp: aiohttp.ClientResponse, body: bytes) -> str | None:+ if resp.content_type != "application/json":+ return None+ try:+ payload = json.loads(body)+ except (UnicodeDecodeError, json.JSONDecodeError):+ return None+ asset_url = payload.get("url") if isinstance(payload, dict) else None+ return asset_url if isinstance(asset_url, str) and asset_url else None+++async def _download_asset(asset_url: str, cfg: _RequestConfig) -> bytes:+ buf = BytesIO()+ try:+ await download_url_to_bytesio(asset_url, buf, timeout=None, cls=cfg.node_cls)+ except (ProcessingInterrupted, LocalNetworkError, ApiServerError):+ raise+ except Exception as e:+ raise Exception(f"The request completed, but its result could not be downloaded: {e}") from e+ return buf.getvalue()++async def _request_base(cfg: _RequestConfig, expect_binary: bool):"""Core request with retries, per-second interruption monitoring, true cancellation, and friendly errors."""url = cfg.endpoint.path@@ -781,6 +874,8 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):method = cfg.endpoint.methodparams = _merge_params(cfg.endpoint.query_params, method, cfg.data if method == "GET" else None)+ keyed = is_comfy_api_request and bool(cfg.idempotency_key)+ multipart_files = _normalize_files(cfg.files) if cfg.content_type == "multipart/form-data" and method != "GET" and cfg.files else []async def _monitor(stop_evt: asyncio.Event, start_ts: float):"""Every second: update elapsed time and signal interruption."""@@ -795,15 +890,19 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):return # normal shutdownstart_time = cfg.progress_origin_ts if cfg.progress_origin_ts is not None else time.monotonic()+ first_attempt_ts = time.monotonic()attempt = 0+ retries_used = 0delay = cfg.retry_delayrate_limit_attempts = 0rate_limit_delay = cfg.retry_delay+ in_flight_waits = 0operation_succeeded: bool = Falsefinal_elapsed_seconds: int | None = Noneextracted_price: float | None = Nonewhile True:attempt += 1+ attempt_ts = time.monotonic()stop_event = asyncio.Event()monitor_task: asyncio.Task | None = Nonesess: aiohttp.ClientSession | None = None@@ -816,11 +915,19 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):payload_headers.update(get_comfy_api_headers(cfg.node_cls))if cfg.endpoint.headers:payload_headers.update(cfg.endpoint.headers)+ if keyed:+ payload_headers[IDEMPOTENCY_KEY_HEADER] = cfg.idempotency_key+ if cfg.asset_urls and is_comfy_api_request:+ payload_headers[ASSET_FORMAT_HEADER] = ASSET_FORMAT_URLpayload_kw: dict[str, Any] = {"headers": payload_headers}if method == "GET":payload_headers.pop("Content-Type", None)- request_body_log = _snapshot_request_body_for_logging(cfg.content_type, method, cfg.data, cfg.files)+ request_body_log = (+ _snapshot_request_body_for_logging(cfg.content_type, method, cfg.data, cfg.files)+ if in_flight_waits == 0+ else None+ )try:if cfg.monitor_progress:monitor_task = asyncio.create_task(_monitor(stop_event, start_time))@@ -829,36 +936,8 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):sess = aiohttp.ClientSession(timeout=timeout)if cfg.content_type == "multipart/form-data" and method != "GET":- # aiohttp will set Content-Type boundary; remove any fixed Content-Typepayload_headers.pop("Content-Type", None)- if cfg.multipart_parser and cfg.data:- form = cfg.multipart_parser(cfg.data)- if not isinstance(form, aiohttp.FormData):- raise ValueError("multipart_parser must return aiohttp.FormData")- else:- form = aiohttp.FormData(default_to_multipart=True)- if cfg.data:- for k, v in cfg.data.items():- if v is None:- continue- form.add_field(k, str(v) if not isinstance(v, (bytes, bytearray)) else v)- if cfg.files:- file_iter = cfg.files if isinstance(cfg.files, list) else cfg.files.items()- for field_name, file_obj in file_iter:- if file_obj is None:- continue- if isinstance(file_obj, tuple):- filename, file_value, content_type = _unpack_tuple(file_obj)- else:- filename = getattr(file_obj, "name", field_name)- file_value = file_obj- content_type = "application/octet-stream"- # Attempt to rewind BytesIO for retries- if isinstance(file_value, BytesIO):- with contextlib.suppress(Exception):- file_value.seek(0)- form.add_field(field_name, file_value, filename=filename, content_type=content_type)- payload_kw["data"] = form+ payload_kw["data"] = _build_multipart_form(cfg, multipart_files)elif cfg.content_type == "application/x-www-form-urlencoded" and method != "GET":payload_headers["Content-Type"] = "application/x-www-form-urlencoded"payload_kw["data"] = cfg.data or {}@@ -893,18 +972,63 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):# Otherwise, request finishedresp = await req_taskasync with resp:+ if keyed and resp.headers.get(_IDEMPOTENT_REPLAYED_HEADER):+ logging.info("Server replayed the response of a previous attempt for %s %s", method, url)if resp.status >= 400:try:body = await resp.json()except (ContentTypeError, json.JSONDecodeError):body = await resp.text()+ error_type = resp.headers.get(_ERROR_TYPE_HEADER) or (body.get("error_type") if isinstance(body, dict) else "")+ error_type = error_type.strip().lower() if isinstance(error_type, str) else ""+ if keyed and resp.status == 409 and error_type in _IDEMPOTENCY_TERMINAL:+ msg = _idempotency_error_message(error_type, body)+ request_logger.log_request_response(+ operation_id=operation_id,+ request_method=method,+ request_url=url,+ response_status_code=resp.status,+ response_headers=dict(resp.headers),+ response_content=body,+ error_message=msg,+ )+ raise Exception(msg)should_retry = False+ in_flight = Falsewait_time = 0.0+ remaining = 0.0retry_label = ""is_rl = resp.status == 429 or (cfg.is_rate_limited is not None and cfg.is_rate_limited(resp.status, body))- if is_rl and rate_limit_attempts < cfg.max_retries_on_rate_limit:+ if keyed and resp.status == 409 and error_type == _IDEMPOTENCY_IN_FLIGHT:+ remaining = cfg.timeout - (time.monotonic() - first_attempt_ts)+ if remaining <= 0:+ msg = (+ "The server is still processing the previous attempt of this request "+ "and did not finish within the node's timeout."+ )+ request_logger.log_request_response(+ operation_id=operation_id,+ request_method=method,+ request_url=url,+ response_status_code=resp.status,+ response_headers=dict(resp.headers),+ response_content=body,+ error_message=msg,+ )+ raise Exception(msg)+ in_flight_waits += 1+ in_flight = True+ retries_used = 0+ delay = cfg.retry_delay+ wait_time = min(+ _IDEMPOTENCY_IN_FLIGHT_MAX_WAIT,+ _IDEMPOTENCY_IN_FLIGHT_WAIT * 1.5 ** (in_flight_waits - 1),+ )+ retry_label = f"previous attempt still in progress, check {in_flight_waits}"+ should_retry = True+ elif is_rl and rate_limit_attempts < cfg.max_retries_on_rate_limit:rate_limit_attempts += 1wait_time = min(rate_limit_delay, 30.0)rate_limit_delay *= cfg.retry_backoff@@ -913,16 +1037,23 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):elif (resp.status in _RETRY_STATUSand not _is_terminal_service_refusal(body)- and (attempt - rate_limit_attempts) <= cfg.max_retries+ and retries_used < cfg.max_retries):+ retries_used += 1wait_time = delaydelay *= cfg.retry_backoff- retry_label = f"retry {attempt - rate_limit_attempts} of {cfg.max_retries}"+ retry_label = f"retry {retries_used} of {cfg.max_retries}"should_retry = Trueif should_retry:- wait_time = _retry_after_wait(resp.headers.get("Retry-After"), wait_time, _MAX_RETRY_AFTER_WAIT)- logging.warning(+ retry_after = _retry_after_wait(resp.headers.get("Retry-After"), wait_time, _MAX_RETRY_AFTER_WAIT)+ if in_flight:+ wait_time = min(max(wait_time, retry_after), remaining)+ else:+ wait_time = retry_after+ if keyed and resp.headers.get(_IDEMPOTENT_REPLAYED_HEADER):+ cfg.idempotency_key = uuid.uuid4().hex+ (logging.info if in_flight else logging.warning)("HTTP %s %s -> %s. Waiting %.2fs (%s).",method,url,@@ -960,19 +1091,9 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):raise Exception(msg)if expect_binary:- buff = bytearray()- last_tick = time.monotonic()- async for chunk in resp.content.iter_chunked(64 * 1024):- buff.extend(chunk)- now = time.monotonic()- if now - last_tick >= 1.0:- last_tick = now- if is_processing_interrupted():- raise ProcessingInterrupted("Task cancelled")- if cfg.monitor_progress:- _display_time_progress(cfg.node_cls, cfg.wait_label, int(now - start_time))- bytes_payload = bytes(buff)+ bytes_payload = await _read_binary_body(resp, cfg, start_time)resp_headers = {k.lower(): v for k, v in resp.headers.items()}+ asset_url = _asset_url_from_envelope(resp, bytes_payload) if cfg.asset_urls else Noneif is_comfy_api_request:_maybe_remember_credits_used(cfg.node_cls, resp.headers.get(PRICE_CREDITS_HEADER))_maybe_remember_server_estimate(cfg.node_cls, resp.headers)@@ -981,8 +1102,6 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):extracted_price = cfg.price_extractor(resp_headers)if cfg.response_header_validator:cfg.response_header_validator(resp_headers)- operation_succeeded = True- final_elapsed_seconds = int(time.monotonic() - start_time)request_logger.log_request_response(operation_id=operation_id,request_method=method,@@ -991,6 +1110,10 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):response_headers=resp_headers,response_content=bytes_payload,)+ if asset_url:+ bytes_payload = await _download_asset(asset_url, cfg)+ operation_succeeded = True+ final_elapsed_seconds = int(time.monotonic() - start_time)return bytes_payloadelse:try:@@ -1023,15 +1146,18 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):except ProcessingInterrupted:logging.debug("Polling was interrupted by user")raise- except (ClientError, OSError) as e:- if (attempt - rate_limit_attempts) <= cfg.max_retries:+ except (ClientError, OSError, asyncio.TimeoutError) as e:+ if retries_used < cfg.max_retries:+ retries_used += 1logging.warning(- "Connection error calling %s %s. Retrying in %.2fs (%d/%d): %s",+ "Connection error calling %s %s after %.1fs. Retrying in %.2fs (%d/%d): %s: %s",method,url,+ time.monotonic() - attempt_ts,delay,- attempt - rate_limit_attempts,+ retries_used,cfg.max_retries,+ type(e).__name__,str(e),)request_logger.log_request_response(@@ -1052,7 +1178,7 @@ async def _request_base(cfg: _RequestConfig, expect_binary: bool):)delay *= cfg.retry_backoffcontinue- diag = await _diagnose_connectivity()+ diag = await diagnose_connectivity()if not diag["internet_accessible"]:request_logger.log_request_response(operation_id=operation_id,diff --git a/comfy_api_nodes/util/download_helpers.py b/comfy_api_nodes/util/download_helpers.pyindex f4b8724b3..d6427af58 100644--- a/comfy_api_nodes/util/download_helpers.py+++ b/comfy_api_nodes/util/download_helpers.py@@ -17,12 +17,12 @@ from folder_paths import get_output_directoryfrom . import request_loggerfrom ._helpers import (default_base_url,+ diagnose_connectivity,get_comfy_api_headers,is_processing_interrupted,sleep_with_interrupt,to_aiohttp_url,)-from .client import _diagnose_connectivityfrom .common_exceptions import ApiServerError, LocalNetworkError, ProcessingInterruptedfrom .conversions import bytesio_to_image_tensor@@ -158,24 +158,29 @@ async def download_url_to_bytesio(sink = dest # BytesIO or file-likewritten = 0- while True:- try:- chunk = await asyncio.wait_for(resp.content.read(1024 * 1024), timeout=1.0)- except asyncio.TimeoutError:- chunk = b""- except asyncio.CancelledError:- raise ProcessingInterrupted("Task cancelled") from None-- if is_processing_interrupted():- raise ProcessingInterrupted("Task cancelled")-- if not chunk:- if resp.content.at_eof():- break- continue-- sink.write(chunk)- written += len(chunk)+ read_task: asyncio.Task | None = None+ try:+ while True:+ if read_task is None:+ read_task = asyncio.create_task(resp.content.read(1024 * 1024))+ done, _ = await asyncio.wait({read_task}, timeout=1.0)+ if is_processing_interrupted():+ raise ProcessingInterrupted("Task cancelled")+ if not done:+ continue+ chunk = read_task.result()+ read_task = None+ if not chunk:+ if resp.content.at_eof():+ break+ continue+ sink.write(chunk)+ written += len(chunk)+ finally:+ if read_task is not None:+ read_task.cancel()+ with contextlib.suppress(asyncio.CancelledError, Exception):+ await read_taskif isinstance(dest, BytesIO):with contextlib.suppress(Exception):@@ -192,7 +197,7 @@ async def download_url_to_bytesio(returnexcept asyncio.CancelledError:raise ProcessingInterrupted("Task cancelled") from None- except (ClientError, OSError) as e:+ except (ClientError, OSError, asyncio.TimeoutError) as e:if attempt <= max_retries:request_logger.log_request_response(operation_id=op_id,@@ -204,7 +209,7 @@ async def download_url_to_bytesio(delay *= retry_backoffcontinue- diag = await _diagnose_connectivity()+ diag = await diagnose_connectivity()if not diag["internet_accessible"]:raise LocalNetworkError("Unable to connect to the network. Please check your internet connection and try again."diff --git a/comfy_api_nodes/util/upload_helpers.py b/comfy_api_nodes/util/upload_helpers.pyindex d7eb702ef..22582409f 100644--- a/comfy_api_nodes/util/upload_helpers.py+++ b/comfy_api_nodes/util/upload_helpers.py@@ -13,10 +13,9 @@ from pydantic import BaseModel, Fieldfrom comfy_api.latest import IO, Input, Typesfrom . import request_logger-from ._helpers import is_processing_interrupted, sleep_with_interrupt+from ._helpers import diagnose_connectivity, is_processing_interrupted, sleep_with_interruptfrom .client import (ApiEndpoint,- _diagnose_connectivity,_display_time_progress,sync_op,)@@ -366,7 +365,7 @@ async def upload_file(delay *= retry_backoffcontinue- diag = await _diagnose_connectivity()+ diag = await diagnose_connectivity()if not diag["internet_accessible"]:raise LocalNetworkError("Unable to connect to the network. Please check your internet connection and try again."