replaced usage of attrs_values with task_dict

Author: tclose

pydra/compose/base/task.py

@@ -16,7 +16,7 @@
 from pydra.utils.messenger import AuditFlag, Messenger
 from pydra.utils.general import (
     attrs_fields,
-    attrs_values,
+    task_dict,
 )
 from pydra.utils.hash import Cache, hash_single, register_serializer
 from .field import Field, Arg, Out
@@ -590,7 +590,7 @@ def _check_arg_refs(
 
     def _check_resolved(self):
         """Checks that all the fields in the task have been resolved"""
-        if lazy_values := [n for n, v in attrs_values(self).items() if is_lazy(v)]:
+        if lazy_values := [n for n, v in task_dict(self).items() if is_lazy(v)]:
             raise ValueError(
                 f"Cannot execute {self} because the following fields "
                 f"still have lazy values {lazy_values}"

pydra/compose/python.py

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

pydra/compose/shell/builder.py

@@ -13,7 +13,7 @@
 from fileformats.core import from_mime
 from fileformats import generic
 from fileformats.core.exceptions import FormatRecognitionError
-from pydra.utils.general import attrs_values
+from pydra.utils.general import task_dict
 from pydra.compose.base import (
     Arg,
     Out,
@@ -375,7 +375,7 @@ def add_arg(name, field_type, kwds):
                 kwds["type"] = fld
                 fld = field_type(name=name, **kwds)
             elif not isinstance(fld, field_type):  # If fld type is outarg not out
-                fld = field_type(**attrs_values(fld))
+                fld = field_type(**task_dict(fld))
             fld.name = name
             type_ = kwds.pop("type", fld.type)
             if fld.type is ty.Any:

pydra/compose/shell/task.py

@@ -10,7 +10,7 @@
 import attrs
 from fileformats.generic import FileSet, File
 from pydra.utils.general import (
-    attrs_values,
+    task_dict,
     task_fields,
     ensure_list,
     position_sort,
@@ -261,7 +261,7 @@ def cmdline(self) -> str:
         """The equivalent command line that would be submitted if the job were run on
         the current working directory."""
         # Skip the executable, which can be a multi-part command, e.g. 'docker run'.
-        values = attrs_values(self)
+        values = task_dict(self)
         values.update(template_update(self, output_dir=Path.cwd()))
         cmd_args = self._command_args(values=values)
         cmdline = cmd_args[0]

pydra/compose/shell/templating.py

@@ -5,7 +5,7 @@
 from copy import copy
 from pathlib import Path
 from fileformats.generic import FileSet
-from pydra.utils.general import attrs_values, task_fields
+from pydra.utils.general import task_dict, task_fields
 from pydra.utils.typing import is_lazy
 from . import field
 
@@ -25,7 +25,7 @@ def template_update(
 
     """
 
-    values = attrs_values(task)
+    values = task_dict(task)
     if map_copyfiles is not None:
         values.update(map_copyfiles)
 
@@ -69,7 +69,7 @@ def template_update_single(
     from pydra.utils.typing import TypeParser, OUTPUT_TEMPLATE_TYPES  # noqa
 
     if values is None:
-        values = attrs_values(task)
+        values = task_dict(task)
 
     if spec_type == "input":
         field_value = values[fld.name]

pydra/compose/tests/test_python_equivalence.py

@@ -3,15 +3,15 @@
 import typing as ty
 from pydra.compose.base import Field
 from pydra.compose import python
-from pydra.utils.general import task_fields, attrs_values
+from pydra.utils.general import task_fields, task_dict
 
 
 def non_func_fields(defn: python.Task) -> list[Field]:
     return [f for f in task_fields(defn) if f.name != "function"]
 
 
 def non_func_values(defn: python.Task) -> dict:
-    return {n: v for n, v in attrs_values(defn).items() if n != "function"}
+    return {n: v for n, v in task_dict(defn).items() if n != "function"}
 
 
 def hashes(defn: python.Task) -> dict[str, str]:

pydra/compose/workflow.py

@@ -11,7 +11,7 @@
     check_explicit_fields_are_none,
     extract_fields_from_class,
 )
-from pydra.utils.general import attrs_values
+from pydra.utils.general import task_dict
 from pydra.utils.typing import StateArray
 
 if ty.TYPE_CHECKING:
@@ -329,7 +329,7 @@ def _from_task(cls, job: "Job[WorkflowTask]") -> ty.Self:
         # Retrieve values from the output fields
         values = {}
         lazy_field: LazyOutField
-        for name, lazy_field in attrs_values(workflow.outputs).items():
+        for name, lazy_field in task_dict(workflow.outputs).items():
             val_out = lazy_field._get_value(workflow=workflow, graph=exec_graph)
             if isinstance(val_out, StateArray):
                 val_out = list(val_out)  # implicitly combine state arrays

pydra/engine/audit.py

@@ -4,7 +4,7 @@
 import typing as ty
 import json
 from pydra.utils.messenger import send_message, make_message, gen_uuid, now, AuditFlag
-from pydra.utils.general import attrs_values
+from pydra.utils.general import task_dict
 from fileformats.core import FileSet
 from pydra.utils.hash import hash_function
 
@@ -108,7 +108,7 @@ def finalize_audit(self, result):
                 )
                 # audit resources/runtime information
                 self.eid = f"uid:{gen_uuid()}"
-                entity = attrs_values(result.runtime)
+                entity = task_dict(result.runtime)
                 entity.update(
                     **{
                         "@id": self.eid,

pydra/engine/job.py

@@ -25,7 +25,7 @@
     record_error,
 )
 from pydra.utils.general import (
-    attrs_values,
+    task_dict,
     attrs_fields,
     task_fields,
     ensure_list,
@@ -248,7 +248,7 @@ def inputs(self) -> dict[str, ty.Any]:
         from pydra.utils.typing import TypeParser
 
         self._inputs = {
-            k: v for k, v in attrs_values(self.task).items() if not k.startswith("_")
+            k: v for k, v in task_dict(self.task).items() if not k.startswith("_")
         }
         map_copyfiles = {}
         fld: "Arg"

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
+from pydra.utils.general import task_dict
 from pydra.utils.typing import is_lazy
 from pydra.engine.state import State, add_name_splitter, add_name_combiner
 
@@ -87,7 +87,7 @@ def inputs(self) -> Inputs:
 
     @property
     def input_names(self) -> list[str]:
-        return list(attrs_values(self._task).keys())
+        return list(task_dict(self._task).keys())
 
     @property
     def state(self):
@@ -98,7 +98,7 @@ def state(self):
 
     @property
     def input_values(self) -> tuple[tuple[str, ty.Any]]:
-        return tuple(attrs_values(self._task).items())
+        return tuple(task_dict(self._task).items())
 
     @property
     def state_values(self) -> dict[str, ty.Any]:
@@ -110,7 +110,7 @@ def state_values(self) -> dict[str, ty.Any]:
         dict[str, Any]
             The values of the task
         """
-        return {f"{self.name}.{n}": v for n, v in attrs_values(self._task).items()}
+        return {f"{self.name}.{n}": v for n, v in task_dict(self._task).items()}
 
     @property
     def lzout(self) -> OutputType:
@@ -129,7 +129,7 @@ def lzout(self) -> OutputType:
         outputs = self.inputs.Outputs(**lazy_fields)
 
         outpt: lazy.LazyOutField
-        for outpt in attrs_values(outputs).values():
+        for outpt in task_dict(outputs).values():
             # Assign the current node to the lazy fields so they can access the state
             outpt._node = self
             # If the node has a non-empty state, wrap the type of the lazy field in