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

bizyengine/bizy_server/api_client.py

@@ -1230,3 +1230,25 @@ class APIClient:
                 f"\033[31m[BizyAir]\033[0m Fail to get trd api node {model} pricing: {str(e)}"
             )
             return None, errnos.TRD_API_PRICING
+
+    async def get_trd_nodes_by_type(
+        self, type, request_api_key: str = None
+    ) -> tuple[dict | None, ErrorNo | None]:
+        server_url = f"{BIZYAIR_X_SERVER}/trd_api/nodes/query"
+        headers, err = self.auth_header(api_key=request_api_key)
+        if err is not None:
+            return None, err
+
+        try:
+            ret, err = await self.do_get(
+                server_url, headers=headers, params={"model_type": type}
+            )
+            if err is not None:
+                return None, err
+
+            return ret["data"], None
+        except Exception as e:
+            print(
+                f"\033[31m[BizyAir]\033[0m Fail to get trd api node of type {type}: {str(e)}"
+            )
+            return None, errnos.GET_TRD_NODES

bizyengine/bizy_server/errno.py

@@ -517,3 +517,10 @@ class errnos:
         None,
         {"en": "Failed to get trd api node pricing", "zh": "获取第三方API节点定价失败"},
     )
+
+    GET_TRD_NODES = ErrorNo(
+        500,
+        500163,
+        None,
+        {"en": "Failed to get trd api nodes", "zh": "获取第三方API节点失败"},
+    )

bizyengine/bizy_server/server.py

@@ -985,6 +985,22 @@ class BizyAirServer:
                 return ErrResponse(err)
             return OKResponse(pricing)
 
+        @self.prompt_server.routes.get(f"/{API_PREFIX}/trd_nodes")
+        async def get_trd_nodes_by_type(request):
+            from bizyengine.misc.utils import cache_trd_models, get_trd_models
+
+            request_api_key, err = _get_request_api_key(request.headers)
+            if err:
+                return ErrResponse(err)
+            type = request.rel_url.query.get("type", "")
+            if not type:
+                return ErrResponse(errnos.INVALID_TYPE)
+            cache_trd_models(type, request_api_key)
+            models = get_trd_models(type)
+            if models is None:
+                return ErrResponse(errnos.NO_MODEL_FOUND)
+            return OKResponse(models)
+
         # 服务器模式独占
         if BIZYAIR_SERVER_MODE:
             return

bizyengine/bizyair_extras/third_party_api/__init__.py

@@ -9,6 +9,7 @@ modules = [
     ".nodes_veo3",
     ".nodes_wan_api",
     ".nodes_vidu",
+    ".nodes_vlm",
 ]
 from bizyengine.core.common.utils import safe_star_import
 

bizyengine/bizyair_extras/third_party_api/nodes_vlm.py

