removed python output order attribute

Author: tclose

pydra/design/base.py

@@ -267,8 +267,6 @@ class Out(Field):
         The converter for the field passed through to the attrs.field, by default it is None
     validator: callable | iterable[callable], optional
         The validator(s) for the field passed through to the attrs.field, by default it is None
-    order : int
-        The order of the output in the output list, allows for tuple unpacking of outputs
     """
 
     pass

pydra/design/python.py

@@ -80,7 +80,7 @@ class out(Out):
         outputs
     """
 
-    order: int = attrs.field(default=None)
+    pass
 
 
 @dataclass_transform(
@@ -161,11 +161,6 @@ def make(wrapped: ty.Callable | type) -> PythonDef:
             name="function", type=ty.Callable, default=function
         )
 
-        # Set positions for outputs to allow for tuple unpacking
-        output: out
-        for i, output in enumerate(parsed_outputs.values()):
-            output.order = i
-
         defn = make_task_def(
             PythonDef,
             PythonOutputs,

pydra/design/shell.py

@@ -125,8 +125,6 @@ class out(Out):
         to the function), output_dir (task output_dir will be used), stdout, stderr
         (stdout and stderr of the task will be sent) inputs (entire inputs will be
         passed) or any input field name (a specific input field will be sent).
-    order : int
-        The order of the output in the output list, allows for tuple unpacking of outputs
     """
 
     callable: ty.Callable | None = None

pydra/design/tests/test_python.py

@@ -25,7 +25,7 @@ def func(a: int) -> float:
         python.arg(name="a", type=int),
         python.arg(name="function", type=ty.Callable, default=func),
     ]
-    assert outputs == [python.out(name="out", type=float, order=0)]
+    assert outputs == [python.out(name="out", type=float)]
     definition = SampleDef(a=1)
     outputs = definition()
     assert outputs.out == 2.0
@@ -48,7 +48,7 @@ def func(a: int, k: float = 2.0) -> float:
         python.arg(name="function", type=ty.Callable, default=func),
         python.arg(name="k", type=float, default=2.0),
     ]
-    assert outputs == [python.out(name="out", type=float, order=0)]
+    assert outputs == [python.out(name="out", type=float)]
     assert SampleDef(a=1)().out == 2.0
     assert SampleDef(a=10, k=3.0)().out == 30.0
 
@@ -72,7 +72,7 @@ def func(a: int) -> float:
         python.arg(name="function", type=ty.Callable, default=func),
     ]
     assert outputs == [
-        python.out(name="b", type=Decimal, help="the doubled output", order=0),
+        python.out(name="b", type=Decimal, help="the doubled output"),
     ]
     outputs = SampleDef.Outputs(b=Decimal(2.0))
     assert isinstance(outputs.b, Decimal)
@@ -96,7 +96,7 @@ def func(a: int) -> int:
         python.arg(name="a", type=float),
         python.arg(name="function", type=ty.Callable, default=func),
     ]
-    assert outputs == [python.out(name="b", type=float, order=0)]
+    assert outputs == [python.out(name="b", type=float)]
     intf = SampleDef(a=1)
     assert isinstance(intf.a, float)
     outputs = SampleDef.Outputs(b=2.0)
@@ -122,8 +122,8 @@ def SampleDef(a: int, b: float) -> tuple[float, float]:
         ),
     ]
     assert outputs == [
-        python.out(name="c", type=float, order=0),
-        python.out(name="d", type=float, order=1),
+        python.out(name="c", type=float),
+        python.out(name="d", type=float),
     ]
     assert attrs.fields(SampleDef).function.default.__name__ == "SampleDef"
     SampleDef.Outputs(c=1.0, d=2.0)
@@ -153,8 +153,8 @@ def SampleDef(a: int, b: float) -> tuple[float, float]:
         ),
     ]
     assert outputs == [
-        python.out(name="c", type=float, help="Sum of a and b", order=0),
-        python.out(name="d", type=float, help="product of a and b", order=1),
+        python.out(name="c", type=float, help="Sum of a and b"),
+        python.out(name="d", type=float, help="product of a and b"),
     ]
     assert attrs.fields(SampleDef).function.default.__name__ == "SampleDef"
 
@@ -187,8 +187,8 @@ def SampleDef(a: int, b: float) -> tuple[float, float]:
         ),
     ]
     assert outputs == [
-        python.out(name="c", type=float, help="Sum of a and b", order=0),
-        python.out(name="d", type=float, help="Product of a and b", order=1),
+        python.out(name="c", type=float, help="Sum of a and b"),
+        python.out(name="d", type=float, help="Product of a and b"),
     ]
     assert attrs.fields(SampleDef).function.default.__name__ == "SampleDef"
 
@@ -229,8 +229,8 @@ def SampleDef(a: int, b: float) -> tuple[float, float]:
         ),
     ]
     assert outputs == [
-        python.out(name="c", type=float, help="Sum of a and b", order=0),
-        python.out(name="d", type=float, help="Product of a and b", order=1),
+        python.out(name="c", type=float, help="Sum of a and b"),
+        python.out(name="d", type=float, help="Product of a and b"),
     ]
     assert attrs.fields(SampleDef).function.default.__name__ == "SampleDef"
 
@@ -276,8 +276,8 @@ def function(a, b):
         ),
     ]
     assert outputs == [
-        python.out(name="c", type=float, help="Sum of a and b", order=0),
-        python.out(name="d", type=float, help="Product of a and b", order=1),
+        python.out(name="c", type=float, help="Sum of a and b"),
+        python.out(name="d", type=float, help="Product of a and b"),
     ]
     assert SampleDef.function.__name__ == "function"
     SampleDef(a=1)
@@ -346,8 +346,8 @@ def function(a, b):
         ),
     ]
     assert outputs == [
-        python.out(name="c", type=float, help="Sum of a and b", order=0),
-        python.out(name="d", type=float, help="Product of a and b", order=1),
+        python.out(name="c", type=float, help="Sum of a and b"),
+        python.out(name="d", type=float, help="Product of a and b"),
     ]
     assert SampleDef.function.__name__ == "function"
     SampleDef(a=1, b=2.0)

pydra/engine/specs.py

@@ -4,7 +4,6 @@
 import re
 from copy import copy
 import os
-from operator import attrgetter
 import inspect
 import itertools
 import platform
@@ -87,6 +86,10 @@ def _get_node(self):
                 f"{self} outputs object is not a lazy output of a workflow node"
             ) from None
 
+    def __iter__(self) -> list[str]:
+        """The names of the fields in the output object"""
+        return sorted(f.name for f in attrs_fields(self))
+
     def __getitem__(self, name_or_index: str | int) -> ty.Any:
         """Return the value for the given attribute
 
