Fix some loop node bug

py/logic.py

@@ -4,6 +4,7 @@
 from .libs.utils import AlwaysEqualProxy, ByPassTypeTuple, cleanGPUUsedForce, compare_revision
 from .libs.cache import remove_cache
 import numpy as np
+import re
 import json
 import torch
 import comfy.utils
@@ -569,8 +570,8 @@ def INPUT_TYPES(cls):
             inputs["optional"]["initial_value%d" % i] = ("*",)
         return inputs
 
-    RETURN_TYPES = ByPassTypeTuple(tuple(["FLOW_CONTROL"] + ["*"] * MAX_FLOW_NUM))
-    RETURN_NAMES = ByPassTypeTuple(tuple(["flow"] + ["value%d" % i for i in range(MAX_FLOW_NUM)]))
+    RETURN_TYPES = tuple(["FLOW_CONTROL"] + ["*"] * MAX_FLOW_NUM)
+    RETURN_NAMES = tuple(["flow"] + ["value%d" % i for i in range(MAX_FLOW_NUM)])
     FUNCTION = "while_loop_open"
 
     CATEGORY = "EasyUse/Logic/While Loop"
@@ -603,8 +604,8 @@ def INPUT_TYPES(cls):
             inputs["optional"]["initial_value%d" % i] = (AlwaysEqualProxy('*'),)
         return inputs
 
-    RETURN_TYPES = ByPassTypeTuple(tuple([AlwaysEqualProxy('*')] * MAX_FLOW_NUM))
-    RETURN_NAMES = ByPassTypeTuple(tuple(["value%d" % i for i in range(MAX_FLOW_NUM)]))
+    RETURN_TYPES = tuple([AlwaysEqualProxy('*')] * MAX_FLOW_NUM)
+    RETURN_NAMES = tuple(["value%d" % i for i in range(MAX_FLOW_NUM)])
     FUNCTION = "while_loop_close"
 
     CATEGORY = "EasyUse/Logic/While Loop"
@@ -923,7 +924,13 @@ def batch(self, a, b):
             if a.shape[1:] != b.shape[1:]:
                 b = comfy.utils.common_upscale(b.movedim(-1, 1), a.shape[2], a.shape[1], "bilinear", "center").movedim(1, -1)
             return (torch.cat((a, b), 0),)
-        elif isinstance(a, (str, float, int, list, dict, tuple)):
+        elif isinstance(a, (str, float, int)):
+            if isinstance(b, tuple):
+                return (b + (a,),)
+            return ((a, b),)
+        elif isinstance(b, (str, float, int)):
+            if isinstance(a, tuple):
+                return (a + (b,),)
             return ((a, b),)
         else:
             return (a + b,)