bizyengine 1.2.38__py3-none-any.whl → 1.2.39__py3-none-any.whl

bizyengine/core/commands/servers/prompt_server.py

@@ -7,8 +7,10 @@ from dataclasses import dataclass, field
 from typing import Any, Dict, List
 
 import comfy
+import requests
 
 from bizyengine.core.commands.base import Command, Processor  # type: ignore
+from bizyengine.core.common import client
 from bizyengine.core.common.caching import BizyAirTaskCache, CacheConfig
 from bizyengine.core.common.client import headers, send_request
 from bizyengine.core.common.env_var import (
@@ -159,6 +161,9 @@ class BizyAirTask:
 
 
 class PromptServer(Command):
+    MAX_POLLING_TIME = 60 * 60
+    POLLING_INTERVAL = 10
+
     cache_manager: BizyAirTaskCache = BizyAirTaskCache(
         config=CacheConfig.from_config(config_manager.get_cache_config())
     )
@@ -178,8 +183,57 @@ class PromptServer(Command):
             and "task_id" in result.get("data", {})
         )
 
+    def is_fass_task(self, result: Dict[str, Any]) -> bool:
+        return (
+            result.get("request_id", None) is not None
+            and result.get("query_url", None) is not None
+        )
+
+    def _get_fass_result(self, result: Dict[str, Any]) -> Dict[str, Any]:
+        request_id = result.get("request_id", None)
+        query_url = f"{BIZYAIR_SERVER_ADDRESS}/supernode/status?request_id={request_id}"
+        return self._poll_fass_for_completion(
+            query_url,
+        )
+
+    def _poll_fass_for_completion(self, query_url, **kwargs):
+        start_time = time.time()
+        headers = client.headers(api_key=kwargs.get("api_key", None))
+        task_failed, failed_reason = False, None
+        while time.time() - start_time < self.MAX_POLLING_TIME and not task_failed:
+            try:
+                resp_body = client.send_request(
+                    method="GET", url=query_url, headers=headers
+                )
+                data = resp_body.get("data", {})
+                if data.get("status") == "Succeed":
+                    result_url = data["data_url"]
+                    result_resp = requests.get(result_url)
+                    out = result_resp.json()
+                    return out
+                elif data.get("status") == "Failed":
+                    task_failed, failed_reason = True, f"Task failed: {data}"
+                    raise RuntimeError(f"Task failed: {data}")
+                time.sleep(self.POLLING_INTERVAL)
+            except Exception as e:
+                if BIZYAIR_DEBUG:
+                    print(f"Response error: {e}\n{traceback.format_exc()}")
+                time.sleep(self.POLLING_INTERVAL)
+
+        if task_failed:
+            raise RuntimeError(f"Task failed: {failed_reason}")
+        raise TimeoutError("Task processing timeout")
+
     def _get_result(self, result: Dict[str, Any], *, cache_key: str = None, **kwargs):
         try:
+            if self.is_fass_task(result):
+                self.cache_manager.set(cache_key, result)
+                result = self._get_fass_result(result)
+                result = result.get("data", {}).get("payload", None)
+                assert result is not None, "Output payload should not be None"
+                self.cache_manager.set(cache_key, result, overwrite=True)
+                return result
+
             response_data = result["data"]
             if BizyAirTask.check_inputs(result):
                 self.cache_manager.set(cache_key, result)

bizyengine/core/common/client.py

@@ -132,6 +132,8 @@ def process_response_data(response_data: dict) -> dict:
     if "result" in response_data:
         try:
             msg = json.loads(response_data["result"])
+            if "request_id" in response_data and "request_id" not in msg:
+                msg["request_id"] = response_data["request_id"]
         except json.JSONDecodeError:
             raise ValueError(f"Failed to decode JSON from response. {response_data=}")
     else:
@@ -161,6 +163,7 @@ def send_request(
         )
         with urllib.request.urlopen(req) as response:
             response_data = response.read().decode("utf-8")
+
     except urllib.error.URLError as e:
         error_message = str(e)
         response_body = e.read().decode("utf-8") if hasattr(e, "read") else "N/A"

bizyengine/core/configs/models.json

