bizyengine 1.2.57__py3-none-any.whl → 1.2.59__py3-none-any.whl

bizyengine/bizyair_extras/__init__.py

@@ -33,6 +33,8 @@ modules = [
     ".nodes_wan_i2v",
     ".nodes_wan_video",
     ".route_bizyair_tools",
+    ".nodes_veo3",
+    ".nodes_sora2",
 ]
 from bizyengine.core.common.utils import safe_star_import
 

bizyengine/bizyair_extras/nodes_gemini.py

@@ -226,7 +226,7 @@ class NanoBanana(BizyAirBaseNode):
         **kwargs,
     ):
         try:
-            url = f"{BIZYAIR_SERVER_ADDRESS}/proxy_inference/VertexAI/gemini-2.5-flash-image-preview"
+            url = f"{BIZYAIR_SERVER_ADDRESS}/proxy_inference/VertexAI/gemini-2.5-flash-image"
             extra_data = pop_api_key_and_prompt_id(kwargs)
 
             parts = []

bizyengine/bizyair_extras/nodes_sora2.py

@@ -0,0 +1,217 @@
+import io
+import json
+import logging
+import time
+
+import requests
+from comfy_api.latest._input_impl import VideoFromFile
+from comfy_api_nodes.apinode_utils import tensor_to_bytesio
+
+from bizyengine.bizyair_extras.nodes_veo3 import _GRSAI_FAILED_STATUS
+from bizyengine.bizyair_extras.utils.audio import save_audio
+from bizyengine.core import BizyAirBaseNode, pop_api_key_and_prompt_id
+from bizyengine.core.common import client
+from bizyengine.core.common.client import send_request
+from bizyengine.core.common.env_var import BIZYAIR_X_SERVER
+
+from .utils.aliyun_oss import parse_upload_token, upload_file_without_sdk
+
+
+def sora2_create_task_and_wait_for_completion(data, model, prompt, headers):
+    # 创建任务
+    create_task_url = f"{BIZYAIR_X_SERVER}/proxy_inference/GRSAI/{model}"
+    json_payload = json.dumps(data).encode("utf-8")
+    logging.debug(f"json_payload: {json_payload}")
+    create_api_resp = send_request(
+        url=create_task_url,
+        data=json_payload,
+        headers=headers,
+    )
+    logging.debug(f"create task api resp: {create_api_resp}")
+
+    # 检查任务创建是否成功
+    if (
+        "code" not in create_api_resp
+        or create_api_resp["code"] != 0
+        or "data" not in create_api_resp
+        or "id" not in create_api_resp["data"]
+    ):
+        raise ValueError(f"Invalid response: {create_api_resp}")
+
+    # 轮询获取结果，最多等待1小时
+    task_id = create_api_resp["data"]["id"]
+    logging.info(f"Sora2 task created, task_id: {task_id}")
+    start_time = time.time()
+    status_url = f"{BIZYAIR_X_SERVER}/proxy_inference/GRSAI/{model}/{task_id}"
+    while time.time() - start_time < 3600:
+        time.sleep(10)
+        try:
+            status_api_resp = send_request(
+                method="GET",
+                url=status_url,
+                headers=headers,
+            )
+            logging.debug(f"status api resp: {status_api_resp}")
+        except Exception as e:
+            logging.error(f"Sora2 task {task_id} status api error: {e}")
+            continue
+
+        if (
+            "data" in status_api_resp
+            and "status" in status_api_resp["data"]
+            and status_api_resp["data"]["status"] == "succeeded"
+            and "results" in status_api_resp["data"]
+            and len(status_api_resp["data"]["results"]) > 0
+            and "url" in status_api_resp["data"]["results"][0]
+            and status_api_resp["data"]["results"][0]["url"]
+        ):
+            video_url = status_api_resp["data"]["results"][0]["url"]
+            logging.info(f"Sora2 task {task_id} success, video_url: {video_url}")
+            # 下载视频
+            video_resp = requests.get(video_url, stream=True, timeout=3600)
+            video_resp.raise_for_status()  # 非 2xx 会抛异常
+            return (VideoFromFile(io.BytesIO(video_resp.content)),)
+        if (
+            "data" not in status_api_resp
+            or "status" not in status_api_resp["data"]
+            or "code" not in status_api_resp
+            or status_api_resp["code"] != 0
+        ):
+            raise ValueError(f"Invalid response: {status_api_resp}")
+        if status_api_resp["data"]["status"] in _GRSAI_FAILED_STATUS:
+            raise ValueError(f"Sora2 task failed: {status_api_resp}")
+        logging.debug(
+            f"Sora2 task {task_id} status: {status_api_resp['data']['status']}"
+        )
+
+    raise ValueError(f"Sora2 task timed out, request ID: {task_id}")
+
+
+class Sora_V2_I2V_API(BizyAirBaseNode):
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "prompt": (
+                    "STRING",
+                    {
+                        "multiline": True,
+                        "default": "",
+                    },
+                ),
+                "image": ("IMAGE", {"tooltip": "首帧图片"}),
+                "model": (["sora-2"], {"default": "sora-2"}),
+            },
+            "optional": {
+                "aspect_ratio": (
+                    ["9:16", "16:9"],
+                    {"default": "16:9"},
+                ),
+                "duration": ([10, 15], {"default": 10}),
+                "size": (["small", "large"], {"default": "small"}),
+            },
+        }
+
+    NODE_DISPLAY_NAME = "Sora2 Image To Video"
+    RETURN_TYPES = ("VIDEO",)
+    RETURN_NAMES = ("video",)
+    CATEGORY = "☁️BizyAir/External APIs/Sora"
+    FUNCTION = "api_call"
+
+    def api_call(self, image, model, prompt, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+        prompt_id = extra_data["prompt_id"]
+        headers["X-BIZYAIR-PROMPT-ID"] = prompt_id
+        headers["X-Bizyair-Async-Result"] = "enable"
+
+        # 参数
+        aspect_ratio = kwargs.get("aspect_ratio", "16:9")
+        duration = kwargs.get("duration", 10)
+        size = kwargs.get("size", "small")
+
+        input = {
+            "webHook": "-1",
+            "aspectRatio": aspect_ratio,
+            "duration": duration,
+            "size": size,
+            "model": model,
+        }
+        if prompt is not None and prompt.strip() != "":
+            input["prompt"] = prompt
+        else:
+            raise ValueError("Prompt is required")
+
+        # 上传图片
+        if image is not None:
+            oss_token_url = f"{BIZYAIR_X_SERVER}/upload/token?file_name={prompt_id}.png&file_type=inputs"
+            token_resp = send_request("GET", oss_token_url, headers=headers)
+            auth_info = parse_upload_token(token_resp)
+            input["url"] = upload_file_without_sdk(
+                tensor_to_bytesio(image), **auth_info
+            )
+
+        # 调用API
+        return sora2_create_task_and_wait_for_completion(
+            data=input, model=model, prompt=prompt, headers=headers
+        )
+
+
+class Sora_V2_T2V_API(BizyAirBaseNode):
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "prompt": (
+                    "STRING",
+                    {
+                        "multiline": True,
+                        "default": "",
+                    },
+                ),
+                "model": (["sora-2"], {"default": "sora-2"}),
+            },
+            "optional": {
+                "aspect_ratio": (
+                    ["9:16", "16:9"],
+                    {"default": "16:9"},
+                ),
+                "duration": ([10, 15], {"default": 10}),
+                "size": (["small", "large"], {"default": "small"}),
+            },
+        }
+
+    NODE_DISPLAY_NAME = "Sora2 Text To Video"
+    RETURN_TYPES = ("VIDEO",)
+    RETURN_NAMES = ("video",)
+    CATEGORY = "☁️BizyAir/External APIs/Sora"
+    FUNCTION = "api_call"
+
+    def api_call(self, prompt, model, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+        prompt_id = extra_data["prompt_id"]
+        headers["X-BIZYAIR-PROMPT-ID"] = prompt_id
+        headers["X-Bizyair-Async-Result"] = "enable"
+
+        # 参数
+        aspect_ratio = kwargs.get("aspect_ratio", "16:9")
+        duration = kwargs.get("duration", 10)
+        size = kwargs.get("size", "small")
+
+        input = {
+            "webHook": "-1",
+            "aspectRatio": aspect_ratio,
+            "duration": duration,
+            "size": size,
+            "model": model,
+        }
+        if prompt is not None and prompt.strip() != "":
+            input["prompt"] = prompt
+        else:
+            raise ValueError("Prompt is required")
+
+        # 调用API
+        return sora2_create_task_and_wait_for_completion(
+            data=input, model=model, prompt=prompt, headers=headers
+        )

bizyengine/bizyair_extras/nodes_veo3.py

@@ -0,0 +1,297 @@
+import io
+import json
+import logging
+import time
+
+import requests
+from comfy_api.latest._input_impl import VideoFromFile
+from comfy_api_nodes.apinode_utils import tensor_to_bytesio
+
+from bizyengine.bizyair_extras.utils.audio import save_audio
+from bizyengine.core import BizyAirBaseNode, pop_api_key_and_prompt_id
+from bizyengine.core.common import client
+from bizyengine.core.common.client import send_request
+from bizyengine.core.common.env_var import BIZYAIR_X_SERVER
+
+from .utils.aliyun_oss import parse_upload_token, upload_file_without_sdk
+
+_GRSAI_FAILED_STATUS = ["failed"]
+
+
+def veo_create_task_and_wait_for_completion(data, model, prompt, headers):
+    # 创建任务
+    create_task_url = f"{BIZYAIR_X_SERVER}/proxy_inference/GRSAI/{model}"
+    json_payload = json.dumps(data).encode("utf-8")
+    logging.debug(f"json_payload: {json_payload}")
+    create_api_resp = send_request(
+        url=create_task_url,
+        data=json_payload,
+        headers=headers,
+    )
+    logging.debug(f"create task api resp: {create_api_resp}")
+
+    # 检查任务创建是否成功
+    if (
+        "code" not in create_api_resp
+        or create_api_resp["code"] != 0
+        or "data" not in create_api_resp
+        or "id" not in create_api_resp["data"]
+    ):
+        raise ValueError(f"Invalid response: {create_api_resp}")
+
+    # 轮询获取结果，最多等待1小时
+    task_id = create_api_resp["data"]["id"]
+    logging.info(f"Veo3.1 task created, task_id: {task_id}")
+    start_time = time.time()
+    status_url = f"{BIZYAIR_X_SERVER}/proxy_inference/GRSAI/{model}/{task_id}"
+    while time.time() - start_time < 3600:
+        time.sleep(10)
+        try:
+            status_api_resp = send_request(
+                method="GET",
+                url=status_url,
+                headers=headers,
+            )
+            logging.debug(f"status api resp: {status_api_resp}")
+        except Exception as e:
+            logging.error(f"Veo3.1 task {task_id} status api error: {e}")
+            continue
+
+        if (
+            "data" in status_api_resp
+            and "status" in status_api_resp["data"]
+            and status_api_resp["data"]["status"] == "succeeded"
+            and "url" in status_api_resp["data"]
+            and status_api_resp["data"]["url"]
+        ):
+            video_url = status_api_resp["data"]["url"]
+            logging.info(f"Veo3.1 task {task_id} success, video_url: {video_url}")
+            # 下载视频
+            video_resp = requests.get(video_url, stream=True, timeout=3600)
+            video_resp.raise_for_status()  # 非 2xx 会抛异常
+            return (VideoFromFile(io.BytesIO(video_resp.content)),)
+        if (
+            "data" not in status_api_resp
+            or "status" not in status_api_resp["data"]
+            or "code" not in status_api_resp
+            or status_api_resp["code"] != 0
+        ):
+            raise ValueError(f"Invalid response: {status_api_resp}")
+        if status_api_resp["data"]["status"] in _GRSAI_FAILED_STATUS:
+            raise ValueError(f"Veo3.1 task failed: {status_api_resp}")
+        logging.debug(
+            f"Veo3.1 task {task_id} status: {status_api_resp['data']['status']}"
+        )
+
+    raise ValueError(f"Veo3.1 task timed out, request ID: {task_id}")
+
+
+class Veo_V3_1_I2V_API(BizyAirBaseNode):
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "prompt": (
+                    "STRING",
+                    {
+                        "multiline": True,
+                        "default": "",
+                    },
+                ),
+                "first_frame_image": ("IMAGE", {"tooltip": "首帧图片"}),
+                "model": (["veo3.1-fast", "veo3.1-pro"], {"default": "veo3.1-fast"}),
+            },
+            "optional": {
+                "last_frame_image": ("IMAGE", {"tooltip": "尾帧图片"}),
+                "aspect_ratio": (
+                    ["9:16", "16:9"],
+                    {"default": "16:9"},
+                ),
+            },
+        }
+
+    NODE_DISPLAY_NAME = "Veo3.1 Image To Video"
+    RETURN_TYPES = ("VIDEO",)
+    RETURN_NAMES = ("video",)
+    CATEGORY = "☁️BizyAir/External APIs/Veo"
+    FUNCTION = "api_call"
+
+    def api_call(self, first_frame_image, model, prompt, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+        prompt_id = extra_data["prompt_id"]
+        headers["X-BIZYAIR-PROMPT-ID"] = prompt_id
+        headers["X-Bizyair-Async-Result"] = "enable"
+
+        # 参数
+        aspect_ratio = kwargs.get("aspect_ratio", "16:9")
+        last_frame_image = kwargs.get("last_frame_image", None)
+
+        input = {
+            "webHook": "-1",
+            "aspectRatio": aspect_ratio,
+            "model": model,
+        }
+        if prompt is not None and prompt.strip() != "":
+            input["prompt"] = prompt
+        else:
+            raise ValueError("Prompt is required")
+
+        # 上传图片
+        if first_frame_image is not None:
+            oss_token_url = f"{BIZYAIR_X_SERVER}/upload/token?file_name={prompt_id}_first.png&file_type=inputs"
+            token_resp = send_request("GET", oss_token_url, headers=headers)
+            auth_info = parse_upload_token(token_resp)
+            input["firstFrameUrl"] = upload_file_without_sdk(
+                tensor_to_bytesio(first_frame_image), **auth_info
+            )
+        if last_frame_image is not None:
+            oss_token_url = f"{BIZYAIR_X_SERVER}/upload/token?file_name={prompt_id}_last.png&file_type=inputs"
+            token_resp = send_request("GET", oss_token_url, headers=headers)
+            auth_info = parse_upload_token(token_resp)
+            input["lastFrameUrl"] = upload_file_without_sdk(
+                tensor_to_bytesio(last_frame_image), **auth_info
+            )
+
+        # 调用API
+        return veo_create_task_and_wait_for_completion(
+            data=input, model=model, prompt=prompt, headers=headers
+        )
+
+
+class Veo_V3_1_I2V_REF_API(BizyAirBaseNode):
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "prompt": (
+                    "STRING",
+                    {
+                        "multiline": True,
+                        "default": "",
+                    },
+                ),
+                "ref_image_1": ("IMAGE", {"tooltip": "参考图片1"}),
+                "model": (["veo3.1-fast"], {"default": "veo3.1-fast"}),
+            },
+            "optional": {
+                "ref_image_2": ("IMAGE", {"tooltip": "参考图片2"}),
+                "ref_image_3": ("IMAGE", {"tooltip": "参考图片3"}),
+                "aspect_ratio": (
+                    ["9:16", "16:9"],
+                    {"default": "16:9"},
+                ),
+            },
+        }
+
+    NODE_DISPLAY_NAME = "Veo3.1 Image To Video (Reference Images)"
+    RETURN_TYPES = ("VIDEO",)
+    RETURN_NAMES = ("video",)
+    CATEGORY = "☁️BizyAir/External APIs/Veo"
+    FUNCTION = "api_call"
+
+    def api_call(self, ref_image_1, model, prompt, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+        prompt_id = extra_data["prompt_id"]
+        headers["X-BIZYAIR-PROMPT-ID"] = prompt_id
+        headers["X-Bizyair-Async-Result"] = "enable"
+
+        # 参数
+        aspect_ratio = kwargs.get("aspect_ratio", "16:9")
+        ref_image_2 = kwargs.get("ref_image_2", None)
+        ref_image_3 = kwargs.get("ref_image_3", None)
+
+        input = {
+            "webHook": "-1",
+            "aspectRatio": aspect_ratio,
+            "model": model,
+        }
+        if prompt is not None and prompt.strip() != "":
+            input["prompt"] = prompt
+        else:
+            raise ValueError("Prompt is required")
+
+        # 上传图片
+        ref_images = []
+        if ref_image_1 is not None:
+            oss_token_url = f"{BIZYAIR_X_SERVER}/upload/token?file_name={prompt_id}_ref_1.png&file_type=inputs"
+            token_resp = send_request("GET", oss_token_url, headers=headers)
+            auth_info = parse_upload_token(token_resp)
+            ref_images.append(
+                upload_file_without_sdk(tensor_to_bytesio(ref_image_1), **auth_info)
+            )
+        if ref_image_2 is not None:
+            oss_token_url = f"{BIZYAIR_X_SERVER}/upload/token?file_name={prompt_id}_ref_2.png&file_type=inputs"
+            token_resp = send_request("GET", oss_token_url, headers=headers)
+            auth_info = parse_upload_token(token_resp)
+            ref_images.append(
+                upload_file_without_sdk(tensor_to_bytesio(ref_image_2), **auth_info)
+            )
+        if ref_image_3 is not None:
+            oss_token_url = f"{BIZYAIR_X_SERVER}/upload/token?file_name={prompt_id}_ref_3.png&file_type=inputs"
+            token_resp = send_request("GET", oss_token_url, headers=headers)
+            auth_info = parse_upload_token(token_resp)
+            ref_images.append(
+                upload_file_without_sdk(tensor_to_bytesio(ref_image_3), **auth_info)
+            )
+        input["urls"] = ref_images
+
+        # 调用API
+        return veo_create_task_and_wait_for_completion(
+            data=input, model=model, prompt=prompt, headers=headers
+        )
+
+
+class Veo_V3_1_T2V_API(BizyAirBaseNode):
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "prompt": (
+                    "STRING",
+                    {
+                        "multiline": True,
+                        "default": "",
+                    },
+                ),
+                "model": (["veo3.1-fast", "veo3.1-pro"], {"default": "veo3.1-fast"}),
+            },
+            "optional": {
+                "aspect_ratio": (
+                    ["9:16", "16:9"],
+                    {"default": "16:9"},
+                ),
+            },
+        }
+
+    NODE_DISPLAY_NAME = "Veo3.1 Text To Video"
+    RETURN_TYPES = ("VIDEO",)
+    RETURN_NAMES = ("video",)
+    CATEGORY = "☁️BizyAir/External APIs/Veo"
+    FUNCTION = "api_call"
+
+    def api_call(self, prompt, model, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+        prompt_id = extra_data["prompt_id"]
+        headers["X-BIZYAIR-PROMPT-ID"] = prompt_id
+        headers["X-Bizyair-Async-Result"] = "enable"
+
+        # 参数
+        aspect_ratio = kwargs.get("aspect_ratio", "16:9")
+
+        input = {
+            "webHook": "-1",
+            "aspectRatio": aspect_ratio,
+            "model": model,
+        }
+        if prompt is not None and prompt.strip() != "":
+            input["prompt"] = prompt
+        else:
+            raise ValueError("Prompt is required")
+
+        # 调用API
+        return veo_create_task_and_wait_for_completion(
+            data=input, model=model, prompt=prompt, headers=headers
+        )

bizyengine/bizyair_extras/nodes_wan_api.py

@@ -1,6 +1,7 @@
 import io
 import json
 import logging
+import time
 
 import requests
 from comfy_api.latest._input_impl import VideoFromFile
@@ -12,24 +13,74 @@ from bizyengine.core.common import client
 from bizyengine.core.common.client import send_request
 from bizyengine.core.common.env_var import BIZYAIR_X_SERVER
 
-from .utils.aliyun_oss import upload_file_without_sdk
+from .utils.aliyun_oss import parse_upload_token, upload_file_without_sdk
 
+_FAILED_STATUS = ["FAILED", "CANCELED", "UNKNOWN"]
 
-def parse_upload_token(resp) -> dict:
-    logging.debug(f"parsing token resp: {resp}")
-    if "data" not in resp:
-        logging.error(f"Invalid response, data not found: {resp}")
-        raise ValueError(f"Invalid response: {resp}")
-    data = resp["data"]
-    if "file" not in data:
-        logging.error(f"Invalid response, file not found: {resp}")
-        raise ValueError(f"Invalid response: {resp}")
-    file = data["file"]
-    if "storage" not in data:
-        logging.error(f"Invalid response, storage not found: {resp}")
-        raise ValueError(f"Invalid response: {resp}")
-    storage = data["storage"]
-    return file | storage
+
+def wan_create_task_and_wait_for_completion(data, model, prompt, headers):
+    # 创建任务
+    create_task_url = f"{BIZYAIR_X_SERVER}/proxy_inference/Wan/{model}"
+    json_payload = json.dumps(data).encode("utf-8")
+    logging.debug(f"json_payload: {json_payload}")
+    create_api_resp = send_request(
+        url=create_task_url,
+        data=json_payload,
+        headers=headers,
+    )
+    logging.debug(f"create task api resp: {create_api_resp}")
+
+    # 检查任务创建是否成功
+    if (
+        "request_id" not in create_api_resp
+        or "output" not in create_api_resp
+        or "task_status" not in create_api_resp["output"]
+        or "task_id" not in create_api_resp["output"]
+    ):
+        raise ValueError(f"Invalid response: {create_api_resp}")
+    # 检查任务状态，是否已经报错，如果报错则抛出异常
+    if create_api_resp["output"]["task_status"] in _FAILED_STATUS:
+        raise ValueError(f"Wan2.5 create task failed: {create_api_resp}")
+
+    # 轮询获取结果，最多等待1小时
+    task_id = create_api_resp["output"]["task_id"]
+    logging.info(
+        f'Wan2.5 task created, task_id: {task_id}, request_id: {create_api_resp["request_id"]}'
+    )
+    start_time = time.time()
+    status_url = f"{BIZYAIR_X_SERVER}/proxy_inference/Wan/{model}/{task_id}"
+    while time.time() - start_time < 3600:
+        time.sleep(10)
+        try:
+            status_api_resp = send_request(
+                method="GET",
+                url=status_url,
+                headers=headers,
+            )
+        except Exception as e:
+            logging.error(f"Wan2.5 task {task_id} status api error: {e}")
+            continue
+
+        if "output" in status_api_resp and "video_url" in status_api_resp["output"]:
+            video_url = status_api_resp["output"]["video_url"]
+            logging.info(f"Wan2.5 task {task_id} success, video_url: {video_url}")
+            actual_prompt = status_api_resp["output"].get("actual_prompt", prompt)
+            # 下载视频
+            video_resp = requests.get(video_url, stream=True, timeout=3600)
+            video_resp.raise_for_status()  # 非 2xx 会抛异常
+            return (VideoFromFile(io.BytesIO(video_resp.content)), actual_prompt)
+        if (
+            "output" not in status_api_resp
+            or "task_status" not in status_api_resp["output"]
+        ):
+            raise ValueError(f"Invalid response: {status_api_resp}")
+        if status_api_resp["output"]["task_status"] in _FAILED_STATUS:
+            raise ValueError(f"Wan2.5 task failed: {status_api_resp}")
+        logging.debug(
+            f"Wan2.5 task {task_id} status: {status_api_resp['output']['task_status']}"
+        )
+
+    raise ValueError(f"Wan2.5 task timed out, request ID: {task_id}")
 
 
 class Wan_V2_5_I2V_API(BizyAirBaseNode):
@@ -88,6 +139,7 @@ class Wan_V2_5_I2V_API(BizyAirBaseNode):
         headers = client.headers(api_key=extra_data["api_key"])
         prompt_id = extra_data["prompt_id"]
         headers["X-BIZYAIR-PROMPT-ID"] = prompt_id
+        headers["X-Bizyair-Async-Result"] = "enable"
 
         # 参数
         prompt = kwargs.get("prompt", "")
@@ -121,7 +173,6 @@ class Wan_V2_5_I2V_API(BizyAirBaseNode):
 
         # 调用API
         model = "wan2.5-i2v-preview"
-        api_url = f"{BIZYAIR_X_SERVER}/proxy_inference/Wan/{model}"
         data = {
             "model": model,
             "input": input,
@@ -132,22 +183,10 @@ class Wan_V2_5_I2V_API(BizyAirBaseNode):
                 "audio": auto_audio,
             },
         }
