bizyengine 1.2.82__py3-none-any.whl → 1.2.83__py3-none-any.whl

bizyengine/bizyair_extras/third_party_api/trd_nodes_base.py

@@ -3,6 +3,7 @@ import asyncio
 import io
 import json
 import logging
+import os
 import time
 from typing import List, Tuple
 
@@ -20,9 +21,15 @@ from bizyengine.core.common import client
 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
+from bizyengine.misc.utils import AsyncAtomicCounter
 
 from ..utils.aliyun_oss import parse_upload_token, upload_file_without_sdk
 
+_trd_api_counter = AsyncAtomicCounter(0)
+# 常驻内存可以
+_placeholder_img = None
+_placeholder_video = None
+
 
 class TrdBase(abc.ABC):
     @abc.abstractmethod
@@ -52,9 +59,44 @@ class BizyAirTrdApiBaseNode(BizyAirMiscBaseNode, TrdBase):
         prompt_id = extra_data["prompt_id"]
         headers["X-BIZYAIR-PROMPT-ID"] = prompt_id
 
+        e = None
+        outputs = [[], [], []]
         data, model = self.handle_inputs(headers, prompt_id, **kwargs)
-        outputs = await self.create_task_and_wait_for_completion(data, model, headers)
-        return self.handle_outputs(outputs)
+        try:
+            await _trd_api_counter.increment(1)
+            outputs = await self.create_task_and_wait_for_completion(
+                data, model, headers
+            )
+        except Exception as api_err:
+            e = api_err
+        finally:
+            await _trd_api_counter.increment(-1)
+            if e is not None:
+                # 还有未完成的其他并发
+                if await _trd_api_counter.value() > 0:
+                    logging.error(
+                        f"BizyAir task failed (silently because of other tasks executing in parallel), error: {str(e)}"
+                    )
+                    # return placeholders
+                    dir = os.path.dirname(__file__)
+                    global _placeholder_img, _placeholder_video
+                    if _placeholder_img is None:
+                        with open(os.path.join(dir, "placeholder.png"), "rb") as f:
+                            image_content = f.read()
+                            _placeholder_img = bytesio_to_image_tensor(
+                                io.BytesIO(image_content)
+                            )
+                    if _placeholder_video is None:
+                        with open(os.path.join(dir, "placeholder.mp4"), "rb") as f:
+                            video_content = f.read()
+                            _placeholder_video = VideoFromFile(
+                                io.BytesIO(video_content)
+                            )
+                    outputs = [[_placeholder_video], [_placeholder_img], [str(e)]]
+                else:
+                    # 无并发正常抛出
+                    raise e
+            return self.handle_outputs(outputs)
 
     async def create_task_and_wait_for_completion(
         self, data, model, headers

bizyengine/misc/utils.py

@@ -459,3 +459,22 @@ def _cache_trd_models(type, request_api_key: str):
         if len(models) == 0:
             raise errno.NO_MODEL_FOUND
         _TRD_MODELS_CACHE.set(type, models)
+
+
+class AsyncAtomicCounter(object):
+    """An atomic, async counter"""
+
+    def __init__(self, initial=0):
+        self._value = initial
+        self._lock = asyncio.Lock()
+
+    async def increment(self, num=1):
+        """Atomically increment the counter by num and return the new value"""
+        async with self._lock:
+            self._value += num
+            return self._value
+
+    async def value(self):
+        """Get the current value (this read is also atomic due to the lock)"""
+        async with self._lock:
+            return self._value

bizyengine/version.txt

@@ -1 +1 @@
-1.2.82
+1.2.83

{bizyengine-1.2.82.dist-info → bizyengine-1.2.83.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=w2FfV7RHNEYJIt90i-7AHCD4NcjvnrJqa6fXhmf82BY,6
+bizyengine/version.txt,sha256=eW3ubbBpwm8g4sWql3pfqnty4K5O8_wlYZNCAtMgIak,6
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
 bizyengine/bizy_server/api_client.py,sha256=oe06P7l8t7lgkACbqN2UdS5R-IlZIINka6eWw8YyVv4,44451
 bizyengine/bizy_server/errno.py,sha256=Qb-V0461LAYpsMMxgLggSZxlIPPaOhhV9k1TkMfqm_U,17494
@@ -57,7 +57,7 @@ bizyengine/bizyair_extras/third_party_api/nodes_veo3.py,sha256=LzZl-9iLMe5IzEAXY
 bizyengine/bizyair_extras/third_party_api/nodes_vidu.py,sha256=-Eo2su0-t9qNPa5J4Qt3fx8xM9NjFHmgl19gMcTU7nM,10012
 bizyengine/bizyair_extras/third_party_api/nodes_vlm.py,sha256=WF4QysWv3IJ1S-dxlwCzf5xazqOJxtlPyg4zDal70IA,4893
 bizyengine/bizyair_extras/third_party_api/nodes_wan_api.py,sha256=GNc616NNsXcZYtojO2XTHwU3AFiprX6tFJ7qu3s2jgc,14508
-bizyengine/bizyair_extras/third_party_api/trd_nodes_base.py,sha256=TeT6orrXv-G8sHzR9q8HqC4hPEgsbtUOJYJpX6-aM1g,9061
+bizyengine/bizyair_extras/third_party_api/trd_nodes_base.py,sha256=3ehpGi-2Jkbt4Dun1EnKCjHQZHw6-VWTO4_9D-yAuW8,10843
 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
@@ -104,8 +104,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=JJqlabu0-wU8WEglaQWRPIYDOPX7qnWTyTZeJAaORns,14654
-bizyengine-1.2.82.dist-info/METADATA,sha256=5vQwTzdxix3GEyQ2YeNqUhneIjTKa8xcaPIZMDeUO3A,735
-bizyengine-1.2.82.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.82.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.82.dist-info/RECORD,,
+bizyengine/misc/utils.py,sha256=1XRC7WN_cKJ1ln6QVBKTQnfqzCepXF8AWlWJgiY_At4,15207
+bizyengine-1.2.83.dist-info/METADATA,sha256=4H94G3pNkBtf8gT5NlpqyHPC8mC9A9rM6F-umEGQuCQ,735
+bizyengine-1.2.83.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+bizyengine-1.2.83.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.83.dist-info/RECORD,,

{bizyengine-1.2.82.dist-info → bizyengine-1.2.83.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any