bizyengine 1.2.7__py3-none-any.whl → 1.2.8__py3-none-any.whl

bizyengine/misc/nodes_controlnet_union_sdxl.py

@@ -8,13 +8,13 @@ import os
 
 import numpy as np
 import requests
+from bizyengine.core import BizyAirMiscBaseNode, pop_api_key_and_prompt_id
+from bizyengine.core.common import client
 from bizyengine.core.common.env_var import BIZYAIR_SERVER_ADDRESS
 from bizyengine.core.image_utils import decode_comfy_image, encode_comfy_image
 
-from .utils import get_api_key
 
-
-class StableDiffusionXLControlNetUnionPipeline:
+class StableDiffusionXLControlNetUnionPipeline(BizyAirMiscBaseNode):
     API_URL = f"{BIZYAIR_SERVER_ADDRESS}/supernode/diffusers-v1-stablediffusionxlcontrolnetunionpipeline"
 
     @classmethod
@@ -83,14 +83,6 @@ class StableDiffusionXLControlNetUnionPipeline:
     FUNCTION = "process"
     CATEGORY = "☁️BizyAir/ControlNet"
 
-    @staticmethod
-    def get_headers():
-        return {
-            "accept": "application/json",
-            "content-type": "application/json",
-            "authorization": f"Bearer {get_api_key()}",
-        }
-
     def process(
         self,
         openpose_image=None,
@@ -101,6 +93,7 @@ class StableDiffusionXLControlNetUnionPipeline:
         segment_image=None,
         **kwargs,
     ):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
         controlnet_img = {
             0: openpose_image,
             1: depth_image,
@@ -143,7 +136,7 @@ class StableDiffusionXLControlNetUnionPipeline:
         response = requests.post(
             self.API_URL,
             json=payload,
-            headers=self.get_headers(),
+            headers=client.headers(api_key=extra_data["api_key"]),
         )
 
         result = response.json()

bizyengine/misc/segment_anything.py

@@ -6,13 +6,14 @@ from enum import Enum
 import folder_paths
 import numpy as np
 import torch
+from bizyengine.core import BizyAirMiscBaseNode, pop_api_key_and_prompt_id
+from bizyengine.core.common import client
 from bizyengine.core.common.env_var import BIZYAIR_SERVER_ADDRESS
 from bizyengine.core.image_utils import decode_base64_to_np, encode_image_to_base64
 from nodes import LoadImage
 from PIL import Image, ImageOps, ImageSequence
 
 from .route_sam import SAM_COORDINATE
-from .utils import get_api_key, send_post_request
 
 
 class INFER_MODE(Enum):
@@ -27,7 +28,7 @@ class EDIT_MODE(Enum):
     point = 1
 
 
-class BizyAirSegmentAnythingText:
+class BizyAirSegmentAnythingText(BizyAirMiscBaseNode):
     API_URL = f"{BIZYAIR_SERVER_ADDRESS}/supernode/sam"
 
     @classmethod
@@ -44,7 +45,7 @@ class BizyAirSegmentAnythingText:
                     "FLOAT",
                     {"default": 0.3, "min": 0, "max": 1.0, "step": 0.01},
                 ),
-            }
+            },
         }
 
     RETURN_TYPES = ("IMAGE", "MASK")
@@ -52,8 +53,10 @@ class BizyAirSegmentAnythingText:
 
     CATEGORY = "☁️BizyAir/segment-anything"
 
-    def text_sam(self, image, prompt, box_threshold, text_threshold):
-        API_KEY = get_api_key()
+    def text_sam(self, image, prompt, box_threshold, text_threshold, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+
         SIZE_LIMIT = 1536
         device = image.device
         _, w, h, c = image.shape
@@ -70,19 +73,20 @@ class BizyAirSegmentAnythingText:
                 "text_threshold": text_threshold,
             },
         }
-        auth = f"Bearer {API_KEY}"
-        headers = {
-            "accept": "application/json",
-            "content-type": "application/json",
-            "authorization": auth,
-        }
         image = image.squeeze(0).numpy()
         image_pil = Image.fromarray((image * 255).astype(np.uint8))
         input_image = encode_image_to_base64(image_pil, format="webp")
         payload["image"] = input_image
-
-        ret: str = send_post_request(self.API_URL, payload=payload, headers=headers)
-        ret = json.loads(ret)
+        if "prompt_id" in extra_data:
+            payload["prompt_id"] = extra_data["prompt_id"]
+        data = json.dumps(payload).encode("utf-8")
+
+        ret = client.send_request(
+            url=self.API_URL,
+            data=data,
+            headers=headers,
+            callback=None,
+        )
 
         try:
             if "result" in ret:
@@ -117,7 +121,7 @@ class BizyAirSegmentAnythingText:
         return (img, img_mask)
 
 
-class BizyAirSegmentAnythingPointBox:
+class BizyAirSegmentAnythingPointBox(BizyAirMiscBaseNode):
     API_URL = f"{BIZYAIR_SERVER_ADDRESS}/supernode/sam"
 
     @classmethod
@@ -141,8 +145,10 @@ class BizyAirSegmentAnythingPointBox:
 
     CATEGORY = "☁️BizyAir/segment-anything"
 
-    def apply(self, image, is_point):
-        API_KEY = get_api_key()
+    def apply(self, image, is_point, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+
         SIZE_LIMIT = 1536
 
         # 加载原始图像
@@ -201,20 +207,18 @@ class BizyAirSegmentAnythingPointBox:
                 },
             }
 
-        auth = f"Bearer {API_KEY}"
-        headers = {
-            "accept": "application/json",
-            "content-type": "application/json",
-            "authorization": auth,
-        }
         # 处理用于API的图像
         api_image = image_to_process.squeeze(0).numpy()
         image_pil = Image.fromarray((api_image * 255).astype(np.uint8))
         input_image = encode_image_to_base64(image_pil, format="webp")
         payload["image"] = input_image
+        if "prompt_id" in extra_data:
+            payload["prompt_id"] = extra_data["prompt_id"]
+        data = json.dumps(payload).encode("utf-8")
 
-        ret: str = send_post_request(self.API_URL, payload=payload, headers=headers)
-        ret = json.loads(ret)
+        ret = client.send_request(
+            url=self.API_URL, data=data, headers=headers, callback=None
+        )
 
         try:
             if "result" in ret:

bizyengine/misc/supernode.py

@@ -8,6 +8,8 @@ import folder_paths
 import node_helpers
 import numpy as np
 import torch
+from bizyengine.core import BizyAirMiscBaseNode
+from bizyengine.core.common import client
 from bizyengine.core.common.env_var import BIZYAIR_SERVER_ADDRESS
 from bizyengine.core.image_utils import (
     decode_base64_to_np,
@@ -20,13 +22,12 @@ from PIL import Image, ImageOps, ImageSequence
 
 from .utils import (
     decode_and_deserialize,
-    get_api_key,
-    send_post_request,
+    pop_api_key_and_prompt_id,
     serialize_and_encode,
 )
 
 
-class RemoveBackground:
+class RemoveBackground(BizyAirMiscBaseNode):
     API_URL = f"{BIZYAIR_SERVER_ADDRESS}/supernode/removebg"
 
     @classmethod
@@ -34,7 +35,7 @@ class RemoveBackground:
         return {
             "required": {
                 "image": ("IMAGE",),
-            }
+            },
         }
 
     RETURN_TYPES = ("IMAGE", "MASK")
@@ -42,8 +43,10 @@ class RemoveBackground:
 
     CATEGORY = "☁️BizyAir"
 
-    def remove_background(self, image):
-        API_KEY = get_api_key()
+    def remove_background(self, image, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+
         device = image.device
         _, h, w, _ = image.shape
         assert (
@@ -54,26 +57,27 @@ class RemoveBackground:
             "is_compress": True,
             "image": None,
         }
-        auth = f"Bearer {API_KEY}"
-        headers = {
-            "accept": "application/json",
-            "content-type": "application/json",
-            "authorization": auth,
-        }
         input_image, compress = serialize_and_encode(image, compress=True)
         payload["image"] = input_image
         payload["is_compress"] = compress
-
-        response: str = send_post_request(
-            self.API_URL, payload=payload, headers=headers
+        if "prompt_id" in extra_data:
+            payload["prompt_id"] = extra_data["prompt_id"]
+        data = json.dumps(payload).encode("utf-8")
+
+        tensors = client.send_request(
+            url=self.API_URL,
+            data=data,
+            headers=headers,
+            callback=None,
+            response_handler=decode_and_deserialize,
         )
-        tensors = decode_and_deserialize(response)
+
         t_images = tensors["images"].to(device)
         t_mask = tensors["mask"].to(device)
         return (t_images, t_mask)
 
 
-class GenerateLightningImage:
+class GenerateLightningImage(BizyAirMiscBaseNode):
     API_URL = f"{BIZYAIR_SERVER_ADDRESS}/supernode/realvis4lightning"
 
     @classmethod
@@ -98,7 +102,7 @@ class GenerateLightningImage:
                     },
                 ),
                 "batch_size": ("INT", {"default": 1, "min": 1, "max": 4}),
-            }
+            },
         }
 
     RETURN_TYPES = ("IMAGE",)
@@ -106,8 +110,10 @@ class GenerateLightningImage:
 
     CATEGORY = "☁️BizyAir"
 
