junifer 0.0.6.dev219__py3-none-any.whl → 0.0.6.dev227__py3-none-any.whl

junifer/__init__.pyi

@@ -13,6 +13,7 @@ __all__ = [
     "external",
     "onthefly",
     "testing",
+    "typing",
     "__version__",
 ]
 
@@ -30,6 +31,7 @@ from . import (
     utils,
     external,
     testing,
+    typing,
     onthefly,
 )
 from ._version import __version__

junifer/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.0.6.dev219'
-__version_tuple__ = version_tuple = (0, 0, 6, 'dev219')
+__version__ = version = '0.0.6.dev227'
+__version_tuple__ = version_tuple = (0, 0, 6, 'dev227')

junifer/api/decorators.py

@@ -8,6 +8,7 @@
 from typing import Type
 
 from ..pipeline import PipelineComponentRegistry
+from ..typing import DataGrabberLike, MarkerLike, PreprocessorLike, StorageLike
 
 
 __all__ = [
@@ -19,7 +20,7 @@ __all__ = [
 ]
 
 
-def register_datagrabber(klass: Type) -> Type:
+def register_datagrabber(klass: DataGrabberLike) -> DataGrabberLike:
     """Register DataGrabber.
 
     Registers the DataGrabber so it can be used by name.
@@ -73,7 +74,7 @@ def register_datareader(klass: Type) -> Type:
     return klass
 
 
-def register_preprocessor(klass: Type) -> Type:
+def register_preprocessor(klass: PreprocessorLike) -> PreprocessorLike:
     """Preprocessor registration decorator.
 
     Registers the preprocessor so it can be used by name.
@@ -96,7 +97,7 @@ def register_preprocessor(klass: Type) -> Type:
     return klass
 
 
-def register_marker(klass: Type) -> Type:
+def register_marker(klass: MarkerLike) -> MarkerLike:
     """Marker registration decorator.
 
     Registers the marker so it can be used by name.
@@ -119,7 +120,7 @@ def register_marker(klass: Type) -> Type:
     return klass
 
 
-def register_storage(klass: Type) -> Type:
+def register_storage(klass: StorageLike) -> StorageLike:
     """Storage registration decorator.
 
     Registers the storage so it can be used by name.

junifer/api/functions.py

@@ -11,22 +11,23 @@ from pathlib import Path
 from typing import Dict, List, Optional, Tuple, Union
 
 from ..api.queue_context import GnuParallelLocalAdapter, HTCondorAdapter
-from ..datagrabber.base import BaseDataGrabber
-from ..markers.base import BaseMarker
+from ..datagrabber import BaseDataGrabber
+from ..markers import BaseMarker
 from ..pipeline import (
     MarkerCollection,
     PipelineComponentRegistry,
     WorkDirManager,
 )
-from ..preprocess.base import BasePreprocessor
-from ..storage.base import BaseFeatureStorage
+from ..preprocess import BasePreprocessor
+from ..storage import BaseFeatureStorage
+from ..typing import DataGrabberLike, MarkerLike, PreprocessorLike, StorageLike
 from ..utils import logger, raise_error, yaml
 
 
 __all__ = ["run", "collect", "queue", "reset", "list_elements"]
 
 
-def _get_datagrabber(datagrabber_config: Dict) -> BaseDataGrabber:
+def _get_datagrabber(datagrabber_config: Dict) -> DataGrabberLike:
     """Get DataGrabber.
 
     Parameters
@@ -48,7 +49,7 @@ def _get_datagrabber(datagrabber_config: Dict) -> BaseDataGrabber:
     )
 
 
-def _get_preprocessor(preprocessing_config: Dict) -> BasePreprocessor:
+def _get_preprocessor(preprocessing_config: Dict) -> PreprocessorLike:
     """Get Preprocessor.
 
     Parameters
@@ -70,7 +71,7 @@ def _get_preprocessor(preprocessing_config: Dict) -> BasePreprocessor:
     )
 
 
