Merge branch 'release/0.4.3'

Author: ty0x2333

CHANGELOG.md

@@ -1,3 +1,15 @@
+0.4.3
+---
+
+### BUG Fix
+
+1. Fix BUG: The ExecutionTime Node is not working with the latest version of ComfyUI.
+   PR: https://github.com/ty0x2333/ComfyUI-Dev-Utils/pull/16
+
+   Thanks [hugovntr](https://github.com/hugovntr) .
+
+   ComfyUI commit: https://github.com/comfyanonymous/ComfyUI/tree/5cfe38f41c7091b0fd954877d9d7427a8b438b1a
+
 0.4.2
 ---
 

nodes/execution_time.py

@@ -21,33 +21,66 @@ def process(self):
 
 CURRENT_START_EXECUTION_DATA = None
 
-origin_recursive_execute = execution.recursive_execute
-
-
-def swizzle_origin_recursive_execute(server, prompt, outputs, current_item, extra_data, executed, prompt_id, outputs_ui,
-                                     object_storage):
-    unique_id = current_item
-    class_type = prompt[unique_id]['class_type']
-    last_node_id = server.last_node_id
-    result = origin_recursive_execute(server, prompt, outputs, current_item, extra_data, executed, prompt_id,
-                                      outputs_ui,
-                                      object_storage)
-    if CURRENT_START_EXECUTION_DATA:
-        start_time = CURRENT_START_EXECUTION_DATA['nodes_start_perf_time'].get(unique_id)
-        if start_time:
-            end_time = time.perf_counter()
-            execution_time = end_time - start_time
-            if server.client_id is not None and last_node_id != server.last_node_id:
-                server.send_sync(
-                    "TyDev-Utils.ExecutionTime.executed",
-                    {"node": unique_id, "prompt_id": prompt_id, "execution_time": int(execution_time * 1000)},
-                    server.client_id
-                )
-            print(f"#{unique_id} [{class_type}]: {execution_time:.2f}s")
-    return result
-
 
-execution.recursive_execute = swizzle_origin_recursive_execute
+def handle_execute(class_type, last_node_id, prompt_id, server, unique_id):
+    if not CURRENT_START_EXECUTION_DATA:
+        return
+    start_time = CURRENT_START_EXECUTION_DATA['nodes_start_perf_time'].get(unique_id)
+    if start_time:
+        end_time = time.perf_counter()
+        execution_time = end_time - start_time
+        if server.client_id is not None and last_node_id != server.last_node_id:
+            server.send_sync(
+                "TyDev-Utils.ExecutionTime.executed",
+                {"node": unique_id, "prompt_id": prompt_id, "execution_time": int(execution_time * 1000)},
+                server.client_id
+            )
+        print(f"#{unique_id} [{class_type}]: {execution_time:.2f}s")
+
+
+try:
+    origin_execute = execution.execute
+
+
+    def swizzle_execute(server, dynprompt, caches, current_item, extra_data, executed, prompt_id, execution_list,
+                        pending_subgraph_results):
+        unique_id = current_item
+        class_type = dynprompt.get_node(unique_id)['class_type']
+        last_node_id = server.last_node_id
+        result = origin_execute(server, dynprompt, caches, current_item, extra_data, executed, prompt_id,
+                                execution_list,
+                                pending_subgraph_results)
+        handle_execute(class_type, last_node_id, prompt_id, server, unique_id)
+        return result
+
+
+    execution.execute = swizzle_execute
+except Exception as e:
+    pass
+
+# region: Deprecated
+try:
+    # The execute method in the old version of ComfyUI is now deprecated.
+    origin_recursive_execute = execution.recursive_execute
+
+
+    def swizzle_origin_recursive_execute(server, prompt, outputs, current_item, extra_data, executed, prompt_id,
+                                         outputs_ui,
+                                         object_storage):
+        unique_id = current_item
+        class_type = prompt[unique_id]['class_type']
+        last_node_id = server.last_node_id
+        result = origin_recursive_execute(server, prompt, outputs, current_item, extra_data, executed, prompt_id,
+                                          outputs_ui,
+                                          object_storage)
+        handle_execute(class_type, last_node_id, prompt_id, server, unique_id)
+        return result
+
+
+    execution.recursive_execute = swizzle_origin_recursive_execute
+except Exception as e:
+    pass
+# endregion
 
 origin_func = server.PromptServer.send_sync
 

pyproject.toml

@@ -1,8 +1,8 @@
 [project]
 name = "comfyui-dev-utils"
 description = "Execution Time Analysis, Reroute Enhancement, Node collection for developers."
-dynamic = "0.4.2"
-license = { file = "LICENSE" }
+dynamic = "0.4.3"
+license = { text = "MIT License" }
 dependencies = ["aiohttp-sse"]
 
 [project.urls]