renamed Task to Job and *Def to *Task

Author: tclose

pydra/design/base.py

@@ -372,7 +372,7 @@ def get_fields(klass, field_type, auto_attribs, helps) -> dict[str, Field]:
         type_hints = ty.get_type_hints(klass)
         for atr_name in dir(klass):
             if (
-                atr_name in ["Task", "Outputs"]
+                atr_name == "Outputs"
                 or atr_name in skip_fields
                 or atr_name.startswith("__")
             ):
@@ -404,7 +404,7 @@ def get_fields(klass, field_type, auto_attribs, helps) -> dict[str, Field]:
             for atr_name, type_ in type_hints.items():
                 if atr_name.startswith("_") or atr_name in skip_fields:
                     continue
-                if atr_name not in list(fields_dict) + ["Task", "Outputs"]:
+                if atr_name not in list(fields_dict) + ["Outputs"]:
                     fields_dict[atr_name] = field_type(
                         name=atr_name, type=type_, help=helps.get(atr_name, "")
                     )

pydra/design/python.py

@@ -14,7 +14,7 @@
 )
 
 if ty.TYPE_CHECKING:
-    from pydra.engine.specs import PythonDef
+    from pydra.engine.specs import PythonTask
 
 __all__ = ["arg", "out", "define"]
 
@@ -103,7 +103,7 @@ def define(
     outputs_bases: ty.Sequence[type] = (),
     auto_attribs: bool = True,
     xor: ty.Sequence[str | None] | ty.Sequence[ty.Sequence[str | None]] = (),
-) -> "PythonDef":
+) -> "PythonTask":
     """
     Create an interface for a function or a class.
 
@@ -124,19 +124,19 @@ def define(
 
     Returns
     -------
-    PythonDef
+    PythonTask
         The task definition class for the Python function
     """
-    from pydra.engine.specs import PythonDef, PythonOutputs
+    from pydra.engine.specs import PythonTask, PythonOutputs
 
-    def make(wrapped: ty.Callable | type) -> PythonDef:
+    def make(wrapped: ty.Callable | type) -> PythonTask:
         if inspect.isclass(wrapped):
             klass = wrapped
             function = klass.function
             name = klass.__name__
             check_explicit_fields_are_none(klass, inputs, outputs)
             parsed_inputs, parsed_outputs = extract_fields_from_class(
-                PythonDef,
+                PythonTask,
                 PythonOutputs,
                 klass,
                 arg,
@@ -176,7 +176,7 @@ def make(wrapped: ty.Callable | type) -> PythonDef:
         )
 
         defn = make_task_def(
-            PythonDef,
+            PythonTask,
             PythonOutputs,
             parsed_inputs,
             parsed_outputs,

pydra/design/shell.py

@@ -31,7 +31,7 @@
 )
 
 if ty.TYPE_CHECKING:
-    from pydra.engine.specs import ShellDef
+    from pydra.engine.specs import ShellTask
 
 __all__ = ["arg", "out", "outarg", "define"]
 
@@ -256,7 +256,7 @@ def define(
     auto_attribs: bool = True,
     name: str | None = None,
     xor: ty.Sequence[str | None] | ty.Sequence[ty.Sequence[str | None]] = (),
-) -> "ShellDef":
+) -> "ShellTask":
     """Create a task definition for a shell command. Can be used either as a decorator on
     the "canonical" dataclass-form of a task definition or as a function that takes a
     "shell-command template string" of the form
@@ -309,14 +309,14 @@ def define(
 
     Returns
     -------
-    ShellDef
+    ShellTask
         The interface for the shell command
     """
-    from pydra.engine.specs import ShellDef, ShellOutputs
+    from pydra.engine.specs import ShellTask, ShellOutputs
 
     def make(
         wrapped: ty.Callable | type | None = None,
-    ) -> ShellDef:
+    ) -> ShellTask:
 
         if inspect.isclass(wrapped):
             klass = wrapped
