mirrors/ComfyUI
1
0
Fork 0
mirror of https://github.com/comfyanonymous/ComfyUI.git synced 2025-06-08 15:17:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add support for Comfy API keys (#8041)

Browse Source 
* Handle Comfy API key based authorizaton (#167)

Co-authored-by: Jedrzej Kosinski <kosinkadink1@gmail.com>

* Bump frontend version to include API key features (#170)

* bump templates version

---------

Co-authored-by: Jedrzej Kosinski <kosinkadink1@gmail.com>
This commit is contained in:
Christian Byrne 2025-05-10 19:10:58 -07:00 committed by GitHub
parent 235d3901fc
commit 3535909eb8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
15 changed files with 319 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
comfy_api_nodes/apinode_utils.py
View File

@ -1,3 +1,4 @@
from __future__ import annotations
import io import io
import logging import logging
from typing import Optional from typing import Optional
@ -314,7 +315,7 @@ def upload_file_to_comfyapi(
file_bytes_io: BytesIO, file_bytes_io: BytesIO,
filename: str, filename: str,
upload_mime_type: str, upload_mime_type: str,
auth_token: Optional[str] = None, auth_kwargs: Optional[dict[str,str]] = None,
) -> str: ) -> str:
""" """
Uploads a single file to ComfyUI API and returns its download URL. Uploads a single file to ComfyUI API and returns its download URL.
@ -323,7 +324,7 @@ def upload_file_to_comfyapi(
file_bytes_io: BytesIO object containing the file data. file_bytes_io: BytesIO object containing the file data.
filename: The filename of the file. filename: The filename of the file.
upload_mime_type: MIME type of the file. upload_mime_type: MIME type of the file.
auth_token: Optional authentication token. auth_kwargs: Optional authentication token(s).
Returns: Returns:
The download URL for the uploaded file. The download URL for the uploaded file.
@ -337,7 +338,7 @@ def upload_file_to_comfyapi(
response_model=UploadResponse, response_model=UploadResponse,
), ),
request=request_object, request=request_object,
auth_token=auth_token, auth_kwargs=auth_kwargs,
) )
response: UploadResponse = operation.execute() response: UploadResponse = operation.execute()
@ -351,7 +352,7 @@ def upload_file_to_comfyapi(
def upload_video_to_comfyapi( def upload_video_to_comfyapi(
video: VideoInput, video: VideoInput,
auth_token: Optional[str] = None, auth_kwargs: Optional[dict[str,str]] = None,
container: VideoContainer = VideoContainer.MP4, container: VideoContainer = VideoContainer.MP4,
codec: VideoCodec = VideoCodec.H264, codec: VideoCodec = VideoCodec.H264,
max_duration: Optional[int] = None, max_duration: Optional[int] = None,
@ -362,7 +363,7 @@ def upload_video_to_comfyapi(
Args: Args:
video: VideoInput object (Comfy VIDEO type). video: VideoInput object (Comfy VIDEO type).
auth_token: Optional authentication token. auth_kwargs: Optional authentication token(s).
container: The video container format to use (default: MP4). container: The video container format to use (default: MP4).
codec: The video codec to use (default: H264). codec: The video codec to use (default: H264).
max_duration: Optional maximum duration of the video in seconds. If the video is longer than this, an error will be raised. max_duration: Optional maximum duration of the video in seconds. If the video is longer than this, an error will be raised.
@ -390,7 +391,7 @@ def upload_video_to_comfyapi(
video_bytes_io.seek(0) video_bytes_io.seek(0)
return upload_file_to_comfyapi( return upload_file_to_comfyapi(
video_bytes_io, filename, upload_mime_type, auth_token video_bytes_io, filename, upload_mime_type, auth_kwargs
) )
@ -453,7 +454,7 @@ def audio_ndarray_to_bytesio(
def upload_audio_to_comfyapi( def upload_audio_to_comfyapi(
audio: AudioInput, audio: AudioInput,
auth_token: Optional[str] = None, auth_kwargs: Optional[dict[str,str]] = None,
container_format: str = "mp4", container_format: str = "mp4",
codec_name: str = "aac", codec_name: str = "aac",
mime_type: str = "audio/mp4", mime_type: str = "audio/mp4",
@ -465,7 +466,7 @@ def upload_audio_to_comfyapi(
Args: Args:
audio: a Comfy `AUDIO` type (contains waveform tensor and sample_rate) audio: a Comfy `AUDIO` type (contains waveform tensor and sample_rate)
auth_token: Optional authentication token. auth_kwargs: Optional authentication token(s).
Returns: Returns:
The download URL for the uploaded audio file. The download URL for the uploaded audio file.
@ -477,11 +478,11 @@ def upload_audio_to_comfyapi(
audio_data_np, sample_rate, container_format, codec_name audio_data_np, sample_rate, container_format, codec_name
) )
return upload_file_to_comfyapi(audio_bytes_io, filename, mime_type, auth_token) return upload_file_to_comfyapi(audio_bytes_io, filename, mime_type, auth_kwargs)
def upload_images_to_comfyapi( def upload_images_to_comfyapi(
image: torch.Tensor, max_images=8, auth_token=None, mime_type: Optional[str] = None image: torch.Tensor, max_images=8, auth_kwargs: Optional[dict[str,str]] = None, mime_type: Optional[str] = None
) -> list[str]: ) -> list[str]:
""" """
Uploads images to ComfyUI API and returns download URLs. Uploads images to ComfyUI API and returns download URLs.
@ -490,7 +491,7 @@ def upload_images_to_comfyapi(
Args: Args:
image: Input torch.Tensor image. image: Input torch.Tensor image.
max_images: Maximum number of images to upload. max_images: Maximum number of images to upload.
auth_token: Optional authentication token. auth_kwargs: Optional authentication token(s).
mime_type: Optional MIME type for the image. mime_type: Optional MIME type for the image.
""" """
# if batch, try to upload each file if max_images is greater than 0 # if batch, try to upload each file if max_images is greater than 0
@ -521,7 +522,7 @@ def upload_images_to_comfyapi(
response_model=UploadResponse, response_model=UploadResponse,
), ),
request=request_object, request=request_object,
auth_token=auth_token, auth_kwargs=auth_kwargs,
) )
response = operation.execute() response = operation.execute()

43
comfy_api_nodes/apis/client.py
View File

@ -20,7 +20,8 @@ Usage Examples:
# 1. Create the API client # 1. Create the API client
api_client = ApiClient( api_client = ApiClient(
base_url="https://api.example.com", base_url="https://api.example.com",
api_key="your_api_key_here", auth_token="your_auth_token_here",
comfy_api_key="your_comfy_api_key_here",
timeout=30.0, timeout=30.0,
verify_ssl=True verify_ssl=True
) )
@ -146,12 +147,14 @@ class ApiClient:
def __init__( def __init__(
self, self,
base_url: str, base_url: str,
api_key: Optional[str] = None, auth_token: Optional[str] = None,
comfy_api_key: Optional[str] = None,
timeout: float = 3600.0, timeout: float = 3600.0,
verify_ssl: bool = True, verify_ssl: bool = True,
): ):
self.base_url = base_url self.base_url = base_url
self.api_key = api_key self.auth_token = auth_token
self.comfy_api_key = comfy_api_key
self.timeout = timeout self.timeout = timeout
self.verify_ssl = verify_ssl self.verify_ssl = verify_ssl
@ -201,8 +204,10 @@ class ApiClient:
"""Get headers for API requests, including authentication if available""" """Get headers for API requests, including authentication if available"""
headers = {"Content-Type": "application/json", "Accept": "application/json"} headers = {"Content-Type": "application/json", "Accept": "application/json"}
if self.api_key: if self.auth_token:
headers["Authorization"] = f"Bearer {self.api_key}" headers["Authorization"] = f"Bearer {self.auth_token}"
elif self.comfy_api_key:
headers["X-API-KEY"] = self.comfy_api_key
return headers return headers
@ -236,7 +241,7 @@ class ApiClient:
requests.RequestException: If the request fails requests.RequestException: If the request fails
""" """
url = urljoin(self.base_url, path) url = urljoin(self.base_url, path)
self.check_auth_token(self.api_key) self.check_auth(self.auth_token, self.comfy_api_key)
# Combine default headers with any provided headers # Combine default headers with any provided headers
request_headers = self.get_headers() request_headers = self.get_headers()
if headers: if headers:
@ -320,11 +325,11 @@ class ApiClient:
return response.json() return response.json()
return {} return {}
def check_auth_token(self, auth_token): def check_auth(self, auth_token, comfy_api_key):
"""Verify that an auth token is present.""" """Verify that an auth token is present or comfy_api_key is present"""
if auth_token is None: if auth_token is None and comfy_api_key is None:
raise Exception("Unauthorized: Please login first to use this node.") raise Exception("Unauthorized: Please login first to use this node.")
return auth_token return auth_token or comfy_api_key
@staticmethod @staticmethod
def upload_file( def upload_file(
@ -392,6 +397,8 @@ class SynchronousOperation(Generic[T, R]):
files: Optional[Dict[str, Any]] = None, files: Optional[Dict[str, Any]] = None,
api_base: str | None = None, api_base: str | None = None,
auth_token: Optional[str] = None, auth_token: Optional[str] = None,
comfy_api_key: Optional[str] = None,
auth_kwargs: Optional[Dict[str,str]] = None,
timeout: float = 604800.0, timeout: float = 604800.0,
verify_ssl: bool = True, verify_ssl: bool = True,
content_type: str = "application/json", content_type: str = "application/json",
@ -403,6 +410,10 @@ class SynchronousOperation(Generic[T, R]):
self.error = None self.error = None
self.api_base: str = api_base or args.comfy_api_base self.api_base: str = api_base or args.comfy_api_base
self.auth_token = auth_token self.auth_token = auth_token
self.comfy_api_key = comfy_api_key
if auth_kwargs is not None:
self.auth_token = auth_kwargs.get("auth_token", self.auth_token)
self.comfy_api_key = auth_kwargs.get("comfy_api_key", self.comfy_api_key)
self.timeout = timeout self.timeout = timeout
self.verify_ssl = verify_ssl self.verify_ssl = verify_ssl
self.files = files self.files = files
@ -415,7 +426,8 @@ class SynchronousOperation(Generic[T, R]):
if client is None: if client is None:
client = ApiClient( client = ApiClient(
base_url=self.api_base, base_url=self.api_base,
api_key=self.auth_token, auth_token=self.auth_token,
comfy_api_key=self.comfy_api_key,
timeout=self.timeout, timeout=self.timeout,
verify_ssl=self.verify_ssl, verify_ssl=self.verify_ssl,
) )
@ -502,12 +514,18 @@ class PollingOperation(Generic[T, R]):
request: Optional[T] = None, request: Optional[T] = None,
api_base: str | None = None, api_base: str | None = None,
auth_token: Optional[str] = None, auth_token: Optional[str] = None,
comfy_api_key: Optional[str] = None,
auth_kwargs: Optional[Dict[str,str]] = None,
poll_interval: float = 5.0, poll_interval: float = 5.0,
): ):
self.poll_endpoint = poll_endpoint self.poll_endpoint = poll_endpoint
self.request = request self.request = request
self.api_base: str = api_base or args.comfy_api_base self.api_base: str = api_base or args.comfy_api_base
self.auth_token = auth_token self.auth_token = auth_token
self.comfy_api_key = comfy_api_key
if auth_kwargs is not None:
self.auth_token = auth_kwargs.get("auth_token", self.auth_token)
self.comfy_api_key = auth_kwargs.get("comfy_api_key", self.comfy_api_key)
self.poll_interval = poll_interval self.poll_interval = poll_interval
# Polling configuration # Polling configuration
@ -528,7 +546,8 @@ class PollingOperation(Generic[T, R]):
if client is None: if client is None:
client = ApiClient( client = ApiClient(
base_url=self.api_base, base_url=self.api_base,
api_key=self.auth_token, auth_token=self.auth_token,
comfy_api_key=self.comfy_api_key,
) )
return self._poll_until_complete(client) return self._poll_until_complete(client)
except Exception as e: except Exception as e:

24
comfy_api_nodes/nodes_bfl.py
View File

@ -179,6 +179,7 @@ class FluxProUltraImageNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -211,7 +212,6 @@ class FluxProUltraImageNode(ComfyNodeABC):
seed=0, seed=0,
image_prompt=None, image_prompt=None,
image_prompt_strength=0.1, image_prompt_strength=0.1,
auth_token=None,
**kwargs, **kwargs,
): ):
if image_prompt is None: if image_prompt is None:
@ -244,7 +244,7 @@ class FluxProUltraImageNode(ComfyNodeABC):
None if image_prompt is None else round(image_prompt_strength, 2) None if image_prompt is None else round(image_prompt_strength, 2)
), ),
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
output_image = handle_bfl_synchronous_operation(operation) output_image = handle_bfl_synchronous_operation(operation)
return (output_image,) return (output_image,)
@ -319,6 +319,7 @@ class FluxProImageNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -337,7 +338,6 @@ class FluxProImageNode(ComfyNodeABC):
seed=0, seed=0,
image_prompt=None, image_prompt=None,
# image_prompt_strength=0.1, # image_prompt_strength=0.1,
auth_token=None,
**kwargs, **kwargs,
): ):
image_prompt = ( image_prompt = (
@ -361,7 +361,7 @@ class FluxProImageNode(ComfyNodeABC):
seed=seed, seed=seed,
image_prompt=image_prompt, image_prompt=image_prompt,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
output_image = handle_bfl_synchronous_operation(operation) output_image = handle_bfl_synchronous_operation(operation)
return (output_image,) return (output_image,)
@ -461,6 +461,7 @@ class FluxProExpandNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -482,7 +483,6 @@ class FluxProExpandNode(ComfyNodeABC):
steps: int, steps: int,
guidance: float, guidance: float,
seed=0, seed=0,
auth_token=None,
**kwargs, **kwargs,
): ):
image = convert_image_to_base64(image) image = convert_image_to_base64(image)
@ -506,7 +506,7 @@ class FluxProExpandNode(ComfyNodeABC):
seed=seed, seed=seed,
image=image, image=image,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
output_image = handle_bfl_synchronous_operation(operation) output_image = handle_bfl_synchronous_operation(operation)
return (output_image,) return (output_image,)
@ -572,6 +572,7 @@ class FluxProFillNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -590,7 +591,6 @@ class FluxProFillNode(ComfyNodeABC):
steps: int, steps: int,
guidance: float, guidance: float,
seed=0, seed=0,
auth_token=None,
**kwargs, **kwargs,
): ):
# prepare mask # prepare mask
@ -615,7 +615,7 @@ class FluxProFillNode(ComfyNodeABC):
image=image, image=image,
mask=mask, mask=mask,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
output_image = handle_bfl_synchronous_operation(operation) output_image = handle_bfl_synchronous_operation(operation)
return (output_image,) return (output_image,)
@ -706,6 +706,7 @@ class FluxProCannyNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -726,7 +727,6 @@ class FluxProCannyNode(ComfyNodeABC):
steps: int, steps: int,
guidance: float, guidance: float,
seed=0, seed=0,
auth_token=None,
**kwargs, **kwargs,
): ):
control_image = convert_image_to_base64(control_image[:,:,:,:3]) control_image = convert_image_to_base64(control_image[:,:,:,:3])
@ -763,7 +763,7 @@ class FluxProCannyNode(ComfyNodeABC):
canny_high_threshold=canny_high_threshold, canny_high_threshold=canny_high_threshold,
preprocessed_image=preprocessed_image, preprocessed_image=preprocessed_image,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
output_image = handle_bfl_synchronous_operation(operation) output_image = handle_bfl_synchronous_operation(operation)
return (output_image,) return (output_image,)
@ -834,6 +834,7 @@ class FluxProDepthNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -852,7 +853,6 @@ class FluxProDepthNode(ComfyNodeABC):
steps: int, steps: int,
guidance: float, guidance: float,
seed=0, seed=0,
auth_token=None,
**kwargs, **kwargs,
): ):
control_image = convert_image_to_base64(control_image[:,:,:,:3]) control_image = convert_image_to_base64(control_image[:,:,:,:3])
@ -878,7 +878,7 @@ class FluxProDepthNode(ComfyNodeABC):
control_image=control_image, control_image=control_image,
preprocessed_image=preprocessed_image, preprocessed_image=preprocessed_image,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
output_image = handle_bfl_synchronous_operation(operation) output_image = handle_bfl_synchronous_operation(operation)
return (output_image,) return (output_image,)

