rework output type socket to be more flexible

backend/execution.py

@@ -31,7 +31,7 @@ from threading import RLock
 from time import perf_counter
 from typing import Any, Callable
 
-from backend.node_registry import NODE_CLASS_MAPPINGS
+from backend.node_registry import NODE_CLASS_MAPPINGS, get_node_output_types
 from backend.execution_context import active_node, execution_callbacks
 
 
@@ -455,7 +455,7 @@ class ExecutionEngine:
                 on_preview(node_id, preview)
                 return
 
-        return_types = getattr(cls, "RETURN_TYPES", ())
+        return_types = get_node_output_types(cls)
 
         for slot, type_name in enumerate(return_types):
             if slot >= len(result):
@@ -536,7 +536,7 @@ class ExecutionEngine:
         import numpy as np
         from backend.data_types import LineData
 
-        return_types = getattr(cls, "RETURN_TYPES", ())
+        return_types = get_node_output_types(cls)
 
         # Find the y-values (current slot) and try to find an x-axis
         y = result[slot]

backend/node_registry.py

@@ -15,6 +15,30 @@ NODE_CLASS_MAPPINGS: dict[str, type] = {}
 NODE_DISPLAY_NAME_MAPPINGS: dict[str, str] = {}
 
 
+def get_node_output_specs(cls: type) -> tuple[tuple[str, str], ...]:
+    raw_outputs = getattr(cls, "OUTPUTS", None)
+    if raw_outputs is None:
+        raise AttributeError(f"{cls.__name__} must define OUTPUTS.")
+
+    specs: list[tuple[str, str]] = []
+    for index, output in enumerate(raw_outputs):
+        if not isinstance(output, (list, tuple)) or len(output) != 2:
+            raise TypeError(
+                f"{cls.__name__}.OUTPUTS[{index}] must be a 2-item tuple of (type, name)."
+            )
+        type_name, name = output
+        specs.append((str(type_name), str(name)))
+    return tuple(specs)
+
+
+def get_node_output_types(cls: type) -> tuple[str, ...]:
+    return tuple(type_name for type_name, _ in get_node_output_specs(cls))
+
+
+def get_node_output_names(cls: type) -> tuple[str, ...]:
+    return tuple(name for _, name in get_node_output_specs(cls))
+
+
 def register_node(display_name: str | None = None):
     """
     Class decorator that registers a node class into NODE_CLASS_MAPPINGS.
@@ -25,6 +49,7 @@ def register_node(display_name: str | None = None):
             ...
     """
     def decorator(cls: type) -> type:
+        get_node_output_specs(cls)
         name = cls.__name__
         NODE_CLASS_MAPPINGS[name] = cls
         NODE_DISPLAY_NAME_MAPPINGS[name] = display_name or name
@@ -50,8 +75,8 @@ def get_node_info(class_name: str) -> dict[str, Any]:
         "menu_categories": list(menu_metadata.get("menu_categories", [])),
         "input": input_types,
         "input_order": {k: list(v.keys()) for k, v in input_types.items()},
-        "output": list(cls.RETURN_TYPES),
+        "output": list(get_node_output_types(cls)),
-        "output_name": list(getattr(cls, "RETURN_NAMES", cls.RETURN_TYPES)),
+        "output_name": list(get_node_output_names(cls)),
         "output_node": bool(getattr(cls, "OUTPUT_NODE", False)),
         "manual_trigger": bool(getattr(cls, "MANUAL_TRIGGER", False)),
         "description": getattr(cls, "DESCRIPTION", ""),

backend/nodes/acf.py

@@ -16,8 +16,9 @@ class ACF:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("acf",)
+        ('DATA_FIELD', 'acf'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/angle_measure.py

@@ -112,8 +112,10 @@ class AngleMeasure:
             },
         }
 
-    RETURN_TYPES = ("ANNOTATION_SOURCE", "MEASURE_TABLE")
+    OUTPUTS = (
-    RETURN_NAMES = ("output", "measurements")
+        ('ANNOTATION_SOURCE', 'output'),
+        ('MEASURE_TABLE', 'measurements'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/annotations.py

@@ -43,8 +43,9 @@ class Annotations:
             },
         }
 