@@ -591,12 +594,6 @@ class RuntimeSpec:
 
 class PythonOutputs(TaskOutputs):
 
-    def __iter__(self) -> ty.Generator[ty.Any, None, None]:
-        """Iterate through all the values in the definition, allows for tuple unpacking"""
-        fields = sorted(attrs_fields(self), key=attrgetter("order"))
-        for field in fields:
-            yield getattr(self, field.name)
-
     @classmethod
     def _from_task(cls, task: "Task[PythonDef]") -> Self:
         """Collect the outputs of a task from a combination of the provided inputs,

pydra/engine/tests/test_functions.py

@@ -89,7 +89,7 @@ def Indirect(a):
     assert non_func_values(Direct(a=a)) == non_func_values(Indirect(a=a))
 
     # checking if the annotation is properly converted to output_spec if used in task
-    assert list_fields(Direct.Outputs)[0] == python.out(name="out", type=int, order=0)
+    assert list_fields(Direct.Outputs)[0] == python.out(name="out", type=int)
 
 
 def test_annotation_equivalence_2():
@@ -119,8 +119,8 @@ def Indirect(a) -> tuple[int, float]:
 
     # checking if the annotation is properly converted to output_spec if used in task
     assert list_fields(Direct.Outputs) == [
-        python.out(name="out1", type=int, order=0),
-        python.out(name="out2", type=float, order=1),
+        python.out(name="out1", type=int),
+        python.out(name="out2", type=float),
     ]
 
 
@@ -150,7 +150,7 @@ def Indirect(a):
     assert hashes(Direct(a=a)) == hashes(Partial(a=a)) == hashes(Indirect(a=a))
 
     # checking if the annotation is properly converted to output_spec if used in task
-    assert list_fields(Direct.Outputs)[0] == python.out(name="out1", type=int, order=0)
+    assert list_fields(Direct.Outputs)[0] == python.out(name="out1", type=int)
 
 
 def test_annotation_equivalence_4():
@@ -186,8 +186,8 @@ def Indirect(a):
 
     # checking if the annotation is properly converted to output_spec if used in task
     assert list_fields(Direct.Outputs) == [
-        python.out(name="sum", type=int, order=0),
-        python.out(name="sub", type=int, order=1),
+        python.out(name="sum", type=int),
+        python.out(name="sub", type=int),
     ]