@@ -342,7 +342,7 @@ def make(
             class_name = klass.__name__
             check_explicit_fields_are_none(klass, inputs, outputs)
             parsed_inputs, parsed_outputs = extract_fields_from_class(
-                ShellDef,
+                ShellTask,
                 ShellOutputs,
                 klass,
                 arg,
@@ -384,7 +384,9 @@ def make(
                 class_name = f"_{class_name}"
 
             # Add in fields from base classes
-            parsed_inputs.update({n: getattr(ShellDef, n) for n in ShellDef.BASE_NAMES})
+            parsed_inputs.update(
+                {n: getattr(ShellTask, n) for n in ShellTask.BASE_NAMES}
+            )
             parsed_outputs.update(
                 {n: getattr(ShellOutputs, n) for n in ShellOutputs.BASE_NAMES}
             )
@@ -429,7 +431,7 @@ def make(
                 outpt.default = NO_DEFAULT
 
         defn = make_task_def(
-            ShellDef,
+            ShellTask,
             ShellOutputs,
             parsed_inputs,
             parsed_outputs,
@@ -769,7 +771,7 @@ class _InputPassThrough:
 
     name: str
 
-    def __call__(self, inputs: ShellDef) -> ty.Any:
+    def __call__(self, inputs: ShellTask) -> ty.Any:
         return getattr(inputs, self.name)
 
 

pydra/design/tests/test_python.py

@@ -4,7 +4,7 @@
 import attrs
 import pytest
 from pydra.engine.helpers import list_fields
-from pydra.engine.specs import PythonDef, PythonOutputs
+from pydra.engine.specs import PythonTask, PythonOutputs
 from pydra.design import python
 
 
@@ -18,7 +18,7 @@ def func(a: int) -> float:
 
     SampleDef = python.define(func)
 
-    assert issubclass(SampleDef, PythonDef)
+    assert issubclass(SampleDef, PythonTask)
     inputs = sorted(list_fields(SampleDef), key=sort_key)
     outputs = sorted(list_fields(SampleDef.Outputs), key=sort_key)
     assert inputs == [
@@ -49,7 +49,7 @@ def func(a: int, k: float = 2.0) -> float:
 
     SampleDef = python.define(func)
 
-    assert issubclass(SampleDef, PythonDef)
+    assert issubclass(SampleDef, PythonTask)
     inputs = sorted(list_fields(SampleDef), key=sort_key)
     outputs = sorted(list_fields(SampleDef.Outputs), key=sort_key)
     assert inputs == [
@@ -73,7 +73,7 @@ def func(a: int) -> float:
         outputs={"b": python.out(help="the doubled output", type=Decimal)},
     )
 
-    assert issubclass(SampleDef, PythonDef)
+    assert issubclass(SampleDef, PythonTask)
     inputs = sorted(list_fields(SampleDef), key=sort_key)
     outputs = sorted(list_fields(SampleDef.Outputs), key=sort_key)
     assert inputs == [
@@ -98,7 +98,7 @@ def func(a: int) -> int:
         outputs={"b": float},
     )
 
-    assert issubclass(SampleDef, PythonDef)
+    assert issubclass(SampleDef, PythonTask)
     inputs = sorted(list_fields(SampleDef), key=sort_key)
     outputs = sorted(list_fields(SampleDef.Outputs), key=sort_key)
     assert inputs == [
@@ -118,7 +118,7 @@ def SampleDef(a: int, b: float) -> tuple[float, float]:
         """Sample function for testing"""
         return a + b, a * b
 
-    assert issubclass(SampleDef, PythonDef)
+    assert issubclass(SampleDef, PythonTask)
     inputs = sorted(list_fields(SampleDef), key=sort_key)
     outputs = sorted(list_fields(SampleDef.Outputs), key=sort_key)
     assert inputs == [
@@ -250,7 +250,7 @@ def SampleDef(a: int, b: float) -> tuple[float, float]:
 
 def test_interface_with_class():
     @python.define
-    class SampleDef(PythonDef["SampleDef.Outputs"]):
+    class SampleDef(PythonTask["SampleDef.Outputs"]):
         """Sample class for testing
 
         Args:
@@ -276,7 +276,7 @@ class Outputs(PythonOutputs):
         def function(a, b):
             return a + b, a * b
 
-    assert issubclass(SampleDef, PythonDef)
+    assert issubclass(SampleDef, PythonTask)
     inputs = sorted(list_fields(SampleDef), key=sort_key)
     outputs = sorted(list_fields(SampleDef.Outputs), key=sort_key)
     assert inputs == [
@@ -301,7 +301,7 @@ def function(a, b):
 
 def test_interface_with_inheritance():
     @python.define
-    class SampleDef(PythonDef["SampleDef.Outputs"]):
+    class SampleDef(PythonTask["SampleDef.Outputs"]):
         """Sample class for testing
 
         Args:
@@ -327,12 +327,12 @@ class Outputs(PythonOutputs):
         def function(a, b):
             return a + b, a * b
 
-    assert issubclass(SampleDef, PythonDef)
+    assert issubclass(SampleDef, PythonTask)
 
 
 def test_interface_with_class_no_auto_attribs():
     @python.define(auto_attribs=False)
-    class SampleDef(PythonDef["SampleDef.Outputs"]):
+    class SampleDef(PythonTask["SampleDef.Outputs"]):
         a: int = python.arg(help="First input to be inputted")
         b: float = python.arg(help="Second input")
 
@@ -377,7 +377,7 @@ def test_interface_invalid_wrapped1():
     with pytest.raises(ValueError):
 
         @python.define(inputs={"a": python.arg()})
-        class SampleDef(PythonDef["SampleDef.Outputs"]):
+        class SampleDef(PythonTask["SampleDef.Outputs"]):
             a: int
 
             class Outputs:
@@ -392,7 +392,7 @@ def test_interface_invalid_wrapped2():
     with pytest.raises(ValueError):
 
         @python.define(outputs={"b": python.out()})
-        class SampleDef(PythonDef["SampleDef.Outputs"]):
+        class SampleDef(PythonTask["SampleDef.Outputs"]):
             a: int
 
             class Outputs: