datastock 0.0.41__tar.gz → 0.0.43__tar.gz

{datastock-0.0.41/datastock.egg-info → datastock-0.0.43}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datastock
-Version: 0.0.41
+Version: 0.0.43
 Summary: A python library for generic class and data handling
 Home-page: https://github.com/ToFuProject/datastock
 Author: Didier VEZINET

{datastock-0.0.41 → datastock-0.0.43}/datastock/_class0.py

@@ -161,14 +161,16 @@ class DataStock0(object):
 
     def save(
         self,
+        pfe=None,
         path=None,
         name=None,
         sep=None,
-        verb=True,
+        overwrite=None,
         return_pfe=False,
+        verb=True,
     ):
 
-        lsep = ['.', '-', '_', ',', ';', '~', '?']
+        lsep = [';', '&', '?', '#', ',', '~', '.', '-', '_']
         if sep is None:
             for ss in lsep:
                 c0 = (
@@ -191,9 +193,11 @@ class DataStock0(object):
                 asarray=True,
                 returnas='blended',
             ),
+            pfe=pfe,
             sep=sep,
             path=path,
             name=name,
+            overwrite=overwrite,
             clsname=self.__class__.__name__,
             return_pfe=return_pfe,
             verb=verb,

{datastock-0.0.41 → datastock-0.0.43}/datastock/_class1_check.py

@@ -147,7 +147,14 @@ def _check_conflicts(dd=None, dd0=None, dd_name=None, returnas=None):
                     or (
                         not isinstance(v0[kk], np.ndarray)
                         and not scpsp.issparse(v0[kk])
-                        and v0[kk] == dd0[k0][kk]
+                        and (
+                            v0[kk] == dd0[k0][kk]
+                            or (
+                                # asunit.Unit vs str should be the same
+                                kk == 'units'
+                                and str(v0[kk]) == str(dd0[k0][kk])
+                            )
+                        )
                     )
                 )
             )
@@ -1925,4 +1932,4 @@ def _select(dd=None, dd_name=None, log=None, returnas=None, **kwdargs):
                 [k0 for jj, k0 in enumerate(dd.keys()) if ind[jj]],
                 dtype=str,
             )
-    return ind
+    return ind

{datastock-0.0.41 → datastock-0.0.43}/datastock/_saveload.py

@@ -26,10 +26,12 @@ _KEY_SEP = '--sep--'
 
 def save(
     dflat=None,
+    pfe=None,
     sep=None,
     name=None,
     path=None,
     clsname=None,
+    overwrite=None,
     return_pfe=None,
     verb=None,
 ):