-    RETURN_TYPES = ("ANNOTATION_SOURCE",)
+    OUTPUTS = (
-    RETURN_NAMES = ("Output",)
+        ('ANNOTATION_SOURCE', 'output'),
+    )
     FUNCTION = "render"
 
     DESCRIPTION = (

backend/nodes/color_map.py

@@ -23,8 +23,9 @@ class ColorMap:
             }
         }
 
-    RETURN_TYPES = ("COLORMAP",)
+    OUTPUTS = (
-    RETURN_NAMES = ("colormap",)
+        ('COLORMAP', 'colormap'),
+    )
     FUNCTION = "build"
 
     DESCRIPTION = (

backend/nodes/colormap_adjust.py

@@ -17,8 +17,9 @@ class ColormapAdjust:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("field",)
+        ('DATA_FIELD', 'field'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/coordinate.py

@@ -15,8 +15,9 @@ class Coordinate:
             }
         }
 
-    RETURN_TYPES = ("COORD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("point",)
+        ('COORD', 'point'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = "Output a fractional (x, y) coordinate pair in [0, 1]."

backend/nodes/coordinate_pair.py

@@ -15,8 +15,9 @@ class CoordinatePair:
             }
         }
 
-    RETURN_TYPES = ("COORDPAIR",)
+    OUTPUTS = (
-    RETURN_NAMES = ("coord pair",)
+        ('COORDPAIR', 'coord_pair'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = "Output a pair of coordinates."

backend/nodes/crop_resize_field.py

@@ -26,8 +26,9 @@ class CropResizeField:
             },
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("field",)
+        ('DATA_FIELD', 'field'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/cross_section.py

@@ -27,8 +27,10 @@ class CrossSection:
             },
         }
 
-    RETURN_TYPES = ("LINE", "COORDPAIR",)
+    OUTPUTS = (
-    RETURN_NAMES = ("profile", "marker pair",)
+        ('LINE', 'profile'),
+        ('COORDPAIR', 'marker_pair'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/cursors.py

@@ -27,8 +27,10 @@ class Cursors:
             },
         }
 
-    RETURN_TYPES = ("MEASURE_TABLE", "COORDPAIR",)
+    OUTPUTS = (
-    RETURN_NAMES = ("measurement", "coord pair",)
+        ('MEASURE_TABLE', 'measurement'),
+        ('COORDPAIR', 'coord_pair'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/curvature.py

@@ -287,8 +287,12 @@ class Curvature:
             },
         }
 
-    RETURN_TYPES = ("ANNOTATION_SOURCE", "MEASURE_TABLE", "LINE", "LINE")
+    OUTPUTS = (
-    RETURN_NAMES = ("output", "measurements", "profile 1", "profile 2")
+        ('ANNOTATION_SOURCE', 'output'),
+        ('MEASURE_TABLE', 'measurements'),
+        ('LINE', 'profile_1'),
+        ('LINE', 'profile_2'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/draw_mask.py

@@ -22,8 +22,9 @@ class DrawMask:
             }
         }
 