29
comfy_api_nodes/nodes_ideogram.py
View File

@ -301,7 +301,10 @@ class IdeogramV1(ComfyNodeABC):
{"default": 1, "min": 1, "max": 8, "step": 1, "display": "number"}, {"default": 1, "min": 1, "max": 8, "step": 1, "display": "number"},
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
RETURN_TYPES = (IO.IMAGE,) RETURN_TYPES = (IO.IMAGE,)
@ -319,7 +322,7 @@ class IdeogramV1(ComfyNodeABC):
seed=0, seed=0,
negative_prompt="", negative_prompt="",
num_images=1, num_images=1,
auth_token=None, **kwargs,
): ):
# Determine the model based on turbo setting # Determine the model based on turbo setting
aspect_ratio = V1_V2_RATIO_MAP.get(aspect_ratio, None) aspect_ratio = V1_V2_RATIO_MAP.get(aspect_ratio, None)
@ -345,7 +348,7 @@ class IdeogramV1(ComfyNodeABC):
negative_prompt=negative_prompt if negative_prompt else None, negative_prompt=negative_prompt if negative_prompt else None,
) )
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response = operation.execute() response = operation.execute()
@ -454,7 +457,10 @@ class IdeogramV2(ComfyNodeABC):
# }, # },
#), #),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
RETURN_TYPES = (IO.IMAGE,) RETURN_TYPES = (IO.IMAGE,)
@ -475,7 +481,7 @@ class IdeogramV2(ComfyNodeABC):
negative_prompt="", negative_prompt="",
num_images=1, num_images=1,
color_palette="", color_palette="",
auth_token=None, **kwargs,
): ):
aspect_ratio = V1_V2_RATIO_MAP.get(aspect_ratio, None) aspect_ratio = V1_V2_RATIO_MAP.get(aspect_ratio, None)
resolution = V1_V1_RES_MAP.get(resolution, None) resolution = V1_V1_RES_MAP.get(resolution, None)
@ -515,7 +521,7 @@ class IdeogramV2(ComfyNodeABC):
color_palette=color_palette if color_palette else None, color_palette=color_palette if color_palette else None,
) )
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response = operation.execute() response = operation.execute()
@ -614,7 +620,10 @@ class IdeogramV3(ComfyNodeABC):
}, },
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
RETURN_TYPES = (IO.IMAGE,) RETURN_TYPES = (IO.IMAGE,)
@ -634,7 +643,7 @@ class IdeogramV3(ComfyNodeABC):
seed=0, seed=0,
num_images=1, num_images=1,
rendering_speed="BALANCED", rendering_speed="BALANCED",
auth_token=None, **kwargs,
): ):
# Check if both image and mask are provided for editing mode # Check if both image and mask are provided for editing mode
if image is not None and mask is not None: if image is not None and mask is not None:
@ -698,7 +707,7 @@ class IdeogramV3(ComfyNodeABC):
"mask": mask_binary, "mask": mask_binary,
}, },
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
elif image is not None or mask is not None: elif image is not None or mask is not None:
@ -739,7 +748,7 @@ class IdeogramV3(ComfyNodeABC):
response_model=IdeogramGenerateResponse, response_model=IdeogramGenerateResponse,
), ),
request=gen_request, request=gen_request,
auth_token=auth_token, auth_kwargs=kwargs,
) )
# Execute the operation and process response # Execute the operation and process response

166
comfy_api_nodes/nodes_kling.py
View File

