eegdash 0.3.1.dev51__py3-none-any.whl → 0.3.2.dev52__py3-none-any.whl

eegdash/__init__.py

@@ -5,4 +5,4 @@ from .utils import __init__mongo_client
 __init__mongo_client()
 
 __all__ = ["EEGDash", "EEGDashDataset", "EEGChallengeDataset"]
-__version__ = "0.3.1.dev51"
+__version__ = "0.3.2.dev52"

eegdash/api.py

@@ -532,7 +532,7 @@ class EEGDashDataset(BaseConcatDataset):
             "gender",
             "sex",
         ],
-        cache_dir: str = ".eegdash_cache",
+        cache_dir: str = "~/eegdash_cache",
         s3_bucket: str | None = None,
         **kwargs,
     ):
@@ -587,6 +587,10 @@ class EEGDashDataset(BaseConcatDataset):
                         )
                     )
 
+        self.filesystem = S3FileSystem(
+            anon=True, client_kwargs={"region_name": "us-east-2"}
+        )
+
         super().__init__(datasets)
 
     def find_key_in_nested_dict(self, data: Any, target_key: str) -> Any:

eegdash/data_utils.py

@@ -53,24 +53,24 @@ class EEGDashBaseDataset(BaseDataset):
         super().__init__(None, **kwargs)
         self.record = record
         self.cache_dir = Path(cache_dir)
-        bids_kwargs = self.get_raw_bids_args()
+        self.bids_kwargs = self.get_raw_bids_args()
 
         if s3_bucket:
             self.s3_bucket = s3_bucket
             self.s3_open_neuro = False
-            bids_root = self.cache_dir
-            self.filecache = self.cache_dir / record["bidspath"]
         else:
             self.s3_bucket = self._AWS_BUCKET
             self.s3_open_neuro = True
-            bids_root = self.cache_dir / record["dataset"]
-            self.filecache = self.cache_dir / record["bidspath"]
+
+        self.filecache = self.cache_dir / record["bidspath"]
+
+        self.bids_root = self.cache_dir / record["dataset"]
 
         self.bidspath = BIDSPath(
-            root=bids_root,
+            root=self.bids_root,
             datatype="eeg",
             suffix="eeg",
-            **bids_kwargs,
+            **self.bids_kwargs,
         )
 
         self.s3file = self.get_s3path(record["bidspath"])
@@ -78,6 +78,7 @@ class EEGDashBaseDataset(BaseDataset):
         # Temporary fix for BIDS dependencies path
         # just to release to the competition
         if not self.s3_open_neuro:
+            self.bids_dependencies_original = self.bids_dependencies
             self.bids_dependencies = [
                 dep.split("/", 1)[1] for dep in self.bids_dependencies
             ]
@@ -95,12 +96,9 @@ class EEGDashBaseDataset(BaseDataset):
         )
         if not self.s3_open_neuro:
             self.s3file = re.sub(r"(^|/)ds\d{6}/", r"\1", self.s3file, count=1)
-            self.filecache = re.sub(
-                r"(^|/)ds\d{6}/", r"\1", str(self.filecache), count=1
-            )
-            self.filecache = Path(self.filecache)
 
         self.filecache.parent.mkdir(parents=True, exist_ok=True)
+
         filesystem.download(self.s3file, self.filecache)
         self.filenames = [self.filecache]
 
@@ -111,8 +109,11 @@ class EEGDashBaseDataset(BaseDataset):
         filesystem = s3fs.S3FileSystem(
             anon=True, client_kwargs={"region_name": "us-east-2"}
         )
-        for dep in self.bids_dependencies:
+        for i, dep in enumerate(self.bids_dependencies):
             s3path = self.get_s3path(dep)
+            if not self.s3_open_neuro:
+                dep = self.bids_dependencies_original[i]
+
             filepath = self.cache_dir / dep
             # here, we download the dependency and it is fine
             # in the case of the competition.
@@ -207,7 +208,7 @@ class EEGDashBaseRaw(BaseRaw):
         metadata: dict[str, Any],
         preload: bool = False,
         *,
-        cache_dir: str = "./.eegdash_cache",
+        cache_dir: str = "~/eegdash_cache",
         bids_dependencies: list[str] = [],
         verbose: Any = None,
     ):
@@ -244,7 +245,7 @@ class EEGDashBaseRaw(BaseRaw):
         print(f"Getting S3 path for {filepath}")
         return f"{self._AWS_BUCKET}/{filepath}"
 
