Merge branch 'main' into feat/mediapipe-vision

Author: ryanontheinside

.github/workflows/publish.yml

@@ -8,17 +8,19 @@ on:
     paths:
       - "pyproject.toml"
 
+permissions:
+  issues: write
+
 jobs:
   publish-node:
     name: Publish Custom Node to registry
     runs-on: ubuntu-latest
-    # if this is a forked repository. Skipping the workflow.
-    if: github.event.repository.fork == false 
+    if: ${{ github.repository_owner == 'ryanontheinside' }}
     steps:
       - name: Check out code
         uses: actions/checkout@v4
       - name: Publish Custom Node
-        uses: Comfy-Org/publish-node-action@main
+        uses: Comfy-Org/publish-node-action@v1
         with:
           ## Add your own personal access token to your Github Repository secrets and reference it here.
           personal_access_token: ${{ secrets.REGISTRY_ACCESS_TOKEN }}

node_wrappers/realtimenodes/controls/state_management_controls.py

@@ -1,4 +1,6 @@
 from ....src.realtimenodes.control_base import ControlNodeBase
+import copy
+from ....src.utils.general_utils import AlwaysEqualProxy
 
 class StateResetNode(ControlNodeBase):
     """Node that resets all control node states when triggered"""
@@ -21,12 +23,8 @@ def INPUT_TYPES(cls):
     CATEGORY = "Realtime Nodes/control/utility"
 
     def update(self, trigger, always_execute=True):
-        print(f"\n=== StateResetNode UPDATE - node_id: {self.node_id} ===")
-        print(f"States before potential reset: {self.state_manager._states}")
         if trigger:
-            print("RESETTING ALL STATES")
             self.state_manager.clear_all_states()
-            print(f"States after reset: {self.state_manager._states}")
             return (True,)
         return (False,)
 
@@ -52,19 +50,87 @@ def INPUT_TYPES(cls):
     CATEGORY = "Realtime Nodes/control/utility"
 
     def update(self, increment, always_execute=True):
-        print(f"\n=== StateTestNode UPDATE - node_id: {self.node_id} ===")
-        print(f"All states before get: {self.state_manager._states}")
-        
         state = self.get_state({
             "counter": 0
         })
-        print(f"Retrieved state: {state}")
 
         state["counter"] += increment
-        print(f"Updated state before save: {state}")
-        
+
         self.set_state(state)
-        print(f"All states after save: {self.state_manager._states}")
 
         return (state["counter"],)
 
+
+
+class GetStateNode(ControlNodeBase):
+    """
+    Node that retrieves a value from the global state using a user-specified key.
+    """
+    CATEGORY = "utils"
+    RETURN_TYPES = (AlwaysEqualProxy("*"),)
+    RETURN_NAMES = ("value",)
+    FUNCTION = "update"
+    DESCRIPTION = "Retrieve a value from the global state using the given key. If the key is not found, return the default value."
+    @classmethod
+    def INPUT_TYPES(cls):
+        inputs = super().INPUT_TYPES()
+        inputs["required"].update({
+            "key": ("STRING", {"default": "default_key", "tooltip": "The key to retrieve the value from. If not provided, the default value will be returned."}),
+            "default_value": (AlwaysEqualProxy("*"), {"tooltip": "The value to return if the key is not found."}),
+            "use_default": ("BOOLEAN", {"default": False, "tooltip": "If True, the default value will be returned if the key is not found."}),
+        })
+        return inputs
+    
+    def update(self, key: str, default_value, use_default: bool, always_execute=True):
+        """
+        Retrieve a value from the global state using the given key.
+        """
+        if not key or use_default:
+            return (default_value,)
+        
+        # Get the shared state dictionary
+        shared_state = self.state_manager.get_state("__shared_keys__", {})
+        
+        # Check if the key exists
+        if key in shared_state:
+            return (shared_state[key],)
+        
+        # Return default value if key not found
+        return (default_value,)
+    
+class SetStateNode(ControlNodeBase):
+    """
+    Node that stores a value in the global state with a user-specified key.
+    The value will be accessible in future workflow runs through GetStateNode.
+    """
+    CATEGORY = "utils"
+    RETURN_TYPES = (AlwaysEqualProxy("*"),)
+    RETURN_NAMES = ("value",)
+    FUNCTION = "update"
+    OUTPUT_NODE = True
+    DESCRIPTION = "Store a value in the global state with the given key. The value will be accessible in future workflow runs through GetStateNode."
+    @classmethod
+    def INPUT_TYPES(cls):
+        inputs = super().INPUT_TYPES()
+        inputs["required"].update({
+            "key": ("STRING", {"default": "default_key", "tooltip": "The key to store the value under. If not provided, the value will not be stored."}),
+            "value": (AlwaysEqualProxy("*"), {"tooltip": "The value to store in the global state."}),
+        })
+        return inputs
+    
+    def update(self, key: str, value, always_execute=True):
+        """
+        Store a value in the global state with the given key.
+        """
+        if not key:
+            return (value,)
+        
+        try:
+            shared_state = self.state_manager.get_state("__shared_keys__", {})
+            shared_state[key] = copy.deepcopy(value)
+            self.state_manager.set_state("__shared_keys__", shared_state)
+        except Exception as e:
+            print(f"[State Node] Error storing value: {str(e)}")
+        
+        return (value,)
+

node_wrappers/realtimenodes/logic/__init__.py

@@ -42,7 +42,7 @@ def INPUT_TYPES(cls):
     RETURN_NAMES = ("debug_image", "hand_data")
     FUNCTION = "track_hands"
     CATEGORY = "image/processing"
-    
+    DESCRIPTION = "(((EXPERIMENTAL))) Track hands in an image using MediaPipe. Returns a debug image with landmarks and a dictionary of hand data."
     def __init__(self):
         self.last_detection_conf = 0.5
         self.last_tracking_conf = 0.5