eegdash 0.0.9__py3-none-any.whl → 0.1.0__py3-none-any.whl

eegdash/__init__.py

@@ -1 +1,4 @@
-from .main import EEGDash, EEGDashDataset
+from .main import EEGDash, EEGDashDataset
+
+__all__ = ["EEGDash", "EEGDashDataset"]
+__version__ = "0.1.0"

eegdash/data_config.py

@@ -1,28 +1,28 @@
 config = {
-  "required_fields": ["data_name"],
-  "attributes": {
-    "data_name": "str",
-    "dataset": "str",
-    "bidspath": "str",
-    "subject": "str",
-    "task": "str",
-    "session": "str",
-    "run": "str",
-    "sampling_frequency": "float",
-    "modality": "str",
-    "nchans": "int",
-    "ntimes": "int"
-  },
-  "description_fields": ["subject", "session", "run", "task", "age", "gender", "sex"],
-  "bids_dependencies_files": [
-    "dataset_description.json", 
-    "participants.tsv", 
-    "events.tsv", 
-    "events.json", 
-    "eeg.json", 
-    "electrodes.tsv", 
-    "channels.tsv", 
-    "coordsystem.json"
-  ],
-  "accepted_query_fields": ["data_name", "dataset"]
-}
+    "required_fields": ["data_name"],
+    "attributes": {
+        "data_name": "str",
+        "dataset": "str",
+        "bidspath": "str",
+        "subject": "str",
+        "task": "str",
+        "session": "str",
+        "run": "str",
+        "sampling_frequency": "float",
+        "modality": "str",
+        "nchans": "int",
+        "ntimes": "int",
+    },
+    "description_fields": ["subject", "session", "run", "task", "age", "gender", "sex"],
+    "bids_dependencies_files": [
+        "dataset_description.json",
+        "participants.tsv",
+        "events.tsv",
+        "events.json",
+        "eeg.json",
+        "electrodes.tsv",
+        "channels.tsv",
+        "coordsystem.json",
+    ],
+    "accepted_query_fields": ["data_name", "dataset"],
+}

eegdash/data_utils.py

@@ -1,23 +1,25 @@
+import json
 import os
-import sys 
-from joblib import Parallel, delayed
+import re
+import sys
+import tempfile
+from pathlib import Path
+
 import mne
+import mne_bids
 import numpy as np
 import pandas as pd
-from pathlib import Path
-import re
-import json
-from mne.io import BaseRaw
-from mne._fiff.utils import _find_channels, _read_segments_file
 import s3fs
-import tempfile
-from mne._fiff.utils import _read_segments_file
-from braindecode.datasets import BaseDataset
-import mne_bids
+from bids import BIDSLayout
+from joblib import Parallel, delayed
+from mne._fiff.utils import _find_channels, _read_segments_file
+from mne.io import BaseRaw
 from mne_bids import (
     BIDSPath,
 )
-from bids import BIDSLayout
+
+from braindecode.datasets import BaseDataset
+
 
 class EEGDashBaseDataset(BaseDataset):
     """Returns samples from an mne.io.Raw object along with a target.
@@ -38,16 +40,23 @@ class EEGDashBaseDataset(BaseDataset):
     transform : callable | None
         On-the-fly transform applied to the example before it is returned.
     """
-    AWS_BUCKET = 's3://openneuro.org'
+
+    AWS_BUCKET = "s3://openneuro.org"
+
     def __init__(self, record, cache_dir, **kwargs):
         super().__init__(None, **kwargs)
         self.record = record
         self.cache_dir = Path(cache_dir)
         bids_kwargs = self.get_raw_bids_args()
-        self.bidspath = BIDSPath(root=self.cache_dir / record['dataset'], datatype='eeg', suffix='eeg', **bids_kwargs)
-        self.s3file = self.get_s3path(record['bidspath'])
-        self.filecache = self.cache_dir / record['bidspath']
-        self.bids_dependencies = record['bidsdependencies']
+        self.bidspath = BIDSPath(
+            root=self.cache_dir / record["dataset"],
+            datatype="eeg",
+            suffix="eeg",
+            **bids_kwargs,
+        )
+        self.s3file = self.get_s3path(record["bidspath"])
+        self.filecache = self.cache_dir / record["bidspath"]
+        self.bids_dependencies = record["bidsdependencies"]
         self._raw = None
         # if os.path.exists(self.filecache):
         #     self.raw = mne_bids.read_raw_bids(self.bidspath, verbose=False)
