datastock 0.0.42__py3-none-any.whl → 0.0.44__py3-none-any.whl

datastock/_class0.py

@@ -65,7 +65,7 @@ class DataStock0(object):
         )
 
     @classmethod
-    def from_dict(cls, din=None, isflat=None, sep=None):
+    def from_dict(cls, din=None, isflat=None, sep=None, obj=None):
         """ Populate the instances attributes using an input dict
 
         The input dict must be properly formatted
@@ -85,7 +85,9 @@ class DataStock0(object):
         # ---------------------
         # Instanciate and populate
 
-        obj = cls()
+        if obj is None:
+            obj = cls()
+
         for k0 in din.keys():
             if k0 == '_ddef':
                 if 'dobj' not in din[k0]['params'].keys():
@@ -161,11 +163,13 @@ class DataStock0(object):
 
     def save(
         self,
+        pfe=None,
         path=None,
         name=None,
         sep=None,
-        verb=True,
+        overwrite=None,
         return_pfe=False,
+        verb=True,
     ):
 
         lsep = [';', '&', '?', '#', ',', '~', '.', '-', '_']
@@ -191,9 +195,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/_class1.py

@@ -369,8 +369,8 @@ class DataStock1(DataStock0):
     ###########
 
     @classmethod
-    def from_dict(cls, din=None, sep=None):
-        obj = super().from_dict(din=din, sep=sep)
+    def from_dict(cls, din=None, sep=None, obj=None):
+        obj = super().from_dict(din=din, sep=sep, obj=obj)
         obj.update()
         return obj
 

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)
+
+        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)
 
-    # name
-    name = _generic_check._check_var(
-        name, 'name',
-        default='name',
-        types=str,
+    # ------------------
+    # 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
 
@@ -110,6 +199,7 @@ def save(
 def load(
     pfe=None,
     cls=None,
+    coll=None,
     allow_pickle=None,
     sep=None,
     verb=None,
@@ -117,16 +207,24 @@ def load(
 
     # -------------
     # check inputs
+    # -------------
 
+    # ---------
     # pfe
+
     if not os.path.isfile(pfe):
         msg = f"Arg pfe must be a valid path to a file!\n\t- Provided: {pfe}"
         raise Exception(msg)
 
-    # cls
-    if cls is None:
-        from ._class import DataStock
-        cls = DataStock
+    # --------------
+    # cls vs coll
+
+    if coll is None:
+        if cls is None:
+            from ._class import DataStock
+            cls = DataStock
+    else:
+        cls = coll.__class__
 
     if not (type(cls) is type and hasattr(cls, 'from_dict')):
         msg = (
@@ -135,14 +233,18 @@ def load(
         )
         raise Exception(msg)
 
+    # ------------
     # allow_pickle
+
     allow_pickle = _generic_check._check_var(
         allow_pickle, 'allow_pickle',
         default=True,
         types=bool,
     )
 
+    # -------
     # verb
+
     verb = _generic_check._check_var(
         verb, 'verb',
         default=True,
@@ -151,11 +253,13 @@ def load(
 
     # --------------
     # load flat dict
+    # --------------
 
     dflat = dict(np.load(pfe, allow_pickle=allow_pickle))
 
     # ------------------------------
     # load sep from file if exists
+    # ------------------------------
 
     if _KEY_SEP in dflat.keys():
         # new
@@ -167,6 +271,7 @@ def load(
 
     # ----------
     # reshape
+    # ----------
 
     dout = {}
     for k0, v0 in dflat.items():
@@ -221,14 +326,19 @@ def load(
 
     # -----------
     # Instanciate
+    # -----------
 
-    obj = cls.from_dict(dout)
+    coll = cls.from_dict(dout, obj=coll)
+
+    # -----------
+    # verb
+    # -----------
 
     if verb:
         msg = f"Loaded from\n\t{pfe}"
         print(msg)
 
-    return obj
+    return coll
 
 
 # #################################################################

datastock/tests/test_01_DataStock.py

@@ -602,11 +602,26 @@ 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
         msg = st2.__eq__(self.st, returnas=str)
+        if msg is not True:
+            raise Exception(msg)
+        os.remove(pfe)
+
+    def test25_saveload_coll(self, verb=False):
+        pfe = self.st.save(path=_PATH_OUTPUT, verb=verb, return_pfe=True)
+        st = DataStock()
+        st2 = load(pfe, coll=st, verb=verb)
+        # Just to check the loaded version works fine
+        msg = st2.__eq__(self.st, returnas=str)
         if msg is not True:
             raise Exception(msg)
         os.remove(pfe)

datastock/version.py

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

{datastock-0.0.42.dist-info → datastock-0.0.44.dist-info}/METADATA

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

{datastock-0.0.42.dist-info → datastock-0.0.44.dist-info}/RECORD

@@ -2,8 +2,8 @@ _updateversion.py,sha256=OR6OJJozaHWzu7NWjKu5ERi0IyYqR61KrWvzf7kfoto,951
 datastock/_DataCollection_utils.py,sha256=hHf6HvGKMmM-psx3fj9QcY1TEmKrAtTdkRokH7SFqoo,7143
 datastock/__init__.py,sha256=i_Ijl-AM07n4zN52frWfbeGN1iB6v4e5oLzTuVIh_oM,217
 datastock/_class.py,sha256=Az9PS3aSskiPMb1ekt78Y2ynBujYVc_cDjJxW9xH9g4,47
-datastock/_class0.py,sha256=2mju4Larmj1Sv5ZMuqPTLvCY-BajhGD3qG6QBalTnRY,5893
-datastock/_class1.py,sha256=8R4zM6p7b62FJuoI7Gyik4_tRCUFi6aF4oaMimiOoFE,28726
+datastock/_class0.py,sha256=je4ckTynK8lEGBa7OSURYZZ_-3XjzAtf6SazN3b-f5k,6028
+datastock/_class1.py,sha256=WlI666OOG8x-qtfNRcwP7aoCs7TDfvk3yKzVsHShO7c,28745
 datastock/_class1_binning.py,sha256=LWHv2LIfgZfSFWYwqdcN0DKpNe6q7Go3sxfcJqmzTrI,28085
 datastock/_class1_check.py,sha256=0azV7ftoAWsqTMEYbGQ_luJi95Px-pBif_vOug3W8Zg,50978
 datastock/_class1_compute.py,sha256=yHdG0afYc_YtjpR6RvMh7SeRtWEyuHZ5y9VOPRIYVDo,31671
@@ -30,13 +30,13 @@ datastock/_plot_as_profile1d.py,sha256=ebOrzcV1m197Ua1CE04EV6mno_LryrumCpwGcrrDZ
 datastock/_plot_correlations.py,sha256=ITOypu_AEoKl0ihxocV-JVTXIHqut6p9TfG-xZmQysc,10175
 datastock/_plot_old_backup.py,sha256=XixTi2CiihKjtQP0TRycH0b25caWN1m35DgpsDeiWZE,21729
 datastock/_plot_text.py,sha256=wQPqjfpLyIioS2JeOt3E9C9HgYUJ49YEoOgRuKYvAR8,3143
-datastock/_saveload.py,sha256=NdOykvmeCaPhpk0EF5WQezYzpuZM2Ul101Nqc4I3dnY,11729
-datastock/version.py,sha256=eImSu2FfqgzmD49HEFW5QfRn9NBAw_itX40-C-Zj7V0,80
+datastock/_saveload.py,sha256=1vAMp27KfqXbo5b_Pi8hJux0stsHq6dO5vy8k1d4_iA,14141
+datastock/version.py,sha256=EX8urNJ1ILJpXuRtvcV0i0MWqPQj1IxD_snvo_plkfg,80
 datastock/tests/__init__.py,sha256=teOo2xP0IO7PQMuMDmum61XVHe2TuxW3BiHiL73X8jQ,35
-datastock/tests/test_01_DataStock.py,sha256=QJSmrVXD6wX-plfrFdLyZou20IYZGAKzartSi84BfC0,16982
+datastock/tests/test_01_DataStock.py,sha256=tGVJiCVjWT5oR4DlFopbcKMxi2cpCbBvdBDRc0WV1KU,17532
 datastock/tests/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datastock-0.0.42.dist-info/LICENSE,sha256=V1uXqi3vxR0QhB4QdFyjkynl6jpN4wZmlB5EMYJk0NM,1068
-datastock-0.0.42.dist-info/METADATA,sha256=VaEXXEm0YfQQmm_ccn37rA13jkzppnLnTJdfc0oi6qQ,8660
-datastock-0.0.42.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
-datastock-0.0.42.dist-info/top_level.txt,sha256=BzJsLLK_zZw13WQCoMhC74qWVKalnVCjBxdPXvJn7HQ,25
-datastock-0.0.42.dist-info/RECORD,,
+datastock-0.0.44.dist-info/LICENSE,sha256=V1uXqi3vxR0QhB4QdFyjkynl6jpN4wZmlB5EMYJk0NM,1068
+datastock-0.0.44.dist-info/METADATA,sha256=XTfrvF04pd1W2uJ7lOUhlFWpvL7pQBWxwa7Updlhazc,8660
+datastock-0.0.44.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+datastock-0.0.44.dist-info/top_level.txt,sha256=BzJsLLK_zZw13WQCoMhC74qWVKalnVCjBxdPXvJn7HQ,25
+datastock-0.0.44.dist-info/RECORD,,