@ -95,7 +95,7 @@ class KlingApiError(Exception):
pass pass
def poll_until_finished(auth_token: str, api_endpoint: ApiEndpoint[Any, R]) -> R: def poll_until_finished(auth_kwargs: dict[str,str], api_endpoint: ApiEndpoint[Any, R]) -> R:
"""Polls the Kling API endpoint until the task reaches a terminal state, then returns the response.""" """Polls the Kling API endpoint until the task reaches a terminal state, then returns the response."""
return PollingOperation( return PollingOperation(
poll_endpoint=api_endpoint, poll_endpoint=api_endpoint,
@ -108,7 +108,7 @@ def poll_until_finished(auth_token: str, api_endpoint: ApiEndpoint[Any, R]) -> R
if response.data and response.data.task_status if response.data and response.data.task_status
else None else None
), ),
auth_token=auth_token, auth_kwargs=auth_kwargs,
).execute() ).execute()
@ -418,16 +418,19 @@ class KlingTextToVideoNode(KlingNodeBase):
}, },
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
RETURN_TYPES = ("VIDEO", "STRING", "STRING") RETURN_TYPES = ("VIDEO", "STRING", "STRING")
RETURN_NAMES = ("VIDEO", "video_id", "duration") RETURN_NAMES = ("VIDEO", "video_id", "duration")
DESCRIPTION = "Kling Text to Video Node" DESCRIPTION = "Kling Text to Video Node"
def get_response(self, task_id: str, auth_token: str) -> KlingText2VideoResponse: def get_response(self, task_id: str, auth_kwargs: dict[str,str]) -> KlingText2VideoResponse:
return poll_until_finished( return poll_until_finished(
auth_token, auth_kwargs,
ApiEndpoint( ApiEndpoint(
path=f"{PATH_TEXT_TO_VIDEO}/{task_id}", path=f"{PATH_TEXT_TO_VIDEO}/{task_id}",
method=HttpMethod.GET, method=HttpMethod.GET,
@ -446,7 +449,7 @@ class KlingTextToVideoNode(KlingNodeBase):
camera_control: Optional[KlingCameraControl] = None, camera_control: Optional[KlingCameraControl] = None,
model_name: Optional[str] = None, model_name: Optional[str] = None,
duration: Optional[str] = None, duration: Optional[str] = None,
auth_token: Optional[str] = None, **kwargs,
) -> tuple[VideoFromFile, str, str]: ) -> tuple[VideoFromFile, str, str]:
validate_prompts(prompt, negative_prompt, MAX_PROMPT_LENGTH_T2V) validate_prompts(prompt, negative_prompt, MAX_PROMPT_LENGTH_T2V)
if model_name is None: if model_name is None:
@ -468,14 +471,14 @@ class KlingTextToVideoNode(KlingNodeBase):
aspect_ratio=KlingVideoGenAspectRatio(aspect_ratio), aspect_ratio=KlingVideoGenAspectRatio(aspect_ratio),
camera_control=camera_control, camera_control=camera_control,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
task_creation_response = initial_operation.execute() task_creation_response = initial_operation.execute()
validate_task_creation_response(task_creation_response) validate_task_creation_response(task_creation_response)
task_id = task_creation_response.data.task_id task_id = task_creation_response.data.task_id
final_response = self.get_response(task_id, auth_token) final_response = self.get_response(task_id, auth_kwargs=kwargs)
validate_video_result_response(final_response) validate_video_result_response(final_response)
video = get_video_from_response(final_response) video = get_video_from_response(final_response)
@ -522,7 +525,10 @@ class KlingCameraControlT2VNode(KlingTextToVideoNode):
}, },
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
DESCRIPTION = "Transform text into cinematic videos with professional camera movements that simulate real-world cinematography. Control virtual camera actions including zoom, rotation, pan, tilt, and first-person view, while maintaining focus on your original text." DESCRIPTION = "Transform text into cinematic videos with professional camera movements that simulate real-world cinematography. Control virtual camera actions including zoom, rotation, pan, tilt, and first-person view, while maintaining focus on your original text."
@ -534,7 +540,7 @@ class KlingCameraControlT2VNode(KlingTextToVideoNode):
cfg_scale: float, cfg_scale: float,
aspect_ratio: str, aspect_ratio: str,
camera_control: Optional[KlingCameraControl] = None, camera_control: Optional[KlingCameraControl] = None,
auth_token: Optional[str] = None, **kwargs,
): ):
return super().api_call( return super().api_call(
model_name=KlingVideoGenModelName.kling_v1, model_name=KlingVideoGenModelName.kling_v1,
@ -545,7 +551,7 @@ class KlingCameraControlT2VNode(KlingTextToVideoNode):
prompt=prompt, prompt=prompt,
negative_prompt=negative_prompt, negative_prompt=negative_prompt,
camera_control=camera_control, camera_control=camera_control,
auth_token=auth_token, **kwargs,
) )
@ -604,16 +610,19 @@ class KlingImage2VideoNode(KlingNodeBase):
enum_type=KlingVideoGenDuration, enum_type=KlingVideoGenDuration,
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
RETURN_TYPES = ("VIDEO", "STRING", "STRING") RETURN_TYPES = ("VIDEO", "STRING", "STRING")
RETURN_NAMES = ("VIDEO", "video_id", "duration") RETURN_NAMES = ("VIDEO", "video_id", "duration")
DESCRIPTION = "Kling Image to Video Node" DESCRIPTION = "Kling Image to Video Node"
def get_response(self, task_id: str, auth_token: str) -> KlingImage2VideoResponse: def get_response(self, task_id: str, auth_kwargs: dict[str,str]) -> KlingImage2VideoResponse:
return poll_until_finished( return poll_until_finished(
auth_token, auth_kwargs,
ApiEndpoint( ApiEndpoint(
path=f"{PATH_IMAGE_TO_VIDEO}/{task_id}", path=f"{PATH_IMAGE_TO_VIDEO}/{task_id}",
method=HttpMethod.GET, method=HttpMethod.GET,
@ -634,7 +643,7 @@ class KlingImage2VideoNode(KlingNodeBase):
duration: str, duration: str,
camera_control: Optional[KlingCameraControl] = None, camera_control: Optional[KlingCameraControl] = None,
end_frame: Optional[torch.Tensor] = None, end_frame: Optional[torch.Tensor] = None,
auth_token: Optional[str] = None, **kwargs,
) -> tuple[VideoFromFile]: ) -> tuple[VideoFromFile]:
validate_prompts(prompt, negative_prompt, MAX_PROMPT_LENGTH_I2V) validate_prompts(prompt, negative_prompt, MAX_PROMPT_LENGTH_I2V)
validate_input_image(start_frame) validate_input_image(start_frame)
@ -666,14 +675,14 @@ class KlingImage2VideoNode(KlingNodeBase):
duration=KlingVideoGenDuration(duration), duration=KlingVideoGenDuration(duration),
camera_control=camera_control, camera_control=camera_control,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
task_creation_response = initial_operation.execute() task_creation_response = initial_operation.execute()
validate_task_creation_response(task_creation_response) validate_task_creation_response(task_creation_response)
task_id = task_creation_response.data.task_id task_id = task_creation_response.data.task_id
final_response = self.get_response(task_id, auth_token) final_response = self.get_response(task_id, auth_kwargs=kwargs)
validate_video_result_response(final_response) validate_video_result_response(final_response)
video = get_video_from_response(final_response) video = get_video_from_response(final_response)
@ -723,7 +732,10 @@ class KlingCameraControlI2VNode(KlingImage2VideoNode):
}, },
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
DESCRIPTION = "Transform still images into cinematic videos with professional camera movements that simulate real-world cinematography. Control virtual camera actions including zoom, rotation, pan, tilt, and first-person view, while maintaining focus on your original image." DESCRIPTION = "Transform still images into cinematic videos with professional camera movements that simulate real-world cinematography. Control virtual camera actions including zoom, rotation, pan, tilt, and first-person view, while maintaining focus on your original image."
@ -736,7 +748,7 @@ class KlingCameraControlI2VNode(KlingImage2VideoNode):
cfg_scale: float, cfg_scale: float,
aspect_ratio: str, aspect_ratio: str,
camera_control: KlingCameraControl, camera_control: KlingCameraControl,
auth_token: Optional[str] = None, **kwargs,
): ):
return super().api_call( return super().api_call(
model_name=KlingVideoGenModelName.kling_v1_5, model_name=KlingVideoGenModelName.kling_v1_5,
@ -748,7 +760,7 @@ class KlingCameraControlI2VNode(KlingImage2VideoNode):
prompt=prompt, prompt=prompt,
negative_prompt=negative_prompt, negative_prompt=negative_prompt,
camera_control=camera_control, camera_control=camera_control,
auth_token=auth_token, **kwargs,
) )
@ -816,7 +828,10 @@ class KlingStartEndFrameNode(KlingImage2VideoNode):
}, },
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
DESCRIPTION = "Generate a video sequence that transitions between your provided start and end images. The node creates all frames in between, producing a smooth transformation from the first frame to the last." DESCRIPTION = "Generate a video sequence that transitions between your provided start and end images. The node creates all frames in between, producing a smooth transformation from the first frame to the last."
@ -830,7 +845,7 @@ class KlingStartEndFrameNode(KlingImage2VideoNode):
cfg_scale: float, cfg_scale: float,
aspect_ratio: str, aspect_ratio: str,
mode: str, mode: str,
auth_token: Optional[str] = None, **kwargs,
): ):
mode, duration, model_name = KlingStartEndFrameNode.get_mode_string_mapping()[ mode, duration, model_name = KlingStartEndFrameNode.get_mode_string_mapping()[
mode mode
@ -845,7 +860,7 @@ class KlingStartEndFrameNode(KlingImage2VideoNode):
aspect_ratio=aspect_ratio, aspect_ratio=aspect_ratio,
duration=duration, duration=duration,
end_frame=end_frame, end_frame=end_frame,
auth_token=auth_token, **kwargs,
) )
@ -875,16 +890,19 @@ class KlingVideoExtendNode(KlingNodeBase):
IO.STRING, KlingVideoExtendRequest, "video_id", forceInput=True IO.STRING, KlingVideoExtendRequest, "video_id", forceInput=True
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
RETURN_TYPES = ("VIDEO", "STRING", "STRING") RETURN_TYPES = ("VIDEO", "STRING", "STRING")
RETURN_NAMES = ("VIDEO", "video_id", "duration") RETURN_NAMES = ("VIDEO", "video_id", "duration")
DESCRIPTION = "Kling Video Extend Node. Extend videos made by other Kling nodes. The video_id is created by using other Kling Nodes." DESCRIPTION = "Kling Video Extend Node. Extend videos made by other Kling nodes. The video_id is created by using other Kling Nodes."
def get_response(self, task_id: str, auth_token: str) -> KlingVideoExtendResponse: def get_response(self, task_id: str, auth_kwargs: dict[str,str]) -> KlingVideoExtendResponse:
return poll_until_finished( return poll_until_finished(
auth_token, auth_kwargs,
ApiEndpoint( ApiEndpoint(
path=f"{PATH_VIDEO_EXTEND}/{task_id}", path=f"{PATH_VIDEO_EXTEND}/{task_id}",
method=HttpMethod.GET, method=HttpMethod.GET,
@ -899,7 +917,7 @@ class KlingVideoExtendNode(KlingNodeBase):
negative_prompt: str, negative_prompt: str,
cfg_scale: float, cfg_scale: float,
video_id: str, video_id: str,
auth_token: Optional[str] = None, **kwargs,
) -> tuple[VideoFromFile, str, str]: ) -> tuple[VideoFromFile, str, str]:
validate_prompts(prompt, negative_prompt, MAX_PROMPT_LENGTH_T2V) validate_prompts(prompt, negative_prompt, MAX_PROMPT_LENGTH_T2V)
initial_operation = SynchronousOperation( initial_operation = SynchronousOperation(
@ -915,14 +933,14 @@ class KlingVideoExtendNode(KlingNodeBase):
cfg_scale=cfg_scale, cfg_scale=cfg_scale,
video_id=video_id, video_id=video_id,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
task_creation_response = initial_operation.execute() task_creation_response = initial_operation.execute()
validate_task_creation_response(task_creation_response) validate_task_creation_response(task_creation_response)
task_id = task_creation_response.data.task_id task_id = task_creation_response.data.task_id
final_response = self.get_response(task_id, auth_token) final_response = self.get_response(task_id, auth_kwargs=kwargs)
validate_video_result_response(final_response) validate_video_result_response(final_response)
video = get_video_from_response(final_response) video = get_video_from_response(final_response)
@ -935,9 +953,9 @@ class KlingVideoEffectsBase(KlingNodeBase):
RETURN_TYPES = ("VIDEO", "STRING", "STRING") RETURN_TYPES = ("VIDEO", "STRING", "STRING")
RETURN_NAMES = ("VIDEO", "video_id", "duration") RETURN_NAMES = ("VIDEO", "video_id", "duration")
def get_response(self, task_id: str, auth_token: str) -> KlingVideoEffectsResponse: def get_response(self, task_id: str, auth_kwargs: dict[str,str]) -> KlingVideoEffectsResponse:
return poll_until_finished( return poll_until_finished(
auth_token, auth_kwargs,
ApiEndpoint( ApiEndpoint(
path=f"{PATH_VIDEO_EFFECTS}/{task_id}", path=f"{PATH_VIDEO_EFFECTS}/{task_id}",
method=HttpMethod.GET, method=HttpMethod.GET,
@ -955,7 +973,7 @@ class KlingVideoEffectsBase(KlingNodeBase):
image_1: torch.Tensor, image_1: torch.Tensor,
image_2: Optional[torch.Tensor] = None, image_2: Optional[torch.Tensor] = None,
mode: Optional[KlingVideoGenMode] = None, mode: Optional[KlingVideoGenMode] = None,
auth_token: Optional[str] = None, **kwargs,
): ):
if dual_character: if dual_character:
request_input_field = KlingDualCharacterEffectInput( request_input_field = KlingDualCharacterEffectInput(
@ -985,14 +1003,14 @@ class KlingVideoEffectsBase(KlingNodeBase):
effect_scene=effect_scene, effect_scene=effect_scene,
input=request_input_field, input=request_input_field,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
task_creation_response = initial_operation.execute() task_creation_response = initial_operation.execute()
validate_task_creation_response(task_creation_response) validate_task_creation_response(task_creation_response)
task_id = task_creation_response.data.task_id task_id = task_creation_response.data.task_id
final_response = self.get_response(task_id, auth_token) final_response = self.get_response(task_id, auth_kwargs=kwargs)
validate_video_result_response(final_response) validate_video_result_response(final_response)
video = get_video_from_response(final_response) video = get_video_from_response(final_response)
@ -1033,7 +1051,10 @@ class KlingDualCharacterVideoEffectNode(KlingVideoEffectsBase):
enum_type=KlingVideoGenDuration, enum_type=KlingVideoGenDuration,
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
DESCRIPTION = "Achieve different special effects when generating a video based on the effect_scene. First image will be positioned on left side, second on right side of the composite." DESCRIPTION = "Achieve different special effects when generating a video based on the effect_scene. First image will be positioned on left side, second on right side of the composite."
@ -1048,7 +1069,7 @@ class KlingDualCharacterVideoEffectNode(KlingVideoEffectsBase):
model_name: KlingCharacterEffectModelName, model_name: KlingCharacterEffectModelName,
mode: KlingVideoGenMode, mode: KlingVideoGenMode,
duration: KlingVideoGenDuration, duration: KlingVideoGenDuration,
auth_token: Optional[str] = None, **kwargs,
): ):
video, _, duration = super().api_call( video, _, duration = super().api_call(
dual_character=True, dual_character=True,
@ -1058,7 +1079,7 @@ class KlingDualCharacterVideoEffectNode(KlingVideoEffectsBase):
duration=duration, duration=duration,
image_1=image_left, image_1=image_left,
image_2=image_right, image_2=image_right,
auth_token=auth_token, **kwargs,
) )
return video, duration return video, duration
@ -1094,7 +1115,10 @@ class KlingSingleImageVideoEffectNode(KlingVideoEffectsBase):
enum_type=KlingVideoGenDuration, enum_type=KlingVideoGenDuration,
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
DESCRIPTION = "Achieve different special effects when generating a video based on the effect_scene." DESCRIPTION = "Achieve different special effects when generating a video based on the effect_scene."
@ -1105,7 +1129,7 @@ class KlingSingleImageVideoEffectNode(KlingVideoEffectsBase):
effect_scene: KlingSingleImageEffectsScene, effect_scene: KlingSingleImageEffectsScene,
model_name: KlingSingleImageEffectModelName, model_name: KlingSingleImageEffectModelName,
duration: KlingVideoGenDuration, duration: KlingVideoGenDuration,
auth_token: Optional[str] = None, **kwargs,
): ):
return super().api_call( return super().api_call(
dual_character=False, dual_character=False,
@ -1113,7 +1137,7 @@ class KlingSingleImageVideoEffectNode(KlingVideoEffectsBase):
model_name=model_name, model_name=model_name,
duration=duration, duration=duration,
image_1=image, image_1=image,
auth_token=auth_token, **kwargs,
) )
@ -1131,10 +1155,10 @@ class KlingLipSyncBase(KlingNodeBase):
f"Text is too long. Maximum length is {MAX_PROMPT_LENGTH_LIP_SYNC} characters." f"Text is too long. Maximum length is {MAX_PROMPT_LENGTH_LIP_SYNC} characters."
) )
def get_response(self, task_id: str, auth_token: str) -> KlingLipSyncResponse: def get_response(self, task_id: str, auth_kwargs: dict[str,str]) -> KlingLipSyncResponse:
"""Polls the Kling API endpoint until the task reaches a terminal state.""" """Polls the Kling API endpoint until the task reaches a terminal state."""
return poll_until_finished( return poll_until_finished(
auth_token, auth_kwargs,
ApiEndpoint( ApiEndpoint(
path=f"{PATH_LIP_SYNC}/{task_id}", path=f"{PATH_LIP_SYNC}/{task_id}",
method=HttpMethod.GET, method=HttpMethod.GET,
@ -1152,18 +1176,18 @@ class KlingLipSyncBase(KlingNodeBase):
text: Optional[str] = None, text: Optional[str] = None,
voice_speed: Optional[float] = None, voice_speed: Optional[float] = None,
voice_id: Optional[str] = None, voice_id: Optional[str] = None,
auth_token: Optional[str] = None, **kwargs
) -> tuple[VideoFromFile, str, str]: ) -> tuple[VideoFromFile, str, str]:
if text: if text:
self.validate_text(text) self.validate_text(text)
# Upload video to Comfy API and get download URL # Upload video to Comfy API and get download URL
video_url = upload_video_to_comfyapi(video, auth_token) video_url = upload_video_to_comfyapi(video, auth_kwargs=kwargs)
logging.info("Uploaded video to Comfy API. URL: %s", video_url) logging.info("Uploaded video to Comfy API. URL: %s", video_url)
# Upload the audio file to Comfy API and get download URL # Upload the audio file to Comfy API and get download URL
if audio: if audio:
audio_url = upload_audio_to_comfyapi(audio, auth_token) audio_url = upload_audio_to_comfyapi(audio, auth_kwargs=kwargs)
logging.info("Uploaded audio to Comfy API. URL: %s", audio_url) logging.info("Uploaded audio to Comfy API. URL: %s", audio_url)
else: else:
audio_url = None audio_url = None
@ -1187,14 +1211,14 @@ class KlingLipSyncBase(KlingNodeBase):
voice_id=voice_id, voice_id=voice_id,
), ),
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
task_creation_response = initial_operation.execute() task_creation_response = initial_operation.execute()
validate_task_creation_response(task_creation_response) validate_task_creation_response(task_creation_response)
task_id = task_creation_response.data.task_id task_id = task_creation_response.data.task_id
final_response = self.get_response(task_id, auth_token) final_response = self.get_response(task_id, auth_kwargs=kwargs)
validate_video_result_response(final_response) validate_video_result_response(final_response)
video = get_video_from_response(final_response) video = get_video_from_response(final_response)
@ -1217,7 +1241,10 @@ class KlingLipSyncAudioToVideoNode(KlingLipSyncBase):
enum_type=KlingLipSyncVoiceLanguage, enum_type=KlingLipSyncVoiceLanguage,
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
DESCRIPTION = "Kling Lip Sync Audio to Video Node. Syncs mouth movements in a video file to the audio content of an audio file." DESCRIPTION = "Kling Lip Sync Audio to Video Node. Syncs mouth movements in a video file to the audio content of an audio file."
@ -1227,14 +1254,14 @@ class KlingLipSyncAudioToVideoNode(KlingLipSyncBase):
video: VideoInput, video: VideoInput,
audio: AudioInput, audio: AudioInput,
voice_language: str, voice_language: str,
auth_token: Optional[str] = None, **kwargs,
): ):
return super().api_call( return super().api_call(
video=video, video=video,
audio=audio, audio=audio,
voice_language=voice_language, voice_language=voice_language,
mode="audio2video", mode="audio2video",
auth_token=auth_token, **kwargs,
) )
@ -1323,7 +1350,10 @@ class KlingLipSyncTextToVideoNode(KlingLipSyncBase):
IO.FLOAT, KlingLipSyncInputObject, "voice_speed", slider=True IO.FLOAT, KlingLipSyncInputObject, "voice_speed", slider=True
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
DESCRIPTION = "Kling Lip Sync Text to Video Node. Syncs mouth movements in a video file to a text prompt." DESCRIPTION = "Kling Lip Sync Text to Video Node. Syncs mouth movements in a video file to a text prompt."
@ -1334,7 +1364,7 @@ class KlingLipSyncTextToVideoNode(KlingLipSyncBase):
text: str, text: str,
voice: str, voice: str,
voice_speed: float, voice_speed: float,
auth_token: Optional[str] = None, **kwargs,
): ):
voice_id, voice_language = KlingLipSyncTextToVideoNode.get_voice_config()[voice] voice_id, voice_language = KlingLipSyncTextToVideoNode.get_voice_config()[voice]
return super().api_call( return super().api_call(
@ -1344,7 +1374,7 @@ class KlingLipSyncTextToVideoNode(KlingLipSyncBase):
voice_id=voice_id, voice_id=voice_id,
voice_speed=voice_speed, voice_speed=voice_speed,
mode="text2video", mode="text2video",
auth_token=auth_token, **kwargs,
) )
@ -1381,16 +1411,19 @@ class KlingVirtualTryOnNode(KlingImageGenerationBase):
enum_type=KlingVirtualTryOnModelName, enum_type=KlingVirtualTryOnModelName,
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
DESCRIPTION = "Kling Virtual Try On Node. Input a human image and a cloth image to try on the cloth on the human." DESCRIPTION = "Kling Virtual Try On Node. Input a human image and a cloth image to try on the cloth on the human."
def get_response( def get_response(
self, task_id: str, auth_token: Optional[str] = None self, task_id: str, auth_kwargs: dict[str,str] = None
) -> KlingVirtualTryOnResponse: ) -> KlingVirtualTryOnResponse:
return poll_until_finished( return poll_until_finished(
auth_token, auth_kwargs,
ApiEndpoint( ApiEndpoint(
path=f"{PATH_VIRTUAL_TRY_ON}/{task_id}", path=f"{PATH_VIRTUAL_TRY_ON}/{task_id}",
method=HttpMethod.GET, method=HttpMethod.GET,
@ -1404,7 +1437,7 @@ class KlingVirtualTryOnNode(KlingImageGenerationBase):
human_image: torch.Tensor, human_image: torch.Tensor,
cloth_image: torch.Tensor, cloth_image: torch.Tensor,
model_name: KlingVirtualTryOnModelName, model_name: KlingVirtualTryOnModelName,
auth_token: Optional[str] = None, **kwargs,
): ):
initial_operation = SynchronousOperation( initial_operation = SynchronousOperation(
endpoint=ApiEndpoint( endpoint=ApiEndpoint(
@ -1418,14 +1451,14 @@ class KlingVirtualTryOnNode(KlingImageGenerationBase):
cloth_image=tensor_to_base64_string(cloth_image), cloth_image=tensor_to_base64_string(cloth_image),
model_name=model_name, model_name=model_name,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
task_creation_response = initial_operation.execute() task_creation_response = initial_operation.execute()
validate_task_creation_response(task_creation_response) validate_task_creation_response(task_creation_response)
task_id = task_creation_response.data.task_id task_id = task_creation_response.data.task_id
final_response = self.get_response(task_id, auth_token) final_response = self.get_response(task_id, auth_kwargs=kwargs)
validate_image_result_response(final_response) validate_image_result_response(final_response)
images = get_images_from_response(final_response) images = get_images_from_response(final_response)
@ -1493,16 +1526,19 @@ class KlingImageGenerationNode(KlingImageGenerationBase):
"optional": { "optional": {
"image": (IO.IMAGE, {}), "image": (IO.IMAGE, {}),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
DESCRIPTION = "Kling Image Generation Node. Generate an image from a text prompt with an optional reference image." DESCRIPTION = "Kling Image Generation Node. Generate an image from a text prompt with an optional reference image."
def get_response( def get_response(
self, task_id: str, auth_token: Optional[str] = None self, task_id: str, auth_kwargs: Optional[dict[str,str]] = None
) -> KlingImageGenerationsResponse: ) -> KlingImageGenerationsResponse:
return poll_until_finished( return poll_until_finished(
auth_token, auth_kwargs,
ApiEndpoint( ApiEndpoint(
path=f"{PATH_IMAGE_GENERATIONS}/{task_id}", path=f"{PATH_IMAGE_GENERATIONS}/{task_id}",
method=HttpMethod.GET, method=HttpMethod.GET,
@ -1522,7 +1558,7 @@ class KlingImageGenerationNode(KlingImageGenerationBase):
n: int, n: int,
aspect_ratio: KlingImageGenAspectRatio, aspect_ratio: KlingImageGenAspectRatio,
image: Optional[torch.Tensor] = None, image: Optional[torch.Tensor] = None,
auth_token: Optional[str] = None, **kwargs,
): ):
self.validate_prompt(prompt, negative_prompt) self.validate_prompt(prompt, negative_prompt)
@ -1547,14 +1583,14 @@ class KlingImageGenerationNode(KlingImageGenerationBase):
n=n, n=n,
aspect_ratio=aspect_ratio, aspect_ratio=aspect_ratio,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
task_creation_response = initial_operation.execute() task_creation_response = initial_operation.execute()
validate_task_creation_response(task_creation_response) validate_task_creation_response(task_creation_response)
task_id = task_creation_response.data.task_id task_id = task_creation_response.data.task_id
final_response = self.get_response(task_id, auth_token) final_response = self.get_response(task_id, auth_kwargs=kwargs)
validate_image_result_response(final_response) validate_image_result_response(final_response)
images = get_images_from_response(final_response) images = get_images_from_response(final_response)

50
comfy_api_nodes/nodes_luma.py
View File

@ -1,4 +1,6 @@
from __future__ import annotations
from inspect import cleandoc from inspect import cleandoc
from typing import Optional
from comfy.comfy_types.node_typing import IO, ComfyNodeABC from comfy.comfy_types.node_typing import IO, ComfyNodeABC
from comfy_api.input_impl.video_types import VideoFromFile from comfy_api.input_impl.video_types import VideoFromFile
from comfy_api_nodes.apis.luma_api import ( from comfy_api_nodes.apis.luma_api import (
@ -201,6 +203,7 @@ class LumaImageGenerationNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -214,7 +217,6 @@ class LumaImageGenerationNode(ComfyNodeABC):
image_luma_ref: LumaReferenceChain = None, image_luma_ref: LumaReferenceChain = None,
style_image: torch.Tensor = None, style_image: torch.Tensor = None,
character_image: torch.Tensor = None, character_image: torch.Tensor = None,
auth_token=None,
**kwargs, **kwargs,
): ):
validate_string(prompt, strip_whitespace=True, min_length=3) validate_string(prompt, strip_whitespace=True, min_length=3)
@ -222,19 +224,19 @@ class LumaImageGenerationNode(ComfyNodeABC):
api_image_ref = None api_image_ref = None
if image_luma_ref is not None: if image_luma_ref is not None:
api_image_ref = self._convert_luma_refs( api_image_ref = self._convert_luma_refs(
image_luma_ref, max_refs=4, auth_token=auth_token image_luma_ref, max_refs=4, auth_kwargs=kwargs,
) )
# handle style_luma_ref # handle style_luma_ref
api_style_ref = None api_style_ref = None
if style_image is not None: if style_image is not None:
api_style_ref = self._convert_style_image( api_style_ref = self._convert_style_image(
style_image, weight=style_image_weight, auth_token=auth_token style_image, weight=style_image_weight, auth_kwargs=kwargs,
) )
# handle character_ref images # handle character_ref images
character_ref = None character_ref = None
if character_image is not None: if character_image is not None:
download_urls = upload_images_to_comfyapi( download_urls = upload_images_to_comfyapi(
character_image, max_images=4, auth_token=auth_token character_image, max_images=4, auth_kwargs=kwargs,
) )
character_ref = LumaCharacterRef( character_ref = LumaCharacterRef(
identity0=LumaImageIdentity(images=download_urls) identity0=LumaImageIdentity(images=download_urls)
@ -255,7 +257,7 @@ class LumaImageGenerationNode(ComfyNodeABC):
style_ref=api_style_ref, style_ref=api_style_ref,
character_ref=character_ref, character_ref=character_ref,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api: LumaGeneration = operation.execute() response_api: LumaGeneration = operation.execute()
@ -269,7 +271,7 @@ class LumaImageGenerationNode(ComfyNodeABC):
completed_statuses=[LumaState.completed], completed_statuses=[LumaState.completed],
failed_statuses=[LumaState.failed], failed_statuses=[LumaState.failed],
status_extractor=lambda x: x.state, status_extractor=lambda x: x.state,
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_poll = operation.execute() response_poll = operation.execute()
@ -278,13 +280,13 @@ class LumaImageGenerationNode(ComfyNodeABC):
return (img,) return (img,)
def _convert_luma_refs( def _convert_luma_refs(
self, luma_ref: LumaReferenceChain, max_refs: int, auth_token=None self, luma_ref: LumaReferenceChain, max_refs: int, auth_kwargs: Optional[dict[str,str]] = None
): ):
luma_urls = [] luma_urls = []
ref_count = 0 ref_count = 0
for ref in luma_ref.refs: for ref in luma_ref.refs:
download_urls = upload_images_to_comfyapi( download_urls = upload_images_to_comfyapi(
ref.image, max_images=1, auth_token=auth_token ref.image, max_images=1, auth_kwargs=auth_kwargs
) )
luma_urls.append(download_urls[0]) luma_urls.append(download_urls[0])
ref_count += 1 ref_count += 1
@ -293,12 +295,12 @@ class LumaImageGenerationNode(ComfyNodeABC):
return luma_ref.create_api_model(download_urls=luma_urls, max_refs=max_refs) return luma_ref.create_api_model(download_urls=luma_urls, max_refs=max_refs)
def _convert_style_image( def _convert_style_image(
self, style_image: torch.Tensor, weight: float, auth_token=None self, style_image: torch.Tensor, weight: float, auth_kwargs: Optional[dict[str,str]] = None
): ):
chain = LumaReferenceChain( chain = LumaReferenceChain(
first_ref=LumaReference(image=style_image, weight=weight) first_ref=LumaReference(image=style_image, weight=weight)
) )
return self._convert_luma_refs(chain, max_refs=1, auth_token=auth_token) return self._convert_luma_refs(chain, max_refs=1, auth_kwargs=auth_kwargs)
class LumaImageModifyNode(ComfyNodeABC): class LumaImageModifyNode(ComfyNodeABC):
@ -350,6 +352,7 @@ class LumaImageModifyNode(ComfyNodeABC):
"optional": {}, "optional": {},
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -360,12 +363,11 @@ class LumaImageModifyNode(ComfyNodeABC):
image: torch.Tensor, image: torch.Tensor,
image_weight: float, image_weight: float,
seed, seed,
auth_token=None,
**kwargs, **kwargs,
): ):
# first, upload image # first, upload image
download_urls = upload_images_to_comfyapi( download_urls = upload_images_to_comfyapi(
image, max_images=1, auth_token=auth_token image, max_images=1, auth_kwargs=kwargs,
) )
image_url = download_urls[0] image_url = download_urls[0]
# next, make Luma call with download url provided # next, make Luma call with download url provided
@ -383,7 +385,7 @@ class LumaImageModifyNode(ComfyNodeABC):
url=image_url, weight=round(max(min(1.0-image_weight, 0.98), 0.0), 2) url=image_url, weight=round(max(min(1.0-image_weight, 0.98), 0.0), 2)
), ),
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api: LumaGeneration = operation.execute() response_api: LumaGeneration = operation.execute()
@ -397,7 +399,7 @@ class LumaImageModifyNode(ComfyNodeABC):
completed_statuses=[LumaState.completed], completed_statuses=[LumaState.completed],
failed_statuses=[LumaState.failed], failed_statuses=[LumaState.failed],
status_extractor=lambda x: x.state, status_extractor=lambda x: x.state,
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_poll = operation.execute() response_poll = operation.execute()
@ -470,6 +472,7 @@ class LumaTextToVideoGenerationNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -483,7 +486,6 @@ class LumaTextToVideoGenerationNode(ComfyNodeABC):
loop: bool, loop: bool,
seed, seed,
luma_concepts: LumaConceptChain = None, luma_concepts: LumaConceptChain = None,
auth_token=None,
**kwargs, **kwargs,
): ):
validate_string(prompt, strip_whitespace=False, min_length=3) validate_string(prompt, strip_whitespace=False, min_length=3)
@ -506,7 +508,7 @@ class LumaTextToVideoGenerationNode(ComfyNodeABC):
loop=loop, loop=loop,
concepts=luma_concepts.create_api_model() if luma_concepts else None, concepts=luma_concepts.create_api_model() if luma_concepts else None,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api: LumaGeneration = operation.execute() response_api: LumaGeneration = operation.execute()
@ -520,7 +522,7 @@ class LumaTextToVideoGenerationNode(ComfyNodeABC):
completed_statuses=[LumaState.completed], completed_statuses=[LumaState.completed],
failed_statuses=[LumaState.failed], failed_statuses=[LumaState.failed],
status_extractor=lambda x: x.state, status_extractor=lambda x: x.state,
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_poll = operation.execute() response_poll = operation.execute()
@ -594,6 +596,7 @@ class LumaImageToVideoGenerationNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -608,14 +611,13 @@ class LumaImageToVideoGenerationNode(ComfyNodeABC):
first_image: torch.Tensor = None, first_image: torch.Tensor = None,
last_image: torch.Tensor = None, last_image: torch.Tensor = None,
luma_concepts: LumaConceptChain = None, luma_concepts: LumaConceptChain = None,
auth_token=None,
**kwargs, **kwargs,
): ):
if first_image is None and last_image is None: if first_image is None and last_image is None:
raise Exception( raise Exception(
"At least one of first_image and last_image requires an input." "At least one of first_image and last_image requires an input."
) )
keyframes = self._convert_to_keyframes(first_image, last_image, auth_token) keyframes = self._convert_to_keyframes(first_image, last_image, auth_kwargs=kwargs)
duration = duration if model != LumaVideoModel.ray_1_6 else None duration = duration if model != LumaVideoModel.ray_1_6 else None
resolution = resolution if model != LumaVideoModel.ray_1_6 else None resolution = resolution if model != LumaVideoModel.ray_1_6 else None
@ -636,7 +638,7 @@ class LumaImageToVideoGenerationNode(ComfyNodeABC):
keyframes=keyframes, keyframes=keyframes,
concepts=luma_concepts.create_api_model() if luma_concepts else None, concepts=luma_concepts.create_api_model() if luma_concepts else None,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api: LumaGeneration = operation.execute() response_api: LumaGeneration = operation.execute()
@ -650,7 +652,7 @@ class LumaImageToVideoGenerationNode(ComfyNodeABC):
completed_statuses=[LumaState.completed], completed_statuses=[LumaState.completed],
failed_statuses=[LumaState.failed], failed_statuses=[LumaState.failed],
status_extractor=lambda x: x.state, status_extractor=lambda x: x.state,
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_poll = operation.execute() response_poll = operation.execute()
@ -661,7 +663,7 @@ class LumaImageToVideoGenerationNode(ComfyNodeABC):
self, self,
first_image: torch.Tensor = None, first_image: torch.Tensor = None,
last_image: torch.Tensor = None, last_image: torch.Tensor = None,
auth_token=None, auth_kwargs: Optional[dict[str,str]] = None,
): ):
if first_image is None and last_image is None: if first_image is None and last_image is None:
return None return None
@ -669,12 +671,12 @@ class LumaImageToVideoGenerationNode(ComfyNodeABC):
frame1 = None frame1 = None
if first_image is not None: if first_image is not None:
download_urls = upload_images_to_comfyapi( download_urls = upload_images_to_comfyapi(
first_image, max_images=1, auth_token=auth_token first_image, max_images=1, auth_kwargs=auth_kwargs,
) )
frame0 = LumaImageReference(type="image", url=download_urls[0]) frame0 = LumaImageReference(type="image", url=download_urls[0])
if last_image is not None: if last_image is not None:
download_urls = upload_images_to_comfyapi( download_urls = upload_images_to_comfyapi(
last_image, max_images=1, auth_token=auth_token last_image, max_images=1, auth_kwargs=auth_kwargs,
) )
frame1 = LumaImageReference(type="image", url=download_urls[0]) frame1 = LumaImageReference(type="image", url=download_urls[0])
return LumaKeyframes(frame0=frame0, frame1=frame1) return LumaKeyframes(frame0=frame0, frame1=frame1)

15
comfy_api_nodes/nodes_minimax.py
View File

@ -67,6 +67,7 @@ class MinimaxTextToVideoNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -84,7 +85,7 @@ class MinimaxTextToVideoNode:
model="T2V-01", model="T2V-01",
image: torch.Tensor=None, # used for ImageToVideo image: torch.Tensor=None, # used for ImageToVideo
subject: torch.Tensor=None, # used for SubjectToVideo subject: torch.Tensor=None, # used for SubjectToVideo
auth_token=None, **kwargs,
): ):
''' '''
Function used between MiniMax nodes - supports T2V, I2V, and S2V, based on provided arguments. Function used between MiniMax nodes - supports T2V, I2V, and S2V, based on provided arguments.
@ -94,12 +95,12 @@ class MinimaxTextToVideoNode:
# upload image, if passed in # upload image, if passed in
image_url = None image_url = None
if image is not None: if image is not None:
image_url = upload_images_to_comfyapi(image, max_images=1, auth_token=auth_token)[0] image_url = upload_images_to_comfyapi(image, max_images=1, auth_kwargs=kwargs)[0]
# TODO: figure out how to deal with subject properly, API returns invalid params when using S2V-01 model # TODO: figure out how to deal with subject properly, API returns invalid params when using S2V-01 model
subject_reference = None subject_reference = None
if subject is not None: if subject is not None:
subject_url = upload_images_to_comfyapi(subject, max_images=1, auth_token=auth_token)[0] subject_url = upload_images_to_comfyapi(subject, max_images=1, auth_kwargs=kwargs)[0]
subject_reference = [SubjectReferenceItem(image=subject_url)] subject_reference = [SubjectReferenceItem(image=subject_url)]
@ -118,7 +119,7 @@ class MinimaxTextToVideoNode:
subject_reference=subject_reference, subject_reference=subject_reference,
prompt_optimizer=None, prompt_optimizer=None,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response = video_generate_operation.execute() response = video_generate_operation.execute()
@ -137,7 +138,7 @@ class MinimaxTextToVideoNode:
completed_statuses=["Success"], completed_statuses=["Success"],
failed_statuses=["Fail"], failed_statuses=["Fail"],
status_extractor=lambda x: x.status.value, status_extractor=lambda x: x.status.value,
auth_token=auth_token, auth_kwargs=kwargs,
) )
task_result = video_generate_operation.execute() task_result = video_generate_operation.execute()
@ -153,7 +154,7 @@ class MinimaxTextToVideoNode:
query_params={"file_id": int(file_id)}, query_params={"file_id": int(file_id)},
), ),
request=EmptyRequest(), request=EmptyRequest(),
auth_token=auth_token, auth_kwargs=kwargs,
) )
file_result = file_retrieve_operation.execute() file_result = file_retrieve_operation.execute()
@ -221,6 +222,7 @@ class MinimaxImageToVideoNode(MinimaxTextToVideoNode):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -279,6 +281,7 @@ class MinimaxSubjectToVideoNode(MinimaxTextToVideoNode):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }

27
comfy_api_nodes/nodes_openai.py
View File

@ -93,7 +93,10 @@ class OpenAIDalle2(ComfyNodeABC):
}, },
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
RETURN_TYPES = (IO.IMAGE,) RETURN_TYPES = (IO.IMAGE,)
@ -110,7 +113,7 @@ class OpenAIDalle2(ComfyNodeABC):
mask=None, mask=None,
n=1, n=1,
size="1024x1024", size="1024x1024",
auth_token=None, **kwargs
): ):
validate_string(prompt, strip_whitespace=False) validate_string(prompt, strip_whitespace=False)
model = "dall-e-2" model = "dall-e-2"
@ -168,7 +171,7 @@ class OpenAIDalle2(ComfyNodeABC):
else None else None
), ),
content_type=content_type, content_type=content_type,
auth_token=auth_token, auth_kwargs=kwargs,
) )
response = operation.execute() response = operation.execute()
@ -236,7 +239,10 @@ class OpenAIDalle3(ComfyNodeABC):
}, },
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
RETURN_TYPES = (IO.IMAGE,) RETURN_TYPES = (IO.IMAGE,)
@ -252,7 +258,7 @@ class OpenAIDalle3(ComfyNodeABC):
style="natural", style="natural",
quality="standard", quality="standard",
size="1024x1024", size="1024x1024",
auth_token=None, **kwargs
): ):
validate_string(prompt, strip_whitespace=False) validate_string(prompt, strip_whitespace=False)
model = "dall-e-3" model = "dall-e-3"
@ -273,7 +279,7 @@ class OpenAIDalle3(ComfyNodeABC):
style=style, style=style,
seed=seed, seed=seed,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response = operation.execute() response = operation.execute()
@ -366,7 +372,10 @@ class OpenAIGPTImage1(ComfyNodeABC):
}, },
), ),
}, },
"hidden": {"auth_token": "AUTH_TOKEN_COMFY_ORG"}, "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
},
} }
RETURN_TYPES = (IO.IMAGE,) RETURN_TYPES = (IO.IMAGE,)
@ -385,7 +394,7 @@ class OpenAIGPTImage1(ComfyNodeABC):
mask=None, mask=None,
n=1, n=1,
size="1024x1024", size="1024x1024",
auth_token=None, **kwargs
): ):
validate_string(prompt, strip_whitespace=False) validate_string(prompt, strip_whitespace=False)
model = "gpt-image-1" model = "gpt-image-1"
@ -462,7 +471,7 @@ class OpenAIGPTImage1(ComfyNodeABC):
), ),
files=files if files else None, files=files if files else None,
content_type=content_type, content_type=content_type,
auth_token=auth_token, auth_kwargs=kwargs,
) )
response = operation.execute() response = operation.execute()

