bizyengine 1.2.9__py3-none-any.whl → 1.2.11__py3-none-any.whl

bizyengine/bizyair_extras/nodes_wan_i2v.py

@@ -21,6 +21,7 @@ except ModuleNotFoundError as e:
 from ..core.common import client
 from ..core.common.env_var import BIZYAIR_DEBUG
 from ..core.nodes_base import BizyAirBaseNode
+from ..core.path_utils import compose_model_name
 
 
 class WanApiNodeBase:
@@ -30,17 +31,19 @@ class WanApiNodeBase:
 
 
 class Wan_LoraLoader(BizyAirBaseNode):
-
     @classmethod
     def INPUT_TYPES(cls):
         return {
             "required": {
                 "lora_name": (
+                    [
+                        "to choose",
+                    ],
+                ),
+                "model_version_id": (
                     "STRING",
                     {
-                        "multiline": True,
-                        "default": "https://huggingface.co/Remade-AI/Squish/resolve/main/squish_18.safetensors",
-                        "tooltip": "LoRA 模型下载地址",
+                        "default": "",
                     },
                 ),
             },
@@ -54,7 +57,7 @@ class Wan_LoraLoader(BizyAirBaseNode):
                         "step": 0.05,
                         "tooltip": "LoRA权重强度",
                     },
-                )
+                ),
             },
         }
 
@@ -63,7 +66,16 @@ class Wan_LoraLoader(BizyAirBaseNode):
     FUNCTION = "apply_lora"
     CATEGORY = "Diffusers/WAN Video Generation"
 
-    def apply_lora(self, lora_name, lora_weight=0.75, **kwargs):
+    @classmethod
+    def VALIDATE_INPUTS(cls, lora_name, model_version_id):
+        if lora_name == "to choose":
+            return False
+        if model_version_id is not None and model_version_id != "":
+            return True
+        return True
+
+    def apply_lora(self, lora_name, lora_weight=0.75, model_version_id="", **kwargs):
+        lora_name = compose_model_name(model_version_id, fallback_name=lora_name)
         return ([(lora_name, lora_weight)],)
 
 

bizyengine/core/common/caching.py

@@ -1,6 +1,8 @@
 import glob
+import hashlib
 import json
 import os
+import threading
 import time
 from abc import ABC, abstractmethod
 from collections import OrderedDict
@@ -47,7 +49,23 @@ class CacheManager(ABC):
         pass
 
 
-class BizyAirTaskCache(CacheManager):
+class ConfigSingleton:
+    _instance_lock = threading.Lock()
+    _instances = {}
+
+    def __new__(cls, config, *args, **kwargs):
+        config_str = str(config)
+        config_key = hashlib.sha256(config_str.encode()).hexdigest()
+        if config_key not in cls._instances:
+            with cls._instance_lock:
+                if config_key not in cls._instances:
+                    instance = super().__new__(cls)
+                    cls._instances[config_key] = instance
+
+        return cls._instances[config_key]
+
+
+class BizyAirTaskCache(ConfigSingleton, CacheManager):
     def __init__(self, config: CacheConfig):
         self.config = config
         self.cache = OrderedDict()
@@ -180,6 +198,10 @@ class BizyAirTaskCache(CacheManager):
 if __name__ == "__main__":
     cache_config = CacheConfig(max_size=12, expiration=10, cache_dir="./cache")
     cache = BizyAirTaskCache(cache_config)
+    assert (
+        BizyAirTaskCache(CacheConfig(max_size=12, expiration=10, cache_dir="./cache"))
+        is cache
+    )
 
     # Set some cache values
     cache.set("key1", "This is the value for key1")

bizyengine/core/nodes_base.py

@@ -158,7 +158,7 @@ class BizyAirBaseNode:
         register_node(cls, PREFIX)
         cls.setup_input_types()
 
-        # 验证FUNCTION接受**kwargs
+        # TODO refine 验证FUNCTION接受**kwargs
         if BIZYAIR_DEBUG:
             import inspect
 

bizyengine/core/path_utils/__init__.py

@@ -6,4 +6,4 @@ from .path_manager import (
     guess_config,
     guess_url_from_node,
 )
-from .utils import filter_files_extensions
+from .utils import compose_model_name, filter_files_extensions

bizyengine/core/path_utils/utils.py

@@ -1,9 +1,50 @@
 import os
 from collections.abc import Collection