-        json_payload = json.dumps(data).encode("utf-8")
-        logging.debug(f"json_payload: {json_payload}")
-        api_resp = send_request(
-            url=api_url,
-            data=json_payload,
-            headers=headers,
+
+        return wan_create_task_and_wait_for_completion(
+            data=data, model=model, prompt=prompt, headers=headers
         )
-        logging.debug(f"api resp: {api_resp}")
-        if "output" not in api_resp or "video_url" not in api_resp["output"]:
-            raise ValueError(f"Invalid response: {api_resp}")
-        video_url = api_resp["output"]["video_url"]
-        actual_prompt = api_resp["output"].get("actual_prompt", prompt)
-        # 下载视频
-        video_resp = requests.get(video_url, stream=True, timeout=30)
-        video_resp.raise_for_status()  # 非 2xx 会抛异常
-        return (VideoFromFile(io.BytesIO(video_resp.content)), actual_prompt)
 
 
 class Wan_V2_5_T2V_API(BizyAirBaseNode):
@@ -214,27 +253,12 @@ class Wan_V2_5_T2V_API(BizyAirBaseNode):
     CATEGORY = "☁️BizyAir/External APIs/WanVideo"
     FUNCTION = "api_call"
 
-    def parse_upload_token(self, resp) -> dict:
-        logging.debug(f"parsing token resp: {resp}")
-        if "data" not in resp:
-            logging.error(f"Invalid response, data not found: {resp}")
-            raise ValueError(f"Invalid response: {resp}")
-        data = resp["data"]
-        if "file" not in data:
-            logging.error(f"Invalid response, file not found: {resp}")
-            raise ValueError(f"Invalid response: {resp}")
-        file = data["file"]
-        if "storage" not in data:
-            logging.error(f"Invalid response, storage not found: {resp}")
-            raise ValueError(f"Invalid response: {resp}")
-        storage = data["storage"]
-        return file | storage
-
     def api_call(self, prompt, **kwargs):
         extra_data = pop_api_key_and_prompt_id(kwargs)
         headers = client.headers(api_key=extra_data["api_key"])
         prompt_id = extra_data["prompt_id"]
         headers["X-BIZYAIR-PROMPT-ID"] = prompt_id
+        headers["X-Bizyair-Async-Result"] = "enable"
 
         # 参数
         negative_prompt = kwargs.get("negative_prompt", "")
@@ -260,7 +284,6 @@ class Wan_V2_5_T2V_API(BizyAirBaseNode):
 
         # 调用API
         model = "wan2.5-t2v-preview"
-        api_url = f"{BIZYAIR_X_SERVER}/proxy_inference/Wan/{model}"
         data = {
             "model": model,
             "input": input,
@@ -271,19 +294,6 @@ class Wan_V2_5_T2V_API(BizyAirBaseNode):
                 "audio": auto_audio,
             },
         }