-    def _download_s3(self):
+    def _download_s3(self) -> None:
         self.filecache.parent.mkdir(parents=True, exist_ok=True)
         filesystem = s3fs.S3FileSystem(
             anon=True, client_kwargs={"region_name": "us-east-2"}

eegdash/dataset.py

@@ -18,9 +18,9 @@ RELEASE_TO_OPENNEURO_DATASET_MAP = {
 class EEGChallengeDataset(EEGDashDataset):
     def __init__(
         self,
-        release: str = "R5",
+        release: str,
+        cache_dir: str,
         query: dict | None = None,
-        cache_dir: str = ".eegdash_cache",
         s3_bucket: str | None = "s3://nmdatasets/NeurIPS25",
         **kwargs,
     ):

{eegdash-0.3.1.dev51.dist-info → eegdash-0.3.2.dev52.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eegdash
-Version: 0.3.1.dev51
+Version: 0.3.2.dev52
 Summary: EEG data for machine learning
 Author-email: Young Truong <dt.young112@gmail.com>, Arnaud Delorme <adelorme@gmail.com>, Aviv Dotan <avivd220@gmail.com>, Oren Shriki <oren70@gmail.com>, Bruno Aristimunha <b.aristimunha@gmail.com>
 License: GNU General Public License

{eegdash-0.3.1.dev51.dist-info → eegdash-0.3.2.dev52.dist-info}/RECORD

@@ -1,8 +1,8 @@
-eegdash/__init__.py,sha256=gfDfEiCyZNcpnl_NcJnYqr4r9XfSMxxSwIrAmP56K-8,238
-eegdash/api.py,sha256=igpkLTCjH6NNQf8tEizA6SF8cYa1gE22-hNVxNRPszg,26747
+eegdash/__init__.py,sha256=Nfsbk31HxH9sVIE7p14a0SwBKJWCAbWc6pHCUzDy_VA,238
+eegdash/api.py,sha256=lYCILa69Y_RRd4_13x1Ge77FDGswnEG2DEfdPzMygAY,26865
 eegdash/data_config.py,sha256=OS6ERO-jHrnEOfMJUehY7ieABdsRw_qWzOKJ4pzSfqw,1323
-eegdash/data_utils.py,sha256=-K_S5rGBUDYZl7U7b27DBPeQKt0jIf-pbj3H6ExnHoY,24603
-eegdash/dataset.py,sha256=BngXb9TtAo0Sjc3o5bRC0fJkQrThdsqzx2Zpvp7xtvs,2374
+eegdash/data_utils.py,sha256=h1FLCTjRj2JDn6IFnVgWrogDYnHFR4mcuDF23KNtLZI,24530
+eegdash/dataset.py,sha256=GVELU-eXq9AQDzOeg6Lkykd-Pctyn42e5UEcAV0Go4s,2348
 eegdash/mongodb.py,sha256=GD3WgA253oFgpzOHrYaj4P1mRjNtDMT5Oj4kVvHswjI,2006
 eegdash/preprocessing.py,sha256=7S_TTRKPKEk47tTnh2D6WExBt4cctAMxUxGDjJqq5lU,2221
 eegdash/utils.py,sha256=wU9CBQZLW_LIQIBwhgQm5bU4X-rSsVNPdeF2iE4QGJ4,410
@@ -21,8 +21,8 @@ eegdash/features/feature_bank/dimensionality.py,sha256=j_Ds71Y1AbV2uLFQj8EuXQ4kz
 eegdash/features/feature_bank/signal.py,sha256=3Tb8z9gX7iZipxQJ9DSyy30JfdmW58kgvimSyZX74p8,3404
 eegdash/features/feature_bank/spectral.py,sha256=bNB7skusePs1gX7NOU6yRlw_Gr4UOCkO_ylkCgybzug,3319
 eegdash/features/feature_bank/utils.py,sha256=DGh-Q7-XFIittP7iBBxvsJaZrlVvuY5mw-G7q6C-PCI,1237
-eegdash-0.3.1.dev51.dist-info/licenses/LICENSE,sha256=asisR-xupy_NrQBFXnx6yqXeZcYWLvbAaiETl25iXT0,931
-eegdash-0.3.1.dev51.dist-info/METADATA,sha256=eiLWVqqlZi3hgMEXOkcJk2vDlc5eTHNQ7drdh8CKyCQ,10784
-eegdash-0.3.1.dev51.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-eegdash-0.3.1.dev51.dist-info/top_level.txt,sha256=zavO69HQ6MyZM0aQMR2zUS6TAFc7bnN5GEpDpOpFZzU,8
-eegdash-0.3.1.dev51.dist-info/RECORD,,
+eegdash-0.3.2.dev52.dist-info/licenses/LICENSE,sha256=asisR-xupy_NrQBFXnx6yqXeZcYWLvbAaiETl25iXT0,931
+eegdash-0.3.2.dev52.dist-info/METADATA,sha256=vlhnJbk-mBMlfsTen_2zpBRpm6VNZ_2gI3I2gprYAC0,10784
+eegdash-0.3.2.dev52.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+eegdash-0.3.2.dev52.dist-info/top_level.txt,sha256=zavO69HQ6MyZM0aQMR2zUS6TAFc7bnN5GEpDpOpFZzU,8
+eegdash-0.3.2.dev52.dist-info/RECORD,,