60
comfy_api_nodes/nodes_pika.py
View File

@ -3,6 +3,7 @@ Pika x ComfyUI API Nodes
Pika API docs: https://pika-827374fb.mintlify.app/api-reference Pika API docs: https://pika-827374fb.mintlify.app/api-reference
""" """
from __future__ import annotations
import io import io
from typing import Optional, TypeVar from typing import Optional, TypeVar
@ -120,7 +121,7 @@ class PikaNodeBase(ComfyNodeABC):
RETURN_TYPES = ("VIDEO",) RETURN_TYPES = ("VIDEO",)
def poll_for_task_status( def poll_for_task_status(
self, task_id: str, auth_token: str self, task_id: str, auth_kwargs: Optional[dict[str,str]] = None
) -> PikaGenerateResponse: ) -> PikaGenerateResponse:
polling_operation = PollingOperation( polling_operation = PollingOperation(
poll_endpoint=ApiEndpoint( poll_endpoint=ApiEndpoint(
@ -139,20 +140,20 @@ class PikaNodeBase(ComfyNodeABC):
progress_extractor=lambda response: ( progress_extractor=lambda response: (
response.progress if hasattr(response, "progress") else None response.progress if hasattr(response, "progress") else None
), ),
auth_token=auth_token, auth_kwargs=auth_kwargs,
) )
return polling_operation.execute() return polling_operation.execute()
def execute_task( def execute_task(
self, self,
initial_operation: SynchronousOperation[R, PikaGenerateResponse], initial_operation: SynchronousOperation[R, PikaGenerateResponse],
auth_token: Optional[str] = None, auth_kwargs: Optional[dict[str,str]] = None,
) -> tuple[VideoFromFile]: ) -> tuple[VideoFromFile]:
"""Executes the initial operation then polls for the task status until it is completed. """Executes the initial operation then polls for the task status until it is completed.
Args: Args:
initial_operation: The initial operation to execute. initial_operation: The initial operation to execute.
auth_token: The authentication token to use for the API call. auth_kwargs: The authentication token(s) to use for the API call.
Returns: Returns:
A tuple containing the video file as a VIDEO output. A tuple containing the video file as a VIDEO output.
@ -164,7 +165,7 @@ class PikaNodeBase(ComfyNodeABC):
raise PikaApiError(error_msg) raise PikaApiError(error_msg)
task_id = initial_response.video_id task_id = initial_response.video_id
final_response = self.poll_for_task_status(task_id, auth_token) final_response = self.poll_for_task_status(task_id, auth_kwargs)
if not is_valid_video_response(final_response): if not is_valid_video_response(final_response):
error_msg = ( error_msg = (
f"Pika task {task_id} succeeded but no video data found in response." f"Pika task {task_id} succeeded but no video data found in response."
@ -193,6 +194,7 @@ class PikaImageToVideoV2_2(PikaNodeBase):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -206,7 +208,7 @@ class PikaImageToVideoV2_2(PikaNodeBase):
seed: int, seed: int,
resolution: str, resolution: str,
duration: int, duration: int,
auth_token: Optional[str] = None, **kwargs
) -> tuple[VideoFromFile]: ) -> tuple[VideoFromFile]:
# Convert image to BytesIO # Convert image to BytesIO
image_bytes_io = tensor_to_bytesio(image) image_bytes_io = tensor_to_bytesio(image)
@ -233,10 +235,10 @@ class PikaImageToVideoV2_2(PikaNodeBase):
request=pika_request_data, request=pika_request_data,
files=pika_files, files=pika_files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
return self.execute_task(initial_operation, auth_token) return self.execute_task(initial_operation, auth_kwargs=kwargs)
class PikaTextToVideoNodeV2_2(PikaNodeBase): class PikaTextToVideoNodeV2_2(PikaNodeBase):
@ -259,6 +261,7 @@ class PikaTextToVideoNodeV2_2(PikaNodeBase):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -272,7 +275,7 @@ class PikaTextToVideoNodeV2_2(PikaNodeBase):
resolution: str, resolution: str,
duration: int, duration: int,
aspect_ratio: float, aspect_ratio: float,
auth_token: Optional[str] = None, **kwargs,
) -> tuple[VideoFromFile]: ) -> tuple[VideoFromFile]:
initial_operation = SynchronousOperation( initial_operation = SynchronousOperation(
endpoint=ApiEndpoint( endpoint=ApiEndpoint(
@ -289,11 +292,11 @@ class PikaTextToVideoNodeV2_2(PikaNodeBase):
duration=duration, duration=duration,
aspectRatio=aspect_ratio, aspectRatio=aspect_ratio,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
content_type="application/x-www-form-urlencoded", content_type="application/x-www-form-urlencoded",
) )
return self.execute_task(initial_operation, auth_token) return self.execute_task(initial_operation, auth_kwargs=kwargs)
class PikaScenesV2_2(PikaNodeBase): class PikaScenesV2_2(PikaNodeBase):
@ -336,6 +339,7 @@ class PikaScenesV2_2(PikaNodeBase):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -355,7 +359,7 @@ class PikaScenesV2_2(PikaNodeBase):
image_ingredient_3: Optional[torch.Tensor] = None, image_ingredient_3: Optional[torch.Tensor] = None,
image_ingredient_4: Optional[torch.Tensor] = None, image_ingredient_4: Optional[torch.Tensor] = None,
image_ingredient_5: Optional[torch.Tensor] = None, image_ingredient_5: Optional[torch.Tensor] = None,
auth_token: Optional[str] = None, **kwargs,
) -> tuple[VideoFromFile]: ) -> tuple[VideoFromFile]:
# Convert all passed images to BytesIO # Convert all passed images to BytesIO
all_image_bytes_io = [] all_image_bytes_io = []
@ -396,10 +400,10 @@ class PikaScenesV2_2(PikaNodeBase):
request=pika_request_data, request=pika_request_data,
files=pika_files, files=pika_files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
return self.execute_task(initial_operation, auth_token) return self.execute_task(initial_operation, auth_kwargs=kwargs)
class PikAdditionsNode(PikaNodeBase): class PikAdditionsNode(PikaNodeBase):
@ -434,6 +438,7 @@ class PikAdditionsNode(PikaNodeBase):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -446,7 +451,7 @@ class PikAdditionsNode(PikaNodeBase):
prompt_text: str, prompt_text: str,
negative_prompt: str, negative_prompt: str,
seed: int, seed: int,
auth_token: Optional[str] = None, **kwargs,
) -> tuple[VideoFromFile]: ) -> tuple[VideoFromFile]:
# Convert video to BytesIO # Convert video to BytesIO
video_bytes_io = io.BytesIO() video_bytes_io = io.BytesIO()
@ -479,10 +484,10 @@ class PikAdditionsNode(PikaNodeBase):
request=pika_request_data, request=pika_request_data,
files=pika_files, files=pika_files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
return self.execute_task(initial_operation, auth_token) return self.execute_task(initial_operation, auth_kwargs=kwargs)
class PikaSwapsNode(PikaNodeBase): class PikaSwapsNode(PikaNodeBase):
@ -526,6 +531,7 @@ class PikaSwapsNode(PikaNodeBase):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -540,7 +546,7 @@ class PikaSwapsNode(PikaNodeBase):
prompt_text: str, prompt_text: str,
negative_prompt: str, negative_prompt: str,
seed: int, seed: int,
auth_token: Optional[str] = None, **kwargs,
) -> tuple[VideoFromFile]: ) -> tuple[VideoFromFile]:
# Convert video to BytesIO # Convert video to BytesIO
video_bytes_io = io.BytesIO() video_bytes_io = io.BytesIO()
@ -583,10 +589,10 @@ class PikaSwapsNode(PikaNodeBase):
request=pika_request_data, request=pika_request_data,
files=pika_files, files=pika_files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
return self.execute_task(initial_operation, auth_token) return self.execute_task(initial_operation, auth_kwargs=kwargs)
class PikaffectsNode(PikaNodeBase): class PikaffectsNode(PikaNodeBase):
@ -630,6 +636,7 @@ class PikaffectsNode(PikaNodeBase):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -642,7 +649,7 @@ class PikaffectsNode(PikaNodeBase):
prompt_text: str, prompt_text: str,
negative_prompt: str, negative_prompt: str,
seed: int, seed: int,
auth_token: Optional[str] = None, **kwargs,
) -> tuple[VideoFromFile]: ) -> tuple[VideoFromFile]:
initial_operation = SynchronousOperation( initial_operation = SynchronousOperation(
@ -660,10 +667,10 @@ class PikaffectsNode(PikaNodeBase):
), ),
files={"image": ("image.png", tensor_to_bytesio(image), "image/png")}, files={"image": ("image.png", tensor_to_bytesio(image), "image/png")},
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
return self.execute_task(initial_operation, auth_token) return self.execute_task(initial_operation, auth_kwargs=kwargs)
class PikaStartEndFrameNode2_2(PikaNodeBase): class PikaStartEndFrameNode2_2(PikaNodeBase):
@ -681,6 +688,7 @@ class PikaStartEndFrameNode2_2(PikaNodeBase):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -695,7 +703,7 @@ class PikaStartEndFrameNode2_2(PikaNodeBase):
seed: int, seed: int,
resolution: str, resolution: str,
duration: int, duration: int,
auth_token: Optional[str] = None, **kwargs,
) -> tuple[VideoFromFile]: ) -> tuple[VideoFromFile]:
pika_files = [ pika_files = [
@ -722,10 +730,10 @@ class PikaStartEndFrameNode2_2(PikaNodeBase):
), ),
files=pika_files, files=pika_files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
return self.execute_task(initial_operation, auth_token) return self.execute_task(initial_operation, auth_kwargs=kwargs)
NODE_CLASS_MAPPINGS = { NODE_CLASS_MAPPINGS = {

28
comfy_api_nodes/nodes_pixverse.py
View File

@ -34,7 +34,7 @@ import requests
from io import BytesIO from io import BytesIO
def upload_image_to_pixverse(image: torch.Tensor, auth_token=None): def upload_image_to_pixverse(image: torch.Tensor, auth_kwargs=None):
# first, upload image to Pixverse and get image id to use in actual generation call # first, upload image to Pixverse and get image id to use in actual generation call
files = { files = {
"image": tensor_to_bytesio(image) "image": tensor_to_bytesio(image)
@ -49,7 +49,7 @@ def upload_image_to_pixverse(image: torch.Tensor, auth_token=None):
request=EmptyRequest(), request=EmptyRequest(),
files=files, files=files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=auth_kwargs,
) )
response_upload: PixverseImageUploadResponse = operation.execute() response_upload: PixverseImageUploadResponse = operation.execute()
@ -148,6 +148,7 @@ class PixverseTextToVideoNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -161,7 +162,6 @@ class PixverseTextToVideoNode(ComfyNodeABC):
seed, seed,
negative_prompt: str=None, negative_prompt: str=None,
pixverse_template: int=None, pixverse_template: int=None,
auth_token=None,
**kwargs, **kwargs,
): ):
validate_string(prompt, strip_whitespace=False) validate_string(prompt, strip_whitespace=False)
@ -190,7 +190,7 @@ class PixverseTextToVideoNode(ComfyNodeABC):
template_id=pixverse_template, template_id=pixverse_template,
seed=seed, seed=seed,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api = operation.execute() response_api = operation.execute()
@ -207,7 +207,7 @@ class PixverseTextToVideoNode(ComfyNodeABC):
completed_statuses=[PixverseStatus.successful], completed_statuses=[PixverseStatus.successful],
failed_statuses=[PixverseStatus.contents_moderation, PixverseStatus.failed, PixverseStatus.deleted], failed_statuses=[PixverseStatus.contents_moderation, PixverseStatus.failed, PixverseStatus.deleted],
status_extractor=lambda x: x.Resp.status, status_extractor=lambda x: x.Resp.status,
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_poll = operation.execute() response_poll = operation.execute()
@ -278,6 +278,7 @@ class PixverseImageToVideoNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -291,11 +292,10 @@ class PixverseImageToVideoNode(ComfyNodeABC):
seed, seed,
negative_prompt: str=None, negative_prompt: str=None,
pixverse_template: int=None, pixverse_template: int=None,
auth_token=None,
**kwargs, **kwargs,
): ):
validate_string(prompt, strip_whitespace=False) validate_string(prompt, strip_whitespace=False)
img_id = upload_image_to_pixverse(image, auth_token=auth_token) img_id = upload_image_to_pixverse(image, auth_kwargs=kwargs)
# 1080p is limited to 5 seconds duration # 1080p is limited to 5 seconds duration
# only normal motion_mode supported for 1080p or for non-5 second duration # only normal motion_mode supported for 1080p or for non-5 second duration
@ -322,7 +322,7 @@ class PixverseImageToVideoNode(ComfyNodeABC):
template_id=pixverse_template, template_id=pixverse_template,
seed=seed, seed=seed,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api = operation.execute() response_api = operation.execute()
@ -339,7 +339,7 @@ class PixverseImageToVideoNode(ComfyNodeABC):
completed_statuses=[PixverseStatus.successful], completed_statuses=[PixverseStatus.successful],
failed_statuses=[PixverseStatus.contents_moderation, PixverseStatus.failed, PixverseStatus.deleted], failed_statuses=[PixverseStatus.contents_moderation, PixverseStatus.failed, PixverseStatus.deleted],
status_extractor=lambda x: x.Resp.status, status_extractor=lambda x: x.Resp.status,
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_poll = operation.execute() response_poll = operation.execute()
@ -407,6 +407,7 @@ class PixverseTransitionVideoNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -420,12 +421,11 @@ class PixverseTransitionVideoNode(ComfyNodeABC):
motion_mode: str, motion_mode: str,
seed, seed,
negative_prompt: str=None, negative_prompt: str=None,
auth_token=None,
**kwargs, **kwargs,
): ):
validate_string(prompt, strip_whitespace=False) validate_string(prompt, strip_whitespace=False)
first_frame_id = upload_image_to_pixverse(first_frame, auth_token=auth_token) first_frame_id = upload_image_to_pixverse(first_frame, auth_kwargs=kwargs)
last_frame_id = upload_image_to_pixverse(last_frame, auth_token=auth_token) last_frame_id = upload_image_to_pixverse(last_frame, auth_kwargs=kwargs)
# 1080p is limited to 5 seconds duration # 1080p is limited to 5 seconds duration
# only normal motion_mode supported for 1080p or for non-5 second duration # only normal motion_mode supported for 1080p or for non-5 second duration
@ -452,7 +452,7 @@ class PixverseTransitionVideoNode(ComfyNodeABC):
negative_prompt=negative_prompt if negative_prompt else None, negative_prompt=negative_prompt if negative_prompt else None,
seed=seed, seed=seed,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api = operation.execute() response_api = operation.execute()
@ -469,7 +469,7 @@ class PixverseTransitionVideoNode(ComfyNodeABC):
completed_statuses=[PixverseStatus.successful], completed_statuses=[PixverseStatus.successful],
failed_statuses=[PixverseStatus.contents_moderation, PixverseStatus.failed, PixverseStatus.deleted], failed_statuses=[PixverseStatus.contents_moderation, PixverseStatus.failed, PixverseStatus.deleted],
status_extractor=lambda x: x.Resp.status, status_extractor=lambda x: x.Resp.status,
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_poll = operation.execute() response_poll = operation.execute()

