easylink 0.1.8__py3-none-any.whl → 0.1.10__py3-none-any.whl

easylink/_version.py

@@ -1 +1 @@
-__version__ = "0.1.8"
+__version__ = "0.1.10"

easylink/graph_components.py

@@ -12,7 +12,8 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 from collections.abc import Callable
-from dataclasses import dataclass
+from dataclasses import dataclass, field
+from types import NotImplementedType
 from typing import TYPE_CHECKING, Any
 
 import networkx as nx
@@ -22,7 +23,7 @@ if TYPE_CHECKING:
     from easylink.step import Step
 
 
-@dataclass(frozen=True)
+@dataclass()
 class InputSlot:
     """A single input slot to a specific node.
 
@@ -41,20 +42,48 @@ class InputSlot:
     env_var: str | None
     """The environment variable that is used to pass a list  of data filepaths to 
     an ``Implementation``."""
-    validator: Callable[[str], None]
+    validator: Callable[[str], None] = field(compare=False)
     """A function that validates the input data being passed into the pipeline via 
     this ``InputSlot``. If the data is invalid, the function should raise an exception 
     with a descriptive error message which will then be reported to the user.
     **Note that the function *must* be defined in the** :mod:`easylink.utilities.validation_utils` 
     **module!**"""
-    splitter: Callable[[list[str], str, Any], None] | None = None
+    splitter: Callable[[list[str], str, Any], None] | None = field(
+        default=None, compare=False
+    )
     """A function that splits the incoming data to this ``InputSlot`` into smaller
     pieces. The primary purpose of this functionality is to run sections of the 
     pipeline in an embarrassingly parallel manner. **Note that the function *must* 
     be defined in the **:mod:`easylink.utilities.splitter_utils`** module!**"""
 
+    def __eq__(self, other: Any) -> bool | NotImplementedType:
+        """Checks if two ``InputSlots`` are equal.
 
-@dataclass(frozen=True)
+        Two ``InputSlots`` are considered equal if their names, ``env_vars``, and
+        names of their ``validators`` and ``splitters`` are all the same.
+        """
+        if not isinstance(other, InputSlot):
+            return NotImplemented
+        splitter_name = self.splitter.__name__ if self.splitter else None
+        other_splitter_name = other.splitter.__name__ if other.splitter else None
+        return (
+            self.name == other.name
+            and self.env_var == other.env_var
+            and self.validator.__name__ == other.validator.__name__
+            and splitter_name == other_splitter_name
+        )
+
+    def __hash__(self) -> int:
+        """Hashes an ``InputSlot``.
+
+        The hash is based on the name of the ``InputSlot``, its ``env_var``, and
+        the names of its ``validator`` and ``splitter``.
+        """
+        splitter_name = self.splitter.__name__ if self.splitter else None
+        return hash((self.name, self.env_var, self.validator.__name__, splitter_name))
+
+
+@dataclass()
 class OutputSlot:
     """A single output slot from a specific node.
 
@@ -75,12 +104,32 @@ class OutputSlot:
 
     name: str
     """The name of the ``OutputSlot``."""
-    aggregator: Callable[[list[str], str], None] = None
+    aggregator: Callable[[list[str], str], None] = field(default=None, compare=False)
     """A function that aggregates all of the generated data to be passed out via this
     ``OutputSlot``. The primary purpose of this functionality is to run sections
     of the pipeline in an embarrassingly parallel manner. **Note that the function 
     *must* be defined in the **:py:mod:`easylink.utilities.aggregator_utils`** module!**"""
 
+    def __eq__(self, other: Any) -> bool | NotImplementedType:
+        """Checks if two ``OutputSlots`` are equal.
+
+        Two ``OutputSlots`` are considered equal if their names and the names of their
+        ``aggregators`` are the same.
+        """
+        if not isinstance(other, OutputSlot):
+            return NotImplemented
+        aggregator_name = self.aggregator.__name__ if self.aggregator else None
+        other_aggregator_name = other.aggregator.__name__ if other.aggregator else None
+        return self.name == other.name and aggregator_name == other_aggregator_name
+
+    def __hash__(self) -> int:
+        """Hashes an ``OutputSlot``.
+
+        The hash is based on the name of the ``OutputSlot`` and the name of its ``aggregator``.
+        """
+        aggregator_name = self.aggregator.__name__ if self.aggregator else None
+        return hash((self.name, aggregator_name))
+
 
 @dataclass(frozen=True)
 class EdgeParams:

