bizyengine 1.2.46__py3-none-any.whl → 1.2.48__py3-none-any.whl

bizyengine/core/common/client.py

@@ -169,7 +169,7 @@ def send_request(
         response_body = e.read().decode("utf-8") if hasattr(e, "read") else "N/A"
         if verbose:
             logging.error(f"URLError encountered: {error_message}")
-            logging.info(f"Response Body: {response_data}")
+            logging.info(f"Response Body: {response_body}")
         code, message = "N/A", "N/A"
         try:
             response_dict = json.loads(response_body)
@@ -178,8 +178,8 @@ def send_request(
                 message = response_dict.get("message", "N/A")
 
         except json.JSONDecodeError:
-            if verbose:
-                logging.error("Failed to decode response body as JSON.")
+            error_info = f"Failed to decode response body as JSON: {str(e)}. Response: {response_body[:200]}"
+            raise ConnectionError(f"Invalid server response: {error_info}") from e
 
         if "Unauthorized" in error_message:
             raise PermissionError(
@@ -225,7 +225,7 @@ def send_request(
                 except urllib.error.HTTPError as e:
                     success = 200 <= e.code < 400
                 except (urllib.error.URLError, TimeoutError):
-                    pass
+                    logging.error(f"Failed ({type(e).__name__}: {str(e)})")
                 results[site] = "Success" if success else "Failed"
             raise ConnectionError(
                 f"Failed to connect to the server: {url}.\n"

bizyengine/core/image_utils.py

@@ -1,292 +1,21 @@
-import base64
-import io
-import json
-import os
-import pickle
-import zlib
 from enum import Enum
-from functools import singledispatch
-from typing import Any, List, Union
 
-import numpy as np
-import torch
-from PIL import Image
+from bizyairsdk import (
+    base64_to_tensor,
+    decode_base64_to_image,
+    decode_base64_to_np,
+    decode_comfy_image,
+    decode_data,
+    encode_comfy_image,
+    encode_data,
+    encode_image_to_base64,
+    numpy_to_base64,
+)
 
-from .common.env_var import BIZYAIR_DEBUG
-
-# Marker to identify base64-encoded tensors
-TENSOR_MARKER = "TENSOR:"
-IMAGE_MARKER = "IMAGE:"
+# from .common.env_var import BIZYAIR_DEBUG
 
 
 class TaskStatus(Enum):
     PENDING = "pending"
     PROCESSING = "processing"
     COMPLETED = "completed"
-
-
-def convert_image_to_rgb(image: Image.Image) -> Image.Image:
-    if image.mode != "RGB":
-        return image.convert("RGB")
-    return image
-
-
-def encode_image_to_base64(
-    image: Image.Image, format: str = "png", quality: int = 100, lossless=False
-) -> str:
-    image = convert_image_to_rgb(image)
-    with io.BytesIO() as output:
-        image.save(output, format=format, quality=quality, lossless=lossless)
-        output.seek(0)
-        img_bytes = output.getvalue()
-        if BIZYAIR_DEBUG:
-            print(f"encode_image_to_base64: {format_bytes(len(img_bytes))}")
-    return base64.b64encode(img_bytes).decode("utf-8")
-
-
-def decode_base64_to_np(img_data: str, format: str = "png") -> np.ndarray:
-    img_bytes = base64.b64decode(img_data)
-    if BIZYAIR_DEBUG:
-        print(f"decode_base64_to_np: {format_bytes(len(img_bytes))}")
-    with io.BytesIO(img_bytes) as input_buffer:
-        img = Image.open(input_buffer)
-        # https://github.com/comfyanonymous/ComfyUI/blob/a178e25912b01abf436eba1cfaab316ba02d272d/nodes.py#L1511
-        img = img.convert("RGB")
-        return np.array(img)
-
-
-def decode_base64_to_image(img_data: str) -> Image.Image:
-    img_bytes = base64.b64decode(img_data)
-    with io.BytesIO(img_bytes) as input_buffer:
-        img = Image.open(input_buffer)
-        if BIZYAIR_DEBUG:
-            format_info = img.format.upper() if img.format else "Unknown"
-            print(f"decode image format: {format_info}")
-        return img
-
-
-def format_bytes(num_bytes: int) -> str:
-    """
-    Converts a number of bytes to a human-readable string with units (B, KB, or MB).
-
-    :param num_bytes: The number of bytes to convert.
-    :return: A string representing the number of bytes in a human-readable format.
-    """
-    if num_bytes < 1024:
-        return f"{num_bytes} B"
-    elif num_bytes < 1024 * 1024:
-        return f"{num_bytes / 1024:.2f} KB"
-    else:
-        return f"{num_bytes / (1024 * 1024):.2f} MB"
-
-
-def _legacy_encode_comfy_image(image: torch.Tensor, image_format="png") -> str:
-    input_image = image.cpu().detach().numpy()
-    i = 255.0 * input_image[0]
-    input_image = np.clip(i, 0, 255).astype(np.uint8)
-    base64ed_image = encode_image_to_base64(
-        Image.fromarray(input_image), format=image_format
-    )
-    return base64ed_image
-
-
-def _legacy_decode_comfy_image(
-    img_data: Union[List, str], image_format="png"
-) -> torch.tensor:
-    if isinstance(img_data, List):
-        decoded_imgs = [decode_comfy_image(x, old_version=True) for x in img_data]
-
-        combined_imgs = torch.cat(decoded_imgs, dim=0)
-        return combined_imgs
-
-    out = decode_base64_to_np(img_data, format=image_format)
-    out = np.array(out).astype(np.float32) / 255.0
-    output = torch.from_numpy(out)[None,]
-    return output
-
-
-def _new_encode_comfy_image(images: torch.Tensor, image_format="WEBP", **kwargs) -> str:
-    """https://docs.comfy.org/essentials/custom_node_snippets#save-an-image-batch
-    Encode a batch of images to base64 strings.
-
-    Args:
-        images (torch.Tensor): A batch of images.
-        image_format (str, optional): The format of the images. Defaults to "WEBP".
-
-    Returns:
-        str: A JSON string containing the base64-encoded images.
-    """
-    results = {}
-    for batch_number, image in enumerate(images):
-        i = 255.0 * image.cpu().numpy()
-        img = Image.fromarray(np.clip(i, 0, 255).astype(np.uint8))
-        base64ed_image = encode_image_to_base64(img, format=image_format, **kwargs)
-        results[batch_number] = base64ed_image
-
-    return json.dumps(results)
-
-
-def _new_decode_comfy_image(img_datas: str, image_format="WEBP") -> torch.tensor:
-    """
-    Decode a batch of base64-encoded images.
-
-    Args:
-        img_datas (str): A JSON string containing the base64-encoded images.
-        image_format (str, optional): The format of the images. Defaults to "WEBP".
-
-    Returns:
-        torch.Tensor: A tensor containing the decoded images.
-    """
-    img_datas = json.loads(img_datas)
-
-    decoded_imgs = []
-    for img_data in img_datas.values():
-        decoded_image = decode_base64_to_np(img_data, format=image_format)
-        decoded_image = np.array(decoded_image).astype(np.float32) / 255.0
-        decoded_imgs.append(torch.from_numpy(decoded_image)[None,])
-
-    return torch.cat(decoded_imgs, dim=0)
-
-
-def encode_comfy_image(
-    image: torch.Tensor, image_format="WEBP", old_version=False, lossless=False
-) -> str:
-    if old_version:
-        return _legacy_encode_comfy_image(image, image_format)
-    return _new_encode_comfy_image(image, image_format, lossless=lossless)
-
-
-def decode_comfy_image(
-    img_data: Union[List, str], image_format="WEBP", old_version=False
-) -> torch.tensor:
-    if old_version:
-        return _legacy_decode_comfy_image(img_data, image_format)
-    return _new_decode_comfy_image(img_data, image_format)
-
-
-def tensor_to_base64(tensor: torch.Tensor, compress=True) -> str:
-    tensor_np = tensor.cpu().detach().numpy()
-
-    tensor_bytes = pickle.dumps(tensor_np)
-    if compress:
-        tensor_bytes = zlib.compress(tensor_bytes)
-
-    tensor_b64 = base64.b64encode(tensor_bytes).decode("utf-8")
-    return tensor_b64
-
-
-def base64_to_tensor(tensor_b64: str, compress=True) -> torch.Tensor:
-    tensor_bytes = base64.b64decode(tensor_b64)
-
-    if compress:
-        tensor_bytes = zlib.decompress(tensor_bytes)
-
-    tensor_np = pickle.loads(tensor_bytes)
-
-    tensor = torch.from_numpy(tensor_np)
-    return tensor
-
-
-@singledispatch
-def decode_data(input, old_version=False):
-    raise NotImplementedError(f"Unsupported type: {type(input)}")
-
-
-@decode_data.register(int)
-@decode_data.register(float)
-@decode_data.register(bool)
-def _(input, **kwargs):
-    return input
-
-
-@decode_data.register(type(None))
-def _(input, **kwargs):
-    return [None]
-
-
-@decode_data.register(dict)
-def _(input, **kwargs):
-    return {k: decode_data(v, **kwargs) for k, v in input.items()}
-
-
-@decode_data.register(list)
-def _(input, **kwargs):
-    return [decode_data(x, **kwargs) for x in input]
-
-
-@decode_data.register(str)
-def _(input: str, **kwargs):
-    if input.startswith(TENSOR_MARKER):
-        tensor_b64 = input[len(TENSOR_MARKER) :]
-        return base64_to_tensor(tensor_b64)
-    elif input.startswith(IMAGE_MARKER):
-        tensor_b64 = input[len(IMAGE_MARKER) :]
-        old_version = kwargs.get("old_version", False)
-        return decode_comfy_image(tensor_b64, old_version=old_version)
-    return input
-
-
-@singledispatch
-def encode_data(output, disable_image_marker=False, old_version=False):
-    raise NotImplementedError(f"Unsupported type: {type(output)}")
-
-
-@encode_data.register(dict)
-def _(output, **kwargs):
-    return {k: encode_data(v, **kwargs) for k, v in output.items()}
-
-
-@encode_data.register(list)
-def _(output, **kwargs):
-    return [encode_data(x, **kwargs) for x in output]
-
-
-def is_image_tensor(tensor) -> bool:
-    """https://docs.comfy.org/essentials/custom_node_datatypes#image
-
-    Check if the given tensor is in the format of an IMAGE (shape [B, H, W, C] where C=3).
-
-    `Args`:
-        tensor (torch.Tensor): The tensor to check.
-
-    `Returns`:
-        bool: True if the tensor is in the IMAGE format, False otherwise.
-    """
-    try:
-        if not isinstance(tensor, torch.Tensor):
-            return False
-
-        if len(tensor.shape) != 4:
-            return False
-
-        B, H, W, C = tensor.shape
-        if C != 3:
-            return False
-
-        return True
-    except:
-        return False
-
-
-@encode_data.register(torch.Tensor)
-def _(output, **kwargs):
-    if is_image_tensor(output) and not kwargs.get("disable_image_marker", False):
-        old_version = kwargs.get("old_version", False)
-        lossless = kwargs.get("lossless", True)
-        return IMAGE_MARKER + encode_comfy_image(
-            output, image_format="WEBP", old_version=old_version, lossless=lossless
-        )
-    return TENSOR_MARKER + tensor_to_base64(output)
-
-
-@encode_data.register(int)
-@encode_data.register(float)
-@encode_data.register(bool)
-@encode_data.register(type(None))
-def _(output, **kwargs):
-    return output
-
-
-@encode_data.register(str)
-def _(output, **kwargs):
-    return output

bizyengine/version.txt

@@ -1 +1 @@
-1.2.46
+1.2.48

{bizyengine-1.2.46.dist-info → bizyengine-1.2.48.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bizyengine
-Version: 1.2.46
+Version: 1.2.48
 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
@@ -13,6 +13,7 @@ Requires-Dist: requests
 Requires-Dist: inputimeout
 Requires-Dist: openai>=1.77.0
 Requires-Dist: pycryptodome
+Requires-Dist: bizyairsdk>=0.0.4
 
 ## BizyEngine
 

{bizyengine-1.2.46.dist-info → bizyengine-1.2.48.dist-info}/RECORD

@@ -1,5 +1,5 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=32_H8a3cQVQgF4b_XGm5nAAN2BMgmYP95gQbYLjXLok,7
+bizyengine/version.txt,sha256=bnvdsAiKg-CLDL8gDQ12c9u0SoaVKcwhsnSzGc7CnJA,7
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
 bizyengine/bizy_server/api_client.py,sha256=Z7G5IjaEqSJkF6nLLw2R3bpgBAOi5ClQiUbel6NMXmE,43932
 bizyengine/bizy_server/errno.py,sha256=1UiFmE2U7r7hCHgsw4-p_YL0VCmTJc9NyYDEbhkanaY,16336
@@ -47,7 +47,7 @@ bizyengine/bizyair_extras/nodes_kolors_mz/__init__.py,sha256=HsCCCphW8q0SrWEiFlZ
 bizyengine/bizyair_extras/oauth_callback/main.py,sha256=KQOZWor3kyNx8xvUNHYNMoHfCF9g_ht13_iPk4K_5YM,3633
 bizyengine/core/__init__.py,sha256=EV9ZtTwOHC0S_eNvCu-tltIydfxfMsH59LbgVX4e_1c,359
 bizyengine/core/data_types.py,sha256=2f7QqqZvhKmXw3kZV1AvXuPTda34b4wXQE9tyO8nUSM,1595
-bizyengine/core/image_utils.py,sha256=8pJncmVPCUm-_S8Tu7gvESVmSDNp7Ok3M4RXNy_2rRA,8630
+bizyengine/core/image_utils.py,sha256=vJt42FcEDD8-fQumuogZM1XXwgYseSQ79_9Qzu9YTQk,409
 bizyengine/core/nodes_base.py,sha256=h2f_FWTWj6lpdKjwHRuOmoRifqwkV59ovM2ZxPK4h9c,9019
 bizyengine/core/nodes_io.py,sha256=VhwRwYkGp0g3Mh0hx1OSwNZbV06NEV13w2aODSiAm5M,2832
 bizyengine/core/commands/__init__.py,sha256=82yRdMT23RTiZPkFW_G3fVa-fj3-TUAXnj6cnGA3xRA,22
@@ -59,7 +59,7 @@ 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=mP24Hxe_y20VXxVFdUz6HtLBzATUS4d8nr-rNf2KNwc,10535
+bizyengine/core/common/client.py,sha256=KzKEzsiiY4RXT3kFZ84oBbdpLJopmV_BjHAaRe03qlo,10682
 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
@@ -79,7 +79,7 @@ bizyengine/misc/route_sam.py,sha256=-bMIR2QalfnszipGxSxvDAHGJa5gPSrjkYPb5baaRg4,
 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.46.dist-info/METADATA,sha256=KThw17QsRFjkDMbYYLkW42PsSbx3mik21HTzG0ZKclE,675
-bizyengine-1.2.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.46.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.46.dist-info/RECORD,,
+bizyengine-1.2.48.dist-info/METADATA,sha256=8AMoIRVUq3iBEVhTx-rwW4L92iNWLjtGTpXMBy7ah-8,708
+bizyengine-1.2.48.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.48.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.48.dist-info/RECORD,,