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

bizyengine/bizyair_extras/__init__.py

@@ -1,34 +1,40 @@
-from .nodes_advanced_refluxcontrol import *
-from .nodes_cogview4 import *
-from .nodes_comfyui_detail_daemon import *
-from .nodes_comfyui_instantid import *
-from .nodes_comfyui_layerstyle_advance import *
-from .nodes_comfyui_pulid_flux import *
-from .nodes_controlnet import *
-from .nodes_custom_sampler import *
-from .nodes_dataset import *
-from .nodes_differential_diffusion import *
-from .nodes_flux import *
-from .nodes_gemini import *
-from .nodes_hunyuan3d import *
-from .nodes_image_utils import *
-from .nodes_ip2p import *
-from .nodes_ipadapter_plus.nodes_ipadapter_plus import *
-from .nodes_janus_pro import *
-from .nodes_kolors_mz import *
-from .nodes_model_advanced import *
-from .nodes_nunchaku import *
-from .nodes_reactor import *
-from .nodes_sam2 import *
-from .nodes_sd3 import *
-from .nodes_seedream import *
-from .nodes_segment_anything import *
-from .nodes_testing_utils import *
-from .nodes_trellis import *
-from .nodes_ultimatesdupscale import *
-from .nodes_upscale_model import *
-from .nodes_utils import *
-from .nodes_wan_api import *
-from .nodes_wan_i2v import *
-from .nodes_wan_video import *
-from .route_bizyair_tools import *
+modules = [
+    ".nodes_advanced_refluxcontrol",
+    ".nodes_cogview4",
+    ".nodes_comfyui_detail_daemon",
+    ".nodes_comfyui_instantid",
+    ".nodes_comfyui_layerstyle_advance",
+    ".nodes_comfyui_pulid_flux",
+    ".nodes_controlnet",
+    ".nodes_custom_sampler",
+    ".nodes_dataset",
+    ".nodes_differential_diffusion",
+    ".nodes_flux",
+    ".nodes_gemini",
+    ".nodes_hunyuan3d",
+    ".nodes_image_utils",
+    ".nodes_ip2p",
+    ".nodes_ipadapter_plus.nodes_ipadapter_plus",
+    ".nodes_janus_pro",
+    ".nodes_kolors_mz",
+    ".nodes_model_advanced",
+    ".nodes_nunchaku",
+    ".nodes_reactor",
+    ".nodes_sam2",
+    ".nodes_sd3",
+    ".nodes_seedream",
+    ".nodes_segment_anything",
+    ".nodes_testing_utils",
+    ".nodes_trellis",
+    ".nodes_ultimatesdupscale",
+    ".nodes_upscale_model",
+    ".nodes_utils",
+    ".nodes_wan_api",
+    ".nodes_wan_i2v",
+    ".nodes_wan_video",
+    ".route_bizyair_tools",
+]
+from bizyengine.core.common.utils import safe_star_import
+
+for mod in modules:
+    safe_star_import(mod, package=__package__)

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) as response:
+        with urllib.request.urlopen(req, timeout=600) as response:
             response_data = response.read().decode("utf-8")
 
     except urllib.error.URLError as e:
@@ -252,7 +252,9 @@ async def async_send_request(
 ) -> dict:
     headers = kwargs.pop("headers") if "headers" in kwargs else _headers()
     try:
-        async with aiohttp.ClientSession() as session:
+        async with aiohttp.ClientSession(
+            timeout=aiohttp.ClientTimeout(total=600)
+        ) as session:
             async with session.request(
                 method, url, data=data, headers=headers, **kwargs
             ) as response:

bizyengine/core/common/utils.py

@@ -1,7 +1,10 @@
 import copy
+import importlib
 import json
 import os
-from typing import Any, List
+import sys
+import traceback
+from typing import Any, List, Optional
 
 import torch
 import yaml
@@ -91,3 +94,29 @@ def load_config_file(file_path: str) -> dict:
         return _load_yaml_config(file_path)
     else:
         raise ValueError(f"Unsupported file extension: {file_path}")