@@ -57,25 +66,29 @@ class EEGDashBaseDataset(BaseDataset):
 
     def _download_s3(self):
         self.filecache.parent.mkdir(parents=True, exist_ok=True)
-        filesystem = s3fs.S3FileSystem(anon=True, client_kwargs={'region_name': 'us-east-2'})
+        filesystem = s3fs.S3FileSystem(
+            anon=True, client_kwargs={"region_name": "us-east-2"}
+        )
         filesystem.download(self.s3file, self.filecache)
         self.filenames = [self.filecache]
 
     def _download_dependencies(self):
-        filesystem = s3fs.S3FileSystem(anon=True, client_kwargs={'region_name': 'us-east-2'})
+        filesystem = s3fs.S3FileSystem(
+            anon=True, client_kwargs={"region_name": "us-east-2"}
+        )
         for dep in self.bids_dependencies:
             s3path = self.get_s3path(dep)
             filepath = self.cache_dir / dep
             if not filepath.exists():
                 filepath.parent.mkdir(parents=True, exist_ok=True)
-                filesystem.download(s3path, filepath) 
+                filesystem.download(s3path, filepath)
 
     def get_raw_bids_args(self):
-        desired_fields = ['subject', 'session', 'task', 'run']
+        desired_fields = ["subject", "session", "task", "run"]
         return {k: self.record[k] for k in desired_fields if self.record[k]}
 
     def check_and_get_raw(self):
-        if not os.path.exists(self.filecache): # not preload
+        if not os.path.exists(self.filecache):  # not preload
             if self.bids_dependencies:
                 self._download_dependencies()
             self._download_s3()
@@ -94,10 +107,10 @@ class EEGDashBaseDataset(BaseDataset):
         if self.transform is not None:
             X = self.transform(X)
         return X, y
-    
+
     def __len__(self):
         if self._raw is None:
-            return int(self.record['ntimes'] * self.record['sampling_frequency'])
+            return int(self.record["ntimes"] * self.record["sampling_frequency"])
         else:
             return len(self._raw)
 
@@ -111,6 +124,7 @@ class EEGDashBaseDataset(BaseDataset):
     def raw(self, raw):
         self._raw = raw
 
+
 class EEGDashBaseRaw(BaseRaw):
     r"""MNE Raw object from EEG-Dash connection with Openneuro S3 file.
 
@@ -138,7 +152,8 @@ class EEGDashBaseRaw(BaseRaw):
     .. versionadded:: 0.11.0
     """
 
-    AWS_BUCKET = 's3://openneuro.org'
+    AWS_BUCKET = "s3://openneuro.org"
+
     def __init__(
         self,
         input_fname,
@@ -146,24 +161,24 @@ class EEGDashBaseRaw(BaseRaw):
         eog=(),
         preload=False,
         *,
-        cache_dir='./.eegdash_cache',
-        bids_dependencies:list = [],
+        cache_dir="./.eegdash_cache",
+        bids_dependencies: list = [],
         uint16_codec=None,
         montage_units="auto",
         verbose=None,
     ):
