datastock 0.0.37__py3-none-any.whl → 0.0.39__py3-none-any.whl

datastock/_class1.py

@@ -977,6 +977,37 @@ class DataStock1(DataStock0):
     def show_interactive(self):
         self.show(show_which=['axes', 'mobile', 'interactivity'])
 
+    def show_details(
+        self,
+        key=None,
+        which=None,
+        # pretty print options
+        sep=None,
+        line=None,
+        justify=None,
+        table_sep=None,
+        # bool options
+        verb=True,
+        returnas=False,
+    ):
+        """ Summary description of the object content """
+        return _class1_show.main_details(
+            coll=self,
+            which=which,
+            key=key,
+            # pretty print options
+            sep=sep,
+            line=line,
+            justify=justify,
+            table_sep=table_sep,
+            # bool options
+            verb=verb,
+            returnas=returnas,
+        )
+
+    def _get_show_details(self, which=None, key=None):
+        raise NotImplementedError()
+
     def __repr__(self):
         try:
             return self.show(returnas=str, verb=False)
@@ -1009,4 +1040,4 @@ class DataStock1(DataStock0):
 
 __all__ = [
     sorted([k0 for k0 in locals() if k0.startswith('DataStock')])[-1]
-]
+]

datastock/_class1_check.py

@@ -12,6 +12,7 @@ import astropy.units as asunits
 
 
 from . import _generic_check