-def _get_marker(marker_config: Dict) -> BaseMarker:
+def _get_marker(marker_config: Dict) -> MarkerLike:
     """Get Marker.
 
     Parameters
@@ -92,7 +93,7 @@ def _get_marker(marker_config: Dict) -> BaseMarker:
     )
 
 
-def _get_storage(storage_config: Dict) -> BaseFeatureStorage:
+def _get_storage(storage_config: Dict) -> StorageLike:
     """Get Storage.
 
     Parameters

junifer/datagrabber/multiple.py

@@ -8,6 +8,7 @@
 from typing import Dict, List, Tuple, Union
 
 from ..api.decorators import register_datagrabber
+from ..typing import DataGrabberLike
 from ..utils import deep_update, raise_error
 from .base import BaseDataGrabber
 
@@ -37,7 +38,7 @@ class MultipleDataGrabber(BaseDataGrabber):
 
     """
 
-    def __init__(self, datagrabbers: List[BaseDataGrabber], **kwargs) -> None:
+    def __init__(self, datagrabbers: List[DataGrabberLike], **kwargs) -> None:
         # Check datagrabbers consistency
         # Check for same element keys
         first_keys = datagrabbers[0].get_element_keys()

junifer/markers/base.py

@@ -6,16 +6,13 @@
 
 from abc import ABC, abstractmethod
 from copy import deepcopy
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from typing import Any, Dict, List, Optional, Union
 
 from ..pipeline import PipelineStepMixin, UpdateMetaMixin
+from ..typing import StorageLike
 from ..utils import logger, raise_error
 
 
-if TYPE_CHECKING:
-    from junifer.storage import BaseFeatureStorage
-
-
 __all__ = ["BaseMarker"]
 
 
@@ -159,7 +156,7 @@ class BaseMarker(ABC, PipelineStepMixin, UpdateMetaMixin):
         type_: str,
         feature: str,
         out: Dict[str, Any],
-        storage: "BaseFeatureStorage",
+        storage: StorageLike,
     ) -> None:
         """Store.
 
@@ -182,7 +179,7 @@ class BaseMarker(ABC, PipelineStepMixin, UpdateMetaMixin):
     def _fit_transform(
         self,
         input: Dict[str, Dict],
-        storage: Optional["BaseFeatureStorage"] = None,
+        storage: Optional[StorageLike] = None,
     ) -> Dict:
         """Fit and transform.
 

junifer/markers/brainprint.py

@@ -11,7 +11,6 @@ from typing import (
     Dict,
     List,
     Optional,
-    Set,
     Union,
 )
 
@@ -25,6 +24,7 @@ from ..external.BrainPrint.brainprint.brainprint import (
 )
 from ..external.BrainPrint.brainprint.surfaces import surf_to_vtk
 from ..pipeline import WorkDirManager
+from ..typing import Dependencies, ExternalDependencies, MarkerInOutMappings
 from ..utils import logger, run_ext_cmd
 from .base import BaseMarker
 
@@ -68,7 +68,7 @@ class BrainPrint(BaseMarker):
 
     """
 
