bizyengine 1.2.76__py3-none-any.whl → 1.2.77__py3-none-any.whl

bizyengine/bizy_server/api_client.py

@@ -1,7 +1,6 @@
 import asyncio
 import json
 import os
-import urllib
 
 import aiohttp
 from openai import OpenAI
@@ -9,6 +8,7 @@ from openai import OpenAI
 import bizyengine.core as core
 from bizyengine.core.common import get_api_key
 from bizyengine.core.common.env_var import (
+    BIZYAIR_DEBUG,
     BIZYAIR_PRODUCTION_TEST,
     BIZYAIR_SERVER_MODE,
     BIZYAIR_X_SERVER,
@@ -62,88 +62,53 @@ class APIClient:
             errnos.INVALID_API_KEY.message = error_message
             return None, errnos.INVALID_API_KEY
 
+    async def _handle_response(self, response, method, url):
+        try:
+            resp_text = await response.text()
+        except Exception:
+            resp_text = ""
+
+        try:
+            resp_json = json.loads(resp_text)
+        except Exception:
+            resp_json = resp_text
+
+        if response.status != 200:
+            print(
+                f"\033[31m[BizyAir]\033[0m API Error: {method} {url} {response.status} Body: {resp_text}"
+            )
+            isJson = isinstance(resp_json, dict)
+            return None, ErrorNo(
+                response.status,
+                resp_json.get("code", response.status) if isJson else resp_json,
+                None,
+                {
+                    user_profile.getLang(): (
+                        resp_json.get("message", resp_text) if isJson else resp_json
+                    )
+                },
+            )
+        return resp_json, None
+
     async def do_get(self, url, params=None, headers=None):
-        if params:
-            query_string = urllib.parse.urlencode(params, doseq=True)
-            url = f"{url}?{query_string}"
         async with await self.get_session() as session:
-            async with session.get(url, headers=headers) as response:
-                resp_json = await response.json()
-                if response.status != 200:
-                    isJson = isinstance(resp_json, dict)
-                    return None, ErrorNo(
-                        response.status,
-                        resp_json.get("code", response.status) if isJson else resp_json,
-                        None,
-                        {
-                            user_profile.getLang(): (
-                                resp_json.get("message", await response.text())
-                                if isJson
-                                else resp_json
-                            )
-                        },
-                    )
-                return resp_json, None
+            async with session.get(url, params=params, headers=headers) as response:
+                return await self._handle_response(response, "GET", url)
 
     async def do_post(self, url, data=None, headers=None):
         async with await self.get_session() as session:
             async with session.post(url, json=data, headers=headers) as response:
-                resp_json = await response.json()
-                if response.status != 200:
-                    isJson = isinstance(resp_json, dict)
-                    return None, ErrorNo(
-                        response.status,
-                        resp_json.get("code", response.status) if isJson else resp_json,
-                        None,
-                        {
-                            user_profile.getLang(): (
-                                resp_json.get("message", await response.text())
-                                if isJson
-                                else resp_json
-                            )
-                        },
-                    )
-                return resp_json, None
+                return await self._handle_response(response, "POST", url)
 
     async def do_put(self, url, data=None, headers=None):
         async with await self.get_session() as session:
             async with session.put(url, json=data, headers=headers) as response:
-                resp_json = await response.json()
-                if response.status != 200:
-                    isJson = isinstance(resp_json, dict)
-                    return None, ErrorNo(
-                        response.status,
-                        resp_json.get("code", response.status) if isJson else resp_json,
-                        None,
-                        {
-                            user_profile.getLang(): (
-                                resp_json.get("message", await response.text())
-                                if isJson
-                                else resp_json
-                            )
-                        },
-                    )
-                return resp_json, None
+                return await self._handle_response(response, "PUT", url)
 
     async def do_delete(self, url, data=None, headers=None):
         async with await self.get_session() as session:
             async with session.delete(url, json=data, headers=headers) as response:
-                resp_json = await response.json()
-                if response.status != 200:
-                    isJson = isinstance(resp_json, dict)
-                    return None, ErrorNo(
-                        response.status,
-                        resp_json.get("code", response.status) if isJson else resp_json,
-                        None,
-                        {
-                            user_profile.getLang(): (
-                                resp_json.get("message", await response.text())
-                                if isJson
-                                else resp_json
-                            )
-                        },
-                    )
-                return resp_json, None
+                return await self._handle_response(response, "DELETE", url)
 
     async def user_info(self) -> tuple[dict | None, ErrorNo | None]:
         headers, err = self.auth_header()
@@ -1216,13 +1181,13 @@ class APIClient:
         try:
             data, err = await self.do_get(url, params=params, headers=headers)
             if err is not None:
-                print(f"fetch_all_models: error fetching models: {err}")
+                print(f"fetch_all_models: error fetching models: {str(err)}")
                 return []
 
             all_models = [model["id"] for model in data["data"]]
             return all_models
         except aiohttp.ClientError as e:
-            print(f"Error fetching models: {e}")
+            print(f"Error fetching models: {str(e)}")
             return []
         except asyncio.exceptions.TimeoutError:
             print("Request to fetch models timed out")

bizyengine/bizy_server/errno.py

@@ -22,6 +22,9 @@ class ErrorNo:
     def set_message(self, msg, lang="en"):
         self.messages[lang] = msg
 
+    def __str__(self) -> str:
+        return f"ErrorNo(http_status_code={self.http_status_code}, code={self.code}, messages={self.messages}, data={self.data})"
+
     message = property(fget=get_message, fset=set_message)
 
 

bizyengine/bizyair_extras/third_party_api/nodes_wan_api.py

@@ -196,3 +196,211 @@ class Wan_V2_5_T2V_API(BizyAirTrdApiBaseNode):
 
     def handle_outputs(self, outputs):
         return (outputs[0][0],)
+
+
+class Wan_V2_6_I2V_API(BizyAirTrdApiBaseNode):
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "image": ("IMAGE",),
+            },
+            "optional": {
+                "audio": ("AUDIO",),
+                "prompt": (
+                    "STRING",
+                    {
+                        "multiline": True,
+                        "default": "",
+                    },
+                ),
+                "negative_prompt": (
+                    "STRING",
+                    {
+                        "multiline": True,
+                        "default": "",
+                    },
+                ),
+                "resolution": (
+                    ["720P", "1080P"],
+                    {"default": "1080P"},
+                ),
+                "duration": ([5, 10, 15], {"default": 5}),
+                "prompt_extend": (
+                    "BOOLEAN",
+                    {
+                        "default": True,
+                        "tooltip": "是否开启prompt智能改写。开启后使用大模型对输入prompt进行智能改写。对于较短的prompt生成效果提升明显，但会增加耗时。",
+                    },
+                ),
+                "shot_type": (
+                    ["single", "multi"],
+                    {
+                        "default": "single",
+                        "tooltip": "指定生成视频的镜头类型，即视频是由一个连续镜头还是多个切换镜头组成。仅当prompt_extend: true时生效",
+                    },
+                ),
+                "auto_audio": (
+                    "BOOLEAN",
+                    {
+                        "default": True,
+                        "tooltip": "是否由模型自动生成声音，优先级低于audio参数。",
+                    },
+                ),
+            },
+        }
+
+    NODE_DISPLAY_NAME = "Wan2.6 Image To Video"
+    RETURN_TYPES = ("VIDEO", "STRING")
+    RETURN_NAMES = ("video", "actual_prompt")
+    CATEGORY = "☁️BizyAir/External APIs/WanVideo"
+
+    def handle_inputs(self, headers, prompt_id, **kwargs):
+        # 参数
+        prompt = kwargs.get("prompt", "")
+        negative_prompt = kwargs.get("negative_prompt", "")
+        audio = kwargs.get("audio", None)
+        resolution = kwargs.get("resolution", "1080P")
+        duration = kwargs.get("duration", 5)
+        prompt_extend = kwargs.get("prompt_extend", True)
+        shot_type = kwargs.get("shot_type", "single")
+        auto_audio = kwargs.get("auto_audio", True)
+        image = kwargs.get("image", None)
+
+        model = "wan2.6-i2v"
+        input = {
+            "resolution": resolution,
+            "prompt_extend": prompt_extend,
+            "duration": duration,
+            "audio": auto_audio,
+            "model": model,
+            "shot_type": shot_type,
+        }
+        if prompt is not None and prompt.strip() != "":
+            input["prompt"] = prompt
+        if negative_prompt is not None and negative_prompt.strip() != "":
+            input["negative_prompt"] = negative_prompt
+
+        # 上传图片&音频
+        if image is not None:
+            image_url = self.upload_file(
+                tensor_to_bytesio(image=image, total_pixels=4096 * 4096),
+                f"{prompt_id}.png",
+                headers,
+            )
+            input["img_url"] = image_url
+        if audio is not None:
+            audio_url = self.upload_file(
+                save_audio(audio=audio, format="mp3"), f"{prompt_id}.mp3", headers
+            )
+            input["audio_url"] = audio_url
+
+        return input, model
+
+    def handle_outputs(self, outputs):
+        return (outputs[0][0],)
+
+
+class Wan_V2_6_T2V_API(BizyAirTrdApiBaseNode):
+    @classmethod
+    def INPUT_TYPES(cls):
+        return {
+            "required": {
+                "prompt": (
+                    "STRING",
+                    {
+                        "multiline": True,
+                        "default": "",
+                    },
+                ),
+            },
+            "optional": {
+                "audio": ("AUDIO",),
+                "negative_prompt": (
+                    "STRING",
+                    {
+                        "multiline": True,
+                        "default": "",
+                    },
+                ),
+                "size": (
+                    [
+                        "1280*720",
+                        "720*1280",
+                        "960*960",
+                        "1088*832",
+                        "832*1088",
+                        "1920*1080",
+                        "1080*1920",
+                        "1440*1440",
+                        "1632*1248",
+                        "1248*1632",
+                    ],
+                    {"default": "1920*1080"},
+                ),
+                "duration": ([5, 10, 15], {"default": 5}),
+                "prompt_extend": (
+                    "BOOLEAN",
+                    {
+                        "default": True,
+                        "tooltip": "是否开启prompt智能改写。开启后使用大模型对输入prompt进行智能改写。对于较短的prompt生成效果提升明显，但会增加耗时。",
+                    },
+                ),
+                "shot_type": (
+                    ["single", "multi"],
+                    {
+                        "default": "single",
+                        "tooltip": "指定生成视频的镜头类型，即视频是由一个连续镜头还是多个切换镜头组成。仅当prompt_extend: true时生效",
+                    },
+                ),
+                "auto_audio": (
+                    "BOOLEAN",
+                    {
+                        "default": True,
+                        "tooltip": "是否由模型自动生成声音，优先级低于audio参数。",
+                    },
+                ),
+            },
+        }
+
+    NODE_DISPLAY_NAME = "Wan2.6 Text To Video"
+    RETURN_TYPES = ("VIDEO", "STRING")
+    RETURN_NAMES = ("video", "actual_prompt")
+    CATEGORY = "☁️BizyAir/External APIs/WanVideo"
+
+    def handle_inputs(self, headers, prompt_id, **kwargs):
+        # 参数
+        model = "wan2.6-t2v"
+        negative_prompt = kwargs.get("negative_prompt", "")
+        audio = kwargs.get("audio", None)
+        size = kwargs.get("size", "1920*1080")
+        duration = kwargs.get("duration", 5)
+        prompt_extend = kwargs.get("prompt_extend", True)
+        shot_type = kwargs.get("shot_type", "single")
+        auto_audio = kwargs.get("auto_audio", True)
+        prompt = kwargs.get("prompt", "")
+
+        input = {
+            "size": size,
+            "prompt_extend": prompt_extend,
+            "duration": duration,
+            "audio": auto_audio,
+            "model": model,
+            "shot_type": shot_type,
+        }
+        if prompt is not None and prompt.strip() != "":
+            input["prompt"] = prompt
+        if negative_prompt is not None and negative_prompt.strip() != "":
+            input["negative_prompt"] = negative_prompt
+
+        # 上传音频
+        if audio is not None:
+            audio_url = self.upload_file(
+                save_audio(audio=audio, format="mp3"), f"{prompt_id}.mp3", headers
+            )
+            input["audio_url"] = audio_url
+
+        return input, model
+
+    def handle_outputs(self, outputs):
+        return (outputs[0][0],)

