The most powerful and modular diffusion model GUI, api and backend with a graph/nodes interface. The fastest local inference engine in the world.
feat(Pika-API-nodes): use new API client (#10608)
Alexander Piskun4e2110c794b1
diff --git a/comfy_api_nodes/apis/pika_defs.py b/comfy_api_nodes/apis/pika_api.pysimilarity index 100%rename from comfy_api_nodes/apis/pika_defs.pyrename to comfy_api_nodes/apis/pika_api.pydiff --git a/comfy_api_nodes/nodes_pika.py b/comfy_api_nodes/nodes_pika.pyindex 5bb406a3b..51148211b 100644--- a/comfy_api_nodes/nodes_pika.py+++ b/comfy_api_nodes/nodes_pika.py@@ -7,24 +7,23 @@ from __future__ import annotationsfrom io import BytesIOimport logging-from typing import Optional, TypeVar+from typing import Optionalimport torchfrom typing_extensions import overridefrom comfy_api.latest import ComfyExtension, IOfrom comfy_api.input_impl.video_types import VideoCodec, VideoContainer, VideoInput-from comfy_api_nodes.apis import pika_defs-from comfy_api_nodes.apis.client import (+from comfy_api_nodes.apis import pika_api as pika_defs+from comfy_api_nodes.util import (+ validate_string,+ download_url_to_video_output,+ tensor_to_bytesio,ApiEndpoint,- EmptyRequest,- HttpMethod,- PollingOperation,- SynchronousOperation,+ sync_op,+ poll_op,)-from comfy_api_nodes.util import validate_string, download_url_to_video_output, tensor_to_bytesio-R = TypeVar("R")PATH_PIKADDITIONS = "/proxy/pika/generate/pikadditions"PATH_PIKASWAPS = "/proxy/pika/generate/pikaswaps"@@ -40,28 +39,18 @@ PATH_VIDEO_GET = "/proxy/pika/videos"async def execute_task(- initial_operation: SynchronousOperation[R, pika_defs.PikaGenerateResponse],- auth_kwargs: Optional[dict[str, str]] = None,- node_id: Optional[str] = None,+ task_id: str,+ cls: type[IO.ComfyNode],) -> IO.NodeOutput:- task_id = (await initial_operation.execute()).video_id- final_response: pika_defs.PikaVideoResponse = await PollingOperation(- poll_endpoint=ApiEndpoint(- path=f"{PATH_VIDEO_GET}/{task_id}",- method=HttpMethod.GET,- request_model=EmptyRequest,- response_model=pika_defs.PikaVideoResponse,- ),- completed_statuses=["finished"],- failed_statuses=["failed", "cancelled"],+ final_response: pika_defs.PikaVideoResponse = await poll_op(+ cls,+ ApiEndpoint(path=f"{PATH_VIDEO_GET}/{task_id}"),+ response_model=pika_defs.PikaVideoResponse,status_extractor=lambda response: (response.status.value if response.status else None),progress_extractor=lambda response: (response.progress if hasattr(response, "progress") else None),- auth_kwargs=auth_kwargs,- result_url_extractor=lambda response: (response.url if hasattr(response, "url") else None),- node_id=node_id,estimated_duration=60,max_poll_attempts=240,- ).execute()+ )if not final_response.url:error_msg = f"Pika task {task_id} succeeded but no video data found in response:\n{final_response}"logging.error(error_msg)@@ -124,23 +113,15 @@ class PikaImageToVideo(IO.ComfyNode):resolution=resolution,duration=duration,)- auth = {- "auth_token": cls.hidden.auth_token_comfy_org,- "comfy_api_key": cls.hidden.api_key_comfy_org,- }- initial_operation = SynchronousOperation(- endpoint=ApiEndpoint(- path=PATH_IMAGE_TO_VIDEO,- method=HttpMethod.POST,- request_model=pika_defs.PikaBodyGenerate22I2vGenerate22I2vPost,- response_model=pika_defs.PikaGenerateResponse,- ),- request=pika_request_data,+ initial_operation = await sync_op(+ cls,+ ApiEndpoint(path=PATH_IMAGE_TO_VIDEO, method="POST"),+ response_model=pika_defs.PikaGenerateResponse,+ data=pika_request_data,files=pika_files,content_type="multipart/form-data",- auth_kwargs=auth,)- return await execute_task(initial_operation, auth_kwargs=auth, node_id=cls.hidden.unique_id)+ return await execute_task(initial_operation.video_id, cls)class PikaTextToVideoNode(IO.ComfyNode):@@ -183,18 +164,11 @@ class PikaTextToVideoNode(IO.ComfyNode):duration: int,aspect_ratio: float,) -> IO.NodeOutput:- auth = {- "auth_token": cls.hidden.auth_token_comfy_org,- "comfy_api_key": cls.hidden.api_key_comfy_org,- }- initial_operation = SynchronousOperation(- endpoint=ApiEndpoint(- path=PATH_TEXT_TO_VIDEO,- method=HttpMethod.POST,- request_model=pika_defs.PikaBodyGenerate22T2vGenerate22T2vPost,- response_model=pika_defs.PikaGenerateResponse,- ),- request=pika_defs.PikaBodyGenerate22T2vGenerate22T2vPost(+ initial_operation = await sync_op(+ cls,+ ApiEndpoint(path=PATH_TEXT_TO_VIDEO, method="POST"),+ response_model=pika_defs.PikaGenerateResponse,+ data=pika_defs.PikaBodyGenerate22T2vGenerate22T2vPost(promptText=prompt_text,negativePrompt=negative_prompt,seed=seed,@@ -202,10 +176,9 @@ class PikaTextToVideoNode(IO.ComfyNode):duration=duration,aspectRatio=aspect_ratio,),- auth_kwargs=auth,content_type="application/x-www-form-urlencoded",)- return await execute_task(initial_operation, auth_kwargs=auth, node_id=cls.hidden.unique_id)+ return await execute_task(initial_operation.video_id, cls)class PikaScenes(IO.ComfyNode):@@ -309,24 +282,16 @@ class PikaScenes(IO.ComfyNode):duration=duration,aspectRatio=aspect_ratio,)- auth = {- "auth_token": cls.hidden.auth_token_comfy_org,- "comfy_api_key": cls.hidden.api_key_comfy_org,- }- initial_operation = SynchronousOperation(- endpoint=ApiEndpoint(- path=PATH_PIKASCENES,- method=HttpMethod.POST,- request_model=pika_defs.PikaBodyGenerate22C2vGenerate22PikascenesPost,- response_model=pika_defs.PikaGenerateResponse,- ),- request=pika_request_data,+ initial_operation = await sync_op(+ cls,+ ApiEndpoint(path=PATH_PIKASCENES, method="POST"),+ response_model=pika_defs.PikaGenerateResponse,+ data=pika_request_data,files=pika_files,content_type="multipart/form-data",- auth_kwargs=auth,)- return await execute_task(initial_operation, auth_kwargs=auth, node_id=cls.hidden.unique_id)+ return await execute_task(initial_operation.video_id, cls)class PikAdditionsNode(IO.ComfyNode):@@ -383,24 +348,16 @@ class PikAdditionsNode(IO.ComfyNode):negativePrompt=negative_prompt,seed=seed,)- auth = {- "auth_token": cls.hidden.auth_token_comfy_org,- "comfy_api_key": cls.hidden.api_key_comfy_org,- }- initial_operation = SynchronousOperation(- endpoint=ApiEndpoint(- path=PATH_PIKADDITIONS,- method=HttpMethod.POST,- request_model=pika_defs.PikaBodyGeneratePikadditionsGeneratePikadditionsPost,- response_model=pika_defs.PikaGenerateResponse,- ),- request=pika_request_data,+ initial_operation = await sync_op(+ cls,+ ApiEndpoint(path=PATH_PIKADDITIONS, method="POST"),+ response_model=pika_defs.PikaGenerateResponse,+ data=pika_request_data,files=pika_files,content_type="multipart/form-data",- auth_kwargs=auth,)- return await execute_task(initial_operation, auth_kwargs=auth, node_id=cls.hidden.unique_id)+ return await execute_task(initial_operation.video_id, cls)class PikaSwapsNode(IO.ComfyNode):@@ -472,23 +429,15 @@ class PikaSwapsNode(IO.ComfyNode):seed=seed,modifyRegionRoi=region_to_modify if region_to_modify else None,)- auth = {- "auth_token": cls.hidden.auth_token_comfy_org,- "comfy_api_key": cls.hidden.api_key_comfy_org,- }- initial_operation = SynchronousOperation(- endpoint=ApiEndpoint(- path=PATH_PIKASWAPS,- method=HttpMethod.POST,- request_model=pika_defs.PikaBodyGeneratePikaswapsGeneratePikaswapsPost,- response_model=pika_defs.PikaGenerateResponse,- ),- request=pika_request_data,+ initial_operation = await sync_op(+ cls,+ ApiEndpoint(path=PATH_PIKASWAPS, method="POST"),+ response_model=pika_defs.PikaGenerateResponse,+ data=pika_request_data,files=pika_files,content_type="multipart/form-data",- auth_kwargs=auth,)- return await execute_task(initial_operation, auth_kwargs=auth, node_id=cls.hidden.unique_id)+ return await execute_task(initial_operation.video_id, cls)class PikaffectsNode(IO.ComfyNode):@@ -528,18 +477,11 @@ class PikaffectsNode(IO.ComfyNode):negative_prompt: str,seed: int,) -> IO.NodeOutput:- auth = {- "auth_token": cls.hidden.auth_token_comfy_org,- "comfy_api_key": cls.hidden.api_key_comfy_org,- }- initial_operation = SynchronousOperation(- endpoint=ApiEndpoint(- path=PATH_PIKAFFECTS,- method=HttpMethod.POST,- request_model=pika_defs.PikaBodyGeneratePikaffectsGeneratePikaffectsPost,- response_model=pika_defs.PikaGenerateResponse,- ),- request=pika_defs.PikaBodyGeneratePikaffectsGeneratePikaffectsPost(+ initial_operation = await sync_op(+ cls,+ ApiEndpoint(path=PATH_PIKAFFECTS, method="POST"),+ response_model=pika_defs.PikaGenerateResponse,+ data=pika_defs.PikaBodyGeneratePikaffectsGeneratePikaffectsPost(pikaffect=pikaffect,promptText=prompt_text,negativePrompt=negative_prompt,@@ -547,9 +489,8 @@ class PikaffectsNode(IO.ComfyNode):),files={"image": ("image.png", tensor_to_bytesio(image), "image/png")},content_type="multipart/form-data",- auth_kwargs=auth,)- return await execute_task(initial_operation, auth_kwargs=auth, node_id=cls.hidden.unique_id)+ return await execute_task(initial_operation.video_id, cls)class PikaStartEndFrameNode(IO.ComfyNode):@@ -592,18 +533,11 @@ class PikaStartEndFrameNode(IO.ComfyNode):("keyFrames", ("image_start.png", tensor_to_bytesio(image_start), "image/png")),("keyFrames", ("image_end.png", tensor_to_bytesio(image_end), "image/png")),]- auth = {- "auth_token": cls.hidden.auth_token_comfy_org,- "comfy_api_key": cls.hidden.api_key_comfy_org,- }- initial_operation = SynchronousOperation(- endpoint=ApiEndpoint(- path=PATH_PIKAFRAMES,- method=HttpMethod.POST,- request_model=pika_defs.PikaBodyGenerate22KeyframeGenerate22PikaframesPost,- response_model=pika_defs.PikaGenerateResponse,- ),- request=pika_defs.PikaBodyGenerate22KeyframeGenerate22PikaframesPost(+ initial_operation = await sync_op(+ cls,+ ApiEndpoint(path=PATH_PIKAFRAMES, method="POST"),+ response_model=pika_defs.PikaGenerateResponse,+ data=pika_defs.PikaBodyGenerate22KeyframeGenerate22PikaframesPost(promptText=prompt_text,negativePrompt=negative_prompt,seed=seed,@@ -612,9 +546,8 @@ class PikaStartEndFrameNode(IO.ComfyNode):),files=pika_files,content_type="multipart/form-data",- auth_kwargs=auth,)- return await execute_task(initial_operation, auth_kwargs=auth, node_id=cls.hidden.unique_id)+ return await execute_task(initial_operation.video_id, cls)class PikaApiNodesExtension(ComfyExtension):