bizyengine 0.4.6__tar.gz → 1.1.2__tar.gz

{bizyengine-0.4.6 → bizyengine-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: bizyengine
-Version: 0.4.6
+Version: 1.1.2
 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-0.4.6 → bizyengine-1.1.2}/bizyengine/bizyair_extras/__init__.py

@@ -22,3 +22,4 @@ from .nodes_trellis import *
 from .nodes_ultimatesdupscale import *
 from .nodes_upscale_model import *
 from .nodes_wan_video import *
+from .route_bizyair_tools import *

bizyengine-1.1.2/bizyengine/bizyair_extras/route_bizyair_tools.py

@@ -0,0 +1,57 @@
+import json
+import pprint
+
+import bizyengine.core as bizyair
+from aiohttp import web
+from bizyengine.core.data_types import BIZYAIR_TYPE_MAP
+from server import PromptServer
+
+
+def get_bizyair_display_name(class_type: str) -> str:
+    bizyair_cls_prefix = bizyair.nodes_base.PREFIX
+    bizyair_logo = bizyair.nodes_base.LOGO
+    return f"{bizyair_logo}{bizyair_cls_prefix} {bizyair.NODE_DISPLAY_NAME_MAPPINGS.get(class_type, class_type)}"
+
+
+def workflow_convert(inputs: dict):
+    nodes = inputs["nodes"]
+    for node in nodes:
+        class_type = node["type"]
+        node_inputs = node.get("inputs")
+        node_outputs = node.get("outputs")
+        bizyair_cls_type = f"{bizyair.nodes_base.PREFIX}_{class_type}"
+        is_converted = False
+        if bizyair_cls_type in bizyair.NODE_CLASS_MAPPINGS:
+            node["type"] = bizyair_cls_type
+            display_name = get_bizyair_display_name(class_type)
+            node["properties"]["Node name for S&R"] = display_name
+            if node_inputs:
+                for input_node in node_inputs:
+                    input_type = input_node["type"]
+                    input_node["type"] = BIZYAIR_TYPE_MAP.get(input_type, input_type)
+            if node_outputs:
+                for output_node in node_outputs:
+                    output_type = output_node["type"]
+                    output_node["type"] = BIZYAIR_TYPE_MAP.get(output_type, output_type)
+            is_converted = True
+        pprint.pprint(
+            {
+                "original_class_type": class_type,
+                "bizyair_cls_type": bizyair_cls_type,
+                "is_converted": is_converted,
+            }
+        )
+    return inputs
+
+
+@PromptServer.instance.routes.post("/bizyair/node_converter")
+async def convert(request):
+    try:
+        data = await request.json()
+        ret = workflow_convert(data)
+        return web.Response(
+            text=json.dumps(ret),
+            content_type="application/json",
+        )
+    except Exception as e:
+        return web.json_response({"status": "error", "message": str(e)}, status=400)

{bizyengine-0.4.6 → bizyengine-1.1.2}/bizyengine/core/data_types.py

@@ -11,6 +11,19 @@ FACEANALYSIS = "BIZYAIR_FACEANALYSIS"
 STYLE_MODEL = "BIZYAIR_STYLE_MODEL"
 
 
+BIZYAIR_TYPE_MAP = {
+    "MODEL": MODEL,
+    "CLIP": CLIP,
+    "VAE": VAE,
+    "CONDITIONING": CONDITIONING,
+    "CONTROL_NET": CONTROL_NET,
+    "UPSCALE_MODEL": UPSCALE_MODEL,
+    "INSTANTID": INSTANTID,
+    "FACEANALYSIS": FACEANALYSIS,
+    "STYLE_MODEL": STYLE_MODEL,
+}
+
+
 def is_model_datatype(datatype):
     return datatype in [MODEL, CLIP, VAE, CONDITIONING, CONTROL_NET, STYLE_MODEL]
 

{bizyengine-0.4.6 → bizyengine-1.1.2}/bizyengine/misc/segment_anything.py

@@ -155,10 +155,9 @@ class BizyAirSegmentAnythingPointBox:
         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}"
-
         if is_point:
             coordinates = [
-                eval(SAM_COORDINATE["point_coords"][key])
+                json.loads(SAM_COORDINATE["point_coords"][key])
                 for key in SAM_COORDINATE["point_coords"]
             ]
 
@@ -179,7 +178,7 @@ class BizyAirSegmentAnythingPointBox:
             }
         else:
             coordinates = [
-                eval(SAM_COORDINATE["box_coords"][key])
+                json.loads(SAM_COORDINATE["box_coords"][key])
                 for key in SAM_COORDINATE["box_coords"]
             ]
             input_box = [
@@ -224,6 +223,9 @@ class BizyAirSegmentAnythingPointBox:
             raise Exception(f"Unexpected response: {ret} {e=}")
 
         if ret["status"] == "error":
+            if "data" in ret:
+                if "error" in ret["data"]:
+                    raise Exception(ret["data"]["error"])
             raise Exception(ret["message"])
 
         msg = ret["data"]

bizyengine-1.1.2/bizyengine/version.txt

@@ -0,0 +1 @@
+1.1.2

{bizyengine-0.4.6 → bizyengine-1.1.2}/bizyengine.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: bizyengine
-Version: 0.4.6
+Version: 1.1.2
 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-0.4.6 → bizyengine-1.1.2}/bizyengine.egg-info/SOURCES.txt

@@ -40,6 +40,7 @@ bizyengine/bizyair_extras/nodes_trellis.py
 bizyengine/bizyair_extras/nodes_ultimatesdupscale.py
 bizyengine/bizyair_extras/nodes_upscale_model.py
 bizyengine/bizyair_extras/nodes_wan_video.py
+bizyengine/bizyair_extras/route_bizyair_tools.py
 bizyengine/bizyair_extras/nodes_ipadapter_plus/__init__.py
 bizyengine/bizyair_extras/nodes_ipadapter_plus/nodes_ipadapter_plus.py
 bizyengine/bizyair_extras/nodes_kolors_mz/__init__.py

bizyengine-0.4.6/bizyengine/version.txt

@@ -1 +0,0 @@
-0.4.6