-    _EXT_DEPENDENCIES: ClassVar[List[Dict[str, Union[str, List[str]]]]] = [
+    _EXT_DEPENDENCIES: ClassVar[ExternalDependencies] = [
         {
             "name": "freesurfer",
             "commands": [
@@ -80,9 +80,9 @@ class BrainPrint(BaseMarker):
         },
     ]
 
-    _DEPENDENCIES: ClassVar[Set[str]] = {"lapy", "numpy"}
+    _DEPENDENCIES: ClassVar[Dependencies] = {"lapy", "numpy"}
 
-    _MARKER_INOUT_MAPPINGS: ClassVar[Dict[str, Dict[str, str]]] = {
+    _MARKER_INOUT_MAPPINGS: ClassVar[MarkerInOutMappings] = {
         "FreeSurfer": {
             "eigenvalues": "scalar_table",
             "areas": "vector",

junifer/markers/complexity/complexity_base.py

@@ -11,10 +11,10 @@ from typing import (
     Dict,
     List,
     Optional,
-    Set,
     Union,
 )
 
+from ...typing import Dependencies, MarkerInOutMappings
 from ...utils import raise_error
 from ..base import BaseMarker
 from ..parcel_aggregation import ParcelAggregation
@@ -51,9 +51,9 @@ class ComplexityBase(BaseMarker):
 
     """
 
-    _DEPENDENCIES: ClassVar[Set[str]] = {"nilearn", "neurokit2"}
+    _DEPENDENCIES: ClassVar[Dependencies] = {"nilearn", "neurokit2"}
 
-    _MARKER_INOUT_MAPPINGS: ClassVar[Dict[str, Dict[str, str]]] = {
+    _MARKER_INOUT_MAPPINGS: ClassVar[MarkerInOutMappings] = {
         "BOLD": {
             "complexity": "vector",
         },

junifer/markers/ets_rss.py

@@ -6,11 +6,12 @@
 #          Synchon Mandal <s.mandal@fz-juelich.de>
 # License: AGPL
 
-from typing import Any, ClassVar, Dict, List, Optional, Set, Union
+from typing import Any, ClassVar, Dict, List, Optional, Union
 
 import numpy as np
 
 from ..api.decorators import register_marker
+from ..typing import Dependencies, MarkerInOutMappings
 from ..utils import logger
 from .base import BaseMarker
 from .parcel_aggregation import ParcelAggregation
@@ -45,9 +46,9 @@ class RSSETSMarker(BaseMarker):
 
     """
 
-    _DEPENDENCIES: ClassVar[Set[str]] = {"nilearn"}
+    _DEPENDENCIES: ClassVar[Dependencies] = {"nilearn"}
 
-    _MARKER_INOUT_MAPPINGS: ClassVar[Dict[str, Dict[str, str]]] = {
+    _MARKER_INOUT_MAPPINGS: ClassVar[MarkerInOutMappings] = {
         "BOLD": {
             "rss_ets": "timeseries",
         },

junifer/markers/falff/_afni_falff.py

@@ -8,22 +8,20 @@ from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     ClassVar,
-    Dict,
-    List,
     Optional,
     Tuple,
-    Union,
 )
 
 import nibabel as nib
 
 from ...pipeline import WorkDirManager
+from ...typing import ExternalDependencies
 from ...utils import logger, run_ext_cmd
 from ...utils.singleton import Singleton
 
 
 if TYPE_CHECKING:
-    from nibabel import Nifti1Image
+    from nibabel.nifti1 import Nifti1Image
 
 
 __all__ = ["AFNIALFF"]
@@ -37,7 +35,7 @@ class AFNIALFF(metaclass=Singleton):
 
     """
 
-    _EXT_DEPENDENCIES: ClassVar[List[Dict[str, Union[str, List[str]]]]] = [
+    _EXT_DEPENDENCIES: ClassVar[ExternalDependencies] = [
         {
             "name": "afni",
             "commands": ["3dRSFC", "3dAFNItoNIFTI"],

junifer/markers/falff/_junifer_falff.py

@@ -9,7 +9,6 @@ from typing import (
     TYPE_CHECKING,
     ClassVar,
     Optional,
-    Set,
     Tuple,
 )
 
@@ -19,12 +18,13 @@ import scipy as sp
 from nilearn import image as nimg
 
 from ...pipeline import WorkDirManager
+from ...typing import Dependencies
 from ...utils import logger
 from ...utils.singleton import Singleton
 
 
 if TYPE_CHECKING:
-    from nibabel import Nifti1Image
+    from nibabel.nifti1 import Nifti1Image
 
 
 __all__ = ["JuniferALFF"]
@@ -37,7 +37,7 @@ class JuniferALFF(metaclass=Singleton):
 
     """
 
-    _DEPENDENCIES: ClassVar[Set[str]] = {"numpy", "nilearn", "scipy"}
+    _DEPENDENCIES: ClassVar[Dependencies] = {"numpy", "nilearn", "scipy"}
 
     def __del__(self) -> None:
         """Terminate the class."""

junifer/markers/falff/falff_base.py

@@ -12,13 +12,11 @@ from typing import (
     Any,
     ClassVar,
     Dict,
-    List,
     Optional,
     Tuple,
-    Type,
-    Union,
 )
 
+from ...typing import ConditionalDependencies, MarkerInOutMappings
 from ...utils.logging import logger, raise_error
 from ..base import BaseMarker
 from ._afni_falff import AFNIALFF
@@ -26,7 +24,7 @@ from ._junifer_falff import JuniferALFF
 
 
 if TYPE_CHECKING:
-    from nibabel import Nifti1Image
+    from nibabel.nifti1 import Nifti1Image
 
 
 __all__ = ["ALFFBase"]
@@ -72,7 +70,7 @@ class ALFFBase(BaseMarker):
 
     """
 
-    _CONDITIONAL_DEPENDENCIES: ClassVar[List[Dict[str, Union[str, Type]]]] = [
+    _CONDITIONAL_DEPENDENCIES: ClassVar[ConditionalDependencies] = [
         {
             "using": "afni",
             "depends_on": AFNIALFF,
@@ -83,7 +81,7 @@ class ALFFBase(BaseMarker):
         },
     ]
 
-    _MARKER_INOUT_MAPPINGS: ClassVar[Dict[str, Dict[str, str]]] = {
+    _MARKER_INOUT_MAPPINGS: ClassVar[MarkerInOutMappings] = {
         "BOLD": {
             "alff": "vector",
             "falff": "vector",

junifer/markers/functional_connectivity/crossparcellation_functional_connectivity.py

@@ -4,11 +4,12 @@
 #          Kaustubh R. Patil <k.patil@fz-juelich.de>
 # License: AGPL
 
-from typing import Any, ClassVar, Dict, List, Optional, Set, Union
+from typing import Any, ClassVar, Dict, List, Optional, Union
 
 import pandas as pd
 
 from ...api.decorators import register_marker
+from ...typing import Dependencies, MarkerInOutMappings
 from ...utils import logger, raise_error
 from ..base import BaseMarker
 from ..parcel_aggregation import ParcelAggregation
@@ -49,9 +50,9 @@ class CrossParcellationFC(BaseMarker):
 
     """
 
-    _DEPENDENCIES: ClassVar[Set[str]] = {"nilearn"}
+    _DEPENDENCIES: ClassVar[Dependencies] = {"nilearn"}
 
-    _MARKER_INOUT_MAPPINGS: ClassVar[Dict[str, Dict[str, str]]] = {
+    _MARKER_INOUT_MAPPINGS: ClassVar[MarkerInOutMappings] = {
         "BOLD": {
             "functional_connectivity": "matrix",
         },

junifer/markers/functional_connectivity/functional_connectivity_base.py

@@ -5,11 +5,12 @@
 
 
 from abc import abstractmethod
-from typing import Any, ClassVar, Dict, List, Optional, Set, Union
+from typing import Any, ClassVar, Dict, List, Optional, Union
 
 from sklearn.covariance import EmpiricalCovariance, LedoitWolf
 
 from ...external.nilearn import JuniferConnectivityMeasure
+from ...typing import Dependencies, MarkerInOutMappings
 from ...utils import raise_error
 from ..base import BaseMarker
 
@@ -51,9 +52,9 @@ class FunctionalConnectivityBase(BaseMarker):
 
     """
 
-    _DEPENDENCIES: ClassVar[Set[str]] = {"nilearn", "scikit-learn"}
+    _DEPENDENCIES: ClassVar[Dependencies] = {"nilearn", "scikit-learn"}
 
-    _MARKER_INOUT_MAPPINGS: ClassVar[Dict[str, Dict[str, str]]] = {
+    _MARKER_INOUT_MAPPINGS: ClassVar[MarkerInOutMappings] = {
         "BOLD": {
             "functional_connectivity": "matrix",
         },

junifer/markers/parcel_aggregation.py

@@ -4,7 +4,7 @@
 #          Synchon Mandal <s.mandal@fz-juelich.de>
 # License: AGPL
 
-from typing import Any, ClassVar, Dict, List, Optional, Set, Union
+from typing import Any, ClassVar, Dict, List, Optional, Union
 
 import numpy as np
 from nilearn.image import math_img
@@ -13,6 +13,7 @@ from nilearn.maskers import NiftiMasker
 from ..api.decorators import register_marker
 from ..data import get_data
 from ..stats import get_aggfunc_by_name
+from ..typing import Dependencies, MarkerInOutMappings
 from ..utils import logger, raise_error, warn_with_log
 from .base import BaseMarker
 
@@ -61,9 +62,9 @@ class ParcelAggregation(BaseMarker):
 
     """
 
-    _DEPENDENCIES: ClassVar[Set[str]] = {"nilearn", "numpy"}
+    _DEPENDENCIES: ClassVar[Dependencies] = {"nilearn", "numpy"}
 
-    _MARKER_INOUT_MAPPINGS: ClassVar[Dict[str, Dict[str, str]]] = {
+    _MARKER_INOUT_MAPPINGS: ClassVar[MarkerInOutMappings] = {
         "T1w": {
             "aggregation": "vector",
         },

junifer/markers/reho/_afni_reho.py

@@ -8,22 +8,20 @@ from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     ClassVar,
-    Dict,
-    List,
     Optional,
     Tuple,
-    Union,
 )
 
 import nibabel as nib
 
 from ...pipeline import WorkDirManager
+from ...typing import ExternalDependencies
 from ...utils import logger, run_ext_cmd
 from ...utils.singleton import Singleton
 
 
 if TYPE_CHECKING:
-    from nibabel import Nifti1Image
+    from nibabel.nifti1 import Nifti1Image
 
 
 __all__ = ["AFNIReHo"]
@@ -37,7 +35,7 @@ class AFNIReHo(metaclass=Singleton):
 
     """
 
-    _EXT_DEPENDENCIES: ClassVar[List[Dict[str, Union[str, List[str]]]]] = [
+    _EXT_DEPENDENCIES: ClassVar[ExternalDependencies] = [
         {
             "name": "afni",
             "commands": ["3dReHo", "3dAFNItoNIFTI"],

junifer/markers/reho/_junifer_reho.py

@@ -9,7 +9,6 @@ from pathlib import Path
 from typing import (
     TYPE_CHECKING,
     ClassVar,
-    Set,
     Tuple,
 )
 
@@ -20,12 +19,13 @@ from nilearn import image as nimg
 from nilearn import masking as nmask
 
 from ...pipeline import WorkDirManager
+from ...typing import Dependencies
 from ...utils import logger, raise_error
 from ...utils.singleton import Singleton
 
 
 if TYPE_CHECKING:
-    from nibabel import Nifti1Image
+    from nibabel.nifti1 import Nifti1Image
 
 
 __all__ = ["JuniferReHo"]
@@ -38,7 +38,7 @@ class JuniferReHo(metaclass=Singleton):
 
     """
 
-    _DEPENDENCIES: ClassVar[Set[str]] = {"numpy", "nilearn", "scipy"}
+    _DEPENDENCIES: ClassVar[Dependencies] = {"numpy", "nilearn", "scipy"}
 
     def __del__(self) -> None:
         """Terminate the class."""

junifer/markers/reho/reho_base.py

@@ -10,13 +10,11 @@ from typing import (
     Any,
     ClassVar,
     Dict,
-    List,
     Optional,
     Tuple,
-    Type,
-    Union,
 )
 
+from ...typing import ConditionalDependencies, MarkerInOutMappings
 from ...utils import logger, raise_error
 from ..base import BaseMarker
 from ._afni_reho import AFNIReHo
@@ -24,7 +22,7 @@ from ._junifer_reho import JuniferReHo
 
 
 if TYPE_CHECKING:
-    from nibabel import Nifti1Image
+    from nibabel.nifti1 import Nifti1Image
 
 __all__ = ["ReHoBase"]
 
@@ -51,7 +49,7 @@ class ReHoBase(BaseMarker):
 
     """
 
-    _CONDITIONAL_DEPENDENCIES: ClassVar[List[Dict[str, Union[str, Type]]]] = [
+    _CONDITIONAL_DEPENDENCIES: ClassVar[ConditionalDependencies] = [
         {
             "using": "afni",
             "depends_on": AFNIReHo,
@@ -62,7 +60,7 @@ class ReHoBase(BaseMarker):
         },
     ]
 
-    _MARKER_INOUT_MAPPINGS: ClassVar[Dict[str, Dict[str, str]]] = {
+    _MARKER_INOUT_MAPPINGS: ClassVar[MarkerInOutMappings] = {
         "BOLD": {
             "reho": "vector",
         },

junifer/markers/sphere_aggregation.py

@@ -4,12 +4,13 @@
 #          Synchon Mandal <s.mandal@fz-juelich.de>
 # License: AGPL
 
-from typing import Any, ClassVar, Dict, List, Optional, Set, Union
+from typing import Any, ClassVar, Dict, List, Optional, Union
 
 from ..api.decorators import register_marker
 from ..data import get_data
 from ..external.nilearn import JuniferNiftiSpheresMasker
 from ..stats import get_aggfunc_by_name
+from ..typing import Dependencies, MarkerInOutMappings
 from ..utils import logger, raise_error, warn_with_log
 from .base import BaseMarker
 
@@ -66,9 +67,9 @@ class SphereAggregation(BaseMarker):
 
     """
 
-    _DEPENDENCIES: ClassVar[Set[str]] = {"nilearn", "numpy"}
+    _DEPENDENCIES: ClassVar[Dependencies] = {"nilearn", "numpy"}
 
-    _MARKER_INOUT_MAPPINGS: ClassVar[Dict[str, Dict[str, str]]] = {
+    _MARKER_INOUT_MAPPINGS: ClassVar[MarkerInOutMappings] = {
         "T1w": {
             "aggregation": "vector",
         },

junifer/markers/temporal_snr/temporal_snr_base.py

@@ -5,10 +5,11 @@
 
 
 from abc import abstractmethod
-from typing import Any, ClassVar, Dict, List, Optional, Set, Union
+from typing import Any, ClassVar, Dict, List, Optional, Union
 
 from nilearn import image as nimg
 
+from ...typing import Dependencies, MarkerInOutMappings
 from ...utils import raise_error
 from ..base import BaseMarker
 
@@ -37,9 +38,9 @@ class TemporalSNRBase(BaseMarker):
 
     """
 
-    _DEPENDENCIES: ClassVar[Set[str]] = {"nilearn"}
+    _DEPENDENCIES: ClassVar[Dependencies] = {"nilearn"}
 
-    _MARKER_INOUT_MAPPINGS: ClassVar[Dict[str, Dict[str, str]]] = {
+    _MARKER_INOUT_MAPPINGS: ClassVar[MarkerInOutMappings] = {
         "BOLD": {
             "tsnr": "vector",
         },

junifer/onthefly/_brainprint.py

@@ -3,23 +3,20 @@
 # Authors: Synchon Mandal <s.mandal@fz-juelich.de>
 # License: AGPL
 
-from typing import TYPE_CHECKING, Dict, Optional, Type
+from typing import Dict, Optional
 
 import numpy as np
 import pandas as pd
 
+from ..typing import StorageLike
 from ..utils import raise_error
 
 
-if TYPE_CHECKING:
-    from junifer.storage import BaseFeatureStorage
-
-
 __all__ = ["normalize", "reweight"]
 
 
 def normalize(
-    storage: Type["BaseFeatureStorage"],
+    storage: StorageLike,
     features: Dict[str, Dict[str, Optional[str]]],
     kind: str,
 ) -> pd.DataFrame:
@@ -89,7 +86,7 @@ def normalize(
 
 
 def reweight(
-    storage: Type["BaseFeatureStorage"],
+    storage: StorageLike,
     feature_name: Optional[str] = None,
     feature_md5: Optional[str] = None,
 ) -> pd.DataFrame:

junifer/onthefly/read_transform.py

@@ -4,22 +4,19 @@
 # License: AGPL
 
 
-from typing import TYPE_CHECKING, Dict, Optional, Tuple, Type
+from typing import Dict, Optional, Tuple
 
 import pandas as pd
 
+from ..typing import StorageLike
 from ..utils import logger, raise_error, warn_with_log
 
 
-if TYPE_CHECKING:
-    from junifer.storage import BaseFeatureStorage
-
-
 __all__ = ["read_transform"]
 
 
 def read_transform(
-    storage: Type["BaseFeatureStorage"],
+    storage: StorageLike,
     transform: str,
     feature_name: Optional[str] = None,
     feature_md5: Optional[str] = None,