-from typing import Dict, Union
+from typing import Dict, Optional, Union
 
 import yaml
 from bizyengine.core.common.env_var import BIZYAIR_SERVER_ADDRESS
+from bizyengine.core.configs.conf import config_manager
+
+
+def compose_model_name(
+    model_version_id: str = "", fallback_name: Optional[str] = None
+) -> str:
+    """Generate standardized model name from version ID.
+
+    Args:
+        model_version_id: Model version identifier (empty string or None treated as missing)
+        fallback_name: Default name to use when version ID is missing
+
+    Returns:
+        Formatted model name (either prefixed ID or default)
+
+    Raises:
+        ValueError: If both model_version_id and default are missing
+        RuntimeError: If configuration manager fails to provide prefix
+    """
+    # Handle missing version ID case
+    if not model_version_id:  # Covers None, empty string, etc.
+        if fallback_name is None:
+            raise ValueError("Missing model_version_id with no default provided")
+        return fallback_name
+
+    # Validate ID format (adjust regex pattern as needed)
+    if not isinstance(model_version_id, str):
+        raise TypeError(
+            f"model_version_id must be string, got {type(model_version_id)}"
+        )
+
+    # Safely retrieve configuration prefix
+    try:
+        prefix = config_manager.get_model_version_id_prefix()
+    except AttributeError as e:
+        raise RuntimeError("Configuration manager missing required method") from e
+    except Exception as e:
+        raise RuntimeError(f"Failed to retrieve model prefix: {str(e)}") from e
+
+    # Construct final model name
+    return f"{prefix}{model_version_id}"
 
 
 def filter_files_extensions(

bizyengine/misc/llm.py

@@ -318,6 +318,29 @@ class BizyAirJoyCaption2(BizyAirMiscBaseNode):
 
     CATEGORY = "☁️BizyAir/AI Assistants"
 
+    def resize_if_large(self, image, max_size=384):
+        import torch.nn.functional as F
+
+        _, h, w, _ = image.shape
+
+        if h <= max_size and w <= max_size:
+            return image
+
+        if h > w:
+            new_h = max_size
+            new_w = int(w * (max_size / h))
+        else:
+            new_w = max_size
+            new_h = int(h * (max_size / w))
+
+        image = image.permute(0, 3, 1, 2)
+        resized_image = F.interpolate(
+            image, size=(new_h, new_w), mode="bilinear", align_corners=False
+        )
+        resized_image = resized_image.permute(0, 2, 3, 1)
+
+        return resized_image
+
     def joycaption2(
         self,
         image,
@@ -333,12 +356,7 @@ class BizyAirJoyCaption2(BizyAirMiscBaseNode):
     ):
         extra_data = pop_api_key_and_prompt_id(kwargs)
         headers = client.headers(api_key=extra_data["api_key"])
-
-        SIZE_LIMIT = 1536
-        _, w, h, c = image.shape
-        assert (
-            w <= SIZE_LIMIT and h <= SIZE_LIMIT
-        ), f"width and height must be less than {SIZE_LIMIT}x{SIZE_LIMIT}, but got {w} and {h}"
+        image = self.resize_if_large(image)
 
         payload = {
             "image": None,
@@ -380,15 +398,21 @@ class BizyAirJoyCaption2(BizyAirMiscBaseNode):
         return (caption,)
 
 
+class BizyAirJoyCaption3(BizyAirJoyCaption2):
+    API_URL = f"{BIZYAIR_SERVER_ADDRESS}/supernode/joycaption3"
+
+
 NODE_CLASS_MAPPINGS = {
     "BizyAirSiliconCloudLLMAPI": SiliconCloudLLMAPI,
     "BizyAirSiliconCloudVLMAPI": SiliconCloudVLMAPI,
     "BizyAirJoyCaption": BizyAirJoyCaption,
     "BizyAirJoyCaption2": BizyAirJoyCaption2,
+    "BizyAirJoyCaption3": BizyAirJoyCaption3,
 }
 NODE_DISPLAY_NAME_MAPPINGS = {
     "BizyAirSiliconCloudLLMAPI": "☁️BizyAir SiliconCloud LLM API",
     "BizyAirSiliconCloudVLMAPI": "☁️BizyAir SiliconCloud VLM API",
     "BizyAirJoyCaption": "☁️BizyAir Joy Caption",
     "BizyAirJoyCaption2": "☁️BizyAir Joy Caption2",
+    "BizyAirJoyCaption3": "☁️BizyAir Joy Caption3",
 }

bizyengine/version.txt

@@ -1 +1 @@
-1.2.9
+1.2.11

{bizyengine-1.2.9.dist-info → bizyengine-1.2.11.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=yNg8JnLF45fOFqLuJ1rEWRcAK5s2dl932Z8xvfge6Cg,6
+bizyengine/version.txt,sha256=NzEMfzSBZRIsy59KhUwpSFOVuzrwZZulp3vgZsFRFnk,7
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
 bizyengine/bizy_server/api_client.py,sha256=F2kSe5FVQz5b47-QzSH5kB9S-wP921MPWrtVbbQ3nEY,43623
 bizyengine/bizy_server/errno.py,sha256=Q-U96XnZQCuPH_44Om8wnc2-Kh7qFqwLKtox27msU54,16095
@@ -34,7 +34,7 @@ bizyengine/bizyair_extras/nodes_testing_utils.py,sha256=qeJHlSq-c21Vx8H0oZw878Q0
 bizyengine/bizyair_extras/nodes_trellis.py,sha256=BTpFfar_Byge-WNTdIrkHaIX3VMmfoQgxUnoYTl_OnA,7431
 bizyengine/bizyair_extras/nodes_ultimatesdupscale.py,sha256=effgVSPOjEDXOjdZpQ7-tJrkxcKPRXxfKtq0KDmNUqI,4132
 bizyengine/bizyair_extras/nodes_upscale_model.py,sha256=lrzA1BFI2w5aEPCmNPMh07s-WDzG-xTT49uU6WCnlP8,1151
-bizyengine/bizyair_extras/nodes_wan_i2v.py,sha256=OniFS3MK1a8FEZzXwkbrSDEmBO8l3ytq8CSqxx0wkwI,7355
+bizyengine/bizyair_extras/nodes_wan_i2v.py,sha256=yGOq20YsqTAy8BpOWMnXZaeiXAO9Wdsqxtg3By9HSNw,7718
 bizyengine/bizyair_extras/nodes_wan_video.py,sha256=d1mCcW9jCj-5Oymmymy0Vz-nwWv36FMGE5Gn-E7Rul4,1632
 bizyengine/bizyair_extras/route_bizyair_tools.py,sha256=QdgfiKeF6c4-5Bx5Pmz9RKlaAHreypy9SIg_krmLk-o,2079
 bizyengine/bizyair_extras/nodes_ipadapter_plus/__init__.py,sha256=ECKATm_EKi_4G47-FJI4-3rHO3iiF9FVakfSTE-pooE,36
@@ -44,7 +44,7 @@ bizyengine/bizyair_extras/oauth_callback/main.py,sha256=KQOZWor3kyNx8xvUNHYNMoHf
 bizyengine/core/__init__.py,sha256=EV9ZtTwOHC0S_eNvCu-tltIydfxfMsH59LbgVX4e_1c,359
 bizyengine/core/data_types.py,sha256=U1Ai149lvbVA-z59sfgniES9KSsyFIbDs_vcjpjlUK4,967
 bizyengine/core/image_utils.py,sha256=--DmQb3R9Ev21MfZG9rfgOGsU2zRywJ-hpiNNN0N8p8,8586
-bizyengine/core/nodes_base.py,sha256=uJ4qB5ZYKm64vmsA2Gp1-6n6CYrGvom1UIrStVVJE8k,8808
+bizyengine/core/nodes_base.py,sha256=Kg6I1xTpyfTiB0fLy8GYb7GCK8NaHxgDSat9ywgXa00,8820
 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
@@ -54,19 +54,19 @@ bizyengine/core/commands/processors/prompt_processor.py,sha256=RpNFzlFwpf_PsgmKp
 bizyengine/core/commands/servers/model_server.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bizyengine/core/commands/servers/prompt_server.py,sha256=giJXPMW-Mph2ccGbs9dQXs6ESiufYDhmGF1GgBsj-gw,8528
 bizyengine/core/common/__init__.py,sha256=GicZw6YeAZk1PsKmFDt9dm1F75zPUlpia9Q_ki5vW1Y,179
-bizyengine/core/common/caching.py,sha256=isliSZsQyrNjXmupW-BaZ2EoVF5G8t7aHAhbcELAn5M,6253
+bizyengine/core/common/caching.py,sha256=hRNsSrfNxgc1zzvBzLVjMY0iMkKqA0TBCr-iYhEpzik,6946
 bizyengine/core/common/client.py,sha256=1Ka8DIjbmD9Gme9c_Q1zwXXueSCP3_OSdEDyGYEol50,10396
 bizyengine/core/common/env_var.py,sha256=TM0832HWjwT1VTKicClugIHVfdXxvBxzz7pCbTnefXE,3342
 bizyengine/core/common/utils.py,sha256=bm-XmSPy83AyjD0v5EfWp6jiO6_5p7rkZ_HQAuVmgmo,3086
 bizyengine/core/configs/conf.py,sha256=D_UWG9SSJnK5EhbrfNFryJQ8hUwwdvhOGlq1TielwpI,3830
 bizyengine/core/configs/models.json,sha256=jCrqQgjVeHugLb191Xay5rg0m3duTVISPp_GxVGQ3HA,2656
 bizyengine/core/configs/models.yaml,sha256=Gbr5k-Yak_ybbPK50eK5wb6gKfDIWjdQ9QCVc7BvZ0Y,8399
-bizyengine/core/path_utils/__init__.py,sha256=5K9n4sexva0rfuYj3HcxdYeWnA1TuLTjpGGMFBTgnhM,240
+bizyengine/core/path_utils/__init__.py,sha256=JVpqNHgaKiEtTI8_r47af8GtWHxrtOockQ6Qpzp9_MQ,260
 bizyengine/core/path_utils/path_manager.py,sha256=tRVAcpsYvfWD-tK7khLvNCZayB0wpU9L0tRTH4ZESzM,10549
-bizyengine/core/path_utils/utils.py,sha256=ksgNPyQaqilOImscLkSYizbRfDQropfxpL8tqIXardM,881
+bizyengine/core/path_utils/utils.py,sha256=SY5TDoOV5Sr_n3Ez2xbcMRsll1A1J7hPZ8Zn4tpjF3c,2393
 bizyengine/misc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bizyengine/misc/auth.py,sha256=V7VoHZ9-ljT_gUUOOh7AeNnAyVuyiK8fiqSM8T8k948,2671
-bizyengine/misc/llm.py,sha256=JOwzioAGtY1YjQZZfnm5xCB3frbbvNi3sHUltd_Qq2M,12856
+bizyengine/misc/llm.py,sha256=4fCMj5rxrjQ12Hyb5-JNHQHnugNdHoYZB2_9x8um8Lw,13526
 bizyengine/misc/mzkolors.py,sha256=mWQh2XDdRza1iNacGZ3YApqbs5RHrW0nDIPGN1ZfC8g,2826
 bizyengine/misc/nodes.py,sha256=HhLfYc_8Z7akcmtrvOviYdZ_GG5KhF5eoSjCzMK4pq4,43654
 bizyengine/misc/nodes_controlnet_aux.py,sha256=Tza7XgStfmTm29bVl7qupE--ELTDfk8JaGFb93DxL_Q,16398
@@ -75,7 +75,7 @@ bizyengine/misc/route_sam.py,sha256=-bMIR2QalfnszipGxSxvDAHGJa5gPSrjkYPb5baaRg4,
 bizyengine/misc/segment_anything.py,sha256=m-G0PsuP6IgpdUzhEqiqzPg1_svMVH5MTivOsoVR1-Y,8940
 bizyengine/misc/supernode.py,sha256=ox1_ufOFbm4zlpPQD8TGd0JKv94vsscu1cCJOdbaZPY,4531
 bizyengine/misc/utils.py,sha256=SkU_qHU3n3dnzq68mdg_E8380ivRDVZwIb4UgnakhMM,6828
-bizyengine-1.2.9.dist-info/METADATA,sha256=Iw5QrJ5-GPfA2sLlvdauqEvvpXiEYuMVvPRyQCvtcxQ,4209
-bizyengine-1.2.9.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.9.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.9.dist-info/RECORD,,
+bizyengine-1.2.11.dist-info/METADATA,sha256=JBQQgsJaoiTpf6L_zWoxjubKBm1APGJ3uSibg-rkkRI,4210
+bizyengine-1.2.11.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.11.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.11.dist-info/RECORD,,