@@ -0,0 +1,120 @@
+from bizyairsdk import tensor_to_bytesio
+
+from .trd_nodes_base import BizyAirTrdApiBaseNode
+
+
+class TRD_VLM_API(BizyAirTrdApiBaseNode):
+    NODE_DISPLAY_NAME = "Third-Party VLM API"
+    RETURN_TYPES = (
+        "STRING",
+        """{"gemini-3-pro-preview": "gemini-3-pro-preview", "gemini-3-flash-preview": "gemini-3-flash-preview"}""",  # NOTE: 需要动态获取
+    )
+    RETURN_NAMES = ("string", "bizyair_model_name")
+    CATEGORY = "☁️BizyAir/External APIs/VLM"
+    INPUT_IS_LIST = True
+
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "model": (
+                    ["gemini-3-pro-preview", "gemini-3-flash-preview"],
+                    {"default": "gemini-3-flash-preview"},
+                ),  # NOTE: 需要动态获取
+                "system_prompt": (
+                    "STRING",
+                    {
+                        "default": "你是一个能分析图像的AI助手。请仔细观察图像，并根据用户的问题提供详细、准确的描述。",
+                        "multiline": True,
+                    },
+                ),
+                "user_prompt": (
+                    "STRING",
+                    {
+                        "default": "请描述这张图片的内容，并指出任何有趣或不寻常的细节。",
+                        "multiline": True,
+                    },
+                ),
+                "images": ("IMAGE",),
+                "max_tokens": ("INT", {"default": 32768, "min": 1, "max": 65536}),
+                "temperature": (
+                    "FLOAT",
+                    {"default": 1.0, "min": 0.0, "max": 2.0, "step": 0.01},
+                ),
+                "detail": (
+                    ["low", "medium", "high"],
+                    {"default": "high"},
+                ),
+                "enable_thinking": (
+                    "BOOLEAN",
+                    {"default": False, "tooltip": "如果模型支持思考模式，是否开启"},
+                ),
+                "inputcount": (
+                    "INT",
+                    {
+                        "default": 1,
+                        "min": 1,
+                        "max": 900,
+                        "tooltip": "动态控制输入的参考图数量，点击Update inputs按钮刷新",
+                    },
+                ),
+            },
+        }
+
+    def handle_inputs(self, headers, prompt_id, **kwargs):
+        temperature = kwargs.get("temperature", [1.0])[0]
+        max_tokens = kwargs.get("max_tokens", [32768])[0]
+        detail = kwargs.get("detail", ["high"])[0]
+        images = kwargs.get("images", [])
+        user_prompt = kwargs.get("user_prompt", [""])[0]
+        system_prompt = kwargs.get("system_prompt", [""])[0]
+        enable_thinking = kwargs.get("enable_thinking", [False])[0]
+        model = kwargs.get("model", ["gemini-3-flash-preview"])[0]
+
+        # 多图的情况可以认为图片输入都是List[Image Batch]
+        total_input_images = 0
+        for _, img_batch in enumerate(images if images is not None else []):
+            if img_batch is not None:
+                total_input_images += img_batch.shape[0]
+        extra_images, total_extra_images = self.get_extra_images(**kwargs)
+        total_input_images += total_extra_images
+        if total_input_images == 0:
+            raise ValueError("At least one image is required")
+        if total_input_images > 200:
+            raise ValueError("Maximum number of images is 200")
+        parts = []
+        index = 1
+        for _, img_batch in enumerate(images if images is not None else []):
+            for _, img in enumerate(img_batch if img_batch is not None else []):
+                if img is not None:
+                    url = self.upload_file(
+                        tensor_to_bytesio(image=img, total_pixels=4096 * 4096),
+                        f"{prompt_id}_{index}.png",
+                        headers,
+                    )
+                    parts.append(url)
+                    index += 1
+        for _, img_batch in enumerate(extra_images):
+            for _, img in enumerate(img_batch if img_batch is not None else []):
+                if img is not None:
+                    url = self.upload_file(
+                        tensor_to_bytesio(image=img, total_pixels=4096 * 4096),
+                        f"{prompt_id}_{index}.png",
+                        headers,
+                    )
+                    parts.append(url)
+                    index += 1
+
+        data = {
+            "urls": parts,
+            "user_prompt": user_prompt,
+            "system_prompt": system_prompt,
+            "temperature": temperature,
+            "max_tokens": max_tokens,
+            "detail": detail,
+            "enable_thinking": enable_thinking,
+        }
+        return data, model
+
+    def handle_outputs(self, outputs):
+        return (outputs[2][0], "")

bizyengine/core/common/client.py

@@ -257,6 +257,7 @@ async def async_send_request(
             method, url, data=data, headers=headers, **kwargs
         ) as response:
             response_data = await response.text()
+            logging.debug(f"Response Data: {response_data}")
             if response.status != 200:
                 error_message = (
                     f"HTTP Status {response.status}, response body: {response_data}"

bizyengine/misc/utils.py

@@ -379,6 +379,7 @@ class SingleFlight(Generic[R]):
 
 
 _MODELS_CACHE = TTLCache[str, list[str]](ttl_sec=600)
+_TRD_MODELS_CACHE = TTLCache[str, dict](ttl_sec=600)
 _SF = SingleFlight[None]()
 
 
@@ -421,3 +422,40 @@ def _cache_models(request_api_key: str):
         ]
         _MODELS_CACHE.set("llm_models", llm_models)
         _MODELS_CACHE.set("vlm_models", vlm_models)
+
+
+def get_trd_models(type: str):
+    return _TRD_MODELS_CACHE.get(type)
+
+
+def cache_trd_models(type, request_api_key: str):
+    # TODO: 效果待验证，目前节点只会被ComfyUI串行执行，所以不会出现竞争
+    # 重试最多五次
+    max_retries = 5
+    for i in range(max_retries):
+        try:
+            _, shared, e = _SF.do(
+                f"_cache_trd_models_{type}",
+                lambda: _cache_trd_models(type, request_api_key),
+            )
+            if e is not None:
+                raise e
+            return
+        except Exception:
+            logging.error(f"Failed to cache trd models on try #{i+1}")
+            if i < max_retries - 1:
+                time.sleep(5)
+
+
+def _cache_trd_models(type, request_api_key: str):
+    # ① 开一条新线程专门跑协程 - 应该不需要在prompt那层上锁，因为并发只有1
+    with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
+        api_client = APIClient()
+        models, err = pool.submit(
+            asyncio.run, api_client.get_trd_nodes_by_type(type, request_api_key)
+        ).result()
+        if err is not None:
+            raise err
+        if len(models) == 0:
+            raise errno.NO_MODEL_FOUND
+        _TRD_MODELS_CACHE.set(type, models)

