handle the case where a non-lazy field (i.e. passed directly from an input) is returned as an output of the workflow

Author: tclose

pydra/compose/workflow.py

@@ -334,7 +334,11 @@ def _from_job(cls, job: "Job[WorkflowTask]") -> ty.Self:
         values = {}
         lazy_field: LazyOutField
         for name, lazy_field in attrs_values(workflow.outputs).items():
-            val_out = lazy_field._get_value(workflow=workflow, graph=exec_graph)
+            val_out = (
+                lazy_field._get_value(workflow=workflow, graph=exec_graph)
+                if isinstance(lazy_field, LazyOutField)
+                else lazy_field
+            )
             if isinstance(val_out, StateArray):
                 val_out = list(val_out)  # implicitly combine state arrays
             values[name] = val_out

pydra/engine/workflow.py

@@ -187,7 +187,8 @@ def construct(
                 )
             for outpt, outpt_lf in zip(output_fields, output_lazy_fields):
                 # Automatically combine any uncombined state arrays into a single lists
-                outpt_lf._type = State.combine_state_arrays(outpt_lf._type)
+                if isinstance(outpt_lf, LazyOutField):
+                    outpt_lf._type = State.combine_state_arrays(outpt_lf._type)
                 setattr(outputs, outpt.name, outpt_lf)
         else:
             if unset_outputs := [