-        '''
+        """
         Get to work with S3 endpoint first, no caching
-        '''
+        """
         # Create a simple RawArray
-        sfreq = metadata['sfreq']  # Sampling frequency
-        n_times = metadata['n_times']
-        ch_names = metadata['ch_names']
+        sfreq = metadata["sfreq"]  # Sampling frequency
+        n_times = metadata["n_times"]
+        ch_names = metadata["ch_names"]
         ch_types = []
-        for ch in metadata['ch_types']:
+        for ch in metadata["ch_types"]:
             chtype = ch.lower()
-            if chtype == 'heog' or chtype == 'veog':
-                chtype = 'eog'
+            if chtype == "heog" or chtype == "veog":
+                chtype = "eog"
             ch_types.append(chtype)
         info = mne.create_info(ch_names=ch_names, sfreq=sfreq, ch_types=ch_types)
         self.s3file = self.get_s3path(input_fname)
@@ -178,7 +193,7 @@ class EEGDashBaseRaw(BaseRaw):
         super().__init__(
             info,
             preload,
-            last_samps=[n_times-1],
+            last_samps=[n_times - 1],
             orig_format="single",
             verbose=verbose,
         )
@@ -188,12 +203,16 @@ class EEGDashBaseRaw(BaseRaw):
 
     def _download_s3(self):
         self.filecache.parent.mkdir(parents=True, exist_ok=True)
-        filesystem = s3fs.S3FileSystem(anon=True, client_kwargs={'region_name': 'us-east-2'})
+        filesystem = s3fs.S3FileSystem(
+            anon=True, client_kwargs={"region_name": "us-east-2"}
+        )
         filesystem.download(self.s3file, self.filecache)
         self.filenames = [self.filecache]
 
     def _download_dependencies(self):
-        filesystem = s3fs.S3FileSystem(anon=True, client_kwargs={'region_name': 'us-east-2'})
+        filesystem = s3fs.S3FileSystem(
+            anon=True, client_kwargs={"region_name": "us-east-2"}
+        )
         for dep in self.bids_dependencies:
             s3path = self.get_s3path(dep)
             filepath = self.cache_dir / dep
@@ -204,34 +223,42 @@ class EEGDashBaseRaw(BaseRaw):
     def _read_segment(
         self, start=0, stop=None, sel=None, data_buffer=None, *, verbose=None
     ):
-        if not os.path.exists(self.filecache): # not preload
+        if not os.path.exists(self.filecache):  # not preload
             if self.bids_dependencies:
                 self._download_dependencies()
             self._download_s3()
-        else: # not preload and file is not cached
+        else:  # not preload and file is not cached
             self.filenames = [self.filecache]
         return super()._read_segment(start, stop, sel, data_buffer, verbose=verbose)
-    
+
     def _read_segment_file(self, data, idx, fi, start, stop, cals, mult):
         """Read a chunk of data from the file."""
         _read_segments_file(self, data, idx, fi, start, stop, cals, mult, dtype="<f4")
 
 
-class EEGBIDSDataset():
-    ALLOWED_FILE_FORMAT = ['eeglab', 'brainvision', 'biosemi', 'european']
+class EEGBIDSDataset:
+    ALLOWED_FILE_FORMAT = ["eeglab", "brainvision", "biosemi", "european"]
     RAW_EXTENSIONS = {
-            '.set': ['.set', '.fdt'], # eeglab
-            '.edf': ['.edf'], # european
-            '.vhdr': ['.eeg', '.vhdr', '.vmrk', '.dat', '.raw'], # brainvision
-            '.bdf': ['.bdf'], # biosemi
-        }
-    METADATA_FILE_EXTENSIONS = ['eeg.json', 'channels.tsv', 'electrodes.tsv', 'events.tsv', 'events.json']
-    def __init__(self,
-            data_dir=None,                            # location of bids dataset 
-            dataset='',                               # dataset name
-        ):                            
+        ".set": [".set", ".fdt"],  # eeglab
+        ".edf": [".edf"],  # european
+        ".vhdr": [".eeg", ".vhdr", ".vmrk", ".dat", ".raw"],  # brainvision
+        ".bdf": [".bdf"],  # biosemi
+    }
+    METADATA_FILE_EXTENSIONS = [
+        "eeg.json",
+        "channels.tsv",
+        "electrodes.tsv",
+        "events.tsv",
+        "events.json",
+    ]
+
+    def __init__(
+        self,
+        data_dir=None,  # location of bids dataset
+        dataset="",  # dataset name
+    ):
         if data_dir is None or not os.path.exists(data_dir):
-            raise ValueError('data_dir must be specified and must exist')
+            raise ValueError("data_dir must be specified and must exist")
         self.bidsdir = Path(data_dir)
         self.dataset = dataset
         assert str(self.bidsdir).endswith(self.dataset)
@@ -239,8 +266,10 @@ class EEGBIDSDataset():
 
         # get all recording files in the bids directory
         self.files = self.get_recordings(self.layout)
-        assert len(self.files) > 0, ValueError('Unable to construct EEG dataset. No EEG recordings found.')
-        assert self.check_eeg_dataset(), ValueError('Dataset is not an EEG dataset.')
+        assert len(self.files) > 0, ValueError(
+            "Unable to construct EEG dataset. No EEG recordings found."
+        )
+        assert self.check_eeg_dataset(), ValueError("Dataset is not an EEG dataset.")
         # temp_dir = (Path().resolve() / 'data')
         # if not os.path.exists(temp_dir):
         #     os.mkdir(temp_dir)
@@ -251,34 +280,35 @@ class EEGBIDSDataset():
         #     self.files = np.load(temp_dir / f'{dataset}_files.npy', allow_pickle=True)
 
     def check_eeg_dataset(self):
-        return self.get_bids_file_attribute('modality', self.files[0]).lower() == 'eeg'
+        return self.get_bids_file_attribute("modality", self.files[0]).lower() == "eeg"
 
-    def get_recordings(self, layout:BIDSLayout):
+    def get_recordings(self, layout: BIDSLayout):
         files = []
         for ext, exts in self.RAW_EXTENSIONS.items():
-            files = layout.get(extension=ext, return_type='filename')
+            files = layout.get(extension=ext, return_type="filename")
             if files:
-                break 
+                break
         return files
 
     def get_relative_bidspath(self, filename):
-        bids_parent_dir = self.bidsdir.parent
+        bids_parent_dir = self.bidsdir.parent.absolute()
         return str(Path(filename).relative_to(bids_parent_dir))
 
     def get_property_from_filename(self, property, filename):
         import platform
+
         if platform.system() == "Windows":
-            lookup = re.search(rf'{property}-(.*?)[_\\]', filename)
+            lookup = re.search(rf"{property}-(.*?)[_\\]", filename)
         else:
-            lookup = re.search(rf'{property}-(.*?)[_\/]', filename)
-        return lookup.group(1) if lookup else ''
+            lookup = re.search(rf"{property}-(.*?)[_\/]", filename)
+        return lookup.group(1) if lookup else ""
 
     def merge_json_inheritance(self, json_files):
-        '''
+        """
         Merge list of json files found by get_bids_file_inheritance,
         expecting the order (from left to right) is from lowest level to highest level,
         and return a merged dictionary