@@ -1,45 +1,56 @@
 {
-  "checkpoints": [{
-    "sdxl": [
-      "counterfeitxl_v25.safetensors",
-      "dreamshaperXL_lightningDPMSDE.safetensors",
-      "dreamshaperXL_v21TurboDPMSDE.safetensors",
-      "HelloWorldXL_v70.safetensors",
-      "juggernautXL_v9Rdphoto2Lightning.safetensors",
-      "Juggernaut-XL_v9_RunDiffusionPhoto_v2.safetensors",
-      "Juggernaut_X_RunDiffusion_Hyper.safetensors",
-      "mannEDreams_v004.safetensors",
-      "realisticStockPhoto_v20.safetensors",
-      "samaritan3dCartoon_v40SDXL.safetensors"
-    ],
-    "sd15": [
-      "dreamshaper_8.safetensors"
-    ]
-  },
-  "sd3.5_large.safetensors", "sd3.5_large_turbo.safetensors"],
-  "clip_vision": [{
-    "models": [
-      "CLIP-ViT-H-14-laion2B-s32B-b79K.safetensors"
-    ],
-    "kolors": [
-      "pytorch_model.bin"
-    ]
-  }, "sigclip_vision_patch14_384.safetensors"],
-  "controlnet": [{
-    "kolors": [
-      "Kolors-ControlNet-Canny.safetensors",
-      "Kolors-ControlNet-Depth.safetensors"
-    ],
-    "sdxl": [
-      "diffusion_pytorch_model_promax.safetensors"
-    ],
-    "sd15": [
-      "control_v11f1e_sd15_tile.pth"
-    ],
-    "instantid": [
-      "diffusion_pytorch_model.safetensors"
-    ]
-  }, "sd3.5_large_controlnet_blur.safetensors", "sd3.5_large_controlnet_canny.safetensors", "sd3.5_large_controlnet_depth.safetensors"],
+  "checkpoints": [
+    {
+      "sdxl": [
+        "counterfeitxl_v25.safetensors",
+        "dreamshaperXL_lightningDPMSDE.safetensors",
+        "dreamshaperXL_v21TurboDPMSDE.safetensors",
+        "HelloWorldXL_v70.safetensors",
+        "juggernautXL_v9Rdphoto2Lightning.safetensors",
+        "Juggernaut-XL_v9_RunDiffusionPhoto_v2.safetensors",
+        "Juggernaut_X_RunDiffusion_Hyper.safetensors",
+        "mannEDreams_v004.safetensors",
+        "realisticStockPhoto_v20.safetensors",
+        "samaritan3dCartoon_v40SDXL.safetensors"
+      ],
+      "sd15": [
+        "dreamshaper_8.safetensors"
+      ]
+    },
+    "sd3.5_large.safetensors",
+    "sd3.5_large_turbo.safetensors"
+  ],
+  "clip_vision": [
+    {
+      "models": [
+        "CLIP-ViT-H-14-laion2B-s32B-b79K.safetensors"
+      ],
+      "kolors": [
+        "pytorch_model.bin"
+      ]
+    },
+    "sigclip_vision_patch14_384.safetensors"
+  ],
+  "controlnet": [
+    {
+      "kolors": [
+        "Kolors-ControlNet-Canny.safetensors",
+        "Kolors-ControlNet-Depth.safetensors"
+      ],
+      "sdxl": [
+        "diffusion_pytorch_model_promax.safetensors"
+      ],
+      "sd15": [
+        "control_v11f1e_sd15_tile.pth"
+      ],
+      "instantid": [
+        "diffusion_pytorch_model.safetensors"
+      ]
+    },
+    "sd3.5_large_controlnet_blur.safetensors",
+    "sd3.5_large_controlnet_canny.safetensors",
+    "sd3.5_large_controlnet_depth.safetensors"
+  ],
   "ipadapter": {
     "kolors": [
       "ip_adapter_plus_general.bin"
@@ -54,36 +65,53 @@
       "meijia_flux_lora_rank16_bf16.safetensors"
     ]
   },
-  "unet": ["shuttle-3.1-aesthetic.safetensors",
-    "flux1-dev-kontext_fp8_scaled.safetensors", "flux1-dev-kontext-onediff.safetensors", {
-    "kolors": [
-      "Kolors-Inpainting.safetensors",
-      "Kolors.safetensors"
-    ],
-    "flux": [
-      "flux1-schnell.sft",
-      "flux1-dev.sft",
-      "pixelwave-flux1-dev.safetensors",
-      "flux1-canny-dev.safetensors",
-      "flux1-depth-dev.safetensors",
-      "flux1-fill-dev.safetensors"
-    ]
-  }],
-  "vae": [{
-    "sdxl": [
-      "sdxl_vae.safetensors"
-    ],
-    "flux": [
-      "ae.sft"
-    ]
-  }, "flux.1-canny-vae.safetensors", "flux.1-depth-vae.safetensors", "flux.1-fill-vae.safetensors"],
+  "unet": [
+    "shuttle-3.1-aesthetic.safetensors",
+    "wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors",
+    "wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors",
+    "flux1-dev-kontext_fp8_scaled.safetensors",
+    "flux1-dev-kontext-onediff.safetensors",
+    {
+      "kolors": [
+        "Kolors-Inpainting.safetensors",
+        "Kolors.safetensors"
+      ],
+      "flux": [
+        "flux1-schnell.sft",
+        "flux1-dev.sft",
+        "pixelwave-flux1-dev.safetensors",
+        "flux1-canny-dev.safetensors",
+        "flux1-depth-dev.safetensors",
+        "flux1-fill-dev.safetensors"
+      ]
+    }
+  ],
+  "vae": [
+    {
+      "sdxl": [
+        "sdxl_vae.safetensors"
+      ],
+      "flux": [
+        "ae.sft"
+      ]
+    },
+    "flux.1-canny-vae.safetensors",
+    "flux.1-depth-vae.safetensors",
+    "flux.1-fill-vae.safetensors",
+    "wan_2.1_vae.safetensors"
+  ],
   "clip": [
     "clip_l.safetensors",
     "clip_g.safetensors",
     "t5xxl_fp16.safetensors",
-    "t5xxl_fp8_e4m3fn.safetensors"
+    "t5xxl_fp8_e4m3fn.safetensors",
+    "umt5_xxl_fp8_e4m3fn_scaled.safetensors"
+  ],
+  "text_encoders": [
+    "t5xxl_fp16.safetensors",
+    "clip_l.safetensors",
+    "umt5_xxl_fp8_e4m3fn_scaled.safetensors"
   ],
-  "text_encoders":["t5xxl_fp16.safetensors","clip_l.safetensors"],
   "upscale_models": [
     "4x_NMKD-Siax_200k.pth",
     "RealESRGAN_x4plus.pth",

bizyengine/core/configs/models.yaml

@@ -436,3 +436,36 @@ model_rules:
       - class_type: "ReActorFaceSwap"
       - class_type: "ReActorFaceSwapOpt"
       - class_type: "ReActorRestoreFace"
+
+  - mode_type: Wan2.2-T2V
+    base_model: Wan
+    describe: Wan
+    score: 1
+    route: /supernode/bizyair-wan-2.2-t2v
+    nodes:
+      - class_type: 'UNETLoader'
+        inputs:
+          unet_name:
+            - ^wan2.2_t2v_high_noise_14B_fp8_scaled.safetensors$
+
+  - mode_type: Wan2.2-T2V
+    base_model: Wan
+    describe: Wan
+    score: 1
+    route: /supernode/bizyair-wan-2.2-t2v
+    nodes:
+      - class_type: 'UNETLoader'
+        inputs:
+          unet_name:
+            - ^wan2.2_t2v_low_noise_14B_fp8_scaled.safetensors$
+
+  - mode_type: Wan2.2-T2V-VAE
+    base_model: Wan
+    describe: Wan
+    score: 1
+    route: /supernode/bizyair-wan-2.2-t2v
+    nodes:
+      - class_type: 'VAELoader'
+        inputs:
+          vae_name:
+            - ^wan_2.1_vae.safetensors$

bizyengine/misc/nodes.py

@@ -761,7 +761,9 @@ class UNETLoader(BizyAirBaseNode):
                 #         "default": "",
                 #     },
                 # ),
-                "weight_dtype": (["default", "fp8_e4m3fn", "fp8_e5m2"],),
+                "weight_dtype": (
+                    ["default", "fp8_e4m3fn", "fp8_e5m2", "fp8_e4m3fn_fast"],
+                ),
             }
         }
 