-    def generate_image(self, prompt, seed, width, height, cfg, batch_size):
-        API_KEY = get_api_key()
+    def generate_image(self, prompt, seed, width, height, cfg, batch_size, **kwargs):
+        extra_data = pop_api_key_and_prompt_id(kwargs)
+        headers = client.headers(api_key=extra_data["api_key"])
+
         assert (
             width <= 1024 and height <= 1024
         ), f"width and height must be less than 1024, but got {width} and {height}"
@@ -120,17 +126,17 @@ class GenerateLightningImage:
             "cfg": cfg,
             "seed": seed,
         }
-        auth = f"Bearer {API_KEY}"
-        headers = {
-            "accept": "application/json",
-            "content-type": "application/json",
-            "authorization": auth,
-        }
-
-        response: str = send_post_request(
-            self.API_URL, payload=payload, headers=headers
+        if "prompt_id" in extra_data:
+            payload["prompt_id"] = extra_data["prompt_id"]
+        data = json.dumps(payload).encode("utf-8")
+
+        tensors_np = client.send_request(
+            url=self.API_URL,
+            data=data,
+            headers=headers,
+            callback=None,
+            response_handler=decode_and_deserialize,
         )
-        tensors_np = decode_and_deserialize(response)
         tensors = torch.from_numpy(tensors_np)
 
         return (tensors,)

bizyengine/misc/utils.py

@@ -8,12 +8,19 @@ import zlib
 from typing import List, Tuple, Union
 
 import numpy as np
+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
 
 BIZYAIR_DEBUG = os.getenv("BIZYAIR_DEBUG", False)
 
 
+#
+# TODO: Deprecated, delete this
 def send_post_request(api_url, payload, headers):
+    import warnings
+
+    warnings.warn(message=f"send_post_request is deprecated")
     """
     Sends a POST request to the specified API URL with the given payload and headers.
 
@@ -123,26 +130,17 @@ def format_bytes(num_bytes: int) -> str:
         return f"{num_bytes / (1024 * 1024):.2f} MB"
 
 
-def get_api_key():
-    from bizyengine.core.common import get_api_key as bcc_get_api_key
-
-    return bcc_get_api_key()
-
-
 def get_llm_response(
     model: str,
     system_prompt: str,
     user_prompt: str,
     max_tokens: int = 1024,
     temperature: float = 0.7,
+    **kwargs,
 ):
     api_url = f"{BIZYAIR_SERVER_ADDRESS}/chat/completions"
-    API_KEY = get_api_key()
-    headers = {
-        "accept": "application/json",
-        "content-type": "application/json",
-        "Authorization": f"Bearer {API_KEY}",
-    }
+    extra_data = pop_api_key_and_prompt_id(kwargs)
+    headers = client.headers(api_key=extra_data["api_key"])
 
     payload = {
         "model": model,
@@ -157,7 +155,16 @@ def get_llm_response(
         "stream": False,
         "n": 1,
     }
-    response = send_post_request(api_url, headers=headers, payload=payload)
+    if "prompt_id" in extra_data:
+        payload["prompt_id"] = extra_data["prompt_id"]
+    data = json.dumps(payload).encode("utf-8")
+
+    response = client.send_request(
+        url=api_url,
+        data=data,
+        headers=headers,
+        callback=None,
+    )
     return response
 
 
@@ -169,14 +176,11 @@ def get_vlm_response(
     max_tokens: int = 1024,
     temperature: float = 0.7,
     detail: str = "auto",
+    **kwargs,
 ):
     api_url = f"{BIZYAIR_SERVER_ADDRESS}/chat/completions"
-    API_KEY = get_api_key()
-    headers = {
-        "accept": "application/json",
-        "content-type": "application/json",
-        "Authorization": f"Bearer {API_KEY}",
-    }
+    extra_data = pop_api_key_and_prompt_id(kwargs)
+    headers = client.headers(api_key=extra_data["api_key"])
 
     messages = [
         {
@@ -214,6 +218,14 @@ def get_vlm_response(
         "stream": False,
         "n": 1,
     }
-
-    response = send_post_request(api_url, headers=headers, payload=payload)
+    if "prompt_id" in extra_data:
+        payload["prompt_id"] = extra_data["prompt_id"]
+    data = json.dumps(payload).encode("utf-8")
+
+    response = client.send_request(
+        url=api_url,
+        headers=headers,
+        data=data,
+        callback=None,
+    )
     return response

bizyengine/version.txt

@@ -1 +1 @@
-1.2.7
+1.2.8

bizyengine-1.2.8.dist-info/METADATA

@@ -0,0 +1,211 @@
+Metadata-Version: 2.4
+Name: bizyengine
+Version: 1.2.8
+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
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+Requires-Dist: requests
+
+## Server Mode
+
+```bash
+export BIZYAIR_API_KEY="your api key"
+export BIZYAIR_SERVER_MODE=1
+```
+
+```python
+import json
+import os
+from urllib import request
+
+BIZYAIR_API_KEY=os.getenv("BIZYAIR_API_KEY", "")
+
+prompt_text = """
+{
+  "36": {
+    "inputs": {
+      "clip_name1": "t5xxl_fp16.safetensors",
+      "clip_name2": "clip_l.safetensors",
+      "type": "flux"
+    },
+    "class_type": "BizyAir_DualCLIPLoader",
+    "_meta": {
+      "title": "☁️BizyAir DualCLIPLoader"
+    }
+  },
+  "37": {
+    "inputs": {
+      "text": "close up photo of a rabbit, forest in spring, haze, halation, bloom, dramatic atmosphere, centred, rule of thirds, 200mm 1.4f macro shot",
+      "clip": [
+        "36",
+        0
+      ]
+    },
+    "class_type": "BizyAir_CLIPTextEncode",
+    "_meta": {
+      "title": "☁️BizyAir CLIP Text Encode (Prompt)"
+    }
+  },
+  "47": {
+    "inputs": {
+      "model": [
+        "48",
+        0
+      ],
+      "conditioning": [
+        "37",
+        0
+      ]
+    },
+    "class_type": "BizyAir_BasicGuider",
+    "_meta": {
+      "title": "☁️BizyAir BasicGuider"
+    }
+  },
+  "48": {
+    "inputs": {
+      "unet_name": "flux/pixelwave-flux1-dev.safetensors",
+      "weight_dtype": "default"
+    },
+    "class_type": "BizyAir_UNETLoader",
+    "_meta": {
+      "title": "☁️BizyAir Load Diffusion Model"
+    }
+  },
+  "50": {
+    "inputs": {
+      "noise": [
+        "59",
+        0
+      ],
+      "guider": [
+        "47",
+        0
+      ],
+      "sampler": [
+        "60",
+        0
+      ],
+      "sigmas": [
+        "58",
+        0
+      ],
+      "latent_image": [
+        "66",
+        0
+      ]
+    },
+    "class_type": "BizyAir_SamplerCustomAdvanced",
+    "_meta": {
+      "title": "☁️BizyAir SamplerCustomAdvanced"
+    }
+  },
+  "54": {
+    "inputs": {
+      "samples": [
+        "50",
+        0
+      ],
+      "vae": [
+        "55",
+        0
+      ]
+    },
+    "class_type": "BizyAir_VAEDecode",
+    "_meta": {
+      "title": "☁️BizyAir VAE Decode"
+    }
+  },
+  "55": {
+    "inputs": {
+      "vae_name": "flux/ae.sft"
+    },
+    "class_type": "BizyAir_VAELoader",
+    "_meta": {
+      "title": "☁️BizyAir Load VAE"
+    }
+  },
+  "56": {
+    "inputs": {
+      "images": [
+        "54",
+        0
+      ]
+    },
+    "class_type": "PreviewImage",
+    "_meta": {
+      "title": "预览图像"
+    }
+  },
+  "58": {
+    "inputs": {
+      "scheduler": "simple",
+      "steps": 20,
+      "denoise": 1,
+      "model": [
+        "48",
+        0
+      ]
+    },
+    "class_type": "BizyAir_BasicScheduler",
+    "_meta": {
+      "title": "☁️BizyAir BasicScheduler"
+    }
+  },
+  "59": {
+    "inputs": {
+      "noise_seed": 0
+    },
+    "class_type": "BizyAir_RandomNoise",
+    "_meta": {
+      "title": "☁️BizyAir RandomNoise"
+    }
+  },
+  "60": {
+    "inputs": {
+      "sampler_name": "euler"
+    },
+    "class_type": "BizyAir_KSamplerSelect",
+    "_meta": {
+      "title": "☁️BizyAir KSamplerSelect"
+    }
+  },
+  "66": {
+    "inputs": {
+      "width": 1024,
+      "height": 1024,
+      "batch_size": 1
+    },
+    "class_type": "EmptySD3LatentImage",
+    "_meta": {
+      "title": "空Latent图像（SD3）"
+    }
+  }
+}
+"""
+
+def queue_prompt(prompt):
+    p = {"prompt": prompt}
+    data = json.dumps(p).encode('utf-8')
+    req =  request.Request("http://127.0.0.1:9111/prompt", data=data)
+    request.urlopen(req)
+
+
+prompt = json.loads(prompt_text)
+param_node =  {
+        "inputs": {},
+        "class_type": "BizyAir_PassParameter",
+        "_meta": {
+        "title": "☁️BizyAir PassParameter",
+        "api_key": BIZYAIR_API_KEY,
+        "prompt_id": "a-unique-prompt-id"
+        }
+    }
+prompt["bizyair_magic_node"]=param_node
+queue_prompt(prompt)
+```