-    RETURN_TYPES = ("IMAGE",)
+    OUTPUTS = (
-    RETURN_NAMES = ("mask",)
+        ('IMAGE', 'mask'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/edge_detect.py

@@ -16,8 +16,9 @@ class EdgeDetect:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("edges",)
+        ('DATA_FIELD', 'edges'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/facet_level_field.py

@@ -123,8 +123,9 @@ class FacetLevelField:
             },
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("leveled",)
+        ('DATA_FIELD', 'leveled'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/fft_2d.py

@@ -21,8 +21,12 @@ class FFT2D:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD", "DATA_FIELD", "DATA_FIELD", "DATA_FIELD")
+    OUTPUTS = (
-    RETURN_NAMES = ("log_magnitude", "magnitude", "phase", "psdf")
+        ('DATA_FIELD', 'log_magnitude'),
+        ('DATA_FIELD', 'magnitude'),
+        ('DATA_FIELD', 'phase'),
+        ('DATA_FIELD', 'psdf'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/fft_filter_1d.py

@@ -29,8 +29,9 @@ class FFTFilter1D:
             }
         }
 
-    RETURN_TYPES = ("LINE",)
+    OUTPUTS = (
-    RETURN_NAMES = ("filtered",)
+        ('LINE', 'filtered'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/fft_filter_2d.py

@@ -30,8 +30,9 @@ class FFTFilter2D:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("filtered",)
+        ('DATA_FIELD', 'filtered'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/fix_zero.py

@@ -15,8 +15,9 @@ class FixZero:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("zeroed",)
+        ('DATA_FIELD', 'zeroed'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/flip_field.py

@@ -19,8 +19,9 @@ class FlipField:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("field",)
+        ('DATA_FIELD', 'field'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/folder.py

@@ -13,8 +13,9 @@ class Folder:
             }
         }
 
-    RETURN_TYPES = ("DIRECTORY",)
+    OUTPUTS = (
-    RETURN_NAMES = ("directory",)
+        ('DIRECTORY', 'directory'),
+    )
     FUNCTION = "list_files"
 
     DESCRIPTION = (

backend/nodes/font_node.py

@@ -19,8 +19,9 @@ class Font:
             }
         }
 
-    RETURN_TYPES = ("FONT",)
+    OUTPUTS = (
-    RETURN_NAMES = ("font",)
+        ('FONT', 'font'),
+    )
     FUNCTION = "build"
 
     DESCRIPTION = (

backend/nodes/fractal_dimension.py

@@ -304,8 +304,11 @@ class FractalDimension:
             }
         }
 
-    RETURN_TYPES = ("FLOAT", "LINE", "MEASURE_TABLE")
+    OUTPUTS = (
-    RETURN_NAMES = ("dimension", "curve", "measurements")
+        ('FLOAT', 'dimension'),
+        ('LINE', 'curve'),
+        ('MEASURE_TABLE', 'measurements'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/gaussian_filter.py

@@ -14,8 +14,9 @@ class GaussianFilter:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("filtered",)
+        ('DATA_FIELD', 'filtered'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = "Apply a Gaussian blur. Equivalent to gwy_data_field_filter_gaussian."

backend/nodes/grain_analysis.py

@@ -17,8 +17,9 @@ class GrainAnalysis:
             }
         }
 
-    RETURN_TYPES = ("RECORD_TABLE",)
+    OUTPUTS = (
-    RETURN_NAMES = ("grain_stats",)
+        ('RECORD_TABLE', 'grain_stats'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/grain_distance_transform.py

@@ -103,8 +103,9 @@ class GrainDistanceTransform:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("distance",)
+        ('DATA_FIELD', 'distance'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/histogram.py

@@ -21,8 +21,10 @@ class Histogram:
             }
         }
 
-    RETURN_TYPES = ("MEASURE_TABLE", "COORDPAIR",)
+    OUTPUTS = (
-    RETURN_NAMES = ("measurements", "marker pair",)
+        ('MEASURE_TABLE', 'measurements'),
+        ('COORDPAIR', 'marker_pair'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/image.py

@@ -24,8 +24,9 @@ class Image:
             },
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("field",)
+        ('DATA_FIELD', 'field'),
+    )
     FUNCTION = "load"
 
     DESCRIPTION = (

backend/nodes/image_demo.py

@@ -19,8 +19,9 @@ class ImageDemo:
             },
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("field",)
+        ('DATA_FIELD', 'field'),
+    )
     FUNCTION = "load"
 
     DESCRIPTION = "Load a bundled demo file so you can try the app without providing your own data."

backend/nodes/inverse_fft_2d.py

@@ -18,8 +18,9 @@ class InverseFFT2D:
             },
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("image",)
+        ('DATA_FIELD', 'image'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/line_correction.py

@@ -307,8 +307,11 @@ class LineCorrection:
             },
         }
 
-    RETURN_TYPES = ("DATA_FIELD", "DATA_FIELD", "LINE")
+    OUTPUTS = (
-    RETURN_NAMES = ("corrected", "background", "row shifts")
+        ('DATA_FIELD', 'corrected'),
+        ('DATA_FIELD', 'background'),
+        ('LINE', 'row_shifts'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/markup.py

@@ -33,8 +33,9 @@ class Markup:
             }
         }
 
-    RETURN_TYPES = ("ANNOTATION_SOURCE",)
+    OUTPUTS = (
-    RETURN_NAMES = ("Output",)
+        ('ANNOTATION_SOURCE', 'output'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/mask_invert.py

@@ -21,8 +21,9 @@ class MaskInvert:
             }
         }
 
-    RETURN_TYPES = ("IMAGE",)
+    OUTPUTS = (
-    RETURN_NAMES = ("mask",)
+        ('IMAGE', 'mask'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = "Invert a binary mask — swap masked and unmasked regions."

backend/nodes/mask_morphology.py

@@ -28,8 +28,9 @@ class MaskMorphology:
             }
         }
 
-    RETURN_TYPES = ("IMAGE",)
+    OUTPUTS = (
-    RETURN_NAMES = ("mask",)
+        ('IMAGE', 'mask'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/mask_operations.py

@@ -37,8 +37,9 @@ class MaskOperations:
             },
         }
 
-    RETURN_TYPES = ("IMAGE",)
+    OUTPUTS = (
-    RETURN_NAMES = ("mask",)
+        ('IMAGE', 'mask'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/median_filter.py

@@ -14,8 +14,9 @@ class MedianFilter:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("filtered",)
+        ('DATA_FIELD', 'filtered'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = "Apply a median filter. Equivalent to gwy_data_field_filter_median."

backend/nodes/number.py

@@ -14,8 +14,9 @@ class Number:
             }
         }
 
-    RETURN_TYPES = ("FLOAT",)
+    OUTPUTS = (
-    RETURN_NAMES = ("value",)
+        ('FLOAT', 'value'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/plane_level_field.py

@@ -61,8 +61,9 @@ class PlaneLevelField:
             },
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("leveled",)
+        ('DATA_FIELD', 'leveled'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/poly_level_field.py

@@ -16,8 +16,10 @@ class PolyLevelField:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD", "DATA_FIELD")
+    OUTPUTS = (
-    RETURN_NAMES = ("leveled", "background")
+        ('DATA_FIELD', 'leveled'),
+        ('DATA_FIELD', 'background'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/preview_image.py

@@ -30,7 +30,7 @@ class PreviewImage:
             }
         }
 
-    RETURN_TYPES = ()
+    OUTPUTS = ()
     FUNCTION = "preview"
 
     OUTPUT_NODE = True

backend/nodes/print_table.py

@@ -15,7 +15,7 @@ class PrintTable:
             }
         }
 
-    RETURN_TYPES = ()
+    OUTPUTS = ()
     FUNCTION = "print_table"
 
     OUTPUT_NODE = True

backend/nodes/psdf.py

@@ -17,8 +17,9 @@ class PSDF:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("psdf",)
+        ('DATA_FIELD', 'psdf'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/range_slider.py

@@ -23,8 +23,9 @@ class RangeSlider:
             }
         }
 
-    RETURN_TYPES = ("FLOAT",)
+    OUTPUTS = (
-    RETURN_NAMES = ("value",)
+        ('FLOAT', 'value'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/rotate_field.py

@@ -18,8 +18,9 @@ class RotateField:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD",)
+    OUTPUTS = (
-    RETURN_NAMES = ("field",)
+        ('DATA_FIELD', 'field'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/save.py

@@ -61,7 +61,7 @@ class Save:
             },
         }
 
-    RETURN_TYPES = ()
+    OUTPUTS = ()
     FUNCTION = "save"
 
     OUTPUT_NODE = True

backend/nodes/save_image.py

@@ -47,7 +47,7 @@ class SaveImage:
             "optional": optional,
         }
 
-    RETURN_TYPES = ()
+    OUTPUTS = ()
     FUNCTION = "save"
 
     OUTPUT_NODE = True

backend/nodes/scar_removal.py

@@ -185,8 +185,10 @@ class ScarRemoval:
             }
         }
 
-    RETURN_TYPES = ("DATA_FIELD", "IMAGE")
+    OUTPUTS = (
-    RETURN_NAMES = ("corrected", "scar mask")
+        ('DATA_FIELD', 'corrected'),
+        ('IMAGE', 'scar_mask'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/statistics_node.py

@@ -14,8 +14,9 @@ class Statistics:
             }
         }
 
-    RETURN_TYPES = ("MEASURE_TABLE",)
+    OUTPUTS = (
-    RETURN_NAMES = ("stats",)
+        ('MEASURE_TABLE', 'stats'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/stats.py

@@ -49,8 +49,9 @@ class Stats:
             }
         }
 
-    RETURN_TYPES = ("FLOAT",)
+    OUTPUTS = (
-    RETURN_NAMES = ("value",)
+        ('FLOAT', 'value'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/threshold_mask.py

@@ -21,8 +21,9 @@ class ThresholdMask:
             }
         }
 
-    RETURN_TYPES = ("IMAGE",)
+    OUTPUTS = (
-    RETURN_NAMES = ("mask",)
+        ('IMAGE', 'mask'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

backend/nodes/value_display.py

@@ -24,8 +24,9 @@ class ValueDisplay:
             }
         }
 
-    RETURN_TYPES = ("FLOAT",)
+    OUTPUTS = (
-    RETURN_NAMES = ("value",)
+        ('FLOAT', 'value'),
+    )
     FUNCTION = "display_value"
 
     DESCRIPTION = "Display a FLOAT, or a selected numeric row from a measurement table, and pass the value through unchanged."

backend/nodes/view_3d.py

@@ -135,8 +135,10 @@ class View3D:
             },
         }
 
