junifer 0.0.7.dev72__py3-none-any.whl → 0.0.7.dev93__py3-none-any.whl

junifer/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.7.dev72'
-__version_tuple__ = version_tuple = (0, 0, 7, 'dev72')
+__version__ = version = '0.0.7.dev93'
+__version_tuple__ = version_tuple = (0, 0, 7, 'dev93')

junifer/api/decorators.py

@@ -5,11 +5,19 @@
 #          Synchon Mandal <s.mandal@fz-juelich.de>
 # License: AGPL
 
+from ..data import DataDispatcher
 from ..pipeline import PipelineComponentRegistry
-from ..typing import DataGrabberLike, MarkerLike, PreprocessorLike, StorageLike
+from ..typing import (
+    DataGrabberLike,
+    DataRegistryLike,
+    MarkerLike,
+    PreprocessorLike,
+    StorageLike,
+)
 
 
 __all__ = [
+    "register_data_registry",
     "register_datagrabber",
     "register_datareader",
     "register_marker",
@@ -25,12 +33,12 @@ def register_datagrabber(klass: DataGrabberLike) -> DataGrabberLike:
 
     Parameters
     ----------
-    klass: class
+    klass : class
         The class of the DataGrabber to register.
 
     Returns
     -------
-    klass: class
+    class
         The unmodified input class.
 
     Notes
@@ -52,12 +60,12 @@ def register_datareader(klass: type) -> type:
 
     Parameters
     ----------
-    klass: class
+    klass : class
         The class of the DataReader to register.
 
     Returns
     -------
-    klass: class
+    class
         The unmodified input class.
 
     Notes
@@ -79,12 +87,12 @@ def register_preprocessor(klass: PreprocessorLike) -> PreprocessorLike:
 
     Parameters
     ----------
-    klass: class
+    klass : class
         The class of the preprocessor to register.
 
     Returns
     -------
-    klass: class
+    class
         The unmodified input class.
 
     """
@@ -102,12 +110,12 @@ def register_marker(klass: MarkerLike) -> MarkerLike:
 
     Parameters
     ----------
-    klass: class
+    klass : class
         The class of the marker to register.
 
     Returns
     -------
-    klass: class
+    class
         The unmodified input class.
 
     """
@@ -125,12 +133,12 @@ def register_storage(klass: StorageLike) -> StorageLike:
 
     Parameters
     ----------
-    klass: class
+    klass : class
         The class of the storage to register.
 
     Returns
     -------
-    klass: class
+    class
         The unmodified input class.
 
     """
@@ -139,3 +147,40 @@ def register_storage(klass: StorageLike) -> StorageLike:
         klass=klass,
     )
     return klass
+
+
+def register_data_registry(name: str) -> DataRegistryLike:
+    """Registry registration decorator.
+
+    Registers the data registry as ``name``.
+
+    Parameters
+    ----------
+    name : str
+        The name of the data registry.
+
+    Returns
+    -------
+    class
+        The unmodified input class.
+
+    """
+
+    def decorator(klass: DataRegistryLike) -> DataRegistryLike:
+        """Actual decorator.
+
+        Parameters
+        ----------
+        klass : class
+            The class of the data registry to register.
+
+        Returns
+        -------
+        class
+            The unmodified input class.
+
+        """
+        DataDispatcher()[name] = klass
+        return klass
+
+    return decorator

junifer/api/tests/test_decorators.py

@@ -0,0 +1,32 @@
+"""Provide tests for public decorators."""
+
+# Authors: Synchon Mandal <s.mandal@fz-juelich.de>
+# License: AGPL
+
+from junifer.api.decorators import register_data_registry
+from junifer.data import BasePipelineDataRegistry, DataDispatcher
+
+
+def test_register_data_registry() -> None:
+    """Test data registry registration."""
+
+    @register_data_registry("dumb")
+    class DumDum(BasePipelineDataRegistry):
+        def __init__(self):
+            super().__init__()
+
+        def register(self):
+            pass
+
+        def deregister(self):
+            pass
+
+        def load(self):
+            pass
+
+        def get(self):
+            pass
+
+    assert "dumb" in DataDispatcher()
+    _ = DataDispatcher().pop("dumb")
+    assert "dumb" not in DataDispatcher()

junifer/data/__init__.pyi

@@ -1,5 +1,7 @@
 __all__ = [
+    "BasePipelineDataRegistry",
     "CoordinatesRegistry",
+    "DataDispatcher",
     "ParcellationRegistry",
     "MaskRegistry",
     "get_data",
@@ -12,11 +14,13 @@ __all__ = [
     "utils",
 ]
 
+from .pipeline_data_registry_base import BasePipelineDataRegistry
 from .coordinates import CoordinatesRegistry
 from .parcellations import ParcellationRegistry
 from .masks import MaskRegistry
 
 from ._dispatch import (
+    DataDispatcher,
     get_data,
     list_data,
     load_data,

junifer/data/_dispatch.py

@@ -3,6 +3,7 @@
 # Authors: Synchon Mandal <s.mandal@fz-juelich.de>
 # License: AGPL
 
+from collections.abc import Iterator, MutableMapping
 from pathlib import Path
 from typing import (
     TYPE_CHECKING,
@@ -18,13 +19,14 @@ from ..utils import raise_error
 from .coordinates import CoordinatesRegistry
 from .masks import MaskRegistry
 from .parcellations import ParcellationRegistry
+from .pipeline_data_registry_base import BasePipelineDataRegistry
 
 
 if TYPE_CHECKING:
     from nibabel.nifti1 import Nifti1Image
 
-
 __all__ = [
+    "DataDispatcher",
     "deregister_data",
     "get_data",
     "list_data",
@@ -33,6 +35,77 @@ __all__ = [
 ]
 
 
+class DataDispatcher(MutableMapping):
+    """Class for helping dynamic data dispatch."""
+
+    _instance = None
+
+    def __new__(cls):
+        # Make class singleton
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+            # Set registries
+            cls._registries: dict[str, type[BasePipelineDataRegistry]] = {}
+            cls._builtin: dict[str, type[BasePipelineDataRegistry]] = {}
+            cls._external: dict[str, type[BasePipelineDataRegistry]] = {}
+            cls._builtin.update(
+                {
+                    "coordinates": CoordinatesRegistry,
+                    "parcellation": ParcellationRegistry,
+                    "mask": MaskRegistry,
+                }
+            )
+            cls._registries.update(cls._builtin)
+        return cls._instance
+
+    def __getitem__(self, key: str) -> type[BasePipelineDataRegistry]:
+        return self._registries[key]
+
+    def __iter__(self) -> Iterator[str]:
+        return iter(self._registries)
+
+    def __len__(self) -> int:
+        return len(self._registries)
+
+    def __delitem__(self, key: str) -> None:
+        # Internal check
+        if key in self._builtin:
+            raise_error(f"Cannot delete in-built key: {key}")
+        # Non-existing key
+        if key not in self._external:
+            raise_error(klass=KeyError, msg=key)
+        # Update external
+        _ = self._external.pop(key)
+        # Update global
+        _ = self._registries.pop(key)
+
+    def __setitem__(
+        self, key: str, value: type[BasePipelineDataRegistry]
+    ) -> None:
+        # Internal check
+        if key in self._builtin:
+            raise_error(f"Cannot set value for in-built key: {key}")
+        # Value type check
+        if not issubclass(value, BasePipelineDataRegistry):
+            raise_error(f"Invalid value type: {type(value)}")
+        # Update external
+        self._external[key] = value
+        # Update global
+        self._registries[key] = value
+
+    def popitem():
+        """Not implemented."""
+        pass
+
+    def clear(self):
+        """Not implemented."""
+        pass
+
+    def setdefault(self, key: str, value=None):
+        """Not implemented."""
+        pass
+
+
 def get_data(
     kind: str,
     names: Union[
@@ -76,27 +149,16 @@ def get_data(
         If ``kind`` is invalid value.
 
     """
-
-    if kind == "coordinates":
-        return CoordinatesRegistry().get(
-            coords=names,
-            target_data=target_data,
-            extra_input=extra_input,
-        )
-    elif kind == "parcellation":
-        return ParcellationRegistry().get(
-            parcellations=names,
-            target_data=target_data,
-            extra_input=extra_input,
-        )
-    elif kind == "mask":
-        return MaskRegistry().get(
-            masks=names,
+    try:
+        registry = DataDispatcher()[kind]
+    except KeyError:
+        raise_error(f"Unknown data kind: {kind}")
+    else:
+        return registry().get(
+            names,
             target_data=target_data,
             extra_input=extra_input,
         )
-    else:  # pragma: no cover
-        raise_error(f"Unknown data kind: {kind}")
 
 
 def list_data(kind: str) -> list[str]:
@@ -119,14 +181,12 @@ def list_data(kind: str) -> list[str]:
 
     """
 
-    if kind == "coordinates":
-        return CoordinatesRegistry().list
-    elif kind == "parcellation":
-        return ParcellationRegistry().list
-    elif kind == "mask":
-        return MaskRegistry().list
-    else:  # pragma: no cover
+    try:
+        registry = DataDispatcher()[kind]
+    except KeyError:
         raise_error(f"Unknown data kind: {kind}")
+    else:
+        return registry().list
 
 
 def load_data(
@@ -165,15 +225,12 @@ def load_data(
         If ``kind`` is invalid value.
 
     """
-
-    if kind == "coordinates":
-        return CoordinatesRegistry().load(name=name)
-    elif kind == "parcellation":
-        return ParcellationRegistry().load(name=name, **kwargs)
-    elif kind == "mask":
-        return MaskRegistry().load(name=name, **kwargs)
-    else:  # pragma: no cover
+    try:
+        registry = DataDispatcher()[kind]
+    except KeyError:
         raise_error(f"Unknown data kind: {kind}")
+    else:
+        return registry().load(name, **kwargs)
 
 
 def register_data(
@@ -205,20 +262,14 @@ def register_data(
 
     """
 
-    if kind == "coordinates":
-        return CoordinatesRegistry().register(
-            name=name, space=space, overwrite=overwrite, **kwargs
-        )
-    elif kind == "parcellation":
-        return ParcellationRegistry().register(
-            name=name, space=space, overwrite=overwrite, **kwargs
-        )
-    elif kind == "mask":
-        return MaskRegistry().register(
+    try:
+        registry = DataDispatcher()[kind]
+    except KeyError:
+        raise_error(f"Unknown data kind: {kind}")
+    else:
+        return registry().register(
             name=name, space=space, overwrite=overwrite, **kwargs
         )
-    else:  # pragma: no cover
-        raise_error(f"Unknown data kind: {kind}")
 
 
 def deregister_data(kind: str, name: str) -> None:
@@ -238,11 +289,9 @@ def deregister_data(kind: str, name: str) -> None:
 
     """
 
-    if kind == "coordinates":
-        return CoordinatesRegistry().deregister(name=name)
-    elif kind == "parcellation":
-        return ParcellationRegistry().deregister(name=name)
-    elif kind == "mask":
-        return MaskRegistry().deregister(name=name)
-    else:  # pragma: no cover
+    try:
+        registry = DataDispatcher()[kind]
+    except KeyError:
         raise_error(f"Unknown data kind: {kind}")
+    else:
+        return registry().deregister(name=name)

junifer/data/coordinates/_coordinates.py

@@ -13,7 +13,6 @@ from junifer_data import get
 from numpy.typing import ArrayLike
 
 from ...utils import logger, raise_error
-from ...utils.singleton import Singleton
 from ..pipeline_data_registry_base import BasePipelineDataRegistry
 from ..utils import JUNIFER_DATA_PARAMS, get_dataset_path, get_native_warper
 from ._ants_coordinates_warper import ANTsCoordinatesWarper
@@ -23,7 +22,7 @@ from ._fsl_coordinates_warper import FSLCoordinatesWarper
 __all__ = ["CoordinatesRegistry"]
 
 
-class CoordinatesRegistry(BasePipelineDataRegistry, metaclass=Singleton):
+class CoordinatesRegistry(BasePipelineDataRegistry):
     """Class for coordinates data registry.
 
     This class is a singleton and is used for managing available coordinates

junifer/data/masks/_masks.py

@@ -24,7 +24,6 @@ from nilearn.masking import (
 )
 
 from ...utils import logger, raise_error
-from ...utils.singleton import Singleton
 from ..pipeline_data_registry_base import BasePipelineDataRegistry
 from ..template_spaces import get_template
 from ..utils import (
@@ -216,7 +215,7 @@ def compute_brain_mask(
     return nimg.new_img_like(target_data["data"], mask)  # type: ignore
 
 
-class MaskRegistry(BasePipelineDataRegistry, metaclass=Singleton):
+class MaskRegistry(BasePipelineDataRegistry):
     """Class for mask data registry.
 
     This class is a singleton and is used for managing available mask

junifer/data/parcellations/_parcellations.py

@@ -16,7 +16,6 @@ import pandas as pd
 from junifer_data import get
 
 from ...utils import logger, raise_error, warn_with_log
-from ...utils.singleton import Singleton
 from ..pipeline_data_registry_base import BasePipelineDataRegistry
 from ..utils import (
     JUNIFER_DATA_PARAMS,
@@ -38,7 +37,7 @@ __all__ = [
 ]
 
 
-class ParcellationRegistry(BasePipelineDataRegistry, metaclass=Singleton):
+class ParcellationRegistry(BasePipelineDataRegistry):
     """Class for parcellation data registry.
 
     This class is a singleton and is used for managing available parcellation

junifer/data/parcellations/tests/test_parcellations.py

@@ -14,6 +14,7 @@ from nilearn.image import new_img_like, resample_to_img
 from numpy.testing import assert_array_almost_equal, assert_array_equal
 
 from junifer.data import (
+    deregister_data,
     get_data,
     list_data,
     load_data,
@@ -1245,3 +1246,9 @@ def test_get_multi_different_space() -> None:
             ],
             target_data=element_data["VBM_GM"],
         )
+
+
+def test_deregister() -> None:
+    """Test parcellation deregistration."""
+    deregister_data(kind="parcellation", name="testparc_3")
+    assert "testparc_3" not in list_data(kind="parcellation")

junifer/data/tests/test_dispatch.py

@@ -0,0 +1,87 @@
+"""Provide tests for data dispatching."""
+
+# Authors: Synchon Mandal <s.mandal@fz-juelich.de>
+# License: AGPL
+
+import pytest
+
+from junifer.data import (
+    BasePipelineDataRegistry,
+    deregister_data,
+    get_data,
+    list_data,
+    load_data,
+    register_data,
+)
+from junifer.data._dispatch import DataDispatcher
+
+
+def test_dispatcher_addition_errors() -> None:
+    """Test registry addition errors."""
+    with pytest.raises(ValueError, match="Cannot set"):
+        DataDispatcher()["mask"] = dict
+
+    with pytest.raises(ValueError, match="Invalid"):
+        DataDispatcher()["masks"] = dict
+
+
+def test_dispatcher_removal_errors() -> None:
+    """Test registry removal errors."""
+    with pytest.raises(ValueError, match="Cannot delete"):
+        _ = DataDispatcher().pop("mask")
+
+    with pytest.raises(KeyError, match="masks"):
+        del DataDispatcher()["masks"]
+
+
+def test_dispatcher() -> None:
+    """Test registry addition and removal."""
+
+    class DumDum(BasePipelineDataRegistry):
+        def register():
+            pass
+
+        def deregister():
+            pass
+
+        def load():
+            pass
+
+        def get():
+            pass
+
+    DataDispatcher().update({"masks": DumDum})
+    assert "masks" in DataDispatcher()
+
+    _ = DataDispatcher().pop("masks")
+    assert "masks" not in DataDispatcher()
+
+
+def test_get_data_error() -> None:
+    """Test error for get_data()."""
+    with pytest.raises(ValueError, match="Unknown data kind"):
+        get_data(kind="planet", names="neptune", target_data={})
+
+
+def test_list_data_error() -> None:
+    """Test error for list_data()."""
+    with pytest.raises(ValueError, match="Unknown data kind"):
+        list_data(kind="planet")
+
+
+def test_load_data_error() -> None:
+    """Test error for load_data()."""
+    with pytest.raises(ValueError, match="Unknown data kind"):
+        load_data(kind="planet", name="neptune")
+
+
+def test_register_data_error() -> None:
+    """Test error for register_data()."""
+    with pytest.raises(ValueError, match="Unknown data kind"):
+        register_data(kind="planet", name="neptune", space="milkyway")
+
+
+def test_deregister_data_error() -> None:
+    """Test error for deregister_data()."""
+    with pytest.raises(ValueError, match="Unknown data kind"):
+        deregister_data(kind="planet", name="neptune")

junifer/datagrabber/__init__.pyi

@@ -10,7 +10,11 @@ __all__ = [
     "DataladHCP1200",
     "MultipleDataGrabber",
     "DMCC13Benchmark",
+    "DataTypeManager",
+    "DataTypeSchema",
+    "OptionalTypeSchema",
     "PatternValidationMixin",
+    "register_data_type",
 ]
 
 # These 4 need to be in this order, otherwise it is a circular import
@@ -24,4 +28,10 @@ from .hcp1200 import HCP1200, DataladHCP1200
 from .multiple import MultipleDataGrabber
 from .dmcc13_benchmark import DMCC13Benchmark
 
-from .pattern_validation_mixin import PatternValidationMixin
+from .pattern_validation_mixin import (
+    DataTypeManager,
+    DataTypeSchema,
+    OptionalTypeSchema,
+    PatternValidationMixin,
+    register_data_type,
+)

junifer/datagrabber/pattern_validation_mixin.py

@@ -3,71 +3,199 @@
 # Authors: Synchon Mandal <s.mandal@fz-juelich.de>
 # License: AGPL
 
+from collections.abc import Iterator, MutableMapping
+from typing import TypedDict
+
 from ..typing import DataGrabberPatterns
 from ..utils import logger, raise_error, warn_with_log
 
 
-__all__ = ["PatternValidationMixin"]
-
-
-# Define schema for pattern-based datagrabber's patterns
-PATTERNS_SCHEMA = {
-    "T1w": {
-        "mandatory": ["pattern", "space"],
-        "optional": {
-            "mask": {"mandatory": ["pattern", "space"], "optional": []},
-        },
-    },
-    "T2w": {
-        "mandatory": ["pattern", "space"],
-        "optional": {
-            "mask": {"mandatory": ["pattern", "space"], "optional": []},
-        },
-    },
-    "BOLD": {
-        "mandatory": ["pattern", "space"],
-        "optional": {
-            "mask": {"mandatory": ["pattern", "space"], "optional": []},
-            "confounds": {
-                "mandatory": ["pattern", "format"],
-                "optional": ["mappings"],
-            },
-            "reference": {"mandatory": ["pattern"], "optional": []},
-            "prewarp_space": {"mandatory": [], "optional": []},
-        },
-    },
-    "Warp": {
-        "mandatory": ["pattern", "src", "dst", "warper"],
-        "optional": {},
-    },
-    "VBM_GM": {
-        "mandatory": ["pattern", "space"],
-        "optional": {},
-    },
-    "VBM_WM": {
-        "mandatory": ["pattern", "space"],
-        "optional": {},
-    },
-    "VBM_CSF": {
-        "mandatory": ["pattern", "space"],
-        "optional": {},
-    },
-    "DWI": {
-        "mandatory": ["pattern"],
-        "optional": {},
-    },
-    "FreeSurfer": {
-        "mandatory": ["pattern"],
-        "optional": {
-            "aseg": {"mandatory": ["pattern"], "optional": []},
-            "norm": {"mandatory": ["pattern"], "optional": []},
-            "lh_white": {"mandatory": ["pattern"], "optional": []},
-            "rh_white": {"mandatory": ["pattern"], "optional": []},
-            "lh_pial": {"mandatory": ["pattern"], "optional": []},
-            "rh_pial": {"mandatory": ["pattern"], "optional": []},
-        },
-    },
-}
+__all__ = [
+    "DataTypeManager",
+    "DataTypeSchema",
+    "OptionalTypeSchema",
+    "PatternValidationMixin",
+    "register_data_type",
+]
+
+
+class OptionalTypeSchema(TypedDict):
+    """Optional type schema."""
+
+    mandatory: list[str]
+    optional: list[str]
+
+
+class DataTypeSchema(TypedDict):
+    """Data type schema."""
+
+    mandatory: list[str]
+    optional: dict[str, OptionalTypeSchema]
+
+
+class DataTypeManager(MutableMapping):
+    """Class for managing data types."""
+
+    _instance = None
+
+    def __new__(cls):
+        """Overridden to make the class singleton."""
+        # Make class singleton
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+            # Set global schema
+            cls._global: dict[str, DataTypeSchema] = {}
+            cls._builtin: dict[str, DataTypeSchema] = {}
+            cls._external: dict[str, DataTypeSchema] = {}
+            cls._builtin.update(
+                {
+                    "T1w": {
+                        "mandatory": ["pattern", "space"],
+                        "optional": {
+                            "mask": {
+                                "mandatory": ["pattern", "space"],
+                                "optional": [],
+                            },
+                        },
+                    },
+                    "T2w": {
+                        "mandatory": ["pattern", "space"],
+                        "optional": {
+                            "mask": {
+                                "mandatory": ["pattern", "space"],
+                                "optional": [],
+                            },
+                        },
+                    },
+                    "BOLD": {
+                        "mandatory": ["pattern", "space"],
+                        "optional": {
+                            "mask": {
+                                "mandatory": ["pattern", "space"],
+                                "optional": [],
+                            },
+                            "confounds": {
+                                "mandatory": ["pattern", "format"],
+                                "optional": ["mappings"],
+                            },
+                            "reference": {
+                                "mandatory": ["pattern"],
+                                "optional": [],
+                            },
+                            "prewarp_space": {"mandatory": [], "optional": []},
+                        },
+                    },
+                    "Warp": {
+                        "mandatory": ["pattern", "src", "dst", "warper"],
+                        "optional": {},
+                    },
+                    "VBM_GM": {
+                        "mandatory": ["pattern", "space"],
+                        "optional": {},
+                    },
+                    "VBM_WM": {
+                        "mandatory": ["pattern", "space"],
+                        "optional": {},
+                    },
+                    "VBM_CSF": {
+                        "mandatory": ["pattern", "space"],
+                        "optional": {},
+                    },
+                    "DWI": {
+                        "mandatory": ["pattern"],
+                        "optional": {},
+                    },
+                    "FreeSurfer": {
+                        "mandatory": ["pattern"],
+                        "optional": {
+                            "aseg": {"mandatory": ["pattern"], "optional": []},
+                            "norm": {"mandatory": ["pattern"], "optional": []},
+                            "lh_white": {
+                                "mandatory": ["pattern"],
+                                "optional": [],
+                            },
+                            "rh_white": {
+                                "mandatory": ["pattern"],
+                                "optional": [],
+                            },
+                            "lh_pial": {
+                                "mandatory": ["pattern"],
+                                "optional": [],
+                            },
+                            "rh_pial": {
+                                "mandatory": ["pattern"],
+                                "optional": [],
+                            },
+                        },
+                    },
+                }
+            )
+            cls._global.update(cls._builtin)
+        return cls._instance
+
+    def __getitem__(self, key: str) -> DataTypeSchema:
+        """Retrieve schema for ``key``."""
+        return self._global[key]
+
+    def __iter__(self) -> Iterator[str]:
+        """Iterate over data types."""
+        return iter(self._global)
+
+    def __len__(self) -> int:
+        """Get data type count."""
+        return len(self._global)
+
+    def __delitem__(self, key: str) -> None:
+        """Remove schema for ``key``."""
+        # Internal check
+        if key in self._builtin:
+            raise_error(f"Cannot delete in-built key: {key}")
+        # Non-existing key
+        if key not in self._external:
+            raise_error(klass=KeyError, msg=key)
+        # Update external
+        _ = self._external.pop(key)
+        # Update global
+        _ = self._global.pop(key)
+
+    def __setitem__(self, key: str, value: DataTypeSchema) -> None:
+        """Update ``key`` with ``value``."""
+        # Internal check
+        if key in self._builtin:
+            raise_error(f"Cannot set value for in-built key: {key}")
+        # Value type check
+        if not isinstance(value, dict):
+            raise_error(f"Invalid value type: {type(value)}")
+        # Update external
+        self._external[key] = value
+        # Update global
+        self._global[key] = value
+
+    def popitem():
+        """Not implemented."""
+        pass
+
+    def clear(self):
+        """Not implemented."""
+        pass
+
+    def setdefault(self, key: str, value=None):
+        """Not implemented."""
+        pass
+
+
+def register_data_type(name: str, schema: DataTypeSchema) -> None:
+    """Register custom data type.
+
+    Parameters
+    ----------
+    name : str
+        The data type name.
+    schema : DataTypeSchema
+        The data type schema.
+
+    """
+    DataTypeManager()[name] = schema
 
 
 class PatternValidationMixin:
@@ -311,12 +439,13 @@ class PatternValidationMixin:
                 msg="`patterns` must contain all `types`", klass=ValueError
             )
         # Check against schema
+        dtype_mgr = DataTypeManager()
         for dtype_key, dtype_val in patterns.items():
             # Check if valid data type is provided
-            if dtype_key not in PATTERNS_SCHEMA:
+            if dtype_key not in dtype_mgr:
                 raise_error(
                     f"Unknown data type: {dtype_key}, "
-                    f"should be one of: {list(PATTERNS_SCHEMA.keys())}"
+                    f"should be one of: {list(dtype_mgr.keys())}"
                 )
             # Conditional for list dtype vals like Warp
             if isinstance(dtype_val, list):
@@ -324,14 +453,14 @@ class PatternValidationMixin:
                     # Check mandatory keys for data type
                     self._validate_mandatory_keys(
                         keys=list(entry),
-                        schema=PATTERNS_SCHEMA[dtype_key]["mandatory"],
+                        schema=dtype_mgr[dtype_key]["mandatory"],
                         data_type=f"{dtype_key}.{idx}",
                         partial_pattern_ok=partial_pattern_ok,
                     )
                     # Check optional keys for data type
-                    for optional_key, optional_val in PATTERNS_SCHEMA[
-                        dtype_key
-                    ]["optional"].items():
+                    for optional_key, optional_val in dtype_mgr[dtype_key][
+                        "optional"
+                    ].items():
                         if optional_key not in entry:
                             logger.debug(
                                 f"Optional key: `{optional_key}` missing for "
@@ -344,12 +473,12 @@ class PatternValidationMixin:
                             )
                             # Set nested type name for easier access
                             nested_dtype = f"{dtype_key}.{idx}.{optional_key}"
-                            nested_mandatory_keys_schema = PATTERNS_SCHEMA[
+                            nested_mandatory_keys_schema = dtype_mgr[
                                 dtype_key
                             ]["optional"][optional_key]["mandatory"]
-                            nested_optional_keys_schema = PATTERNS_SCHEMA[
-                                dtype_key
-                            ]["optional"][optional_key]["optional"]
+                            nested_optional_keys_schema = dtype_mgr[dtype_key][
+                                "optional"
+                            ][optional_key]["optional"]
                             # Check mandatory keys for nested type
                             self._validate_mandatory_keys(
                                 keys=list(optional_val["mandatory"]),
@@ -392,10 +521,8 @@ class PatternValidationMixin:
                     self._identify_stray_keys(
                         keys=list(entry.keys()),
                         schema=(
-                            PATTERNS_SCHEMA[dtype_key]["mandatory"]
-                            + list(
-                                PATTERNS_SCHEMA[dtype_key]["optional"].keys()
-                            )
+                            dtype_mgr[dtype_key]["mandatory"]
+                            + list(dtype_mgr[dtype_key]["optional"].keys())
                         ),
                         data_type=dtype_key,
                     )
@@ -412,12 +539,12 @@ class PatternValidationMixin:
                 # Check mandatory keys for data type
                 self._validate_mandatory_keys(
                     keys=list(dtype_val),
-                    schema=PATTERNS_SCHEMA[dtype_key]["mandatory"],
+                    schema=dtype_mgr[dtype_key]["mandatory"],
                     data_type=dtype_key,
                     partial_pattern_ok=partial_pattern_ok,
                 )
                 # Check optional keys for data type
-                for optional_key, optional_val in PATTERNS_SCHEMA[dtype_key][
+                for optional_key, optional_val in dtype_mgr[dtype_key][
                     "optional"
                 ].items():
                     if optional_key not in dtype_val:
@@ -432,12 +559,12 @@ class PatternValidationMixin:
                         )
                         # Set nested type name for easier access
                         nested_dtype = f"{dtype_key}.{optional_key}"
-                        nested_mandatory_keys_schema = PATTERNS_SCHEMA[
-                            dtype_key
-                        ]["optional"][optional_key]["mandatory"]
-                        nested_optional_keys_schema = PATTERNS_SCHEMA[
-                            dtype_key
-                        ]["optional"][optional_key]["optional"]
+                        nested_mandatory_keys_schema = dtype_mgr[dtype_key][
+                            "optional"
+                        ][optional_key]["mandatory"]
+                        nested_optional_keys_schema = dtype_mgr[dtype_key][
+                            "optional"
+                        ][optional_key]["optional"]
                         # Check mandatory keys for nested type
                         self._validate_mandatory_keys(
                             keys=list(optional_val["mandatory"]),
@@ -476,8 +603,8 @@ class PatternValidationMixin:
                 self._identify_stray_keys(
                     keys=list(dtype_val.keys()),
                     schema=(
-                        PATTERNS_SCHEMA[dtype_key]["mandatory"]
-                        + list(PATTERNS_SCHEMA[dtype_key]["optional"].keys())
+                        dtype_mgr[dtype_key]["mandatory"]
+                        + list(dtype_mgr[dtype_key]["optional"].keys())
                     ),
                     data_type=dtype_key,
                 )

junifer/datagrabber/tests/test_pattern_validation_mixin.py

@@ -9,7 +9,110 @@ from typing import Union
 
 import pytest
 
-from junifer.datagrabber.pattern_validation_mixin import PatternValidationMixin
+from junifer.datagrabber.pattern_validation_mixin import (
+    DataTypeManager,
+    DataTypeSchema,
+    PatternValidationMixin,
+    register_data_type,
+)
+
+
+def test_dtype_mgr_addition_errors() -> None:
+    """Test data type manager addition errors."""
+    with pytest.raises(ValueError, match="Cannot set"):
+        dtype_schema: DataTypeSchema = {
+            "mandatory": ["pattern"],
+            "optional": {},
+        }
+        DataTypeManager()["T1w"] = dtype_schema
+
+    with pytest.raises(ValueError, match="Invalid"):
+        DataTypeManager()["DType"] = ""
+
+
+def test_dtype_mgr_removal_errors() -> None:
+    """Test data type manager removal errors."""
+    with pytest.raises(ValueError, match="Cannot delete"):
+        _ = DataTypeManager().pop("T1w")
+
+    with pytest.raises(KeyError, match="DType"):
+        del DataTypeManager()["DType"]
+
+
+@pytest.mark.parametrize(
+    "dtype",
+    [
+        {
+            "mandatory": ["pattern"],
+            "optional": {},
+        },
+        {
+            "mandatory": ["pattern"],
+            "optional": {
+                "subtype": {
+                    "mandatory": [],
+                    "optional": [],
+                }
+            },
+        },
+        {
+            "mandatory": ["pattern"],
+            "optional": {
+                "subtype": {
+                    "mandatory": ["pattern"],
+                    "optional": [],
+                }
+            },
+        },
+        {
+            "mandatory": ["pattern"],
+            "optional": {
+                "subtype": {
+                    "mandatory": ["pattern"],
+                    "optional": ["pattern"],
+                }
+            },
+        },
+    ],
+)
+def test_dtype_mgr(dtype: DataTypeSchema) -> None:
+    """Test data type manager addition and removal.
+
+    Parameters
+    ----------
+    dtype : DataTypeSchema
+        The parametrized schema.
+
+    """
+
+    DataTypeManager().update({"DType": dtype})
+    assert "DType" in DataTypeManager()
+
+    _ = DataTypeManager().pop("DType")
+    assert "DType" not in DataTypeManager()
+
+
+def test_register_data_type() -> None:
+    """Test data type registration."""
+
+    dtype_schema: DataTypeSchema = {
+        "mandatory": ["pattern"],
+        "optional": {
+            "mask": {
+                "mandatory": ["pattern"],
+                "optional": [],
+            },
+        },
+    }
+
+    register_data_type(
+        name="dtype",
+        schema=dtype_schema,
+    )
+
+    assert "dtype" in DataTypeManager()
+    _ = DataTypeManager().pop("dtype")
+    assert "dumb" not in DataTypeManager()
 
 
 @pytest.mark.parametrize(

junifer/typing/__init__.pyi

@@ -1,5 +1,6 @@
 __all__ = [
     "DataGrabberLike",
+    "DataRegistryLike",
     "PreprocessorLike",
     "MarkerLike",
     "StorageLike",
@@ -16,6 +17,7 @@ __all__ = [
 
 from ._typing import (
     DataGrabberLike,
+    DataRegistryLike,
     PreprocessorLike,
     MarkerLike,
     StorageLike,

junifer/typing/_typing.py

@@ -11,6 +11,7 @@ from typing import (
 
 
 if TYPE_CHECKING:
+    from ..data import BasePipelineDataRegistry
     from ..datagrabber import BaseDataGrabber
     from ..datareader import DefaultDataReader
     from ..markers import BaseMarker
@@ -23,6 +24,7 @@ __all__ = [
     "ConfigVal",
     "DataGrabberLike",
     "DataGrabberPatterns",
+    "DataRegistryLike",
     "Dependencies",
     "Element",
     "Elements",
@@ -35,6 +37,7 @@ __all__ = [
 ]
 
 
+DataRegistryLike = type["BasePipelineDataRegistry"]
 DataGrabberLike = type["BaseDataGrabber"]
 PreprocessorLike = type["BasePreprocessor"]
 MarkerLike = type["BaseMarker"]
@@ -61,7 +64,7 @@ ConditionalDependencies = Sequence[
 ExternalDependencies = Sequence[MutableMapping[str, Union[str, Sequence[str]]]]
 MarkerInOutMappings = MutableMapping[str, MutableMapping[str, str]]
 DataGrabberPatterns = dict[
-    str, Union[dict[str, str], Sequence[dict[str, str]]]
+    str, Union[dict[str, str], list[dict[str, str]]]
 ]
 ConfigVal = Union[bool, int, float, str]
 Element = Union[str, tuple[str, ...]]

{junifer-0.0.7.dev72.dist-info → junifer-0.0.7.dev93.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: junifer
-Version: 0.0.7.dev72
+Version: 0.0.7.dev93
 Summary: JUelich NeuroImaging FEature extractoR
 Author-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>
 Maintainer-email: Fede Raimondo <f.raimondo@fz-juelich.de>, Synchon Mandal <s.mandal@fz-juelich.de>

{junifer-0.0.7.dev72.dist-info → junifer-0.0.7.dev93.dist-info}/RECORD

@@ -1,12 +1,12 @@
 junifer/__init__.py,sha256=2McgH1yNue6Z1V26-uN_mfMjbTcx4CLhym-DMBl5xA4,266
 junifer/__init__.pyi,sha256=SsTvgq2Dod6UqJN96GH1lCphH6hJQQurEJHGNhHjGUI,508
-junifer/_version.py,sha256=LYWWm9KxYBr--JmpK7VCe37ywBK4F9KtSMviNQt4mQw,526
+junifer/_version.py,sha256=vFYsjG-TWfjglJG7fH8rtbhQ3pjvXxlnFjXQw4toOfM,526
 junifer/conftest.py,sha256=PWYkkRDU8ly2lYwv7VBKMHje4et6HX7Yey3Md_I2KbA,613
 junifer/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/stats.py,sha256=e9aaagMGtgpRfW3Wdpz9ocpnYld1IWylCDcjFUgX9Mk,6225
 junifer/api/__init__.py,sha256=aAXW_KAEGQ8aAP5Eni2G1R4MWBF7UgjKOgM6akLuJco,252
 junifer/api/__init__.pyi,sha256=UJu55ApMFd43N0xlQyNKrYpCdzqhAxA3Jjaj0ETwCXU,169
-junifer/api/decorators.py,sha256=rBkoqHt_lKUb9b_ctbKNPk5E2XGHCiYSsMm3PrxDjdw,2853
+junifer/api/decorators.py,sha256=hBmJbJIedXvCxzvxWBQond3Nu9oSTd2e7dvJ_QZ9zF0,3635
 junifer/api/functions.py,sha256=LXKPqsfWINq1iSUShdryGB8hPOyyydc1ldHfr68bP20,14226
 junifer/api/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/api/queue_context/__init__.py,sha256=glr8x4aMm4EvVrHywDIlugdNlwD1RzqV2FTDNPqYQZ4,204
@@ -40,6 +40,7 @@ junifer/api/res/fsl/flirt,sha256=tSjiUco8ui8AbHD7mTzChEwbR0Rf_4iJTgzYTPF_WuQ,42
 junifer/api/res/fsl/img2imgcoord,sha256=Zmaw3oJYrEltcXiPyEubXry9ppAq3SND52tdDWGgeZk,49
 junifer/api/res/fsl/run_fsl_docker.sh,sha256=pq-fcNdLuvHzVIQePN4GebZGlcE2UF-xj5rBIqAMz4g,1122
 junifer/api/res/fsl/std2imgcoord,sha256=-X5wRH6XMl0yqnTACJX6MFhO8DFOEWg42MHRxGvimXg,49
+junifer/api/tests/test_decorators.py,sha256=GN4wSRDJncqa1Jz9krNY_Ls9e6ge9xaGyOpaiSSXibk,759
 junifer/api/tests/test_functions.py,sha256=HcJIBCtcgL1xJlDwtGHrGOWBMjXgCoAFoVxQW6n2Tds,20676
 junifer/cli/__init__.py,sha256=LRmpmMe0DdZKYZTV61onUiLLxYZ_ZYSfmRbH55bBJMg,500
 junifer/cli/__init__.pyi,sha256=PiV4znUnzSeuSSJGz-RT8N21PiMqoSMwYcypi7nt2Js,40
@@ -71,8 +72,8 @@ junifer/configs/juseless/datagrabbers/tests/test_ixi_vbm.py,sha256=8jxpNZelXwpJG
 junifer/configs/juseless/datagrabbers/tests/test_ucla.py,sha256=l-1y_m6NJo7JExhyIzp-vajUfiqiofX69YUOrRHIFKw,3246
 junifer/configs/juseless/datagrabbers/tests/test_ukb_vbm.py,sha256=b9hjc1mgO--PSRC3id2EzzfE2yWNsuZ2UI47a6sfGZU,1025
 junifer/data/__init__.py,sha256=xJDI2QKtdjcNzpd1oVFM3guh1SFHM6jKstl7pFmzOuk,267
-junifer/data/__init__.pyi,sha256=qYszjUYcbFi_2zO23MnbA2HhTW-Ad2oh1pqPQYd6yt0,542
-junifer/data/_dispatch.py,sha256=TZmz9CS9GNKu1fGk9H0SY_G45P0kCU1XY0xBYxEqm4A,6270
+junifer/data/__init__.pyi,sha256=yt6gNTY8fgv9O5HjUqEHdKkO7Oo3q4dVp-aeqP4q5PY,682
+junifer/data/_dispatch.py,sha256=l1UbmSQyrAVzfYopaijUFIkbHntFdIxsA8RpRHjvcf0,7519
 junifer/data/pipeline_data_registry_base.py,sha256=G8bE3WTj4D_rKC4ZKZe6E48Sd96CGea1PS3SxmTgGK4,2010
 junifer/data/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/data/template_spaces.py,sha256=7LcQbUV_SWCic-TtETCejgat-BxxFDxZFm5z80rRZ-M,4661
@@ -80,32 +81,33 @@ junifer/data/utils.py,sha256=zVqlkc2jXFDv1jx8plXBHRL6y0h1eR_XzH7fkTJ6ric,3978
 junifer/data/coordinates/__init__.py,sha256=ffM8rwcHLgHAWixJbKrATrbUKzX940V1UF6RAxZdUMg,186
 junifer/data/coordinates/__init__.pyi,sha256=Z-Ti5XD3HigkZ8uYN6oYsLqw40-F1GvTVQ5QAy08Wng,88
 junifer/data/coordinates/_ants_coordinates_warper.py,sha256=9nIdg4B5EMje8s30n_8Dl7eYko3HmVJ8jyZpXETg8Sk,2976
-junifer/data/coordinates/_coordinates.py,sha256=DHjSPaA3ntlP85SERefqkiGkq-rITrR9dpONj4oQwgc,13365
+junifer/data/coordinates/_coordinates.py,sha256=l-nu-eGdW2Cp4eDmnrSsuWE-zcj55apPab5pTt07SwU,13303
 junifer/data/coordinates/_fsl_coordinates_warper.py,sha256=fxxvsiq-hSeP_PDokMHJSxlyffMugzSDUHhKzuU7Vg4,2429
 junifer/data/coordinates/tests/test_coordinates.py,sha256=JG045I7l5zcxGRQMbZZTrJY0TI5ZKaJ_szGMB6j1ZRI,4623
 junifer/data/masks/__init__.py,sha256=eEEhHglyVEx1LrqwXjq3cOmjf4sTsgBstRx5-k7zIQU,180
 junifer/data/masks/__init__.pyi,sha256=lcgr8gmWDPibC4RxnWBXb8DDpIkO73Aax09u6VXiJJI,114
 junifer/data/masks/_ants_mask_warper.py,sha256=YJYVuD4QkgFwUSs1edt2rrqfHYHaIR1u85HSeQE4GUk,5825
 junifer/data/masks/_fsl_mask_warper.py,sha256=7-Aw4m9GA7ZLqB26jjuKYJUJSv9V11DfPFNBbb5caSE,2877
-junifer/data/masks/_masks.py,sha256=c30OPW01jfiZT4ExM2uZdoRvQ-VeTcXEk3R68EUDoHc,28664
+junifer/data/masks/_masks.py,sha256=hOQ_VpXW8HvOfpd7-bxxvPClEn5WT3WQHro2Ofrtna8,28602
 junifer/data/masks/tests/test_masks.py,sha256=VK3IenIwhaYpbESe0pOjb40OKE6rcRlw8ddsBxSRfyU,16688
 junifer/data/parcellations/__init__.py,sha256=6-Ysil3NyZ69V6rWx4RO15_d-iDKizfbHuxSjsHNt24,188
 junifer/data/parcellations/__init__.pyi,sha256=lhBHTbMDizzqUqVHrx2eyfPFodrTBgMFeTgxfESSkQ8,140
 junifer/data/parcellations/_ants_parcellation_warper.py,sha256=LIfeIAv3bFQbIrl6Cr7RU2RdkA-c2G6qURIBUe5MJCQ,5826
 junifer/data/parcellations/_fsl_parcellation_warper.py,sha256=lmZDPv2fMjOnbJ0z2d3K9S7QH2bgYd5bXbzxNDUR5NY,2699
-junifer/data/parcellations/_parcellations.py,sha256=bby15ZET8AhudtUg74CAMz_eKRMCUbRGmKSOfwGl-5o,48490
-junifer/data/parcellations/tests/test_parcellations.py,sha256=898lhEpmVW-KcjD2Wj--oe_AU8qOSmK78rZrbj86vpY,37324
+junifer/data/parcellations/_parcellations.py,sha256=e5Cd6VptKNZaqmAnfuhfMPeb48utimAkq5h4JioaB5w,48428
+junifer/data/parcellations/tests/test_parcellations.py,sha256=s3TtsXTw7wEb-FvW0pFX2QcIXjp9IwlgjtM8X95rz_8,37544
 junifer/data/tests/test_data_utils.py,sha256=6-UQ7HDZ7_zA7iQalzk29KJBdftQMVyqKsQ0tx1URkE,1062
+junifer/data/tests/test_dispatch.py,sha256=bm4R0E8gs_XpJ6B5lfWFXjle7PmDjaX7Wu0L6mEU33w,2315
 junifer/data/tests/test_template_spaces.py,sha256=ZEicEcLqOJ-NpuBZ5SYh4yZ0xZRkhYHnYXiC_YSxjrY,3219
 junifer/datagrabber/__init__.py,sha256=EHIK-lbjuvkt0V8ypFvLSt85OAAXSkaxBmVlCbNNz8M,323
-junifer/datagrabber/__init__.pyi,sha256=zOQE4TaCKXBTHnNqgmECtsszWIOHYiQ1CUEeXXFU9F4,832
+junifer/datagrabber/__init__.pyi,sha256=4Eydc8RO4TN8TLRDq68cdbJPQMxGEynQwU2bmmWStLg,1027
 junifer/datagrabber/base.py,sha256=Llr5bHyHovkySI-bzxoQ1TklEF6WOaNRN9D_srqQvYM,6661
 junifer/datagrabber/datalad_base.py,sha256=52T2DbqDGOxiKSESBESzElrVJ3WihLWrrGlQewSvYOs,12616
 junifer/datagrabber/dmcc13_benchmark.py,sha256=VMyiwvkr4qSvzBICSksPPKOI2w_WVo06H89Url-hrNs,12819
 junifer/datagrabber/multiple.py,sha256=4tCOzojs3hoG7daHJJ7HUsx15atWR5nTmyP0S0__aig,6666
 junifer/datagrabber/pattern.py,sha256=hZxXc59qFGiH710aZkcVgt-JcvVjuR-EMmQ1_QFAoHM,18724
 junifer/datagrabber/pattern_datalad.py,sha256=7jY-0Xw0G-mKG0BgXNTQPuS-KPnpFhvqfVOZtD6Yfcc,4567
-junifer/datagrabber/pattern_validation_mixin.py,sha256=3MwpeUePm8eGgbe-J2kTWs9x5bk1SR3nhojHwN95SXM,19368
+junifer/datagrabber/pattern_validation_mixin.py,sha256=UpeSy9jNtJ_5OL5IqlLIFPOMg0SFTHcOTpW3DlepE9g,23696
 junifer/datagrabber/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 junifer/datagrabber/aomic/__init__.py,sha256=ATxzXq9NBPmWowTMuL77zqrmIbbnk0Wd1iXtXCP3XDg,266
 junifer/datagrabber/aomic/__init__.pyi,sha256=Rp6C075fZDdKY8VIq508_g4NhVj8bWzR6zb9yln761Q,189
@@ -128,7 +130,7 @@ junifer/datagrabber/tests/test_dmcc13_benchmark.py,sha256=h5zLrcP7BbSCeGLt2VfCsi
 junifer/datagrabber/tests/test_multiple.py,sha256=tZBQhlEiSE1PeQ5E3TtuVgsHENquna9t39p54AJ-O5w,9963
 junifer/datagrabber/tests/test_pattern.py,sha256=H55jYRPfT3rMsoIQOAnWJgw3nGrkU7m2xFa3-ed6NQE,9527
 junifer/datagrabber/tests/test_pattern_datalad.py,sha256=HJ3dQ3XSlMZ3UT1w2b2xpdPqvfmNxRWmla9zhRejWYI,6483
-junifer/datagrabber/tests/test_pattern_validation_mixin.py,sha256=KU3xha3Mo7IX_5Tp4RL5awvEzZrX43OmrRFjeqMYVgk,7498
+junifer/datagrabber/tests/test_pattern_validation_mixin.py,sha256=yzUBRB4it_2BCNcp8syh5n3WejRRI6YfMg5T-p4_IkM,9982
 junifer/datareader/__init__.py,sha256=CDWjL4PQthskxWX5d0ASro6YIfTT1Tb7ZmyDllWWZso,318
 junifer/datareader/__init__.pyi,sha256=VOqhh-C3-eqapHVR7-F9Ulc_6iyHTb35XLoGb2DCRaA,72
 junifer/datareader/default.py,sha256=q8aXHlBzLtRtgM2z3JWIsB-daSZncr33mliZlV5RzdM,6733
@@ -305,8 +307,8 @@ junifer/testing/tests/test_testing_registry.py,sha256=MK4a_q4MHieCvYhnhuPm_dH76l
 junifer/tests/test_main.py,sha256=GMff7jlisGM9_FsiUwWDte43j-KQJGFRYZpwRRqTkd8,373
 junifer/tests/test_stats.py,sha256=NljoGFu2JOPADbi9W0WeUHwpf8nZSdOkcCgCv-Z1fY4,4149
 junifer/typing/__init__.py,sha256=e0UbuxozXUIxz8h8pLokMOxZV629Q1lnA7vvgm95WF0,215
-junifer/typing/__init__.pyi,sha256=GRGfrnReP1ROtQM6eT0EpFjmE-v-pCJuBiQZMXCVTsE,594
-junifer/typing/_typing.py,sha256=2D7ibO5OB3yTgpjI1IV_QorZ6b-ZEQVPQE-z2qxis9I,1663
+junifer/typing/__init__.pyi,sha256=5jzVAkras38Eou5abUvdP1AXhbpCSnPAllLx88YuPB8,640
+junifer/typing/_typing.py,sha256=JogiI9wCZWHuqgTaZarjk89aA5pR0yTvFx2JfheLT_Y,1783
 junifer/utils/__init__.py,sha256=I3tYaePAD_ZEU-36-TJ_OYeqW_aMmi5MZ3jmqie6RfU,260
 junifer/utils/__init__.pyi,sha256=CMb4rq1VcQ00IRuiBFfAWu07Vb-vA4qtVLAoY0ll-bA,422
 junifer/utils/_config.py,sha256=cfxyv1bfklID2atQseu6y3J7mZrCXPwnGEfBSImG9CM,3054
@@ -320,10 +322,10 @@ junifer/utils/tests/test_config.py,sha256=7ltIXuwb_W4Mv_1dxQWyiyM10XgUAfsWKV6D_i
 junifer/utils/tests/test_fs.py,sha256=WQS7cKlKEZ742CIuiOYYpueeAhY9PqlastfDVpVVtvE,923
 junifer/utils/tests/test_helpers.py,sha256=k5qqfxK8dFyuewTJyR1Qn6-nFaYNuVr0ysc18bfPjyU,929
 junifer/utils/tests/test_logging.py,sha256=W4tFKmaf8_CxnWZ-o_-XxM7DQbhGG18RsLZJk8bZelI,8163
-junifer-0.0.7.dev72.dist-info/licenses/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
-junifer-0.0.7.dev72.dist-info/licenses/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
-junifer-0.0.7.dev72.dist-info/METADATA,sha256=VRpJuhWDpLEMFpJPke6QnTbLN-oOXRUbzoiUwr0LwlM,8387
-junifer-0.0.7.dev72.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-junifer-0.0.7.dev72.dist-info/entry_points.txt,sha256=6O8ru0BP-SP7YMUZiizFNoaZ2HvJpadO2G7nKk4PwjI,48
-junifer-0.0.7.dev72.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
-junifer-0.0.7.dev72.dist-info/RECORD,,
+junifer-0.0.7.dev93.dist-info/licenses/AUTHORS.rst,sha256=rmULKpchpSol4ExWFdm-qu4fkpSZPYqIESVJBZtGb6E,163
+junifer-0.0.7.dev93.dist-info/licenses/LICENSE.md,sha256=MqCnOBu8uXsEOzRZWh9EBVfVz-kE9NkXcLCrtGXo2yU,34354
+junifer-0.0.7.dev93.dist-info/METADATA,sha256=XJDtsS1aolWYxCr-iCbrso20QFIP8bciZm9-BxskKWk,8387
+junifer-0.0.7.dev93.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+junifer-0.0.7.dev93.dist-info/entry_points.txt,sha256=6O8ru0BP-SP7YMUZiizFNoaZ2HvJpadO2G7nKk4PwjI,48
+junifer-0.0.7.dev93.dist-info/top_level.txt,sha256=4bAq1R2QFQ4b3hohjys2JBvxrl0GKk5LNFzYvz9VGcA,8
+junifer-0.0.7.dev93.dist-info/RECORD,,

{junifer-0.0.7.dev72.dist-info → junifer-0.0.7.dev93.dist-info}/WHEEL

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