easylink/pipeline_schema_constants/development.py

@@ -59,21 +59,23 @@ NODES = [
     ),
     LoopStep(
         template_step=EmbarrassinglyParallelStep(
-            step_name="step_3",
-            input_slots=[
-                InputSlot(
-                    name="step_3_main_input",
-                    env_var="DUMMY_CONTAINER_MAIN_INPUT_FILE_PATHS",
-                    validator=validate_input_file_dummy,
-                    splitter=split_data_by_size,
-                ),
-            ],
-            output_slots=[
-                OutputSlot(
-                    name="step_3_main_output",
-                    aggregator=concatenate_datasets,
-                ),
-            ],
+            step=Step(
+                step_name="step_3",
+                input_slots=[
+                    InputSlot(
+                        name="step_3_main_input",
+                        env_var="DUMMY_CONTAINER_MAIN_INPUT_FILE_PATHS",
+                        validator=validate_input_file_dummy,
+                        splitter=split_data_by_size,
+                    ),
+                ],
+                output_slots=[
+                    OutputSlot(
+                        name="step_3_main_output",
+                        aggregator=concatenate_datasets,
+                    ),
+                ],
+            ),
         ),
         self_edges=[
             EdgeParams(

easylink/step.py

@@ -1138,19 +1138,25 @@ class EmbarrassinglyParallelStep(Step):
 
     An ``EmbarrassinglyParallelStep`` is different than a :class:`ParallelStep`
     in that it is not configured by the user to be run in parallel - it completely
-    happens on the back end for performance reasons. As such, note that it inherits
-    from :class:`Step` instead of :class:`TemplatedStep`.
+    happens on the back end for performance reasons.
 
     See :class:`Step` for inherited attributes.
+
+    Parameters
+    ----------
+    step
+        The ``Step`` to be run in an embarrassingly parallel manner. To run multiple
+        steps in parallel, use a :class:`HierarchicalStep`.
+
     """
 
     def __init__(
         self,
-        step_name: str,
-        input_slots: Iterable[InputSlot],
-        output_slots: Iterable[OutputSlot],
+        step: Step,
     ) -> None:
-        super().__init__(step_name, input_slots=input_slots, output_slots=output_slots)
+        super().__init__(
+            step.step_name, step.name, step.input_slots.values(), step.output_slots.values()
+        )
         self._validate()
 
     def _validate(self) -> None:

{easylink-0.1.8.dist-info → easylink-0.1.10.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: easylink
-Version: 0.1.8
+Version: 0.1.10
 Summary: Research repository for the EasyLink ER ecosystem project.
 Home-page: https://github.com/ihmeuw/easylink
 Author: The EasyLink developers

{easylink-0.1.8.dist-info → easylink-0.1.10.dist-info}/RECORD

@@ -1,9 +1,9 @@
 easylink/__about__.py,sha256=2-oxCfu9t9yUJouLDwqYRZ0eii8kN25SxRzsawjWjho,440
 easylink/__init__.py,sha256=gGMcIVfiVnHtlDw5mZwhevcDb2wt-kuP6F64gnkFack,159
-easylink/_version.py,sha256=C69ADlbQREQlR15trneyA2sk8x0-oH4rDAX5fsv19_U,22
+easylink/_version.py,sha256=z0zCHFTcKSR0tJ6h5qrpNmRVP21QIPP8N0p7quCnnm0,23
 easylink/cli.py,sha256=ARSKAljepNOEYd1VCS_QqBJQIBLzE3IgKiOb5-OROdY,6380
 easylink/configuration.py,sha256=Ire2pMZNZ6wtSwhcWnQpYa-snX4KrhXgovlQwQ2Wxf4,12530
-easylink/graph_components.py,sha256=6OipaUkCW2ESBW6bxwZVgpRAX8RuL15m4x_mGE7i4R8,12669
+easylink/graph_components.py,sha256=PhMKxpgZjorhubS7vcta1pgXgXSGplmPulQpV0YZhqo,14811
 easylink/implementation.py,sha256=AwGl5YCKCSQo91owWj-gg9_5lBz7H_4q2z7jF0BhXs4,8992
 easylink/implementation_metadata.yaml,sha256=VvlEu3Dvlmeh1MpzeYx91j22GiV-9mu3hZP5yVuW04o,6763
 easylink/pipeline.py,sha256=EyCXv5p9WzTqcndXK6ukBJE6jY_fWIP_DGZQUl1wRcY,12284
@@ -11,11 +11,11 @@ easylink/pipeline_graph.py,sha256=vsY6nW_iEwZCNf_N_3CsixsKBUy_5JxGEi61-1Q-KAw,22
 easylink/pipeline_schema.py,sha256=kINpvy2Fl2S3FBqgdgZCCFHEk237_36X4ltLOtk5-dE,5862
 easylink/rule.py,sha256=W97LMI-vkEPipJbnSZLn2BxfYfFtvzGTKzq6YgDVri0,19913
 easylink/runner.py,sha256=k9ICTToHj2xr6MGIuvlWf6YMeZ47UGgseaMByMgUGac,6271
-easylink/step.py,sha256=gIDrfgo6SIDCqJfY_2h6ShiYMn0f5qwdTVgVaWuOa1k,67052
+easylink/step.py,sha256=8EhoFOXBLWgDfb3OhmQu5g03fqElIJCWg8-Y_5azKEA,67100
 easylink/images/spark_cluster/Dockerfile,sha256=3PHotbR4jdjVYRHOJ0VQW55b5Qd4tQ1pLLQMrTKWVA0,576
 easylink/images/spark_cluster/README.md,sha256=KdgSttZRplNNWqHn4K1GTsTIab3dTOSG4V99QPLxSp8,569
 easylink/pipeline_schema_constants/__init__.py,sha256=uRVjQw7_Ff5IBQw0_Jc93Fzfa-MnbPVPKsy18CCaW7E,1021
-easylink/pipeline_schema_constants/development.py,sha256=k7GSUvbxyk9gynSfS-IFzCusXfQLBbIaxDfxiwQpQxM,11449
+easylink/pipeline_schema_constants/development.py,sha256=kOTEqfZD5pWqP9gu7E6r9Cubf3ILtWEUxCfJfrN8znc,11547
 easylink/pipeline_schema_constants/testing.py,sha256=ohcTlT_viZYxS1GkO46mjkb8IzXo6yIOqvBbb4YrOhA,10897
 easylink/steps/dev/README.md,sha256=u9dZUggpY2Lf2qb-xkDLWWgHjcmi4osbQtzSNo4uklE,4549
 easylink/steps/dev/build-containers-local.sh,sha256=Wy3pfcyt7I-BNvHcr7ZXDe0g5Ihd00BIPqt9YuRbLeA,259
@@ -43,8 +43,8 @@ easylink/utilities/paths.py,sha256=KM1GlnsAcKbUJrC4LZKpeJfPljxe_aXP1ZhVp43TYRA,9
 easylink/utilities/spark.smk,sha256=tQ7RArNQzhjbaBQQcRORB4IxxkuDx4gPHUBcWHDYJ_U,5795
 easylink/utilities/splitter_utils.py,sha256=y4CbbTBgRaoXFxy-9Eu5eWx4lA4ZEcbrYpxgLIzG_kc,2602
 easylink/utilities/validation_utils.py,sha256=W9r_RXcivJjfpioLhONirfwdByYttxNsVY489_sbrYQ,1683
-easylink-0.1.8.dist-info/METADATA,sha256=enI0WFt--1KZ6BDFxZ0diVH2YiHZABnSwxirpf64PSA,2804
-easylink-0.1.8.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-easylink-0.1.8.dist-info/entry_points.txt,sha256=OGMZDFltg3yMboT7XjJt3joiPhRfV_7jnREVtrAIQNU,51
-easylink-0.1.8.dist-info/top_level.txt,sha256=oHcOpcF_jDMWFiJRzfGQvuskENGDjSPC_Agu9Z_Xvik,9
-easylink-0.1.8.dist-info/RECORD,,
+easylink-0.1.10.dist-info/METADATA,sha256=wPKznMaCPytiFoECbqY0jcFra-Hl28FMQJLo4XQcwdo,2805
+easylink-0.1.10.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
+easylink-0.1.10.dist-info/entry_points.txt,sha256=OGMZDFltg3yMboT7XjJt3joiPhRfV_7jnREVtrAIQNU,51
+easylink-0.1.10.dist-info/top_level.txt,sha256=oHcOpcF_jDMWFiJRzfGQvuskENGDjSPC_Agu9Z_Xvik,9
+easylink-0.1.10.dist-info/RECORD,,

{easylink-0.1.8.dist-info → easylink-0.1.10.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (78.0.2)
 Root-Is-Purelib: true
 Tag: py3-none-any