bizyengine/misc/utils.py

@@ -1,6 +1,7 @@
 import asyncio
 import base64
 import concurrent.futures
+import errno
 import json
 import logging
 import os
@@ -373,8 +374,8 @@ class SingleFlight(Generic[R]):
         # 读取结果
         with call.mu:
             if call.err is not None:
-                return call.result, True, call.err
-            return call.result, True, None
+                return call.result, not first, call.err
+            return call.result, not first, None
 
 
 _MODELS_CACHE = TTLCache[str, list[str]](ttl_sec=600)
@@ -383,7 +384,20 @@ _SF = SingleFlight[None]()
 
 def cache_models(request_api_key: str):
     # TODO: 效果待验证，目前节点只会被ComfyUI串行执行，所以不会出现竞争
-    _SF.do("_cache_models", lambda: _cache_models(request_api_key))
+    # 重试最多五次
+    max_retries = 5
+    for i in range(max_retries):
+        try:
+            _, shared, e = _SF.do(
+                "_cache_models", lambda: _cache_models(request_api_key)
+            )
+            if e is not None:
+                raise e
+            return
+        except Exception:
+            logging.error(f"Failed to cache models on try #{i+1}")
+            if i < max_retries - 1:
+                time.sleep(5)
 
 
 def _cache_models(request_api_key: str):