-    RETURN_TYPES = ("MESH_MODEL", "IMAGE")
+    OUTPUTS = (
-    RETURN_NAMES = ("mesh", "viewport")
+        ('MESH_MODEL', 'mesh'),
+        ('IMAGE', 'viewport'),
+    )
     FUNCTION = "render"
 
     OUTPUT_NODE = True

backend/nodes/watershed_segmentation.py

@@ -221,8 +221,9 @@ class WatershedSegmentation:
             },
         }
 
-    RETURN_TYPES = ("IMAGE",)
+    OUTPUTS = (
-    RETURN_NAMES = ("mask",)
+        ('IMAGE', 'mask'),
+    )
     FUNCTION = "process"
 
     DESCRIPTION = (

tests/test_nodes.py

@@ -2425,8 +2425,9 @@ def test_execution_engine_numeric_socket_coercion():
         def INPUT_TYPES(cls):
             return {"required": {"value": ("INT",)}}
 
-        RETURN_TYPES = ("INT",)
+        OUTPUTS = (
-        RETURN_NAMES = ("value",)
+            ('INT', 'value'),
+        )
         FUNCTION = "process"
         CATEGORY = "tests"
 
@@ -2439,8 +2440,9 @@ def test_execution_engine_numeric_socket_coercion():
         def INPUT_TYPES(cls):
             return {"required": {"value": ("FLOAT",)}}
 
-        RETURN_TYPES = ("FLOAT",)
+        OUTPUTS = (
-        RETURN_NAMES = ("value",)
+            ('FLOAT', 'value'),
+        )
         FUNCTION = "process"
         CATEGORY = "tests"
 
@@ -2483,8 +2485,9 @@ def test_execution_engine_caches_unchanged_nodes():
         def INPUT_TYPES(cls):
             return {"required": {"value": ("FLOAT",)}}
 
-        RETURN_TYPES = ("FLOAT",)
+        OUTPUTS = (
-        RETURN_NAMES = ("value",)
+            ('FLOAT', 'value'),
+        )
         FUNCTION = "process"
         CATEGORY = "tests"
 
@@ -2500,8 +2503,9 @@ def test_execution_engine_caches_unchanged_nodes():
         def INPUT_TYPES(cls):
             return {"required": {"value": ("FLOAT",)}}
 
-        RETURN_TYPES = ("FLOAT",)
+        OUTPUTS = (
-        RETURN_NAMES = ("value",)
+            ('FLOAT', 'value'),
+        )
         FUNCTION = "process"
         CATEGORY = "tests"
 
@@ -2552,8 +2556,9 @@ def test_execution_engine_only_propagates_real_output_changes():
         def INPUT_TYPES(cls):
             return {"required": {"value": ("FLOAT",)}}
 
-        RETURN_TYPES = ("INT",)
+        OUTPUTS = (
-        RETURN_NAMES = ("value",)
+            ('INT', 'value'),
+        )
         FUNCTION = "process"
         CATEGORY = "tests"
 
@@ -2569,8 +2574,9 @@ def test_execution_engine_only_propagates_real_output_changes():
         def INPUT_TYPES(cls):
             return {"required": {"value": ("INT",)}}
 
-        RETURN_TYPES = ("FLOAT",)
+        OUTPUTS = (
-        RETURN_NAMES = ("value",)
+            ('FLOAT', 'value'),
+        )
         FUNCTION = "process"
         CATEGORY = "tests"