bizyengine 1.2.9__tar.gz → 1.2.11__tar.gz

{bizyengine-1.2.9 → bizyengine-1.2.11}/PKG-INFO

@@ -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 → bizyengine-1.2.11}/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-1.2.9 → bizyengine-1.2.11}/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-1.2.9 → bizyengine-1.2.11}/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-1.2.9 → bizyengine-1.2.11}/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-1.2.11/bizyengine/core/path_utils/utils.py

@@ -0,0 +1,75 @@
+import os
+from collections.abc import Collection
+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(
+    files: Collection[str], extensions: Collection[str]
+) -> list[str]:
+    return sorted(
+        list(
+            filter(
+                lambda a: os.path.splitext(a)[-1].lower() in extensions
+                or len(extensions) == 0,
+                files,
+            )
+        )
+    )
+
+
+def load_yaml_config(file_path):
+    with open(file_path, "r") as file:
+        config = yaml.safe_load(file)
+    return config
+
+
+def get_service_route(service_config: Dict[str, str]) -> Union[str, None]:
+    if {"route"}.issubset(service_config):
+        return str(
+            service_config.get("service_address", BIZYAIR_SERVER_ADDRESS)
+        ) + service_config.get("route")
+    return None

{bizyengine-1.2.9 → bizyengine-1.2.11}/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-1.2.11/bizyengine/version.txt

@@ -0,0 +1 @@
+1.2.11

{bizyengine-1.2.9 → bizyengine-1.2.11}/bizyengine.egg-info/PKG-INFO

@@ -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/bizyengine/core/path_utils/utils.py

@@ -1,34 +0,0 @@
-import os
-from collections.abc import Collection
-from typing import Dict, Union
-
-import yaml
-from bizyengine.core.common.env_var import BIZYAIR_SERVER_ADDRESS
-
-
-def filter_files_extensions(
-    files: Collection[str], extensions: Collection[str]
-) -> list[str]:
-    return sorted(
-        list(
-            filter(
-                lambda a: os.path.splitext(a)[-1].lower() in extensions
-                or len(extensions) == 0,
-                files,
-            )
-        )
-    )
-
-
-def load_yaml_config(file_path):
-    with open(file_path, "r") as file:
-        config = yaml.safe_load(file)
-    return config
-
-
-def get_service_route(service_config: Dict[str, str]) -> Union[str, None]:
-    if {"route"}.issubset(service_config):
-        return str(
-            service_config.get("service_address", BIZYAIR_SERVER_ADDRESS)
-        ) + service_config.get("route")
-    return None

bizyengine-1.2.9/bizyengine/version.txt

@@ -1 +0,0 @@
-1.2.9