Revert "renamed task_as_dict to get_fields"

This reverts commit 74a1976.

Author: tclose

docs/source/tutorial/7-canonical-form.ipynb

@@ -340,7 +340,7 @@
    "source": [
     "from pathlib import Path\n",
     "import tempfile\n",
-    "from pydra.utils import get_fields\n",
+    "from pydra.utils import task_as_dict\n",
     "\n",
     "tmp_dir = Path(tempfile.mkdtemp())\n",
     "\n",
@@ -350,7 +350,7 @@
     "cp_file_with_size = ReloadedCpFileWithSize(in_file=a_file)\n",
     "outputs = cp_file_with_size(cache_root=tmp_dir / \"cache\")\n",
     "\n",
-    "pprint(get_fields(outputs))"
+    "pprint(task_as_dict(outputs))"
    ]
   }
  ],

pydra/compose/python.py

@@ -2,7 +2,7 @@
 import inspect
 from typing import dataclass_transform
 import attrs
-from pydra.utils.general import task_fields, get_fields
+from pydra.utils.general import task_fields, task_as_dict
 from pydra.compose import base
 from pydra.compose.base import (
     ensure_field_objects,
@@ -226,7 +226,7 @@ class PythonTask(base.Task[PythonOutputsType]):
 
     def _run(self, job: "Job[PythonTask]", rerun: bool = True) -> None:
         # Prepare the inputs to the function
-        inputs = get_fields(self)
+        inputs = task_as_dict(self)
         del inputs["function"]
         # Run the actual function
         returned = self.function(**inputs)

pydra/engine/node.py

@@ -3,7 +3,7 @@
 from enum import Enum
 import attrs
 from pydra.engine import lazy
-from pydra.utils.general import attrs_values, get_fields
+from pydra.utils.general import attrs_values, task_as_dict
 from pydra.utils.typing import is_lazy
 from pydra.engine.state import State, add_name_splitter, add_name_combiner
 
@@ -162,7 +162,7 @@ def combiner(self):
     def _check_if_outputs_have_been_used(self, msg):
         used = []
         if self._lzout:
-            for outpt_name, outpt_val in get_fields(self._lzout).items():
+            for outpt_name, outpt_val in task_as_dict(self._lzout).items():
                 if outpt_val._type_checked:
                     used.append(outpt_name)
         if used:

pydra/engine/workflow.py

@@ -19,7 +19,7 @@
 from pydra.engine.submitter import Submitter, NodeExecution
 from pydra.utils.general import (
     attrs_values,
-    get_fields,
+    task_as_dict,
     task_fields,
 )
 from pydra.utils.typing import is_lazy
@@ -147,7 +147,7 @@ def construct(
         constructor = input_values.pop("constructor")
         # Call the user defined constructor to set the outputs
         output_lazy_fields = constructor(**input_values)
-        if all(v is attrs.NOTHING for v in get_fields(outputs).values()):
+        if all(v is attrs.NOTHING for v in task_as_dict(outputs).values()):
             if output_lazy_fields is None:
                 raise ValueError(
                     f"Constructor function for {task} returned None, must a lazy field "
@@ -160,7 +160,7 @@ def construct(
                     "if any of the outputs are already set explicitly"
                 )
             if unset_outputs := [
-                n for n, v in get_fields(outputs).items() if v is attrs.NOTHING
+                n for n, v in task_as_dict(outputs).items() if v is attrs.NOTHING
             ]:
                 raise ValueError(
                     f"Mandatory outputs {unset_outputs} are not set by the "

pydra/utils/__init__.py

@@ -1,6 +1,6 @@
 from .general import (
     task_fields,
-    get_fields,
+    task_as_dict,
     plot_workflow,
     show_workflow,
     task_help,
@@ -13,7 +13,7 @@
 __all__ = [
     "__version__",
     "task_fields",
-    "get_fields",
+    "task_as_dict",
     "plot_workflow",
     "show_workflow",
     "task_help",

pydra/utils/general.py

@@ -352,7 +352,7 @@ def task_fields(task: "type[Task] | Task") -> _TaskFieldsList:
     )
 
 
-def get_fields(obj, **kwargs) -> dict[str, ty.Any]:
+def task_as_dict(obj, **kwargs) -> dict[str, ty.Any]:
     """Get the values of an attrs object."""
     return {f.name: getattr(obj, f.name) for f in task_fields(obj)}