bizyengine 1.2.78__py3-none-any.whl → 1.2.80__py3-none-any.whl

bizyengine/bizy_server/server.py

@@ -51,6 +51,10 @@ if not BIZYAIR_DEBUG:
 def _get_request_api_key(request_headers):
     if BIZYAIR_SERVER_MODE:
         encrypted_api_key = request_headers.get("Authorization")
+        if not encrypted_api_key:
+            # 尝试从cookie中读取auth_token
+            cookie_str = request_headers.get("Cookie")
+            encrypted_api_key = _get_auth_token_from_cookie(cookie_str)
         return decrypt_apikey(encrypted_api_key)
     return None, None
 
@@ -65,6 +69,17 @@ def _get_api_key_from_cookie(cookie_str):
     return None
 
 
+def _get_auth_token_from_cookie(cookie_str):
+    if not cookie_str:
+        return None
+    cookies = cookie_str.split(";")
+    for cookie in cookies:
+        cookie = cookie.strip()
+        if cookie.startswith("auth_token="):
+            return cookie[11:]
+    return None
+
+
 class BizyAirServer:
     def __init__(self):
         BizyAirServer.instance = self

bizyengine/bizyair_extras/third_party_api/trd_nodes_base.py

@@ -1,11 +1,12 @@
 import abc
+import asyncio
 import io
 import json
 import logging
 import time
 from typing import List, Tuple
 
-import requests
+import aiohttp
 import torch
 from bizyairsdk import bytesio_to_image_tensor, common_upscale
 from comfy_api.latest._input_impl import VideoFromFile
@@ -16,7 +17,7 @@ from bizyengine.core import (
     register_node,
 )
 from bizyengine.core.common import client
-from bizyengine.core.common.client import send_request
+from bizyengine.core.common.client import async_send_request, send_request
 from bizyengine.core.common.env_var import BIZYAIR_X_SERVER
 from bizyengine.core.nodes_base import PREFIX
 
@@ -45,24 +46,24 @@ class BizyAirTrdApiBaseNode(BizyAirMiscBaseNode, TrdBase):
         super().__init_subclass__(**kwargs)
         register_node(cls, PREFIX)
 