36
comfy_api_nodes/nodes_recraft.py
View File

@ -41,7 +41,7 @@ def handle_recraft_file_request(
total_pixels=4096*4096, total_pixels=4096*4096,
timeout=1024, timeout=1024,
request=None, request=None,
auth_token=None auth_kwargs: dict[str,str] = None,
) -> list[BytesIO]: ) -> list[BytesIO]:
""" """
Handle sending common Recraft file-only request to get back file bytes. Handle sending common Recraft file-only request to get back file bytes.
@ -65,7 +65,7 @@ def handle_recraft_file_request(
request=request, request=request,
files=files, files=files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=auth_kwargs,
multipart_parser=recraft_multipart_parser, multipart_parser=recraft_multipart_parser,
) )
response: RecraftImageGenerationResponse = operation.execute() response: RecraftImageGenerationResponse = operation.execute()
@ -387,6 +387,7 @@ class RecraftTextToImageNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -399,7 +400,6 @@ class RecraftTextToImageNode:
recraft_style: RecraftStyle = None, recraft_style: RecraftStyle = None,
negative_prompt: str = None, negative_prompt: str = None,
recraft_controls: RecraftControls = None, recraft_controls: RecraftControls = None,
auth_token=None,
**kwargs, **kwargs,
): ):
validate_string(prompt, strip_whitespace=False, max_length=1000) validate_string(prompt, strip_whitespace=False, max_length=1000)
@ -432,7 +432,7 @@ class RecraftTextToImageNode:
style_id=recraft_style.style_id, style_id=recraft_style.style_id,
controls=controls_api, controls=controls_api,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response: RecraftImageGenerationResponse = operation.execute() response: RecraftImageGenerationResponse = operation.execute()
images = [] images = []
@ -522,6 +522,7 @@ class RecraftImageToImageNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -532,7 +533,6 @@ class RecraftImageToImageNode:
n: int, n: int,
strength: float, strength: float,
seed, seed,
auth_token=None,
recraft_style: RecraftStyle = None, recraft_style: RecraftStyle = None,
negative_prompt: str = None, negative_prompt: str = None,
recraft_controls: RecraftControls = None, recraft_controls: RecraftControls = None,
@ -570,7 +570,7 @@ class RecraftImageToImageNode:
image=image[i], image=image[i],
path="/proxy/recraft/images/imageToImage", path="/proxy/recraft/images/imageToImage",
request=request, request=request,
auth_token=auth_token, auth_kwargs=kwargs,
) )
with handle_recraft_image_output(): with handle_recraft_image_output():
images.append(torch.cat([bytesio_to_image_tensor(x) for x in sub_bytes], dim=0)) images.append(torch.cat([bytesio_to_image_tensor(x) for x in sub_bytes], dim=0))
@ -638,6 +638,7 @@ class RecraftImageInpaintingNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -648,7 +649,6 @@ class RecraftImageInpaintingNode:
prompt: str, prompt: str,
n: int, n: int,
seed, seed,
auth_token=None,
recraft_style: RecraftStyle = None, recraft_style: RecraftStyle = None,
negative_prompt: str = None, negative_prompt: str = None,
**kwargs, **kwargs,
@ -683,7 +683,7 @@ class RecraftImageInpaintingNode:
mask=mask[i:i+1], mask=mask[i:i+1],
path="/proxy/recraft/images/inpaint", path="/proxy/recraft/images/inpaint",
request=request, request=request,
auth_token=auth_token, auth_kwargs=kwargs,
) )
with handle_recraft_image_output(): with handle_recraft_image_output():
images.append(torch.cat([bytesio_to_image_tensor(x) for x in sub_bytes], dim=0)) images.append(torch.cat([bytesio_to_image_tensor(x) for x in sub_bytes], dim=0))
@ -762,6 +762,7 @@ class RecraftTextToVectorNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -774,7 +775,6 @@ class RecraftTextToVectorNode:
seed, seed,
negative_prompt: str = None, negative_prompt: str = None,
recraft_controls: RecraftControls = None, recraft_controls: RecraftControls = None,
auth_token=None,
**kwargs, **kwargs,
): ):
validate_string(prompt, strip_whitespace=False, max_length=1000) validate_string(prompt, strip_whitespace=False, max_length=1000)
@ -805,7 +805,7 @@ class RecraftTextToVectorNode:
substyle=recraft_style.substyle, substyle=recraft_style.substyle,
controls=controls_api, controls=controls_api,
), ),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response: RecraftImageGenerationResponse = operation.execute() response: RecraftImageGenerationResponse = operation.execute()
svg_data = [] svg_data = []
@ -836,13 +836,13 @@ class RecraftVectorizeImageNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
def api_call( def api_call(
self, self,
image: torch.Tensor, image: torch.Tensor,
auth_token=None,
**kwargs, **kwargs,
): ):
svgs = [] svgs = []
@ -852,7 +852,7 @@ class RecraftVectorizeImageNode:
sub_bytes = handle_recraft_file_request( sub_bytes = handle_recraft_file_request(
image=image[i], image=image[i],
path="/proxy/recraft/images/vectorize", path="/proxy/recraft/images/vectorize",
auth_token=auth_token, auth_kwargs=kwargs,
) )
svgs.append(SVG(sub_bytes)) svgs.append(SVG(sub_bytes))
pbar.update(1) pbar.update(1)
@ -917,6 +917,7 @@ class RecraftReplaceBackgroundNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -926,7 +927,6 @@ class RecraftReplaceBackgroundNode:
prompt: str, prompt: str,
n: int, n: int,
seed, seed,
auth_token=None,
recraft_style: RecraftStyle = None, recraft_style: RecraftStyle = None,
negative_prompt: str = None, negative_prompt: str = None,
**kwargs, **kwargs,
@ -956,7 +956,7 @@ class RecraftReplaceBackgroundNode:
image=image[i], image=image[i],
path="/proxy/recraft/images/replaceBackground", path="/proxy/recraft/images/replaceBackground",
request=request, request=request,
auth_token=auth_token, auth_kwargs=kwargs,
) )
images.append(torch.cat([bytesio_to_image_tensor(x) for x in sub_bytes], dim=0)) images.append(torch.cat([bytesio_to_image_tensor(x) for x in sub_bytes], dim=0))
pbar.update(1) pbar.update(1)
@ -986,13 +986,13 @@ class RecraftRemoveBackgroundNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
def api_call( def api_call(
self, self,
image: torch.Tensor, image: torch.Tensor,
auth_token=None,
**kwargs, **kwargs,
): ):
images = [] images = []
@ -1002,7 +1002,7 @@ class RecraftRemoveBackgroundNode:
sub_bytes = handle_recraft_file_request( sub_bytes = handle_recraft_file_request(
image=image[i], image=image[i],
path="/proxy/recraft/images/removeBackground", path="/proxy/recraft/images/removeBackground",
auth_token=auth_token, auth_kwargs=kwargs,
) )
images.append(torch.cat([bytesio_to_image_tensor(x) for x in sub_bytes], dim=0)) images.append(torch.cat([bytesio_to_image_tensor(x) for x in sub_bytes], dim=0))
pbar.update(1) pbar.update(1)
@ -1037,13 +1037,13 @@ class RecraftCrispUpscaleNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
def api_call( def api_call(
self, self,
image: torch.Tensor, image: torch.Tensor,
auth_token=None,
**kwargs, **kwargs,
): ):
images = [] images = []
@ -1053,7 +1053,7 @@ class RecraftCrispUpscaleNode:
sub_bytes = handle_recraft_file_request( sub_bytes = handle_recraft_file_request(
image=image[i], image=image[i],
path=self.RECRAFT_PATH, path=self.RECRAFT_PATH,
auth_token=auth_token, auth_kwargs=kwargs,
) )
images.append(torch.cat([bytesio_to_image_tensor(x) for x in sub_bytes], dim=0)) images.append(torch.cat([bytesio_to_image_tensor(x) for x in sub_bytes], dim=0))
pbar.update(1) pbar.update(1)

