Merge branch 'release/0.6.1'

Author: ty0x2333

CHANGELOG.md

@@ -1,3 +1,16 @@
+0.6.1
+---
+
+### Enhancement
+
+1. Rename hook methods starting with `swizzle_` to `dev_utils_`, so that errors can be located more easily.
+
+### BUG Fix
+
+1. Fix TypeError: swizzle_execute() missing 1 required positional argument: 'pending_async_nodes'.
+
+   https://github.com/ty0x2333/ComfyUI-Dev-Utils/issues/33
+
 0.6.0
 ---
 

nodes/execution_time.py

@@ -4,6 +4,8 @@
 import inspect
 import execution
 import server
+
+
 # import model_management
 
 
@@ -73,8 +75,8 @@ def handle_execute(class_type, last_node_id, prompt_id, server, unique_id):
     origin_execute = execution.execute
 
     if inspect.iscoroutinefunction(origin_execute):
-        async def swizzle_execute(server, dynprompt, caches, current_item, extra_data, executed, prompt_id,
-                                  execution_list, pending_subgraph_results, pending_async_nodes):
+        async def dev_utils_execute(server, dynprompt, caches, current_item, extra_data, executed, prompt_id,
+                                    execution_list, pending_subgraph_results, pending_async_nodes):
             unique_id = current_item
             class_type = dynprompt.get_node(unique_id)['class_type']
             last_node_id = server.last_node_id
@@ -83,18 +85,17 @@ async def swizzle_execute(server, dynprompt, caches, current_item, extra_data, e
             handle_execute(class_type, last_node_id, prompt_id, server, unique_id)
             return result
     else:
-        def swizzle_execute(server, dynprompt, caches, current_item, extra_data, executed, prompt_id,
-                            execution_list, pending_subgraph_results, pending_async_nodes):
+        def dev_utils_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, pending_async_nodes)
+                                    execution_list, pending_subgraph_results)
             handle_execute(class_type, last_node_id, prompt_id, server, unique_id)
             return result
 
-
-    execution.execute = swizzle_execute
+    execution.execute = dev_utils_execute
 except Exception as e:
     pass
 
@@ -104,9 +105,9 @@ def swizzle_execute(server, dynprompt, caches, current_item, extra_data, execute
     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):
+    def dev_utils_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
@@ -117,16 +118,16 @@ def swizzle_origin_recursive_execute(server, prompt, outputs, current_item, extr
         return result
 
 
-    execution.recursive_execute = swizzle_origin_recursive_execute
+    execution.recursive_execute = dev_utils_origin_recursive_execute
 except Exception as e:
     pass
 # endregion
 
 origin_func = server.PromptServer.send_sync
 
 
-def swizzle_send_sync(self, event, data, sid=None):
-    # print(f"swizzle_send_sync, event: {event}, data: {data}")
+def dev_utils_send_sync(self, event, data, sid=None):
+    # print(f"dev_utils_send_sync, event: {event}, data: {data}")
     global CURRENT_START_EXECUTION_DATA
     if event == "execution_start":
         CURRENT_START_EXECUTION_DATA = dict(
@@ -158,4 +159,4 @@ def swizzle_send_sync(self, event, data, sid=None):
             CURRENT_START_EXECUTION_DATA['nodes_start_vram'][node_id] = get_peak_memory()
 
 
-server.PromptServer.send_sync = swizzle_send_sync
+server.PromptServer.send_sync = dev_utils_send_sync

pyproject.toml

@@ -1,7 +1,7 @@
 [project]
 name = "comfyui-dev-utils"
 description = "Execution Time Analysis, Reroute Enhancement, Node collection for developers."
-version = "0.6.0"
+version = "0.6.1"
 license = { text = "MIT License" }
 dependencies = ["aiohttp-sse"]