brukerapi 0.2.2__tar.gz → 0.2.3__tar.gz

{brukerapi-0.2.2/brukerapi.egg-info → brukerapi-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brukerapi
-Version: 0.2.2
+Version: 0.2.3
 Summary: Bruker API
 Author-email: Tomas Psorn <tomaspsorn@isibrno.cz>, Jiri Vitous <vitous@isibrno.cz>
 Maintainer-email: Jiri Vitous <vitous@isibrno.cz>

{brukerapi-0.2.2 → brukerapi-0.2.3}/brukerapi/dataset.py

@@ -15,6 +15,7 @@ from .exceptions import (
     DatasetTypeMissmatch,
     FilterEvalFalse,
     IncompleteDataset,
+    InvalidDataset,
     NotADatasetDir,
     ParametersNotLoaded,
     PropertyConditionNotMet,
@@ -269,7 +270,6 @@ class Dataset:
                 if i not in set(os.listdir(str(param_path.parent))):
                     raise IncompleteDataset
 
-
     def load(self):
         """
         Load parameters, properties, schema and data. In case, there is a traj file related to a fid file,
@@ -401,7 +401,7 @@ class Dataset:
     def unload_properties(self):
         for property in self._properties:
             if hasattr(self, property):
-                delattr(self,property)
+                delattr(self, property)
         self._properties = []
         self._state["load_properties"] = False
 
@@ -565,11 +565,11 @@ class Dataset:
         -------
         1D ndarray containing the full data vector
         """
-        # TODO debug with this
+
         try:
             assert os.stat(str(path)).st_size == np.prod(shape) * dtype.itemsize
         except AssertionError:
-            raise ValueError("Dimension mismatch") from AssertionError
+            raise InvalidDataset("Invalid dataset, dimension mismatch") from AssertionError
 
         return np.array(np.memmap(path, dtype=dtype, shape=shape, order="F")[:])
 

{brukerapi-0.2.2 → brukerapi-0.2.3}/brukerapi/exceptions.py

@@ -248,6 +248,19 @@ class DataNotLoaded(Exception):
         return "DataNotLoaded"
 
 
+class InvalidDataset(Exception):
+    def __init__(self, *args):
+        if args:
+            self.message = args[0]
+        else:
+            self.message = None
+
+    def __str__(self):
+        if self.message:
+            return f"{self.message}"
+        return "Invalid dataset loaded"
+
+
 class TrajNotLoaded(Exception):
     def __init__(self, *args):
         if args:

{brukerapi-0.2.2 → brukerapi-0.2.3}/brukerapi/folders.py

@@ -7,6 +7,7 @@ from .dataset import Dataset
 from .exceptions import (
     FilterEvalFalse,
     IncompleteDataset,
+    InvalidDataset,
     InvalidJcampdxFile,
     JcampdxVersionError,
     NotADatasetDir,
@@ -17,7 +18,7 @@ from .exceptions import (
 )
 from .jcampdx import JCAMPDX
 
-DEFAULT_DATASET_STATE = {"parameter_files": [], "property_files": [], "load": False}
+DEFAULT_DATASET_STATE = {"parameter_files": [], "property_files": [], "load": 3}
 
 
 class Folder:
@@ -220,7 +221,7 @@ class Folder:
             if path.name in self._dataset_index or (path.name.partition(".")[0] in self._dataset_index and "rawdata" in path.name):
                 try:
                     children.append(Dataset(path, **self._dataset_state))
-                except (UnsuportedDatasetType, IncompleteDataset, NotADatasetDir):
+                except (UnsuportedDatasetType, IncompleteDataset, NotADatasetDir, InvalidDataset):
                     continue
 
             try:

{brukerapi-0.2.2 → brukerapi-0.2.3/brukerapi.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: brukerapi
-Version: 0.2.2
+Version: 0.2.3
 Summary: Bruker API
 Author-email: Tomas Psorn <tomaspsorn@isibrno.cz>, Jiri Vitous <vitous@isibrno.cz>
 Maintainer-email: Jiri Vitous <vitous@isibrno.cz>

{brukerapi-0.2.2 → brukerapi-0.2.3}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "brukerapi"
-version = "0.2.2"
+version = "0.2.3"
 description = "Bruker API"
 authors = [
     { name = "Tomas Psorn", email = "tomaspsorn@isibrno.cz" },