+
+
+def safe_star_import(module: str, package: Optional[str] = None) -> None:
+    """
+    在模块级执行  from module import * （支持相对导入）
+    失败时打印异常，不终止程序
+    :param module: 模块名，可带前导点，如 '.nodes_advanced_refluxcontrol'
+    :param package: 当前包名，如 'ui.nodes'；若 module 为相对导入则必须传
+    """
+    try:
+        # 1. 导入模块（相对导入必须传 package）
+        mod = importlib.import_module(module, package=package)
+        # 2. 取 __all__ 或全部非下划线名字
+        names = getattr(mod, "__all__", None)
+        if names is None:
+            names = [k for k in mod.__dict__ if not k.startswith("_")]
+        # 3. 注入到调用者 globals
+        caller_globals = sys._getframe(1).f_globals
+        for name in names:
+            caller_globals[name] = getattr(mod, name)
+    except Exception as e:
+        print(
+            f"\033[92m[BizyAir]\033[0m safe_star_import {module} failed: {e}",
+            file=sys.stderr,
+        )
+        traceback.print_exc()

bizyengine/misc/llm.py

@@ -381,22 +381,39 @@ class BizyAirJoyCaption2(BizyAirMiscBaseNode):
         )
 
         try:
-            if "result" in ret:
-                ret = json.loads(ret["result"])
-            if ret["type"] == "error":
-                raise Exception(ret["message"])
+            if isinstance(ret, dict) and "result" in ret:
+                if isinstance(ret["result"], str):
+                    ret = json.loads(ret["result"])
+
+            if not isinstance(ret, dict):
+                raise ValueError(
+                    f"Response is not a dictionary after processing: {ret}"
+                )
+
+            if ret.get("type") == "error":
+                error_message = ret.get("message", "Unknown error from API")
+                raise Exception(f"API returned an error: {error_message}")
+
+            msg = ret["data"]
+            if not isinstance(msg, dict) or msg.get("type") not in (
+                "comfyair",
+                "bizyair",
+            ):
+                raise Exception(f"Unexpected response type: {msg}")
+
+            caption = msg["data"]
+            return (caption,)
+
+        except json.JSONDecodeError as e:
+            raise Exception(f"Failed to parse JSON response: {ret}. Error: {e}")
+        except (KeyError, TypeError) as e:
+            raise Exception(
+                f"Invalid response format, missing key or wrong type. Response: {ret}. Error: {e}"
+            )
         except Exception as e:
-            raise Exception(f"Unexpected response: {ret} {e=}")
-
-        msg = ret["data"]
-        if msg["type"] not in (
-            "comfyair",
-            "bizyair",
-        ):
-            raise Exception(f"Unexpected response type: {msg}")
-
-        caption = msg["data"]
-        return (caption,)
+            raise Exception(
+                f"An unexpected error occurred while processing the response: {ret}. Error: {e}"
+            )
 
 
 class BizyAirJoyCaption3(BizyAirJoyCaption2):

bizyengine/misc/utils.py

@@ -1,14 +1,21 @@
+import asyncio
 import base64
+import concurrent.futures
 import json
+import logging
 import os
 import pickle
+import re
+import threading
+import time
 import urllib.parse
 import urllib.request
 import zlib
-from typing import List, Tuple, Union
+from typing import Callable, Dict, Generic, List, Optional, Tuple, TypeVar, Union
 
 import numpy as np
 
+from bizyengine.bizy_server.api_client import APIClient
 from bizyengine.core import pop_api_key_and_prompt_id
 from bizyengine.core.common import client
 from bizyengine.core.common.env_var import BIZYAIR_SERVER_ADDRESS
@@ -36,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) as response:
+        with urllib.request.urlopen(req, timeout=600) as response:
             response_data = response.read().decode("utf-8")
         return response_data
     except urllib.error.URLError as e:
