netloader 3.12.0__tar.gz → 3.12.1__tar.gz

{netloader-3.12.0 → netloader-3.12.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: netloader
-Version: 3.12.0
+Version: 3.12.1
 Summary: Utility to generate and train PyTorch neural network objects from JSON files
 Author-email: Ethan Tregidga <ethan.tregidga@epfl.ch>
 License-Expression: MIT

{netloader-3.12.0 → netloader-3.12.1}/netloader/__init__.py

@@ -6,7 +6,7 @@ import logging
 import warnings
 
 
-__version__ = '3.12.0'
+__version__ = '3.12.1'
 __author__ = 'Ethan Tregidga'
 logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.WARNING)
 warnings.filterwarnings('once', category=DeprecationWarning, module=r'^netloader(\.|$)')

{netloader-3.12.0 → netloader-3.12.1}/netloader/data/datasets.py

@@ -63,7 +63,7 @@ class BaseDatasetMeta(type):
 
 
 class BaseDataset(
-    Dataset[tuple[int, DataListT, DataListT, Any]],
+    Dataset[tuple[int | ndarray, DataListT, DataListT, Any]],
     Generic[DataListT],
     metaclass=BaseDatasetMeta):
     """
@@ -98,28 +98,28 @@ class BaseDataset(
         """
         return len(self.idxs)
 
-    def __getitem__(self, idx: int) -> tuple[int, DataListT, DataListT, Any]:
+    def __getitem__(self, idx: int | slice) -> tuple[int | ndarray, DataListT, DataListT, Any]:
         """
         Parameters
         ----------
-        idx : int
-            Sample index
+        idx : int | slice
+            Sample index or slice
 
         Returns
         -------
-        tuple[int, DataListT, DataListT, Any]
+        tuple[int | ndarray, DataListT, DataListT, Any]
             Sample index, low dimensional data, high dimensional data, and extra data
         """
         return self.idxs[idx], self.get_low_dim(idx), self.get_high_dim(idx), self.get_extra(idx)
 
-    def get_extra(self, idx: int) -> Any:
+    def get_extra(self, idx: int | slice) -> Any:
         """
         Gets extra data for the sample of the given index
 
         Parameters
         ----------
-        idx : int
-            Sample index
+        idx : int | slice
+            Sample index or slice
 
         Returns
         -------
@@ -128,14 +128,14 @@ class BaseDataset(
         """
         return torch.tensor(()) if self.extra is None else self.extra[idx]
 
-    def get_high_dim(self, idx: int) -> DataListT:
+    def get_high_dim(self, idx: int | slice) -> DataListT:
         """
         Gets a high dimensional sample of the given index
 
         Parameters
         ----------
-        idx : int
-            Sample index
+        idx : int | slice
+            Sample index or slice
 
         Returns
         -------
@@ -145,14 +145,14 @@ class BaseDataset(
         assert self.high_dim is not None
         return cast(DataListT, self.high_dim[idx])
 
-    def get_low_dim(self, idx: int) -> DataListT:
+    def get_low_dim(self, idx: int | slice) -> DataListT:
         """
         Gets a low dimensional sample of the given index
 
         Parameters
         ----------
-        idx : int
-            Sample index
+        idx : int | slice
+            Sample index or slice
 
         Returns
         -------