bizyengine/version.txt

@@ -1 +1 @@
-1.2.81
+1.2.82

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

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

@@ -1,13 +1,13 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=BIxqlk4qFX0rTxoaGz3szRCvEYArsAjvUAs_-d5c1oU,6
+bizyengine/version.txt,sha256=w2FfV7RHNEYJIt90i-7AHCD4NcjvnrJqa6fXhmf82BY,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
+bizyengine/bizy_server/api_client.py,sha256=oe06P7l8t7lgkACbqN2UdS5R-IlZIINka6eWw8YyVv4,44451
+bizyengine/bizy_server/errno.py,sha256=Qb-V0461LAYpsMMxgLggSZxlIPPaOhhV9k1TkMfqm_U,17494
 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
 bizyengine/bizy_server/resp.py,sha256=iOFT5Ud7VJBP2uqkojJIgc3y2ifMjjEXoj0ewneL9lc,710
-bizyengine/bizy_server/server.py,sha256=5wreS4aMPLec8VCBpEk3XEHl7i_cyW3r8CZtZMmb3zQ,59127
+bizyengine/bizy_server/server.py,sha256=u_CdaxrWxvPebl_N_w5lB6w6dwmkInE35e21wjJ5gQE,59817
 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
@@ -45,7 +45,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/third_party_api/__init__.py,sha256=jAZrTdBSVg3TielWoAUWUqWonBwoKZQ-jLQ07JzOHx8,339
+bizyengine/bizyair_extras/third_party_api/__init__.py,sha256=zSKsgBWaOXwKixZqDx8OSb-hhOFyYjtDVXe1vORinac,357
 bizyengine/bizyair_extras/third_party_api/nodes_doubao.py,sha256=TrFDCRkyF6LRJ2QxRmlqiIX_ebeHI5KvKWpVfQxa3Qg,30256
 bizyengine/bizyair_extras/third_party_api/nodes_flux.py,sha256=iv9V7-ijKGgR5_n8BlIe4E7QjWSGvWkIIUDMOn_3t1s,6339
 bizyengine/bizyair_extras/third_party_api/nodes_gemini.py,sha256=tRjAGNJsJkYPXhlBREJd3jxPr4lF533Q_XMMHNIeXNM,17910
@@ -55,6 +55,7 @@ bizyengine/bizyair_extras/third_party_api/nodes_kling.py,sha256=ZxQB99O7E41lA25f
 bizyengine/bizyair_extras/third_party_api/nodes_sora.py,sha256=_-O37uRi5QHqJZqlJ3QzoNHYxZH4zv79-0cBYuZHer4,7132
 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_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/utils/aliyun_oss.py,sha256=H6wGZq1DqP7BHJ_frBJVvUVttgXprJprOnxytePIuos,3050
@@ -84,7 +85,7 @@ bizyengine/core/commands/servers/model_server.py,sha256=47DEQpj8HBSa-_TImW-5JCeu
 bizyengine/core/commands/servers/prompt_server.py,sha256=5R4a5EU5z5lqGNoDlGRtUGGHRojFWAtm3rdslqxpebU,11366
 bizyengine/core/common/__init__.py,sha256=GicZw6YeAZk1PsKmFDt9dm1F75zPUlpia9Q_ki5vW1Y,179
 bizyengine/core/common/caching.py,sha256=hRNsSrfNxgc1zzvBzLVjMY0iMkKqA0TBCr-iYhEpzik,6946
-bizyengine/core/common/client.py,sha256=CXhcNALGae1lLt5OhPvMg7RUhzgMz8ClFPYoiy6H22g,10394
+bizyengine/core/common/client.py,sha256=tEkIJALKr-LWnwrstS3j04fkfGfTxVq0FUO_gOeJGGw,10455
 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
@@ -103,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=GMRWKhOP-MCueVyCO-doflb7dH5dM32DyLcSPEVOXWA,13333
-bizyengine-1.2.81.dist-info/METADATA,sha256=gjscZH-NEPlq8K8hNENZabddgt27l3uqdYSNAhr6zGE,735
-bizyengine-1.2.81.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.81.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.81.dist-info/RECORD,,
+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,,