-        '''
+        """
         json_files.reverse()
         json_dict = {}
         for f in json_files:
@@ -286,26 +316,26 @@ class EEGBIDSDataset():
         return json_dict
 
     def get_bids_file_inheritance(self, path, basename, extension):
-        '''
-        Get all files with given extension that applies to the basename file 
+        """
+        Get all files with given extension that applies to the basename file
         following the BIDS inheritance principle in the order of lowest level first
         @param
             basename: bids file basename without _eeg.set extension for example
             extension: e.g. channels.tsv
-        '''
-        top_level_files = ['README', 'dataset_description.json', 'participants.tsv']
+        """
+        top_level_files = ["README", "dataset_description.json", "participants.tsv"]
         bids_files = []
 
         # check if path is str object
         if isinstance(path, str):
             path = Path(path)
         if not path.exists:
-            raise ValueError('path {path} does not exist')
+            raise ValueError("path {path} does not exist")
 
         # check if file is in current path
         for file in os.listdir(path):
             # target_file = path / f"{cur_file_basename}_{extension}"
-            if os.path.isfile(path/file):
+            if os.path.isfile(path / file):
                 # check if file has extension extension
                 # check if file basename has extension
                 if file.endswith(extension):
@@ -317,38 +347,42 @@ class EEGBIDSDataset():
             return bids_files
         else:
             # call get_bids_file_inheritance recursively with parent directory
-            bids_files.extend(self.get_bids_file_inheritance(path.parent, basename, extension))
+            bids_files.extend(
+                self.get_bids_file_inheritance(path.parent, basename, extension)
+            )
             return bids_files
 
     def get_bids_metadata_files(self, filepath, metadata_file_extension):
         """
         (Wrapper for self.get_bids_file_inheritance)
         Get all BIDS metadata files that are associated with the given filepath, following the BIDS inheritance principle.
-        
+
         Args:
             filepath (str or Path): The filepath to get the associated metadata files for.
             metadata_files_extensions (list): A list of file extensions to search for metadata files.
-        
+
         Returns:
             list: A list of filepaths for all the associated metadata files
         """
         if isinstance(filepath, str):
             filepath = Path(filepath)
         if not filepath.exists:
-            raise ValueError('filepath {filepath} does not exist')
+            raise ValueError("filepath {filepath} does not exist")
         path, filename = os.path.split(filepath)
-        basename = filename[:filename.rfind('_')]
+        basename = filename[: filename.rfind("_")]
         # metadata files
-        meta_files = self.get_bids_file_inheritance(path, basename, metadata_file_extension)
+        meta_files = self.get_bids_file_inheritance(
+            path, basename, metadata_file_extension
+        )
         return meta_files