+from . import _generic_utils
 
 
 _DRESERVED_KEYS = {
@@ -198,12 +199,18 @@ def _check_conflicts(dd=None, dd0=None, dd_name=None, returnas=None):
 
 
 def _check_remove(key=None, dkey=None, name=None):
-    c0 = isinstance(key, str) and key in dkey.keys()
-    c1 = (
-        isinstance(key, list)
-        and all([isinstance(kk, str) and kk in dkey.keys() for kk in key])
+
+    # -----------------------
+    # check basic conformity
+
+    if isinstance(key, str):
+        key = [key]
+
+    c0 = (
+        isinstance(key, (list, tuple, set))
+        and all([isinstance(kk, str) for kk in key])
     )
-    if not (c0 or c1):
+    if not c0:
         msg = (
             """
             Removed item must be a str already in self.d{}
@@ -213,8 +220,12 @@ def _check_remove(key=None, dkey=None, name=None):
             """.format(name, key, sorted(dkey.keys()))
         )
         raise Exception(msg)
-    if c0:
-        key = [key]
+
+    # -----------------------
+    # only keep relevant keys
+
+    key = [k0 for k0 in key if k0 in dkey.keys()]
+
     return key
 
 
@@ -327,7 +338,8 @@ def _remove_ref(
     for k0 in key:
         # Remove orphan ddata
         for k1 in dref0[k0]['ldata']:
-            del ddata0[k1]
+            if k1 in ddata0.keys():
+                del ddata0[k1]
         del dref0[k0]
 
     # Double-check consistency
@@ -474,7 +486,7 @@ def _remove_obj(
             del dobj0[which][kk]
 
     # cleanup
-    if propagate is True and len(dobj0.get(which, {})) == 0:
+    if propagate is True and dobj0.get(which) is not None and len(dobj0[which]) == 0:
         del dobj0[which]
 
     return _consistency(
@@ -1020,13 +1032,15 @@ def _check_dobj(
 
     # ----------------
     # Trivial case
+    # ----------------
+
     if dobj in [None, {}]:
         return {}
 
-    # ----------------
-    # Check conformity
+    # ------------
+    # Check type
+    # ------------
 
-    # map possible non-conformities
     if not isinstance(dobj, dict):
         msg = (
             "Arg dobj must be a dict!\n"
@@ -1034,48 +1048,69 @@ def _check_dobj(
         )
         raise Exception(msg)
 
+    # -----------------------------
     # Map possible non-conformities
+    # -----------------------------
+
     dc = {}
     dobj2 = {}
     for k0, v0 in dobj.items():
 
+        # -----------------------
         # check types (str, dict)
+
         c1 = isinstance(k0, str) and isinstance(v0, dict)
         if not c1:
             dc[k0] = "type(key) != str or type(value) != dict"
             continue
 
-        # check each key / value
-        lc2 = [
-            f'\t- {str(k1)}: type {type(v1)}'
-            f', key already in dobj0: {k1 in dobj0.get(k0, {}).keys()}'
-            for k1, v1 in v0.items()
-            if not (
-                (k1 is None or isinstance(k1, str))
-                and isinstance(v1, dict)
-                and k1 not in dobj0.get(k0, {}).keys()
-            )
-        ]
-        if len(lc2) > 0:
-            dc[k0] = (
-                f"The following keys of dobj['{k0}'] are not valid:\n"
-                + "\n".join(lc2)
-            )
-            continue
 
-        # set None to default keys if any None
-        dobj2[k0] = {}
-        for k1 in v0.keys():
+        lc2 = []
+        for k1, v1 in v0.items():
 
+            # key
             key = _generic_check._obj_key(
                 d0=dobj0.get(k0, {}),
                 short=dshort.get(k0, k0[:4]),
                 key=k1,
             )
 
+            # value
+            if not isinstance(v1, dict):
+                lc2.append(f'\t- {key}: type {type(v1)}')
+                continue
+
+            # key in dobj0
+            if key in dobj0.get(k0, {}).keys():
+
+                isidentical = _generic_utils.compare_dict(
+                    d0=dobj0[k0][key],
+                    d1=v1,
+                    dname='v1',
+                    returnas=bool,
+                    verb=False,
+                )
+
+                if not isidentical:
+                    lc2.append(f"\t- '{key}' already in dobj0['{k0}']")
+                continue
+
+            # add to dobj2
+            if dobj2.get(k0) is None:
+                dobj2[k0] = {}
             dobj2[k0][key] = dict(dobj[k0][k1])
 
+
+        if len(lc2) > 0:
+            dc[k0] = (
+                f"The following keys of dobj['{k0}'] are not valid:\n"
+                + "\n".join(lc2)
+            )
+
+    # ----------------
     # Raise Exception
+    # ----------------
+
     if len(dc) > 0:
         msg = (
             "The following keys of dobj are non-conform:\n"

datastock/_class1_interpolate.py

@@ -533,14 +533,6 @@ def _check_params(
     # ----
     # ndim
 
-    if deriv not in [None, 0] and ndim > 1:
-        msg = (
-            "Arg deriv can only be used for 1d interpolations!\n"
-            f"\t- ndim: {ndim}\n"
-            f"\t- deriv: {deriv}\n"
-        )
-        raise Exception(msg)
-
     if ndim > 2:
         msg = (
             "Interpolations of more than 2 dimensions not implemented!\n"
@@ -551,12 +543,27 @@ def _check_params(
     # -----
     # deriv
 
-    deriv = _generic_check._check_var(
-        deriv, 'deriv',
-        default=0,
-        types=int,
-        allowed=[ii for ii in range(deg + 1)],
-    )
+    if ndim == 1:
+        deriv = _generic_check._check_var(
+            deriv, 'deriv',
+            default=0,
+            types=int,
+            allowed=[ii for ii in range(deg + 1)],
+        )
+
+    elif ndim == 2:
+
+        if np.isscalar(deriv):
+            deriv = (int(deriv), int(deriv))
+
+        deriv = tuple(_generic_check._check_var_iter(
+            deriv, 'deriv',
+            default=(0, 0),
+            types=(list, tuple),
+            types_iter=int,
+            size=2,
+            allowed=[ii for ii in range(deg + 1)],
+        ))
 
     # -------
     # log_log
@@ -1518,6 +1525,8 @@ def _interp2d(
                 )(
                     np.log(x0[slix]),
                     np.log(x1[slix]),
+                    dx=deriv[0],
+                    dy=deriv[1],
                     grid=False,
                 )
             )
@@ -1533,6 +1542,8 @@ def _interp2d(
             )(
                 x0[slix],
                 x1[slix],
+                dx=deriv[0],
+                dy=deriv[1],
                 grid=False,
             )
 

datastock/_class1_show.py

@@ -13,7 +13,6 @@ from . import _generic_utils
 from . import _generic_check
 
 
-
 #############################################
 #############################################
 #       Main
@@ -77,7 +76,13 @@ def main(
         for k0 in coll._dobj.keys():
             if 'obj' in show_which or k0 in show_which:
                 func = coll._get_show_obj(k0)
-                lcol, lar = func(coll=coll, which=k0, lcol=lcol, lar=lar, show=show)
+                lcol, lar = func(
+                    coll=coll,
+                    which=k0,
+                    lcol=lcol,
+                    lar=lar,
+                    show=show,
+                )
 
     return _generic_utils.pretty_print(
         headers=lcol,
@@ -403,4 +408,116 @@ def _show_extract(dobj=None, lk=None):
         else:
             lv0.append(str(v0))
 
-    return lv0
+    return lv0
+
+
+#############################################
+#############################################
+#       Main - details
+#############################################
+
+
+def main_details(
+    coll=None,
+    # options
+    which=None,
+    key=None,
+    # print parameters
+    sep=None,
+    line=None,
+    justify=None,
+    table_sep=None,
+    # bool options
+    verb=True,
+    returnas=False,
+):
+
+    # -------------
+    # check inputs
+    # -------------
+
+    which, key = _check_details(
+        coll=coll,
+        which=which,
+        key=key,
+    )
+
+    # intialize
+    lcol, lar = [], []
+
+    # -----------------------
+    # Build for dobj
+    # -----------------------
+
+    func = coll._get_show_details(which=which)
+    lcol, lar = func(
+        coll=coll,
+        key=key,
+        lcol=lcol,
+        lar=lar,
+    )
+
+    return _generic_utils.pretty_print(
+        headers=lcol,
+        content=lar,
+        sep=sep,
+        line=line,
+        table_sep=table_sep,
+        verb=verb,
+        returnas=returnas,
+    )
+
+
+###########################################################
+###########################################################
+#       check details
+###########################################################
+
+
+def _check_details(
+    coll=None,
+    which=None,
+    key=None,
+):
+
+    # -------------
+    # key
+    # -------------
+
+    lok_which = list(coll._dobj.keys())
+    dkey = {}
+    for kw in lok_which:
+        dkey.update({
+            k1: kw for k1 in coll.dobj[kw].keys()
+        })
+
+    # check
+    try:
+        key = _generic_check._check_var(
+            key, 'key',
+            types=str,
+            allowed=list(dkey.keys()),
+        )
+
+        which = dkey[key]
+
+    except Exception:
+
+        # -------------
+        # show_which
+
+        lok = list(coll._dobj.keys())
+        which = _generic_check._check_var(
+            which, 'which',
+            types=str,
+            allowed=lok,
+        )
+
+        lok = [k1 for k1, kw in dkey.items() if kw == which]
+        key = _generic_check._check_var(
+            key, 'key',
+            types=str,
+            allowed=lok,
+        )
+
+    return which, key

datastock/_generic_check.py

@@ -140,6 +140,7 @@ def _check_var_iter(
     types=None,
     types_iter=None,
     default=None,
+    size=None,
     allowed=None,
     excluded=None,
     extra_msg=None,
@@ -188,6 +189,15 @@ def _check_var_iter(
             )
             raise Exception(_complete_extra_msg(msg, extra_msg))
 
+    # check size
+    if size is not None:
+        if len(var) != size:
+            msg = (
+                f"Arg {varname} must be an iterable of len = {size}\n"
+                f"Provided: {len(var)}"
+            )
+            raise Exception(_complete_extra_msg(msg, extra_msg))
+
     # check if allowed
     if allowed is not None:
         if any([vv not in allowed for vv in var]):

datastock/_plot_as_array.py

@@ -906,4 +906,4 @@ def get_data_str(dk=None, coll2=None, key=None, ndim=None, dscale=None):
     else:
         lab = f"{key} ({units})"
 
-    return dk, key, lab
+    return dk, key, lab

datastock/_plot_as_array_234d.py

@@ -783,4 +783,4 @@ def _label_axes(
             ax.set_xticks([])
             ax.set_yticks([])
 
-    return dax
+    return dax

datastock/version.py

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

{datastock-0.0.37.dist-info → datastock-0.0.39.dist-info}/METADATA

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

{datastock-0.0.37.dist-info → datastock-0.0.39.dist-info}/RECORD

@@ -3,13 +3,13 @@ datastock/_DataCollection_utils.py,sha256=hHf6HvGKMmM-psx3fj9QcY1TEmKrAtTdkRokH7
 datastock/__init__.py,sha256=i_Ijl-AM07n4zN52frWfbeGN1iB6v4e5oLzTuVIh_oM,217
 datastock/_class.py,sha256=Az9PS3aSskiPMb1ekt78Y2ynBujYVc_cDjJxW9xH9g4,47
 datastock/_class0.py,sha256=QULjNJke13jJrGLIeM7SWHZVziorDK_KCIlqq8LgS9U,5883
-datastock/_class1.py,sha256=PVlY3_kZQk_Nm4RL-GcdAGWoR7O4_h60NCveg2zAYgI,27591
+datastock/_class1.py,sha256=0IDelA1ZXRJ7xAPWHnQUi9Hu-q8HOaDMN2SCKOm13ro,28347
 datastock/_class1_binning.py,sha256=LWHv2LIfgZfSFWYwqdcN0DKpNe6q7Go3sxfcJqmzTrI,28085
-datastock/_class1_check.py,sha256=UrbNtikISmNiIT96NQmjfVbhyxXrFmEJrjB8Yq5XvvI,49956
+datastock/_class1_check.py,sha256=0oWF07MOo2c_G7219H7Dz-gRjBiTDDqbZ5loq9mC8ko,50574
 datastock/_class1_compute.py,sha256=yHdG0afYc_YtjpR6RvMh7SeRtWEyuHZ5y9VOPRIYVDo,31671
 datastock/_class1_domain.py,sha256=bkuCl29QO7C3RchC8qZyreU90QxmdDYNVYDmzuCLCUY,6252
-datastock/_class1_interpolate.py,sha256=-nuljuZfu6VxC40ydZ3JcRBkjOswQfFd7I_Od9iTwjI,37543
-datastock/_class1_show.py,sha256=J_CVhfxIYaicqtBoub6NvXwRHNmKHPnFTUt2cYb7I6M,9490
+datastock/_class1_interpolate.py,sha256=3LRKK6aOepJLSnRoRpsS8RAnobqTdE-QZrkdQrnIaqc,37825
+datastock/_class1_show.py,sha256=hqd-FeJ1NqiOzbrHzGMrwIo8_lLsjC199Zmw68NqkDQ,11745
 datastock/_class1_uniformize.py,sha256=NtriKnQAMhzdEAc766rgYWouz4GFEG1MVAVhu9VcaOk,26918
 datastock/_class2.py,sha256=ag8bfEtAF1G_ET4ufpWh8uM609cVUUfhAO6L8L7hc14,45322
 datastock/_class2_interactivity.py,sha256=YdM4cEjDrgh-bSsOzkkwtu-pqKoeqhSyfiZl2Udkl3E,16632
@@ -17,26 +17,26 @@ datastock/_class3.py,sha256=CH1oD_lTfVlcDp29L_iwzSfP78vX6_edDmZG9aSb1Ks,10848
 datastock/_direct_calls.py,sha256=EHFwI2mGMDqGz8_Bv2BseMBX4J8dSdE_RcNX3pt0ZYY,1801
 datastock/_export_dataframe.py,sha256=fy-uJR3EhDlHvd9ls1EQna_C8fyha1jCJLu1DTKTkdo,1576
 datastock/_find_plateau.py,sha256=sqnAuy0361DXkqBb_Lo1MmIGjn35tnKFvcv6MW6hifs,2685
-datastock/_generic_check.py,sha256=bxO453Q5WHyk7xUTRmEK8635ghiyqGMm3nqrcnCkmiI,24515
+datastock/_generic_check.py,sha256=x41ITg3NxOiMK4IyIQX9wYrrqwPy88991rlvCpkFy8w,24812
 datastock/_generic_utils.py,sha256=iBsEQcVEoyN11-R5lMCZJzZUAksROkVD_gzKNvWXLvA,21381
 datastock/_generic_utils_plot.py,sha256=xrWzeZFtdTAs-RO2DfpCRveJPqw_p4lRFtQuuAn1pD8,3709
 datastock/_plot_BvsA_as_distribution.py,sha256=fpRhlbv3Bk96buANC46Brc9hdLxkOAsoKpE5A9pohG0,15389
 datastock/_plot_BvsA_as_distribution_check.py,sha256=2LoM3mGHtPu87_qf37hLcFuknWfeSydU8WDqpVo1Sco,13086
-datastock/_plot_as_array.py,sha256=DwumZrzfKmAUeUF_y6v33mVBH1mVDBAlIbZ-wHnvn5E,22707
+datastock/_plot_as_array.py,sha256=bnYui-3gli_AFnwYrbULCQVEq3i2TF7tUPWdqcJhDYQ,22708
 datastock/_plot_as_array_1d.py,sha256=6J-95zRTH2RPn_3g8GzDLX8HAGiLU39awNYi-EB2t7o,6611
-datastock/_plot_as_array_234d.py,sha256=k1AcKyseuObcte8yPm-FSn2g01rK-m_-japUA738IbA,21999
+datastock/_plot_as_array_234d.py,sha256=-j33lga5no4K3IBNN4Iy0ziBhassDtWVo4KZuezhyiQ,22000
 datastock/_plot_as_mobile_lines.py,sha256=QSmJZUMKrNa__SzUCJO96KpnQPoNB_qpjK_ZRJt11oY,23289
 datastock/_plot_as_profile1d.py,sha256=ebOrzcV1m197Ua1CE04EV6mno_LryrumCpwGcrrDZ5Y,23740
 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=Nn5V6g5Fni_GmDG2991HOKltYIl-MPDURNj8ze_u6oQ,80
+datastock/version.py,sha256=Bb6NW7Kw8uEjYqVT0BzNF9HwbmuDI1NDZNdzzrPAbbU,80
 datastock/tests/__init__.py,sha256=teOo2xP0IO7PQMuMDmum61XVHe2TuxW3BiHiL73X8jQ,35
 datastock/tests/test_01_DataStock.py,sha256=QJSmrVXD6wX-plfrFdLyZou20IYZGAKzartSi84BfC0,16982
 datastock/tests/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datastock-0.0.37.dist-info/LICENSE,sha256=V1uXqi3vxR0QhB4QdFyjkynl6jpN4wZmlB5EMYJk0NM,1068
-datastock-0.0.37.dist-info/METADATA,sha256=QXFNu5BxSKujUX1jgwp84hVt3PnkpWP22OyEOUkbKf8,8666
-datastock-0.0.37.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-datastock-0.0.37.dist-info/top_level.txt,sha256=BzJsLLK_zZw13WQCoMhC74qWVKalnVCjBxdPXvJn7HQ,25
-datastock-0.0.37.dist-info/RECORD,,
+datastock-0.0.39.dist-info/LICENSE,sha256=V1uXqi3vxR0QhB4QdFyjkynl6jpN4wZmlB5EMYJk0NM,1068
+datastock-0.0.39.dist-info/METADATA,sha256=az228ShtdPfti88S7_DpvjMCUMKVqmmCKsiY6HEB7uw,8666
+datastock-0.0.39.dist-info/WHEEL,sha256=mguMlWGMX-VHnMpKOjjQidIo1ssRlCFu4a4mBpz1s2M,91
+datastock-0.0.39.dist-info/top_level.txt,sha256=BzJsLLK_zZw13WQCoMhC74qWVKalnVCjBxdPXvJn7HQ,25
+datastock-0.0.39.dist-info/RECORD,,

{datastock-0.0.37.dist-info → datastock-0.0.39.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: bdist_wheel (0.42.0)
+Generator: setuptools (70.1.1)
 Root-Is-Purelib: true
 Tag: py3-none-any