bizyengine 0.4.6__py3-none-any.whl → 1.1.2__py3-none-any.whl

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/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/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/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/version.txt

@@ -1 +1 @@
-0.4.6
+1.1.2

{bizyengine-0.4.6.dist-info → bizyengine-1.1.2.dist-info}/METADATA

@@ -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.dist-info → bizyengine-1.1.2.dist-info}/RECORD

@@ -1,5 +1,5 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=IIEpneCMo0_ihBdTj147GsGWQ-Q0gBYQP01x1pjhWOM,5
+bizyengine/version.txt,sha256=g9DE-d3AiatY4yLimLYZDyv1kdwiX_XN130F5qhCBhk,5
 bizyengine/bizy_server/__init__.py,sha256=SP9oSblnPo4KQyh7yOGD26YCskFAcQHAZy04nQBNRIw,200
 bizyengine/bizy_server/api_client.py,sha256=Txt17UOwpHRgbo5vXI00VEr1Z-rJi1IZjptKnV6QaSs,26719
 bizyengine/bizy_server/errno.py,sha256=OsVdedWFunQyJdZ7ijMqaL7gKrrP6DxndhJ0ZGnif00,6856
@@ -8,7 +8,7 @@ bizyengine/bizy_server/execution.py,sha256=ayaEf6eGJKQsVZV-1_UlGlvwwmlH7FEek31Uq
 bizyengine/bizy_server/resp.py,sha256=uxNMCOPNSC4EH6ZB43yXUrQ8_BYJ2RG-w4rk52brnBQ,521
 bizyengine/bizy_server/server.py,sha256=zKp4NemJ_eUwzLe-heKT5FQ2glLruC09FCqj6WU0Gos,34106
 bizyengine/bizy_server/utils.py,sha256=9VYj9tFyJ53VUyPcdoolTPNivHyRrRrzzP17Cc4UAXs,2202
-bizyengine/bizyair_extras/__init__.py,sha256=W6ZdwaEv-Ol2HiHPneR2oMce5uVEZWrPyWqsiTBjc_A,857
+bizyengine/bizyair_extras/__init__.py,sha256=Lnf-6vOrpkmzZ1H_AiBKlRo0pPt_A8HyUqGDXCZKOIc,892
 bizyengine/bizyair_extras/nodes_advanced_refluxcontrol.py,sha256=cecfjrtnjJAty9aNkhz8BlmHUC1NImkFlUDiA0COEa4,2242
 bizyengine/bizyair_extras/nodes_cogview4.py,sha256=Ni0TDOycczyDhYPvSR68TxGV_wE2uhaxd8MIj-J4-3o,2031
 bizyengine/bizyair_extras/nodes_comfyui_detail_daemon.py,sha256=i71it24tiGvZ3h-XFWISr4CpZszUtPuz3UrZARYluLk,6169
@@ -32,12 +32,13 @@ bizyengine/bizyair_extras/nodes_trellis.py,sha256=QU2dQsN_zKA91vTVtR4Af4kJXDJA8C
 bizyengine/bizyair_extras/nodes_ultimatesdupscale.py,sha256=6IZCDZ_9PhrKwJzCZGvKNxcRYwwkPRMNovF17nwzFqw,4130
 bizyengine/bizyair_extras/nodes_upscale_model.py,sha256=6DWAkcLPKy_8byaL9xShzDuccHLiVevKEswcbPr1vSI,825
 bizyengine/bizyair_extras/nodes_wan_video.py,sha256=d1mCcW9jCj-5Oymmymy0Vz-nwWv36FMGE5Gn-E7Rul4,1632
+bizyengine/bizyair_extras/route_bizyair_tools.py,sha256=QdgfiKeF6c4-5Bx5Pmz9RKlaAHreypy9SIg_krmLk-o,2079
 bizyengine/bizyair_extras/nodes_ipadapter_plus/__init__.py,sha256=ECKATm_EKi_4G47-FJI4-3rHO3iiF9FVakfSTE-pooE,36
 bizyengine/bizyair_extras/nodes_ipadapter_plus/nodes_ipadapter_plus.py,sha256=7J0f-LLyETZTfcKUMiFenz6WwJnZeRDID_Ghz2z6Caw,53476
 bizyengine/bizyair_extras/nodes_kolors_mz/__init__.py,sha256=mYaCDH1G28DOp5yLN-wsrCJV3TwgY18bqNPygeNqa30,2304
 bizyengine/bizyair_extras/oauth_callback/main.py,sha256=KQOZWor3kyNx8xvUNHYNMoHfCF9g_ht13_iPk4K_5YM,3633
 bizyengine/core/__init__.py,sha256=XKaHyQVH_xybBzEPJ_Vv-KA1dAtsU_cYtPnAMfdUT3c,303
-bizyengine/core/data_types.py,sha256=QKOTsEIiMJNYjgFQ63IfABNPx6om-w4Ae3bBcKotIMc,692
+bizyengine/core/data_types.py,sha256=U1Ai149lvbVA-z59sfgniES9KSsyFIbDs_vcjpjlUK4,967
 bizyengine/core/image_utils.py,sha256=--DmQb3R9Ev21MfZG9rfgOGsU2zRywJ-hpiNNN0N8p8,8586
 bizyengine/core/nodes_base.py,sha256=oWyFUXRjCiMrG1xz4pIKx8m9ioS_XJe0i37ixJl4hSE,5264
 bizyengine/core/nodes_io.py,sha256=3U1rb7CyZxsXYGeA-51Y_q8VaElLz-guR0EUlbgOr84,2812
@@ -67,10 +68,10 @@ bizyengine/misc/nodes.py,sha256=HJ4m7AiyfU_SynMYoTuYgYGsflzeTv4Zy4wlA6a8xk4,3626
 bizyengine/misc/nodes_controlnet_aux.py,sha256=9DoNT06go6fm2wjttUdPQKfqzumtEPnHUe3e93cCarc,16211
 bizyengine/misc/nodes_controlnet_union_sdxl.py,sha256=e6Zs7unfPU-18VCLGgZXFOa0x1L8NJQyTkPv_YqI-zA,5857
 bizyengine/misc/route_sam.py,sha256=-bMIR2QalfnszipGxSxvDAHGJa5gPSrjkYPb5baaRg4,1561
-bizyengine/misc/segment_anything.py,sha256=ZaZqs-NjqC8nFK1BzN0ED81wiD8iYoHWhiRkrJDkv6o,8535
+bizyengine/misc/segment_anything.py,sha256=RRm8FOfDY9VxdVrLjcdzJRh2pSM-kmNcCySuYnx9l7w,8677
 bizyengine/misc/supernode.py,sha256=eOhV7gLK6FaqXwASmD-0HJ-OPFrZk2e1IGOI1taCL9w,5152
 bizyengine/misc/utils.py,sha256=FRDEy63vDpssQxSFXrlK6WuXu15dNitYDIGGNOqtdH8,6353
-bizyengine-0.4.6.dist-info/METADATA,sha256=SAgQKdJsfPRhnpKup0GVp0SPo1LmXIZH4f-JFXhK_qo,574
-bizyengine-0.4.6.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-bizyengine-0.4.6.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-0.4.6.dist-info/RECORD,,
+bizyengine-1.1.2.dist-info/METADATA,sha256=UM1U2_YysM_EhDpTm1YQWVys5AZvxKOUqeN0BK590sM,574
+bizyengine-1.1.2.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+bizyengine-1.1.2.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.1.2.dist-info/RECORD,,