-        
+
     def scan_directory(self, directory, extension):
         result_files = []
-        directory_to_ignore = ['.git', '.datalad', 'derivatives', 'code']
+        directory_to_ignore = [".git", ".datalad", "derivatives", "code"]
         with os.scandir(directory) as entries:
             for entry in entries:
                 if entry.is_file() and entry.name.endswith(extension):
-                    print('Adding ', entry.path)
+                    print("Adding ", entry.path)
                     result_files.append(entry.path)
                 elif entry.is_dir():
                     # check that entry path doesn't contain any name in ignore list
@@ -356,7 +390,9 @@ class EEGBIDSDataset():
                         result_files.append(entry.path)  # Add directory to scan later
         return result_files
 
-    def get_files_with_extension_parallel(self, directory, extension='.set', max_workers=-1):
+    def get_files_with_extension_parallel(
+        self, directory, extension=".set", max_workers=-1
+    ):
         result_files = []
         dirs_to_scan = [directory]
 
@@ -367,7 +403,7 @@ class EEGBIDSDataset():
             results = Parallel(n_jobs=max_workers, prefer="threads", verbose=1)(
                 delayed(self.scan_directory)(d, extension) for d in dirs_to_scan
             )
-            
+
             # Reset the directories to scan and process the results
             dirs_to_scan = []
             for res in results:
@@ -382,8 +418,8 @@ class EEGBIDSDataset():
 
     def load_and_preprocess_raw(self, raw_file, preprocess=False):
         print(f"Loading {raw_file}")
-        EEG = mne.io.read_raw_eeglab(raw_file, preload=True, verbose='error')
-        
+        EEG = mne.io.read_raw_eeglab(raw_file, preload=True, verbose="error")
+
         if preprocess:
             # highpass filter
             EEG = EEG.filter(l_freq=0.25, h_freq=25, verbose=False)
@@ -391,7 +427,7 @@ class EEGBIDSDataset():
             EEG = EEG.notch_filter(freqs=(60), verbose=False)
             # bring to common sampling rate
             sfreq = 128
-            if EEG.info['sfreq'] != sfreq:
+            if EEG.info["sfreq"] != sfreq:
                 EEG = EEG.resample(sfreq)
             # # normalize data to zero mean and unit variance
             # scalar = preprocessing.StandardScaler()
@@ -400,12 +436,12 @@ class EEGBIDSDataset():
         mat_data = EEG.get_data()
 
         if len(mat_data.shape) > 2:
-            raise ValueError('Expect raw data to be CxT dimension')
+            raise ValueError("Expect raw data to be CxT dimension")
         return mat_data
-    
+
     def get_files(self):
         return self.files
-    
+
     def resolve_bids_json(self, json_files: list):
         """
         Resolve the BIDS JSON files and return a dictionary of the resolved values.
@@ -416,8 +452,8 @@ class EEGBIDSDataset():
             dict: A dictionary of the resolved values.
         """
         if len(json_files) == 0:
-            raise ValueError('No JSON files provided')
-        json_files.reverse() # TODO undeterministic
+            raise ValueError("No JSON files provided")
+        json_files.reverse()  # TODO undeterministic
 
         json_dict = {}
         for json_file in json_files:
@@ -428,53 +464,63 @@ class EEGBIDSDataset():
     def get_bids_file_attribute(self, attribute, data_filepath):
         entities = self.layout.parse_file_entities(data_filepath)
         bidsfile = self.layout.get(**entities)[0]
-        attributes = bidsfile.get_entities(metadata='all')
+        attributes = bidsfile.get_entities(metadata="all")
         attribute_mapping = {
-            'sfreq': 'SamplingFrequency',
-            'modality': 'datatype',
-            'task': 'task',
-            'session': 'session',
-            'run': 'run',
-            'subject': 'subject',
-            'ntimes': 'RecordingDuration',
-            'nchans': 'EEGChannelCount'
+            "sfreq": "SamplingFrequency",
+            "modality": "datatype",
+            "task": "task",
+            "session": "session",
+            "run": "run",
+            "subject": "subject",
+            "ntimes": "RecordingDuration",
+            "nchans": "EEGChannelCount",
         }
         attribute_value = attributes.get(attribute_mapping.get(attribute), None)
         return attribute_value
 
     def channel_labels(self, data_filepath):