-        json_payload = json.dumps(data).encode("utf-8")
-        logging.debug(f"json_payload: {json_payload}")
-        api_resp = send_request(
-            url=api_url,
-            data=json_payload,
-            headers=headers,
+        return wan_create_task_and_wait_for_completion(
+            data=data, model=model, prompt=prompt, headers=headers
         )
-        logging.debug(f"api resp: {api_resp}")
-        if "output" not in api_resp or "video_url" not in api_resp["output"]:
-            raise ValueError(f"Invalid response: {api_resp}")
-        video_url = api_resp["output"]["video_url"]
-        actual_prompt = api_resp["output"].get("actual_prompt", prompt)
-        # 下载视频
-        video_resp = requests.get(video_url, stream=True, timeout=30)
-        video_resp.raise_for_status()  # 非 2xx 会抛异常
-        return (VideoFromFile(io.BytesIO(video_resp.content)), actual_prompt)

bizyengine/bizyair_extras/utils/aliyun_oss.py

@@ -73,3 +73,20 @@ def upload_file_without_sdk(
         if response is not None:
             logging.error(f"Response content: {response.text}")
         raise e
+
+
+def parse_upload_token(resp) -> dict:
+    logging.debug(f"parsing token resp: {resp}")
+    if "data" not in resp:
+        logging.error(f"Invalid response, data not found: {resp}")
+        raise ValueError(f"Invalid response: {resp}")
+    data = resp["data"]
+    if "file" not in data:
+        logging.error(f"Invalid response, file not found: {resp}")
+        raise ValueError(f"Invalid response: {resp}")
+    file = data["file"]
+    if "storage" not in data:
+        logging.error(f"Invalid response, storage not found: {resp}")
+        raise ValueError(f"Invalid response: {resp}")
+    storage = data["storage"]
+    return file | storage

bizyengine/core/common/client.py

@@ -160,7 +160,7 @@ def send_request(
         req = urllib.request.Request(
             url, data=data, headers=headers, method=method, **kwargs
         )
-        with urllib.request.urlopen(req, timeout=600) as response:
+        with urllib.request.urlopen(req, timeout=3600) as response:
             response_data = response.read().decode("utf-8")
 
     except urllib.error.URLError as e:

bizyengine/misc/utils.py

@@ -43,7 +43,7 @@ def send_post_request(api_url, payload, headers):
     try:
         data = json.dumps(payload).encode("utf-8")
         req = urllib.request.Request(api_url, data=data, headers=headers, method="POST")
-        with urllib.request.urlopen(req, timeout=600) as response:
+        with urllib.request.urlopen(req, timeout=3600) as response:
             response_data = response.read().decode("utf-8")
         return response_data
     except urllib.error.URLError as e:

bizyengine/version.txt

@@ -1 +1 @@
-1.2.57
+1.2.59

{bizyengine-1.2.57.dist-info → bizyengine-1.2.59.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizyengine
-Version: 1.2.57
+Version: 1.2.59
 Summary: [a/BizyAir](https://github.com/siliconflow/BizyAir) Comfy Nodes that can run in any environment.
 Author-email: SiliconFlow <yaochi@siliconflow.cn>
 Project-URL: Repository, https://github.com/siliconflow/BizyAir

{bizyengine-1.2.57.dist-info → bizyengine-1.2.59.dist-info}/RECORD

@@ -1,5 +1,5 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=txvxJYLvzIKQ52dHqmS8wu-ETqexjhrTKOe0yuriLUE,7
+bizyengine/version.txt,sha256=_GSvGEHdo_UgJSqo8uN6JMq8S1egBFMkDpw_HlzaeYM,7
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
 bizyengine/bizy_server/api_client.py,sha256=Z7G5IjaEqSJkF6nLLw2R3bpgBAOi5ClQiUbel6NMXmE,43932
 bizyengine/bizy_server/errno.py,sha256=RIyvegX3lzpx_1L1q2XVvu3on0kvYgKiUQ8U3ZtyF68,16823
@@ -10,7 +10,7 @@ bizyengine/bizy_server/resp.py,sha256=iOFT5Ud7VJBP2uqkojJIgc3y2ifMjjEXoj0ewneL9l
 bizyengine/bizy_server/server.py,sha256=isOzHDk2kD6WjdlemeOA7j_xLnZ2vat_NvE1I0bsOFw,57490
 bizyengine/bizy_server/stream_response.py,sha256=H2XHqlVRtQMhgdztAuG7l8-iV_Pm42u2x6WJ0gNVIW0,9654
 bizyengine/bizy_server/utils.py,sha256=Kkn-AATZcdaDhg8Rg_EJW6aKqkyiSE2EYmuyOhUwXso,3863
-bizyengine/bizyair_extras/__init__.py,sha256=ZeUPmpn_6aVM9luC-k2jAl017RP2ihYtlLRLKrofryE,1053
+bizyengine/bizyair_extras/__init__.py,sha256=GNmQ3C0fG8pIGgAMV6M9Jp89fOOVd-YpsLOuIWgjxF4,1092
 bizyengine/bizyair_extras/nodes_advanced_refluxcontrol.py,sha256=cecfjrtnjJAty9aNkhz8BlmHUC1NImkFlUDiA0COEa4,2242
 bizyengine/bizyair_extras/nodes_cogview4.py,sha256=Ni0TDOycczyDhYPvSR68TxGV_wE2uhaxd8MIj-J4-3o,2031
 bizyengine/bizyair_extras/nodes_comfyui_detail_daemon.py,sha256=i71it24tiGvZ3h-XFWISr4CpZszUtPuz3UrZARYluLk,6169
@@ -22,7 +22,7 @@ bizyengine/bizyair_extras/nodes_custom_sampler.py,sha256=NK-7sdcp8oxJisjTEFfBskk
 bizyengine/bizyair_extras/nodes_dataset.py,sha256=htF0YZb_FHncLhLDEbJfNCVqJ6rvlo1ZLk7iY42Rylc,3440
 bizyengine/bizyair_extras/nodes_differential_diffusion.py,sha256=nSrbD-w0XtrwktwzME5M0Vmi1sI7Z08AqwgymTdThqo,370
 bizyengine/bizyair_extras/nodes_flux.py,sha256=ls94kGBuBNgW5c6uhG36iZLk1TTM2TIoTTcpERgEE5E,2683
-bizyengine/bizyair_extras/nodes_gemini.py,sha256=g1LBpAs5vbORJJZjxt0iv5uNvs8mOQL_-88JL_wA5MY,10602
+bizyengine/bizyair_extras/nodes_gemini.py,sha256=XWp3Y7aKF_TDSM2QthOhUqMQN1s4FWWac98JkL8Hxxc,10594
 bizyengine/bizyair_extras/nodes_hunyuan3d.py,sha256=dWHLeqX68N7zKnfDMzm9nutmCNtFT6-wwt7P5cPDu7Q,2058
 bizyengine/bizyair_extras/nodes_image_utils.py,sha256=BldF_CKD2M01K8-SnG-QV86u3HZqFz_GP5GrCQ5CFDQ,2875
 bizyengine/bizyair_extras/nodes_ip2p.py,sha256=GSEFJvrs4f2tv0xwYkWqc8uhsXrzAJVPvvwcw0gTjR0,619
@@ -35,12 +35,14 @@ bizyengine/bizyair_extras/nodes_sd3.py,sha256=lZCxj0IFmuxk1fZTDcRKgVV5QWHjkUdpR4
 bizyengine/bizyair_extras/nodes_seedream.py,sha256=-I22lrdR0S6oRCgN7e5HD8pOJhuGBxDMlhX2S-CyOhY,6855
 bizyengine/bizyair_extras/nodes_segment_anything.py,sha256=x1ei2UggHnB8T6aUtK_ZcUehMALEyLUnDoD5SNJCbFU,7249
 bizyengine/bizyair_extras/nodes_segment_anything_utils.py,sha256=ZefAqrFrevDH3XY_wipr_VwKfeXrgpZEUFaqg_JGOdU,4714
+bizyengine/bizyair_extras/nodes_sora2.py,sha256=ehIZNZyh0Dgvf74LUSCq9FeqdCHzdU6CqcouQzjrAqQ,7703
 bizyengine/bizyair_extras/nodes_testing_utils.py,sha256=lYmcyCIkTkQ7WOZfpEPU9wUbEvC_mL6_A46ks68WzZA,3988
 bizyengine/bizyair_extras/nodes_trellis.py,sha256=GqSRM8FobuziOIxwyAs3BLztpjVIP4rFT0ZWbfqJAfY,6065
 bizyengine/bizyair_extras/nodes_ultimatesdupscale.py,sha256=-_SsLTAWAQDv4uw-4Z7IGP2tXTe73BJ3N5D6RqVVAK4,4133
 bizyengine/bizyair_extras/nodes_upscale_model.py,sha256=lrzA1BFI2w5aEPCmNPMh07s-WDzG-xTT49uU6WCnlP8,1151
 bizyengine/bizyair_extras/nodes_utils.py,sha256=whog_tmV-q7JvLEdb03JL3KKsC7wKe3kImzx_jPaQD8,2613
-bizyengine/bizyair_extras/nodes_wan_api.py,sha256=lhzkfsLFZPKuBXrJBf0i2t9A2zLB4TxgWIrW8MYJ49g,11088
+bizyengine/bizyair_extras/nodes_veo3.py,sha256=C3aS20yylRAvV9gTXUyhvnXWIRZshZzLbRll7vqYEOY,10936
+bizyengine/bizyair_extras/nodes_wan_api.py,sha256=nPTbPf6NU5ykCk43O49gLnjzIfOBsR5jjL0ON95n-nM,11265
 bizyengine/bizyair_extras/nodes_wan_i2v.py,sha256=3XwcxLHmgrihgXDEzcVOjU6VjqnZa3mErINlY014PFA,8435
 bizyengine/bizyair_extras/nodes_wan_video.py,sha256=aE2JBF0ZT-6BOM0bGu9R4yZ_eMeMnnjCW-YzFe4qg8Q,2804
 bizyengine/bizyair_extras/route_bizyair_tools.py,sha256=EiP5pS6xoE3tULoNSN2hYZA29vgt7yCErsbRp34gGEg,3898
@@ -48,7 +50,7 @@ bizyengine/bizyair_extras/nodes_ipadapter_plus/__init__.py,sha256=ECKATm_EKi_4G4
 bizyengine/bizyair_extras/nodes_ipadapter_plus/nodes_ipadapter_plus.py,sha256=lOKRem7oiPs8ZkA_p68HxagAgiCSvn3Rk-L4fSXIjyE,54846
 bizyengine/bizyair_extras/nodes_kolors_mz/__init__.py,sha256=HsCCCphW8q0SrWEiFlZKK_W2lQr1T0UJIJL7gEn37ME,3729
 bizyengine/bizyair_extras/oauth_callback/main.py,sha256=KQOZWor3kyNx8xvUNHYNMoHfCF9g_ht13_iPk4K_5YM,3633
-bizyengine/bizyair_extras/utils/aliyun_oss.py,sha256=NBC8tB_xG33X9nAuoSzzgkN2VHSOpEMqOH8wTIAERCE,2407
+bizyengine/bizyair_extras/utils/aliyun_oss.py,sha256=H6wGZq1DqP7BHJ_frBJVvUVttgXprJprOnxytePIuos,3050
 bizyengine/bizyair_extras/utils/audio.py,sha256=cCmX080jtxsHFa7mCgn13R6cyfqE-1Gq37ZnRJdZNU8,3183
 bizyengine/bizybot/__init__.py,sha256=NINN_7QECKQwtAwKPBTrrSiAK6KbxaZCkIvJ-e1J1xk,262
 bizyengine/bizybot/client.py,sha256=PWdcjslMaW4xmNaAq3TwRGV8twg9yPEfDNyfuZzpCyY,26029
@@ -75,7 +77,7 @@ bizyengine/core/commands/servers/model_server.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 bizyengine/core/commands/servers/prompt_server.py,sha256=e8JhtKRM8nw0kQwe2Ofl-zQtiVqQdbbWRxOqkFmSclM,10873
 bizyengine/core/common/__init__.py,sha256=GicZw6YeAZk1PsKmFDt9dm1F75zPUlpia9Q_ki5vW1Y,179
 bizyengine/core/common/caching.py,sha256=hRNsSrfNxgc1zzvBzLVjMY0iMkKqA0TBCr-iYhEpzik,6946
-bizyengine/core/common/client.py,sha256=5ZdbmNHNfkNgEvND34wTN9BLHyoe-HcWk_L1G6XmVRw,10700
+bizyengine/core/common/client.py,sha256=5wp_gsyvnSQxETCjUayYe536taOhaVP0zonPvW_asdA,10701
 bizyengine/core/common/env_var.py,sha256=1EAW3gOXY2bKouCqrGa583vTJRdDasQ1IsFTnzDg7Dk,3450
 bizyengine/core/common/utils.py,sha256=Jxk4tCURbUhjYBFuHTiQgeUo2w13TYj4upnPTKNNucM,4215
 bizyengine/core/configs/conf.py,sha256=D_UWG9SSJnK5EhbrfNFryJQ8hUwwdvhOGlq1TielwpI,3830
@@ -94,8 +96,8 @@ bizyengine/misc/nodes_controlnet_union_sdxl.py,sha256=fYyu_XMY7mcX1Ad9x30q1tYB8m
 bizyengine/misc/route_sam.py,sha256=-bMIR2QalfnszipGxSxvDAHGJa5gPSrjkYPb5baaRg4,1561
 bizyengine/misc/segment_anything.py,sha256=wNKYwlYPMszfwj23524geFZJjZaG4eye65SGaUnh77I,8941
 bizyengine/misc/supernode.py,sha256=STN9gaxfTSErH8OiHeZa47d8z-G9S0I7fXuJvHQOBFM,4532
-bizyengine/misc/utils.py,sha256=hLGARJ2fkckGBm6_noC38hGT4b6OXUA4dx68eCdTbzc,12913
-bizyengine-1.2.57.dist-info/METADATA,sha256=lgy5VTeQLkdhZzQc8xxX7-uJtTicw0XqR9gZQuYTvGM,734
-bizyengine-1.2.57.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.57.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.57.dist-info/RECORD,,
+bizyengine/misc/utils.py,sha256=nXXTPkj4WBvds4EWjI9c-ydeWwmXl8Vwrdu-4Fh62g8,12914
+bizyengine-1.2.59.dist-info/METADATA,sha256=iHk2UvrrGQSIK6EfObzDh5pr_QGOwkD5KXjxeN1SBYg,734
+bizyengine-1.2.59.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.59.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.59.dist-info/RECORD,,