@@ -37,30 +39,97 @@ def save(
 
     # ------------
     # check inputs
+    # ------------
 
-    # path
-    path = _generic_check._check_var(
-        path, 'path',
-        default=os.path.abspath('./'),
-        types=str,
-    )
-    path = os.path.abspath(path)
-    if not os.path.isdir(path):
-        msg = f"Arg path must be a valid path!\nProvided: {path}"
+    # ------------------
+    # pfe vs path/name
+
+    lc = [
+        pfe is not None,
+        path is not None or name is not None,
+    ]
+
+    if np.sum(lc) > 1:
+        msg = (
+            "Saving, please provide {pfe} xor {path and/or name}!\n"
+            f"\t- path: {path}\n"
+            f"\t- name: {name}\n"
+            f"\t- pfe: {pfe}\n"
+        )
         raise Exception(msg)
 
-    # clsname
-    clsname = _generic_check._check_var(
-        clsname, 'clsname',
-        default='DataCollection',
-        types=str,
-    )
+    # ------------------
+    # pfe vs path/name
+
+    if lc[0]:
+        if not isinstance(pfe, str):
+            msg = (
+                "Arg pfe must be a str ponting to a file!\n"
+                f"Provided: {pfe}\n"
+            )
+            raise Exception(msg)
 
-    # name
-    name = _generic_check._check_var(
-        name, 'name',
-        default='name',
-        types=str,
+        sdir, sfile = os.path.split(pfe)
+        if sdir == '':
+            sdir = os.path.asbpath('.')
+
+        # check path
+        if not os.path.isdir(sdir):
+            msg = (
+                "Arg pfe seems to have a non-valid path!\n"
+                "Provided: {sdir}\n"
+            )
+            raise Exception(msg)
+
+        # check file name
+        if not sfile.endswith('.npz'):
+            sfile = f"{sfile}.npz"
+
+        # re-assemble
+        pfe = os.path.join(sdir, sfile)
+
+    else:
+        # path
+        path = _generic_check._check_var(
+            path, 'path',
+            default=os.path.abspath('./'),
+            types=str,
+        )
+        path = os.path.abspath(path)
+        if not os.path.isdir(path):
+            msg = f"Arg path must be a valid path!\nProvided: {path}"
+            raise Exception(msg)
+
+        # clsname
+        clsname = _generic_check._check_var(
+            clsname, 'clsname',
+            default='DataCollection',
+            types=str,
+        )
+
+        # name
+        name = _generic_check._check_var(
+            name, 'name',
+            default='name',
+            types=str,
+        )
+
+        # set automatic name
+        user = getpass.getuser()
+        dt = dtm.datetime.now().strftime("%Y%m%d-%H%M%S")
+        name = f'{clsname}_{name}_{user}_{dt}.npz'
+
+        # pfe
+        pfe = os.path.join(path, name)
+
+    # ------------------
+    # options
+
+    # overwrite
+    overwrite = _generic_check._check_var(
+        overwrite, 'overwrite',
+        default=False,
+        types=bool,
     )
 
     # verb
@@ -79,24 +148,44 @@ def save(
 
     # ----------------------
     # save / print / return
-
-    user = getpass.getuser()
-    dt = dtm.datetime.now().strftime("%Y%m%d-%H%M%S")
-    name = f'{clsname}_{name}_{user}_{dt}.npz'
+    # ----------------------
 
     # add sep
     dflat[_KEY_SEP] = sep
 
+    # -----------------
+    # check vs existing
+
+    if os.path.isfile(pfe):
+        if overwrite is True:
+            msg = (
+                "Overwriting existing file:\n"
+                f"\t{pfe}"
+            )
+            warnings.warn(msg)
+        else:
+            msg = (
+                "File already existing!\n"
+                "\t=> use overwrite = True to overwrite\n"
+                f"\t{pfe}"
+            )
+            raise Exception(msg)
+
+    # --------
     # save
-    pfe = os.path.join(path, name)
-    np.savez(pfe,  **dflat)
 
+    np.savez(pfe, **dflat)
+
+    # -------
     # print
+
     if verb:
-        msg = f"Saved in:\n\t{pfe}"
+        msg = f"\nSaved in:\n\t{pfe}\n"
         print(msg)
 
+    # -------
     # return
+
     if return_pfe is True:
         return pfe
 

{datastock-0.0.41 → datastock-0.0.43}/datastock/tests/test_01_DataStock.py

@@ -602,7 +602,12 @@ class Test02_Manipulate():
     def test22_get_nbytes(self):
         nb, dnb = self.st.get_nbytes()
 
-    def test23_saveload(self, verb=False):
+    def test23_save_pfe(self, verb=False):
+        pfe = os.path.join(_PATH_OUTPUT, 'testsave.npz')
+        self.st.save(pfe=pfe, return_pfe=False)
+        os.remove(pfe)
+
+    def test24_saveload(self, verb=False):
         pfe = self.st.save(path=_PATH_OUTPUT, verb=verb, return_pfe=True)
         st2 = load(pfe, verb=verb)
         # Just to check the loaded version works fine

{datastock-0.0.41 → datastock-0.0.43}/datastock/version.py

@@ -1,2 +1,2 @@
 # Do not edit, pipeline versioning governed by git tags!
-__version__ = '0.0.41'
+__version__ = '0.0.43'

{datastock-0.0.41 → datastock-0.0.43/datastock.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: datastock
-Version: 0.0.41
+Version: 0.0.43
 Summary: A python library for generic class and data handling
 Home-page: https://github.com/ToFuProject/datastock
 Author: Didier VEZINET