bizyengine 1.2.40__py3-none-any.whl → 1.2.41__py3-none-any.whl

bizyengine/bizyair_extras/route_bizyair_tools.py

@@ -8,6 +8,22 @@ import bizyengine.core as bizyair
 from bizyengine.core.common.env_var import BIZYAIR_DEBUG
 from bizyengine.core.data_types import BIZYAIR_TYPE_MAP
 
+# Invert BIZYAIR_TYPE_MAP for reverse lookup
+INVERTED_BIZYAIR_TYPE_MAP = {v: k for k, v in BIZYAIR_TYPE_MAP.items()}
+
+import importlib
+import warnings
+
+try:
+    comfy_nodes = importlib.import_module("nodes")
+except ModuleNotFoundError:
+    warnings.warn("Importing comfyui.nodes failed!")
+    comfy_nodes = type(
+        "nodes",
+        (object,),
+        {"NODE_DISPLAY_NAME_MAPPINGS": {}, "NODE_CLASS_MAPPINGS": {}},
+    )
+
 
 def get_bizyair_display_name(class_type: str) -> str:
     bizyair_cls_prefix = bizyair.nodes_base.PREFIX
@@ -15,35 +31,69 @@ def get_bizyair_display_name(class_type: str) -> str:
     return f"{bizyair_logo}{bizyair_cls_prefix} {bizyair.NODE_DISPLAY_NAME_MAPPINGS.get(class_type, class_type)}"
 
 
-def workflow_convert(inputs: dict):
+def revert_bizyair_display_name(class_type: str) -> str:
+    comfy_class_type = class_type[len(f"{bizyair.nodes_base.PREFIX}_") :]
+    return comfy_nodes.NODE_DISPLAY_NAME_MAPPINGS.get(
+        comfy_class_type, comfy_class_type
+    )
+
+
+def workflow_convert(inputs: dict, comfy2bizyair: bool = True):
     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)
+
+        # check if the node is a bizyair node
+        new_class_type = class_type
+        if not comfy2bizyair:
+            if (
+                len(class_type) > len(f"{bizyair.nodes_base.PREFIX}_")
+                and class_type[len(f"{bizyair.nodes_base.PREFIX}_") :]
+                in comfy_nodes.NODE_CLASS_MAPPINGS
+            ):
+                new_class_type = class_type[len(f"{bizyair.nodes_base.PREFIX}_") :]
+        elif (
+            comfy2bizyair
+            and f"{bizyair.nodes_base.PREFIX}_{class_type}"
+            in bizyair.NODE_CLASS_MAPPINGS
+        ):
+            new_class_type = f"{bizyair.nodes_base.PREFIX}_{class_type}"
+
+        if new_class_type != class_type:
+            node["type"] = new_class_type
+            display_name = (
+                get_bizyair_display_name(class_type)
+                if comfy2bizyair
+                else revert_bizyair_display_name(class_type)
+            )
             node["properties"]["Node name for S&R"] = display_name
+
+            type_mapping = (
+                BIZYAIR_TYPE_MAP if comfy2bizyair else INVERTED_BIZYAIR_TYPE_MAP
+            )
             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)
+                    input_node["type"] = type_mapping.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)
+                    output_node["type"] = type_mapping.get(output_type, output_type)
+
             is_converted = True
+
         if BIZYAIR_DEBUG:
             pprint.pprint(
                 {
                     "original_class_type": class_type,
-                    "bizyair_cls_type": bizyair_cls_type,
+                    "new_class_type": new_class_type,
                     "is_converted": is_converted,
                 }
             )
+
     return inputs
 
 
@@ -51,7 +101,13 @@ def workflow_convert(inputs: dict):
 async def convert(request):
     try:
         data = await request.json()
-        ret = workflow_convert(data)
+        comfy2bizyair = data.get("comfy2bizyair", True)
+        ret = workflow_convert(data, comfy2bizyair=comfy2bizyair)
+
+        # remove "comfy2bizyair" key from the response
+        if "comfy2bizyair" in ret:
+            del ret["comfy2bizyair"]
+
         return web.Response(
             text=json.dumps(ret),
             content_type="application/json",

bizyengine/version.txt

@@ -1 +1 @@
-1.2.40
+1.2.41

{bizyengine-1.2.40.dist-info → bizyengine-1.2.41.dist-info}/METADATA

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

@@ -1,5 +1,5 @@
 bizyengine/__init__.py,sha256=GP9V-JM07fz7uv_qTB43QEA2rKdrVJxi5I7LRnn_3ZQ,914
-bizyengine/version.txt,sha256=ieRc7kTZ6hz8JdJRjtnFbjOxruKVZLAcz159-DPNzKg,7
+bizyengine/version.txt,sha256=14oMCP7qyokUFWpNMA8OF-sbwiuToPwd3e8z94cw7ZM,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
@@ -40,7 +40,7 @@ bizyengine/bizyair_extras/nodes_upscale_model.py,sha256=lrzA1BFI2w5aEPCmNPMh07s-
 bizyengine/bizyair_extras/nodes_utils.py,sha256=whog_tmV-q7JvLEdb03JL3KKsC7wKe3kImzx_jPaQD8,2613
 bizyengine/bizyair_extras/nodes_wan_i2v.py,sha256=3XwcxLHmgrihgXDEzcVOjU6VjqnZa3mErINlY014PFA,8435
 bizyengine/bizyair_extras/nodes_wan_video.py,sha256=aE2JBF0ZT-6BOM0bGu9R4yZ_eMeMnnjCW-YzFe4qg8Q,2804
-bizyengine/bizyair_extras/route_bizyair_tools.py,sha256=w04QUWFnavT1zu8ht7Z1WTMlSnn__cO3r5RmiKlcuUQ,2191
+bizyengine/bizyair_extras/route_bizyair_tools.py,sha256=EiP5pS6xoE3tULoNSN2hYZA29vgt7yCErsbRp34gGEg,3898
 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=lOKRem7oiPs8ZkA_p68HxagAgiCSvn3Rk-L4fSXIjyE,54846
 bizyengine/bizyair_extras/nodes_kolors_mz/__init__.py,sha256=HsCCCphW8q0SrWEiFlZKK_W2lQr1T0UJIJL7gEn37ME,3729
@@ -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=deQjBgLAkxIr-NaOMm77TcgBT3ExAp0MFm5ehUJ3CGs,6829
-bizyengine-1.2.40.dist-info/METADATA,sha256=-h0_LM-Rbok05CLoxBva4Mgr3qTTsdXP0FqXoEkizvw,675
-bizyengine-1.2.40.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-bizyengine-1.2.40.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
-bizyengine-1.2.40.dist-info/RECORD,,
+bizyengine-1.2.41.dist-info/METADATA,sha256=H3M0yCeP_Gz6s_izao-RYYhtfwhkrV8jv-UkJqZs-8w,675
+bizyengine-1.2.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+bizyengine-1.2.41.dist-info/top_level.txt,sha256=2zapzqxX-we5cRyJkGf9bd5JinRtXp3-_uDI-xCAnc0,11
+bizyengine-1.2.41.dist-info/RECORD,,