-        channels_tsv = pd.read_csv(self.get_bids_metadata_files(data_filepath, 'channels.tsv')[0], sep='\t')
-        return channels_tsv['name'].tolist()
-    
+        channels_tsv = pd.read_csv(
+            self.get_bids_metadata_files(data_filepath, "channels.tsv")[0], sep="\t"
+        )
+        return channels_tsv["name"].tolist()
+
     def channel_types(self, data_filepath):
-        channels_tsv = pd.read_csv(self.get_bids_metadata_files(data_filepath, 'channels.tsv')[0], sep='\t')
-        return channels_tsv['type'].tolist()
-            
+        channels_tsv = pd.read_csv(
+            self.get_bids_metadata_files(data_filepath, "channels.tsv")[0], sep="\t"
+        )
+        return channels_tsv["type"].tolist()
+
     def num_times(self, data_filepath):
-        eeg_jsons = self.get_bids_metadata_files(data_filepath, 'eeg.json')
+        eeg_jsons = self.get_bids_metadata_files(data_filepath, "eeg.json")
         eeg_json_dict = self.merge_json_inheritance(eeg_jsons)
-        return int(eeg_json_dict['SamplingFrequency'] * eeg_json_dict['RecordingDuration'])
-    
+        return int(
+            eeg_json_dict["SamplingFrequency"] * eeg_json_dict["RecordingDuration"]
+        )
+
     def subject_participant_tsv(self, data_filepath):
-        '''Get participants_tsv info of a subject based on filepath'''
-        participants_tsv = pd.read_csv(self.get_bids_metadata_files(data_filepath, 'participants.tsv')[0], sep='\t')
+        """Get participants_tsv info of a subject based on filepath"""
+        participants_tsv = pd.read_csv(
+            self.get_bids_metadata_files(data_filepath, "participants.tsv")[0], sep="\t"
+        )
         # if participants_tsv is not empty
         if participants_tsv.empty:
             return {}
         # set 'participant_id' as index
-        participants_tsv.set_index('participant_id', inplace=True)
+        participants_tsv.set_index("participant_id", inplace=True)
         subject = f"sub-{self.get_bids_file_attribute('subject', data_filepath)}"
         return participants_tsv.loc[subject].to_dict()
-    
+
     def eeg_json(self, data_filepath):
-        eeg_jsons = self.get_bids_metadata_files(data_filepath, 'eeg.json')
+        eeg_jsons = self.get_bids_metadata_files(data_filepath, "eeg.json")
         eeg_json_dict = self.merge_json_inheritance(eeg_jsons)
         return eeg_json_dict
-    
+
     def channel_tsv(self, data_filepath):
-        channels_tsv = pd.read_csv(self.get_bids_metadata_files(data_filepath, 'channels.tsv')[0], sep='\t')
+        channels_tsv = pd.read_csv(
+            self.get_bids_metadata_files(data_filepath, "channels.tsv")[0], sep="\t"
+        )
         channel_tsv = channels_tsv.to_dict()
         # 'name' and 'type' now have a dictionary of index-value. Convert them to list
-        for list_field in ['name', 'type', 'units']:
+        for list_field in ["name", "type", "units"]:
             channel_tsv[list_field] = list(channel_tsv[list_field].values())
-        return channel_tsv
+        return channel_tsv

eegdash/features/__init__.py

@@ -1,25 +1,25 @@
 # Features datasets
-from .datasets import FeaturesDataset, FeaturesConcatDataset
-from .serialization import load_features_concat_dataset
+from .datasets import FeaturesConcatDataset, FeaturesDataset
+from .decorators import (
+    FeatureKind,
+    FeaturePredecessor,
+    bivariate_feature,
+    directed_bivariate_feature,
+    multivariate_feature,
+    univariate_feature,
+)
 
 # Feature extraction
 from .extractors import (
-    FeatureExtractor,
-    FitableFeature,
-    UnivariateFeature,
     BivariateFeature,
     DirectedBivariateFeature,
+    FeatureExtractor,
+    FitableFeature,
     MultivariateFeature,
+    UnivariateFeature,
 )
-from .decorators import (
-    FeaturePredecessor,
-    FeatureKind,
-    univariate_feature,
-    bivariate_feature,
-    directed_bivariate_feature,
-    multivariate_feature,
-)
-from .utils import extract_features, fit_feature_extractors
 
 # Features:
 from .feature_bank import *
+from .serialization import load_features_concat_dataset
+from .utils import extract_features, fit_feature_extractors