dropped fields_dict in favour of task_fields

Author: tclose

docs/source/tutorial/5-shell.ipynb

@@ -162,7 +162,7 @@
    "metadata": {},
    "outputs": [],
    "source": [
-    "from pydra.utils import fields_dict\n",
+    "from pydra.utils import task_fields\n",
     "\n",
     "Cp = shell.define(\n",
     "    \"cp <in_fs_objects:fs-object+> <out|out_dir:directory> \"\n",
@@ -172,7 +172,7 @@
     "    \"--tuple-arg <tuple_arg:int,str=(1,'bar')> \"\n",
     ")\n",
     "\n",
-    "print(f\"'--int-arg' default: {fields_dict(Cp)['int_arg'].default}\")"
+    "print(f\"'--int-arg' default: {task_fields(Cp).int_arg.default}\")"
    ]
   },
   {

pydra/engine/workflow.py

@@ -19,7 +19,7 @@
 from pydra.engine.submitter import Submitter, NodeExecution
 from pydra.utils.general import (
     attrs_values,
-    fields_values,
+    task_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 fields_values(outputs).values()):
+        if all(v is attrs.NOTHING for v in task_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 fields_values(outputs).items() if v is attrs.NOTHING
+                n for n, v in task_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,5 @@
 from .general import (
     task_fields,
-    fields_dict,
     plot_workflow,
     show_workflow,
     task_help,
@@ -15,5 +14,4 @@
     "show_workflow",
     "task_help",
     "print_help",
-    "fields_dict",
 ]

pydra/utils/general.py

@@ -349,16 +349,11 @@ def task_fields(task: "type[Task] | Task") -> _TaskFieldsList:
     )
 
 
-def fields_values(obj, **kwargs) -> dict[str, ty.Any]:
+def task_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)}
 
 
-def fields_dict(task: "type[Task] | Task") -> dict[str, "Field"]:
-    """Returns the fields of a task in a dictionary"""
-    return {f.name: f for f in task_fields(task)}
-
-
 def from_list_if_single(obj: ty.Any) -> ty.Any:
     """Converts a list to a single item if it is of length == 1"""
     from pydra.utils.typing import is_lazy