@@ -394,7 +408,7 @@ def _cache_models(request_api_key: str):
             asyncio.run, api_client.fetch_all_llm_models(request_api_key)
         ).result()
         if len(all_models) == 0:
-            return
+            raise errno.NO_MODEL_FOUND
         llm_models = [
             model
             for model in all_models

bizyengine/version.txt

@@ -1 +1 @@
-1.2.76
+1.2.77

{bizyengine-1.2.76.dist-info → bizyengine-1.2.77.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizyengine
-Version: 1.2.76
+Version: 1.2.77
 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.76.dist-info → bizyengine-1.2.77.dist-info}/RECORD

@@ -1,8 +1,8 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=TyBvX2lRbFHbsOP6JcbacJtjOAnXtSQa91b766suWhE,7
+bizyengine/version.txt,sha256=jgjXi4gpvDak_oc4lNqmFXG-uh20Gz7PivgcatO_r5s,7
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
-bizyengine/bizy_server/api_client.py,sha256=fF2VApJjPcPWGQwYWSEaIN12c8WT95lj1_QHX83WbeQ,44630
-bizyengine/bizy_server/errno.py,sha256=ikb4Z3MRMTjosi9AC1epaOwE3kJsD6CcFcFp56AKF-Y,16986
+bizyengine/bizy_server/api_client.py,sha256=a2OaFe2kJSQ1aZk15Es5Pg6sNl2qLt_nh3-IezbfVNk,42872
+bizyengine/bizy_server/errno.py,sha256=xbQVryHlGTMgQ2msyqM89BL7OmD9md8d4bi3jgcgD4k,17147
 bizyengine/bizy_server/error_handler.py,sha256=MGrfO1AEqbfEgMWPL8B6Ypew_zHiQAdYGlhN9bZohrY,167
 bizyengine/bizy_server/execution.py,sha256=ayaEf6eGJKQsVZV-1_UlGlvwwmlH7FEek31Uq-MbUjA,1644
 bizyengine/bizy_server/profile.py,sha256=f4juAzJ73gCm0AhagYpt9WnG8HEI6xze_U96-omBLqU,3044
@@ -54,7 +54,7 @@ bizyengine/bizyair_extras/third_party_api/nodes_hailuo.py,sha256=hBmt6AHVXzsbO-U
 bizyengine/bizyair_extras/third_party_api/nodes_kling.py,sha256=zyQF9NM0vnOeOzuCayj3oA2x_s9Nm-S23YcgGuiC5ig,18796
 bizyengine/bizyair_extras/third_party_api/nodes_sora.py,sha256=alxI3zNDSUKdc2IOOv5csIWFcHSAqL_55H9Zp4BdcN4,6976
 bizyengine/bizyair_extras/third_party_api/nodes_veo3.py,sha256=H-6zWsUSTKaMMIUrMaH205-hnegvXxs1SQmKi4uY8rI,6489
-bizyengine/bizyair_extras/third_party_api/nodes_wan_api.py,sha256=qkbXFHlnirqUTqnN-X5mu7MyHRYjtGv6e233PjlyUxg,6776
+bizyengine/bizyair_extras/third_party_api/nodes_wan_api.py,sha256=S6xUhiK2bvgRdBklLBw1ANeu5e_8qgd4Xp1aBgHapp8,14169
 bizyengine/bizyair_extras/third_party_api/trd_nodes_base.py,sha256=s4v8sPyvSu9-GaPQFFKq3w6V5uqQnciFgq7nrQGECiI,7895
 bizyengine/bizyair_extras/utils/aliyun_oss.py,sha256=H6wGZq1DqP7BHJ_frBJVvUVttgXprJprOnxytePIuos,3050
 bizyengine/bizyair_extras/utils/audio.py,sha256=cCmX080jtxsHFa7mCgn13R6cyfqE-1Gq37ZnRJdZNU8,3183
@@ -102,8 +102,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=nXXTPkj4WBvds4EWjI9c-ydeWwmXl8Vwrdu-4Fh62g8,12914
-bizyengine-1.2.76.dist-info/METADATA,sha256=6TobovQIQmNcfvYr0d56gUDT8VpRrwmgh_F6kyzKTNk,735
-bizyengine-1.2.76.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.76.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.76.dist-info/RECORD,,
+bizyengine/misc/utils.py,sha256=GMRWKhOP-MCueVyCO-doflb7dH5dM32DyLcSPEVOXWA,13333
+bizyengine-1.2.77.dist-info/METADATA,sha256=bPL9bUbVuQ1bO_Az3StZsew7-y16gt-HB6fms6iVZ40,735
+bizyengine-1.2.77.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.77.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.77.dist-info/RECORD,,