fix + node conversion

Fix conditioning not knowing about Float inputs;
Convert VideoMathNode to new format

Author: mcDandy

more_math/ConditioningMathNode.py

@@ -48,7 +48,7 @@ def check_lazy_status(cls, Expression,Expression_pi, V, F, length_mismatch="tile
         stream = CommonTokenStream(lexer)
         stream.fill()
 
-        input_stream = InputStream(Expression)
+        input_stream = InputStream(Expression_pi)
         lexer = MathExprLexer(input_stream)
         stream1 = CommonTokenStream(lexer)
         stream1.fill()
@@ -131,6 +131,9 @@ def execute(cls, V, F, Expression, Expression_pi, length_mismatch="tile"):
             "batch_count": a.shape[0],
         } | generate_dim_variables(a) | V_norm_tensors
 
+        for k, val in F.items():
+            variables[k] = val if val is not None else 0.0
+
         # Execute Expression (Main Tensor)
         tree = parse_expr(Expression)
         visitor = UnifiedMathVisitor(variables, a.shape, state_storage=ss)

more_math/ImageMathNode.py

@@ -19,11 +19,7 @@ class ImageMathNode(io.ComfyNode):
     @classmethod
     def define_schema(cls) -> io.Schema:
         return io.Schema(
-            node_id="mrmth_ag_ImageMathNode", # New ID to avoid collision if necessary, or keep standard and user migrates? User asked to "switch", likely implies replacing functionality but maybe keeping ID? Usually replacing ID breaks workflows. 
-            # Strategy: Use a NEW ID for the autogrow version if we want to allow side-by-side, but typically "Autogrow switch" implies replacing the main node. 
-            # However, standard ComfyUI practice for breaking changes is often a new node or careful migration.
-            # Looking at AudioMathNode in step 6, it used "mrmth_ag_AudioMathNode". 
-            # I will follow that pattern: mrmth_ag_ImageMathNode.
+            node_id="mrmth_ag_ImageMathNode",
             category="More math",
             display_name="Image math",
             inputs=[
@@ -75,7 +71,7 @@ def check_lazy_status(cls, Expression, V, F, length_mismatch="tile"):
         return needed1
 
     @classmethod
-    def execute(cls, V, F, Expression, length_mismatch="tile"):
+    def execute(cls, V, F, Expression, length_mismatch="error"):
         # I and F are Autogrow.Type which is dict[str, Any]
 
         # Identify all present tensors and their keys

more_math/ModelMathNode.py

@@ -81,29 +81,9 @@ def execute(cls, V, F, Expression, length_mismatch="tile") -> io.NodeOutput:
         if a is None:
             raise ValueError("At least one input model is required.")
 
-        # Prepare variables
-        # V0..V3 map to a..d for backward compatibility in calculate_patches
-
-        # Note: calculate_patches usually takes specific args. We might need to update it to support dynamic V/F or just pass everything.
-        # Looking at Step 34, calculate_patches signature: (Model, a, b, c, d, w, x, y, z)
-        # We need to verify if calculate_patches handles V/F. It probably doesn't.
-        # We should check 'modelLikeCommon.py' to see if update is needed.
-
-        # Assume for now we pass a,b,c,d,w,x,y,z as standard. 
-        # But for full autogrow support (more than 4 inputs), calculate_patches needs update.
-        # The prompt didn't explicitly ask to update modelLikeCommon, but "switch to Autogrow" implies full functionality.
-        # I'll check modelLikeCommon.py after this block. 
-        # For now, I will pass V and F to calculate_patches if I modify it, or I will stick to legacy args if I don't modify it.
-        # However, to support V4+, I MUST modify calculate_patches.
-
-        # Let's pass the V and F dicts to a modified calculate_patches, or overload it.
-        # I will update modelLikeCommon.py as part of this task.
 
         from .modelLikeCommon import calculate_patches_autogrow
 
-        # Map inputs to patchers if needed (Model.Input gives Model wrapper, need state_dict source?)
-        # ModelMathNode inputs are Model wrappers (comfy.model_patcher.ModelPatcher).
-        # So V items are ready to be used.
 
         aliases = {"a": "V0", "b": "V1", "c": "V2", "d": "V3", "w": "F0", "x": "F1", "y": "F2", "z": "F3"}
         patches = calculate_patches_autogrow(Expression, V=V, F=F, mapping=aliases)

more_math/Parser/UnifiedMathVisitor.py

@@ -162,7 +162,7 @@ def visitVariableExp(self, ctx):
             return float(self.depth)
         if var_name in self.variables:
             return self.variables[var_name]
-        raise ValueError(f"Variable '{var_name}' not found")
+        raise ValueError(f"line {ctx.VARIABLE().getPayload().line}:{ctx.VARIABLE().getPayload().column}: Variable '{var_name}' not found")
 
     def visitListExp(self, ctx):
         res = []