27
comfy_api_nodes/nodes_stability.py
View File

@ -120,12 +120,13 @@ class StabilityStableImageUltraNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
def api_call(self, prompt: str, aspect_ratio: str, style_preset: str, seed: int, def api_call(self, prompt: str, aspect_ratio: str, style_preset: str, seed: int,
negative_prompt: str=None, image: torch.Tensor = None, image_denoise: float=None, negative_prompt: str=None, image: torch.Tensor = None, image_denoise: float=None,
auth_token=None): **kwargs):
validate_string(prompt, strip_whitespace=False) validate_string(prompt, strip_whitespace=False)
# prepare image binary if image present # prepare image binary if image present
image_binary = None image_binary = None
@ -160,7 +161,7 @@ class StabilityStableImageUltraNode:
), ),
files=files, files=files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api = operation.execute() response_api = operation.execute()
@ -252,12 +253,13 @@ class StabilityStableImageSD_3_5Node:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
def api_call(self, model: str, prompt: str, aspect_ratio: str, style_preset: str, seed: int, cfg_scale: float, def api_call(self, model: str, prompt: str, aspect_ratio: str, style_preset: str, seed: int, cfg_scale: float,
negative_prompt: str=None, image: torch.Tensor = None, image_denoise: float=None, negative_prompt: str=None, image: torch.Tensor = None, image_denoise: float=None,
auth_token=None): **kwargs):
validate_string(prompt, strip_whitespace=False) validate_string(prompt, strip_whitespace=False)
# prepare image binary if image present # prepare image binary if image present
image_binary = None image_binary = None
@ -298,7 +300,7 @@ class StabilityStableImageSD_3_5Node:
), ),
files=files, files=files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api = operation.execute() response_api = operation.execute()
@ -368,11 +370,12 @@ class StabilityUpscaleConservativeNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
def api_call(self, image: torch.Tensor, prompt: str, creativity: float, seed: int, negative_prompt: str=None, def api_call(self, image: torch.Tensor, prompt: str, creativity: float, seed: int, negative_prompt: str=None,
auth_token=None): **kwargs):
validate_string(prompt, strip_whitespace=False) validate_string(prompt, strip_whitespace=False)
image_binary = tensor_to_bytesio(image, total_pixels=1024*1024).read() image_binary = tensor_to_bytesio(image, total_pixels=1024*1024).read()
@ -398,7 +401,7 @@ class StabilityUpscaleConservativeNode:
), ),
files=files, files=files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api = operation.execute() response_api = operation.execute()
@ -473,11 +476,12 @@ class StabilityUpscaleCreativeNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
def api_call(self, image: torch.Tensor, prompt: str, creativity: float, style_preset: str, seed: int, negative_prompt: str=None, def api_call(self, image: torch.Tensor, prompt: str, creativity: float, style_preset: str, seed: int, negative_prompt: str=None,
auth_token=None): **kwargs):
validate_string(prompt, strip_whitespace=False) validate_string(prompt, strip_whitespace=False)
image_binary = tensor_to_bytesio(image, total_pixels=1024*1024).read() image_binary = tensor_to_bytesio(image, total_pixels=1024*1024).read()
@ -506,7 +510,7 @@ class StabilityUpscaleCreativeNode:
), ),
files=files, files=files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api = operation.execute() response_api = operation.execute()
@ -521,7 +525,7 @@ class StabilityUpscaleCreativeNode:
completed_statuses=[StabilityPollStatus.finished], completed_statuses=[StabilityPollStatus.finished],
failed_statuses=[StabilityPollStatus.failed], failed_statuses=[StabilityPollStatus.failed],
status_extractor=lambda x: get_async_dummy_status(x), status_extractor=lambda x: get_async_dummy_status(x),
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_poll: StabilityResultsGetResponse = operation.execute() response_poll: StabilityResultsGetResponse = operation.execute()
@ -555,11 +559,12 @@ class StabilityUpscaleFastNode:
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
def api_call(self, image: torch.Tensor, def api_call(self, image: torch.Tensor,
auth_token=None): **kwargs):
image_binary = tensor_to_bytesio(image, total_pixels=4096*4096).read() image_binary = tensor_to_bytesio(image, total_pixels=4096*4096).read()
files = { files = {
@ -576,7 +581,7 @@ class StabilityUpscaleFastNode:
request=EmptyRequest(), request=EmptyRequest(),
files=files, files=files,
content_type="multipart/form-data", content_type="multipart/form-data",
auth_token=auth_token, auth_kwargs=kwargs,
) )
response_api = operation.execute() response_api = operation.execute()