@@ -1001,6 +1003,41 @@ class DualCLIPLoader(BizyAirBaseNode):
     #     return (model,)
 
 
+class CLIPLoader(BizyAirBaseNode):
+    @classmethod
+    def INPUT_TYPES(s):
+        return {
+            "required": {
+                "clip_name": (folder_paths.get_filename_list("text_encoders"),),
+                "type": (
+                    [
+                        "stable_diffusion",
+                        "stable_cascade",
+                        "sd3",
+                        "stable_audio",
+                        "mochi",
+                        "ltxv",
+                        "pixart",
+                        "cosmos",
+                        "lumina2",
+                        "wan",
+                        "hidream",
+                        "chroma",
+                        "ace",
+                        "omnigen2",
+                    ],
+                ),
+            },
+            "optional": {
+                "device": (["default", "cpu"], {"advanced": True}),
+            },
+        }
+
+    RETURN_TYPES = ("CLIP",)
+    # FUNCTION = "load_clip"
+    CATEGORY = "advanced/loaders"
+
+
 class KSamplerSelect(BizyAirBaseNode):
     @classmethod
     def INPUT_TYPES(s):

bizyengine/version.txt

@@ -1 +1 @@
-1.2.38
+1.2.39

{bizyengine-1.2.38.dist-info → bizyengine-1.2.39.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=hX7Z4r5S6GwxvrvN_CprJAnYh20TMy3LxcCF9L-kRwQ,7
+bizyengine/version.txt,sha256=9oNira_RnApeSDu5Wu73K540tdB-LBj2UA4KTjIiSMM,7
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
 bizyengine/bizy_server/api_client.py,sha256=t6cwob7hs993oy5WdFcjKtIzfi3S_eUhODdDVv_Hedo,43822
 bizyengine/bizy_server/errno.py,sha256=1UiFmE2U7r7hCHgsw4-p_YL0VCmTJc9NyYDEbhkanaY,16336
@@ -56,15 +56,15 @@ bizyengine/core/commands/invoker.py,sha256=8wcIMd8k44o96LAvxFrIiKOlVtf1MW-AcMDXs
 bizyengine/core/commands/processors/model_hosting_processor.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bizyengine/core/commands/processors/prompt_processor.py,sha256=jG0EuphvtycH5Dm-frBGtlIcxkTCXiFMQ1vFMvi_Re0,4963
 bizyengine/core/commands/servers/model_server.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-bizyengine/core/commands/servers/prompt_server.py,sha256=f5qTTyoe7_cFJ8xESG--mvP2axATKUgHyTBeV6JrBCI,8529
+bizyengine/core/commands/servers/prompt_server.py,sha256=0QjpAB1JG90yq4a8zvzPtUfqALd5J7Mq69W4I4Ma6xQ,10866
 bizyengine/core/common/__init__.py,sha256=GicZw6YeAZk1PsKmFDt9dm1F75zPUlpia9Q_ki5vW1Y,179
 bizyengine/core/common/caching.py,sha256=hRNsSrfNxgc1zzvBzLVjMY0iMkKqA0TBCr-iYhEpzik,6946
-bizyengine/core/common/client.py,sha256=1Ka8DIjbmD9Gme9c_Q1zwXXueSCP3_OSdEDyGYEol50,10396
+bizyengine/core/common/client.py,sha256=mP24Hxe_y20VXxVFdUz6HtLBzATUS4d8nr-rNf2KNwc,10535
 bizyengine/core/common/env_var.py,sha256=1EAW3gOXY2bKouCqrGa583vTJRdDasQ1IsFTnzDg7Dk,3450
 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=NqYVmp-ICpr1vFgafWjJMu5dyuRt9ffVUJmov3_-xRY,2746
-bizyengine/core/configs/models.yaml,sha256=0fNJo2VsAaEonhPpUdKesP1hiKkjMs-DrkuvmkBB8es,10668
+bizyengine/core/configs/models.json,sha256=rmH1BQp-j4nWiSo22QJhGIIb3y_Yycfmpkhseq6dgD8,3190
+bizyengine/core/configs/models.yaml,sha256=SgCyNGE-ia5GDgROF9ATDE6YdLYzqoNuVsKP0XjXJ8w,11442
 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=kQfPQjGU27qF9iyzRxLSRg5cMsd-VixuCUldART7cgY,2394
@@ -72,14 +72,14 @@ 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/mzkolors.py,sha256=xjJZ5Ct5Wh3WxSOK-ojX7a_fPvl_hA8qWIDKFUwBuvk,2827
-bizyengine/misc/nodes.py,sha256=e5TkJAFRPXT7OtLt1Lwnk7_tpu4q2zgiWNWDClRaIhA,43655
+bizyengine/misc/nodes.py,sha256=DnHqxurkhSrsFie9a0aupKA05NUA_E5IZxq19HDzMCk,44723
 bizyengine/misc/nodes_controlnet_aux.py,sha256=w7rASZmnBqhZCalDd7oVPjJpx6b31sPFxqlo3aWoAHc,16399
 bizyengine/misc/nodes_controlnet_union_sdxl.py,sha256=fYyu_XMY7mcX1Ad9x30q1tYB8mmCurMY48lCEylKrA4,5831
 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=deQjBgLAkxIr-NaOMm77TcgBT3ExAp0MFm5ehUJ3CGs,6829
-bizyengine-1.2.38.dist-info/METADATA,sha256=pMTJfTVSnAucVRYkvDob7EDJVQPm5cgxctPVmdGJv38,675
-bizyengine-1.2.38.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.38.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.38.dist-info/RECORD,,
+bizyengine-1.2.39.dist-info/METADATA,sha256=Bp5tyJOcAiD4ubGW7LloYfZqK3ft46RxeYyiGh3CJ8M,675
+bizyengine-1.2.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.39.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.39.dist-info/RECORD,,