@@ -143,6 +150,18 @@ def get_llm_response(
     extra_data = pop_api_key_and_prompt_id(kwargs)
     headers = client.headers(api_key=extra_data["api_key"])
 
+    # 如果model已不可用，选择第一个可用model
+    if _MODELS_CACHE.get("llm_models") is None:
+        cache_models(extra_data["api_key"])
+    llm_models = _MODELS_CACHE.get("llm_models")
+    if llm_models is None:
+        logging.warning(f"No LLM models available, keeping the original model {model}")
+    elif model not in llm_models:
+        logging.warning(
+            f"Model {model} is not available, using the first available model {llm_models[0]}"
+        )
+        model = llm_models[0]
+
     payload = {
         "model": model,
         "messages": [
@@ -183,6 +202,18 @@ def get_vlm_response(
     extra_data = pop_api_key_and_prompt_id(kwargs)
     headers = client.headers(api_key=extra_data["api_key"])
 
+    # 如果model已不可用，选择第一个可用model
+    if _MODELS_CACHE.get("vlm_models") is None:
+        cache_models(extra_data["api_key"])
+    vlm_models = _MODELS_CACHE.get("vlm_models")
+    if vlm_models is None:
+        logging.warning(f"No VLM models available, keeping the original model {model}")
+    elif model not in vlm_models:
+        logging.warning(
+            f"Model {model} is not available, using the first available model {vlm_models[0]}"
+        )
+        model = vlm_models[0]
+
     messages = [
         {
             "role": "system",
@@ -230,3 +261,149 @@ def get_vlm_response(
         callback=None,
     )
     return response
+
+
+K = TypeVar("K")
+V = TypeVar("V")
+R = TypeVar("R")
+
+
+class TTLCache(Generic[K, V]):
+    """线程安全 TTL 内存缓存（仅依赖标准库）"""
+
+    def __init__(self, ttl_sec: float):
+        self.ttl = ttl_sec
+        self._data: Dict[K, tuple[V, float]] = {}
+        self._lock = threading.RLock()
+        self._stop_evt = threading.Event()
+        # 后台清扫线程
+        self._cleaner = threading.Thread(target=self._cleanup, daemon=True)
+        self._cleaner.start()
+
+    # ---------- 公共 API ----------
+    def set(self, key: K, value: V) -> None:
+        """写入/刷新键值"""
+        with self._lock:
+            self._data[key] = (value, time.time() + self.ttl)
+
+    def get(self, key: K) -> Optional[V]:
+        """读取键值；不存在或已过期返回 None"""
+        with self._lock:
+            val, expire = self._data.get(key, (None, 0))
+            if val is None or time.time() > expire:
+                self._data.pop(key, None)
+                return None
+            return val
+
+    def delete(self, key: K) -> None:
+        """手动删除"""
+        with self._lock:
+            self._data.pop(key, None)
+
+    def stop(self):
+        """停止后台线程（程序退出前调用）"""
+        self._stop_evt.set()
+        self._cleaner.join(timeout=self.ttl + 1)
+
+    # ---------- 内部 ----------
+    def _cleanup(self):
+        """周期清扫过期键"""
+        while not self._stop_evt.wait(self.ttl / 2):
+            with self._lock:
+                now = time.time()
+                for key, (_, expire) in list(self._data.items()):
+                    if now > expire:
+                        self._data.pop(key, None)
+
+
+class SingleFlight(Generic[R]):
+    """Python 版 singleflight.Group（线程安全）"""
+
+    def __init__(self):
+        self._lock = threading.Lock()
+        self._call_map: dict[str, SingleFlight._Call[R]] = {}
+
+    class _Call(Generic[R]):
+        __slots__ = ("mu", "done", "result", "err", "waiters")
+
+        def __init__(self):
+            self.mu = threading.Lock()
+            self.done = False
+            self.result: Optional[R] = None
+            self.err: Optional[BaseException] = None
+            self.waiters = 0
+
+    def do(
+        self, key: str, fn: Callable[[], R]
+    ) -> tuple[R, bool, Optional[BaseException]]:
+        """
+        返回值: (result, shared?, exception)
+        shared=True 表示本次未真正执行 fn，复用了别人结果
+        """
+        with self._lock:
+            call = self._call_map.get(key)
+            if call is None:  # 我是第一个
+                call = self._Call[R]()
+                call.waiters = 1
+                self._call_map[key] = call
+                first = True
+            else:  # 已有并发请求
+                call.waiters += 1
+                first = False
+
+        if first:  # 只有第一个真正执行
+            try:
+                result = fn()
+                with call.mu:
+                    call.result = result
+                    call.done = True
+            except BaseException as e:
+                with call.mu:
+                    call.err = e
+                    call.done = True
+                raise
+            finally:  # 把自己从 map 摘掉
+                with self._lock:
+                    if call.waiters == 0:
+                        self._call_map.pop(key, None)
+        else:  # 其它人阻塞等待
+            with call.mu:
+                while not call.done:
+                    call.mu.wait()
+        # 读取结果
+        with call.mu:
+            if call.err is not None:
+                return call.result, True, call.err
+            return call.result, True, None
+
+
+_MODELS_CACHE = TTLCache[str, list[str]](ttl_sec=600)
+_SF = SingleFlight[None]()
+
+
+def cache_models(request_api_key: str):
+    # TODO: 效果待验证，目前节点只会被ComfyUI串行执行，所以不会出现竞争
+    _SF.do("_cache_models", lambda: _cache_models(request_api_key))
+
+
+def _cache_models(request_api_key: str):
+    # ① 开一条新线程专门跑协程 - 应该不需要在prompt那层上锁，因为并发只有1
+    with concurrent.futures.ThreadPoolExecutor(max_workers=1) as pool:
+        api_client = APIClient()
+        all_models = pool.submit(
+            asyncio.run, api_client.fetch_all_llm_models(request_api_key)
+        ).result()
+        if len(all_models) == 0:
+            return
+        llm_models = [
+            model
+            for model in all_models
+            if not (re.search(r"\d+(\.\d+)?v", model.lower()) or "vl" in model.lower())
+        ]
+        vlm_models = [
+            model
+            for model in all_models
+            if re.search(r"\d+(\.\d+)?v", model.lower()) or "vl" in model.lower()
+        ]
+        _MODELS_CACHE.set("llm_models", llm_models)
+        _MODELS_CACHE.set("vlm_models", vlm_models)

bizyengine/version.txt

@@ -1 +1 @@
-1.2.55
+1.2.57

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

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

@@ -1,5 +1,5 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=hhQr61vio--euFMt34QKJLejnKYdRuaYW5ZVVyNMlM4,7
+bizyengine/version.txt,sha256=txvxJYLvzIKQ52dHqmS8wu-ETqexjhrTKOe0yuriLUE,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=8WBnjvNTDOJoME-lWMUmr51WRqW4UJHCnq1KoUVpVWk,1151
+bizyengine/bizyair_extras/__init__.py,sha256=ZeUPmpn_6aVM9luC-k2jAl017RP2ihYtlLRLKrofryE,1053
 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
@@ -75,9 +75,9 @@ 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=gk8hfw8sjbJJM7zgz5-54YiC25PHibuT1UtgKFTAhO4,10625
+bizyengine/core/common/client.py,sha256=5ZdbmNHNfkNgEvND34wTN9BLHyoe-HcWk_L1G6XmVRw,10700
 bizyengine/core/common/env_var.py,sha256=1EAW3gOXY2bKouCqrGa583vTJRdDasQ1IsFTnzDg7Dk,3450
-bizyengine/core/common/utils.py,sha256=bm-XmSPy83AyjD0v5EfWp6jiO6_5p7rkZ_HQAuVmgmo,3086
+bizyengine/core/common/utils.py,sha256=Jxk4tCURbUhjYBFuHTiQgeUo2w13TYj4upnPTKNNucM,4215
 bizyengine/core/configs/conf.py,sha256=D_UWG9SSJnK5EhbrfNFryJQ8hUwwdvhOGlq1TielwpI,3830
 bizyengine/core/configs/models.json,sha256=v-PpSxNuexSPAVlZbXJyn934cfzoaTC76whFSidaRks,3301
 bizyengine/core/configs/models.yaml,sha256=9yWbx99700yQXd0AdKI19puUhR4I5mmPoSeZ2xaduGM,11854
@@ -86,7 +86,7 @@ bizyengine/core/path_utils/path_manager.py,sha256=tRVAcpsYvfWD-tK7khLvNCZayB0wpU
 bizyengine/core/path_utils/utils.py,sha256=kQfPQjGU27qF9iyzRxLSRg5cMsd-VixuCUldART7cgY,2394
 bizyengine/misc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bizyengine/misc/auth.py,sha256=DwKy4en1a58RgO5TRdE0EMjjEjlxmerNHAOMNVZRacE,2672
-bizyengine/misc/llm.py,sha256=d0GEnY7CzDZ9AokBkOsshZ-KC7KpR_VzEcBvHTfwVoc,13528
+bizyengine/misc/llm.py,sha256=hQlu0Plmbi5to6vKT9JvR0RMCA-BZhYe1qLDfOIQrXQ,14339
 bizyengine/misc/mzkolors.py,sha256=xjJZ5Ct5Wh3WxSOK-ojX7a_fPvl_hA8qWIDKFUwBuvk,2827
 bizyengine/misc/nodes.py,sha256=DnHqxurkhSrsFie9a0aupKA05NUA_E5IZxq19HDzMCk,44723
 bizyengine/misc/nodes_controlnet_aux.py,sha256=w7rASZmnBqhZCalDd7oVPjJpx6b31sPFxqlo3aWoAHc,16399
@@ -94,8 +94,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=CKduySGSMNGlJMImHyZmN-giABY5VUaB88f6Kq-HAV0,6831
-bizyengine-1.2.55.dist-info/METADATA,sha256=Sk5fsuDIXdpXOa-yfWzWjOICOiGbK6OHRycSPU6Guo0,734
-bizyengine-1.2.55.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.55.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.55.dist-info/RECORD,,
+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,,