7
comfy_api_nodes/nodes_veo2.py
View File

@ -114,6 +114,7 @@ class VeoVideoGenerationNode(ComfyNodeABC):
}, },
"hidden": { "hidden": {
"auth_token": "AUTH_TOKEN_COMFY_ORG", "auth_token": "AUTH_TOKEN_COMFY_ORG",
"comfy_api_key": "API_KEY_COMFY_ORG",
}, },
} }
@ -133,7 +134,7 @@ class VeoVideoGenerationNode(ComfyNodeABC):
person_generation="ALLOW", person_generation="ALLOW",
seed=0, seed=0,
image=None, image=None,
auth_token=None, **kwargs,
): ):
# Prepare the instances for the request # Prepare the instances for the request
instances = [] instances = []
@ -179,7 +180,7 @@ class VeoVideoGenerationNode(ComfyNodeABC):
instances=instances, instances=instances,
parameters=parameters parameters=parameters
), ),
auth_token=auth_token auth_kwargs=kwargs,
) )
initial_response = initial_operation.execute() initial_response = initial_operation.execute()
@ -213,7 +214,7 @@ class VeoVideoGenerationNode(ComfyNodeABC):
request=Veo2GenVidPollRequest( request=Veo2GenVidPollRequest(
operationName=operation_name operationName=operation_name
), ),
auth_token=auth_token, auth_kwargs=kwargs,
poll_interval=5.0 poll_interval=5.0
) )

2
execution.py
View File

@ -146,6 +146,8 @@ def get_input_data(inputs, class_def, unique_id, outputs=None, dynprompt=None, e
input_data_all[x] = [unique_id] input_data_all[x] = [unique_id]
if h[x] == "AUTH_TOKEN_COMFY_ORG": if h[x] == "AUTH_TOKEN_COMFY_ORG":
input_data_all[x] = [extra_data.get("auth_token_comfy_org", None)] input_data_all[x] = [extra_data.get("auth_token_comfy_org", None)]
if h[x] == "API_KEY_COMFY_ORG":
input_data_all[x] = [extra_data.get("api_key_comfy_org", None)]
return input_data_all, missing_keys return input_data_all, missing_keys
map_node_over_list = None #Don't hook this please map_node_over_list = None #Don't hook this please

4
requirements.txt
View File

@ -1,5 +1,5 @@
comfyui-frontend-package==1.18.9 comfyui-frontend-package==1.18.10
comfyui-workflow-templates==0.1.11 comfyui-workflow-templates==0.1.14
torch torch
torchsde torchsde
torchvision torchvision