-    def api_call(self, **kwargs):
+    async def api_call(self, **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
 
         data, model = self.handle_inputs(headers, prompt_id, **kwargs)
-        outputs = self.create_task_and_wait_for_completion(data, model, headers)
+        outputs = await self.create_task_and_wait_for_completion(data, model, headers)
         return self.handle_outputs(outputs)
 
-    def create_task_and_wait_for_completion(
+    async def create_task_and_wait_for_completion(
         self, data, model, headers
     ) -> Tuple[List[VideoFromFile], List[torch.Tensor], List[str]]:
         # 创建任务
         create_task_url = f"{BIZYAIR_X_SERVER}/trd_api/{model}"
         json_payload = json.dumps(data).encode("utf-8")
         logging.debug(f"json_payload: {json_payload}")
-        create_api_resp = send_request(
+        create_api_resp = await async_send_request(
             url=create_task_url,
             data=json_payload,
             headers=headers,
@@ -73,6 +74,9 @@ class BizyAirTrdApiBaseNode(BizyAirMiscBaseNode, TrdBase):
 
         # 检查任务创建是否成功
         if "data" not in create_api_resp or "request_id" not in create_api_resp["data"]:
+            logging.error(
+                f"[BizyAir-Async] {self.NODE_DISPLAY_NAME} 任务创建失败: {create_api_resp}"
+            )
             raise ValueError(f"Invalid response: {create_api_resp}")
 
         # 轮询获取结果，最多等待1小时
@@ -80,32 +84,39 @@ class BizyAirTrdApiBaseNode(BizyAirMiscBaseNode, TrdBase):
         logging.info(f"{self.NODE_DISPLAY_NAME} task created, request_id: {request_id}")
         start_time = time.time()
         status_url = f"{BIZYAIR_X_SERVER}/trd_api/{request_id}"
+
         while time.time() - start_time < 3600:
-            time.sleep(10)
+            await asyncio.sleep(10)
+
             try:
-                status_api_resp = send_request(
+                status_api_resp = await async_send_request(
                     method="GET",
                     url=status_url,
                     headers=headers,
                 )
             except Exception as e:
                 logging.error(
-                    f"{self.NODE_DISPLAY_NAME} task {request_id} status api error: {e}"
+                    f"[BizyAir-Async] {self.NODE_DISPLAY_NAME} task {request_id} status api error: {e}"
                 )
                 continue
 
             if "data" not in status_api_resp:
                 logging.error(
-                    f"{self.NODE_DISPLAY_NAME} task {request_id} status api resp no data: {status_api_resp}"
+                    f"[BizyAir-Async] {self.NODE_DISPLAY_NAME} task {request_id} status api resp no data: {status_api_resp}"
                 )
                 continue
             if "status" not in status_api_resp["data"]:
                 logging.error(
-                    f"{self.NODE_DISPLAY_NAME} task {request_id} status api resp no status: {status_api_resp}"
+                    f"[BizyAir-Async] {self.NODE_DISPLAY_NAME} task {request_id} status api resp no status: {status_api_resp}"
                 )
                 continue
             status = status_api_resp["data"]["status"]
+            logging.debug(f"{self.NODE_DISPLAY_NAME} task {request_id} 状态: {status}")
+
             if status == "failed":
+                logging.error(
+                    f"[BizyAir-Async] {self.NODE_DISPLAY_NAME} task {request_id} 失败: {status_api_resp}"
+                )
                 raise ValueError(
                     f"{self.NODE_DISPLAY_NAME} task {request_id} failed: {status_api_resp}"
                 )
@@ -114,6 +125,9 @@ class BizyAirTrdApiBaseNode(BizyAirMiscBaseNode, TrdBase):
 
             # 成功，获取输出结果
             if "outputs" not in status_api_resp["data"]:
+                logging.error(
+                    f"[BizyAir-Async] {self.NODE_DISPLAY_NAME} task {request_id} 无输出: {status_api_resp}"
+                )
                 raise ValueError(
                     f"{self.NODE_DISPLAY_NAME} task {request_id} no outputs: {status_api_resp}"
                 )
@@ -126,24 +140,31 @@ class BizyAirTrdApiBaseNode(BizyAirMiscBaseNode, TrdBase):
             texts = []
             outputs = status_api_resp["data"]["outputs"]
             try:
-                if "videos" in outputs:
-                    for video_url in outputs["videos"]:
-                        video_resp = requests.get(video_url, stream=True, timeout=3600)
-                        video_resp.raise_for_status()  # 非 2xx 会抛异常
-                        videos.append(VideoFromFile(io.BytesIO(video_resp.content)))
-                if "images" in outputs:
-                    for image_url in outputs["images"]:
-                        image_resp = requests.get(image_url, stream=True, timeout=3600)
-                        image_resp.raise_for_status()  # 非 2xx 会抛异常
-                        images.append(
-                            bytesio_to_image_tensor(io.BytesIO(image_resp.content))
-                        )
+                async with aiohttp.ClientSession(
+                    timeout=aiohttp.ClientTimeout(total=3600)
+                ) as session:
+                    if "videos" in outputs:
+                        for idx, video_url in enumerate(outputs["videos"]):
+                            async with session.get(video_url) as video_resp:
+                                video_resp.raise_for_status()
+                                video_content = await video_resp.read()
+                                videos.append(VideoFromFile(io.BytesIO(video_content)))
+
+                    if "images" in outputs:
+                        for idx, image_url in enumerate(outputs["images"]):
+                            async with session.get(image_url) as image_resp:
+                                image_resp.raise_for_status()
+                                image_content = await image_resp.read()
+                                images.append(
+                                    bytesio_to_image_tensor(io.BytesIO(image_content))
+                                )
+
                 if "texts" in outputs:
                     for text in outputs["texts"]:
                         texts.append(text)
             except Exception as e:
                 logging.error(
-                    f"{self.NODE_DISPLAY_NAME} task {request_id} handle outputs error: {e}"
+                    f"[BizyAir-Async] {self.NODE_DISPLAY_NAME} task {request_id} handle outputs error: {e}"
                 )
                 raise ValueError(
                     f"{self.NODE_DISPLAY_NAME} task {request_id} handle outputs error: {e}, please download the outputs manually, outputs: {outputs}"
@@ -151,6 +172,9 @@ class BizyAirTrdApiBaseNode(BizyAirMiscBaseNode, TrdBase):
 
             return (videos, images, texts)
 
+        logging.error(
+            f"[BizyAir-Async] {self.NODE_DISPLAY_NAME} task {request_id} 超时"
+        )
         raise ValueError(
             f"{self.NODE_DISPLAY_NAME} task timed out, request ID: {request_id}"
         )

bizyengine/core/nodes_base.py

@@ -1,4 +1,5 @@
 import importlib
+import inspect
 import logging
 import warnings
 from functools import wraps
@@ -117,13 +118,28 @@ def register_node(cls, prefix):
 
 
 def ensure_unique_id(org_func, original_has_unique_id=False):
-    @wraps(org_func)
-    def new_func(self, **kwargs):
-        if original_has_unique_id:
-            self._assigned_id = kwargs.get("unique_id", "UNIQUE_ID")
-        elif "unique_id" in kwargs:
-            self._assigned_id = kwargs.pop("unique_id")
-        return org_func(self, **kwargs)
+    # 检测原函数是否是异步函数
+    is_async = inspect.iscoroutinefunction(org_func)
+
+    if is_async:
+        # 异步函数包装
+        @wraps(org_func)
+        async def new_func(self, **kwargs):
+            if original_has_unique_id:
+                self._assigned_id = kwargs.get("unique_id", "UNIQUE_ID")
+            elif "unique_id" in kwargs:
+                self._assigned_id = kwargs.pop("unique_id")
+            return await org_func(self, **kwargs)
+
+    else:
+        # 同步函数包装（保持原有逻辑）
+        @wraps(org_func)
+        def new_func(self, **kwargs):
+            if original_has_unique_id:
+                self._assigned_id = kwargs.get("unique_id", "UNIQUE_ID")
+            elif "unique_id" in kwargs:
+                self._assigned_id = kwargs.pop("unique_id")
+            return org_func(self, **kwargs)
 
     return new_func
 

bizyengine/version.txt

@@ -1 +1 @@
-1.2.78
+1.2.80

{bizyengine-1.2.78.dist-info → bizyengine-1.2.80.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=NX2wLXhZUvOyCjFSI-YuxHfGMoPfQKB09K-V0V_vrUo,6
+bizyengine/version.txt,sha256=jPMuwo0YkWz0z6ipvf5yo6r6zf129yvctPDotxDmQ6g,6
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
 bizyengine/bizy_server/api_client.py,sha256=vNBUkFNMjPI_F_wAGiN-ydCZO8oLdgyWBlMY1DQbHOk,43685
 bizyengine/bizy_server/errno.py,sha256=8dzmtlqq0wBJguHAXKEDb_uUYUQ7qlZQK6FxOpMxqLg,17328
@@ -7,7 +7,7 @@ bizyengine/bizy_server/error_handler.py,sha256=MGrfO1AEqbfEgMWPL8B6Ypew_zHiQAdYG
 bizyengine/bizy_server/execution.py,sha256=ayaEf6eGJKQsVZV-1_UlGlvwwmlH7FEek31Uq-MbUjA,1644
 bizyengine/bizy_server/profile.py,sha256=f4juAzJ73gCm0AhagYpt9WnG8HEI6xze_U96-omBLqU,3044
 bizyengine/bizy_server/resp.py,sha256=iOFT5Ud7VJBP2uqkojJIgc3y2ifMjjEXoj0ewneL9lc,710
-bizyengine/bizy_server/server.py,sha256=cOoOEm7PtPUL38cnrxlG8VN83XEdyiwdNqbU-p4EUO4,58640
+bizyengine/bizy_server/server.py,sha256=5wreS4aMPLec8VCBpEk3XEHl7i_cyW3r8CZtZMmb3zQ,59127
 bizyengine/bizy_server/stream_response.py,sha256=H2XHqlVRtQMhgdztAuG7l8-iV_Pm42u2x6WJ0gNVIW0,9654
 bizyengine/bizy_server/utils.py,sha256=t3y3ZTDzFa8K4wXlzgLVaFNCizgylsKsd9K3rLL4sGw,3986
 bizyengine/bizyair_extras/__init__.py,sha256=9iPmEyR7F1IXbUaBNS90ivW9ul18GcuWFxRfFv2ieAw,1011
@@ -56,7 +56,7 @@ bizyengine/bizyair_extras/third_party_api/nodes_sora.py,sha256=_-O37uRi5QHqJZqlJ
 bizyengine/bizyair_extras/third_party_api/nodes_veo3.py,sha256=LzZl-9iLMe5IzEAXYUVkb8RUPLAfZloTPxRgGcY7Hsg,6703
 bizyengine/bizyair_extras/third_party_api/nodes_vidu.py,sha256=-Eo2su0-t9qNPa5J4Qt3fx8xM9NjFHmgl19gMcTU7nM,10012
 bizyengine/bizyair_extras/third_party_api/nodes_wan_api.py,sha256=GNc616NNsXcZYtojO2XTHwU3AFiprX6tFJ7qu3s2jgc,14508
-bizyengine/bizyair_extras/third_party_api/trd_nodes_base.py,sha256=xu1q3cMprsfhjQPTQvzS2HqkrteWAgBx-nzqqGsy4gA,7945
+bizyengine/bizyair_extras/third_party_api/trd_nodes_base.py,sha256=TeT6orrXv-G8sHzR9q8HqC4hPEgsbtUOJYJpX6-aM1g,9061
 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
@@ -73,7 +73,7 @@ bizyengine/bizybot/mcp/routing.py,sha256=COgeao02y-oIiHpcXEZGl2cccgcR1u343BEcJ95
 bizyengine/core/__init__.py,sha256=EygpO-kvl5-4rk44rP8_s0GBDd_TF7FMvrl2exBSWWM,378
 bizyengine/core/data_types.py,sha256=2f7QqqZvhKmXw3kZV1AvXuPTda34b4wXQE9tyO8nUSM,1595
 bizyengine/core/image_utils.py,sha256=vJt42FcEDD8-fQumuogZM1XXwgYseSQ79_9Qzu9YTQk,409
-bizyengine/core/nodes_base.py,sha256=5cmBMdhGe9CMQrd1doZTrqE-7Z8XXrsTFEuh9N68bvY,9098
+bizyengine/core/nodes_base.py,sha256=tq6TZpko3SxdnCasMoRxoI1qSFmMPTxaONNgx7bOo48,9679
 bizyengine/core/nodes_io.py,sha256=VhwRwYkGp0g3Mh0hx1OSwNZbV06NEV13w2aODSiAm5M,2832
 bizyengine/core/commands/__init__.py,sha256=82yRdMT23RTiZPkFW_G3fVa-fj3-TUAXnj6cnGA3xRA,22
 bizyengine/core/commands/base.py,sha256=TYH9lhr033B2roBLPkWkxcvoz_fW3cdzx_bvP_FI7dg,635
@@ -104,7 +104,7 @@ bizyengine/misc/route_sam.py,sha256=-bMIR2QalfnszipGxSxvDAHGJa5gPSrjkYPb5baaRg4,
 bizyengine/misc/segment_anything.py,sha256=wNKYwlYPMszfwj23524geFZJjZaG4eye65SGaUnh77I,8941
 bizyengine/misc/supernode.py,sha256=STN9gaxfTSErH8OiHeZa47d8z-G9S0I7fXuJvHQOBFM,4532
 bizyengine/misc/utils.py,sha256=GMRWKhOP-MCueVyCO-doflb7dH5dM32DyLcSPEVOXWA,13333
-bizyengine-1.2.78.dist-info/METADATA,sha256=ojYvqvOYFk5hNUltqCws4o4BE_PPhuJuMKTdUlGpE-A,735
-bizyengine-1.2.78.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.78.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.78.dist-info/RECORD,,
+bizyengine-1.2.80.dist-info/METADATA,sha256=1TBmpEReFNxvv5XWdlyW-P3cUqULI2XXGygxnt3tifU,735
+bizyengine-1.2.80.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.80.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.80.dist-info/RECORD,,