datastock 0.0.30__py3-none-any.whl → 0.0.32__py3-none-any.whl

datastock/_class1_check.py

@@ -590,14 +590,14 @@ def _check_dref(
             isinstance(v0, dict)
             and (
                 isinstance(v0.get('data'), (np.ndarray, list, tuple))
-                or isinstance(v0.get('size'), (int, np.int_))
+                or isinstance(v0.get('size'), (int, np.integer))
             )
         )
         if not c0:
             msg = "v0 must be a dict with either 'data' or 'size'"
             raise Exception(msg)
 
-        if isinstance(v0.get('size'), (int, np.int_)):
+        if isinstance(v0.get('size'), (int, np.integer)):
             dref[k0]['size'] = int(v0['size'])
 
         dref2[key] = dict(dref[k0])
@@ -1553,9 +1553,9 @@ def _set_param(
     # Set value
 
     # Check value - TBC: allow list
-    ltypes = [str, int, np.integer, float, np.floating, tuple]
+    ltypes = (int, np.integer, float, str, tuple)
     lc = [
-        isinstance(value, tuple(ltypes)),
+        isinstance(value, ltypes),
         isinstance(value, (list, tuple, np.ndarray))
         and distribute is False,
         isinstance(value, (list, tuple, np.ndarray))
@@ -1569,15 +1569,15 @@ def _set_param(
     ]
     if not (value is None or any(lc)):
         msg = (
-            """
+            f"""
             Accepted types for value include:
                 - None
-                - {}: common to all
+                - {ltypes}: common to all
                 - list, np.ndarray: key by key
                 - dict of scalar / str
 
-            The length of value must match the selected keys ({})
-            """.format(ltypes, len(key))
+            The length of value must match the selected keys ({len(key)})
+            """
         )
         raise Exception(msg)
 
@@ -1690,7 +1690,7 @@ def _ind_tofrom_key(
             and (
                 (ind.dtype == np.bool and ind.size == len(dd))
                 or (
-                    ind.dtype == np.int
+                    ind.dtype == int
                     and np.all(np.isfinite(ind))
                     and np.max(ind) <= len(dd)
                 )
@@ -1798,10 +1798,11 @@ def _select(dd=None, dd_name=None, log=None, returnas=None, **kwdargs):
     # Get raw bool indices
 
     # Get list of accessible param
-    ltypes = (int, np.int_, float, np.float_)
+    ltypes = (float, int, np.integer)
     lquant = [
         kk for kk in kwdargs.keys()
-        if any([isinstance(dd[k0][kk], ltypes) for k0 in dd.keys()])
+        if any([isinstance(dd[k0][kk], ltypes) for k0 in dd.keys()
+        ])
     ]
 
     # Prepare array of bool indices and populate
@@ -1973,7 +1974,7 @@ def _show_extract(dobj=None, lk=None):
         if isinstance(v0, float):
             lv0.append(f'{v0:.2e}')
         elif isinstance(v0, np.ndarray) and v0.size == 3:
-            if v0.dtype == np.float:
+            if v0.dtype == float:
                 lv0.append(
                     np.array2string(
                         v0,

datastock/_class3.py

@@ -38,6 +38,7 @@ class DataStock3(DataStock2):
         inverty=None,
         bck=None,
         interp=None,
+        show_commands=None,
         # figure-specific
         dax=None,
         dmargin=None,
@@ -72,6 +73,7 @@ class DataStock3(DataStock2):
             inverty=inverty,
             bck=bck,
             interp=interp,
+            show_commands=show_commands,
             # figure-specific
             dax=dax,
             dmargin=dmargin,
@@ -102,6 +104,7 @@ class DataStock3(DataStock2):
         rotation=None,
         inverty=None,
         bck=None,
+        show_commands=None,
         # figure-specific
         dax=None,
         dmargin=None,
@@ -131,6 +134,7 @@ class DataStock3(DataStock2):
             rotation=rotation,
             inverty=inverty,
             bck=bck,
+            show_commands=show_commands,
             # figure-specific
             dax=dax,
             dmargin=dmargin,
@@ -158,6 +162,7 @@ class DataStock3(DataStock2):
         lkeys=None,
         bstr_dict=None,
         rotation=None,
+        show_commands=None,
         # figure-specific
         dax=None,
         dmargin=None,
@@ -185,6 +190,7 @@ class DataStock3(DataStock2):
             lkeys=lkeys,
             bstr_dict=bstr_dict,
             rotation=rotation,
+            show_commands=show_commands,
             # figure-specific
             dax=dax,
             dmargin=dmargin,
@@ -247,6 +253,7 @@ class DataStock3(DataStock2):
         keyB=None,
         keyX=None,
         axis=None,
+        show_commands=None,
         # customization of scatter plot
         dlim=None,
         color_dict=None,
@@ -289,6 +296,7 @@ class DataStock3(DataStock2):
             keyB=keyB,
             keyX=keyX,
             axis=axis,
+            show_commands=show_commands,
             # customization of scatter plot
             dlim=dlim,
             color_dict=color_dict,

datastock/_plot_BvsA_as_distribution.py

@@ -37,6 +37,7 @@ def plot_BvsA_as_distribution(
     keyB=None,
     keyX=None,
     axis=None,
+    show_commands=None,
     # customization of scatter plot
     dlim=None,
     dlim_logic=None,
@@ -471,7 +472,7 @@ def plot_BvsA_as_distribution(
         coll2.disconnect_old()
         coll2.connect()
 
-        coll2.show_commands()
+        coll2.show_commands(verb=show_commands)
         return coll2
     else:
         return coll2, dgroup

datastock/_plot_as_array.py

@@ -65,6 +65,7 @@ def plot_as_array(
     inverty=None,
     bck=None,
     interp=None,
+    show_commands=None,
     # figure-specific
     dax=None,
     dmargin=None,
@@ -324,7 +325,7 @@ def plot_as_array(
         coll2.disconnect_old()
         coll2.connect()
 
-        coll2.show_commands()
+        coll2.show_commands(verb=show_commands)
         return coll2
     else:
         return coll2, dgroup
@@ -412,10 +413,18 @@ def _check_keyXYZ(
                         or _check_uniform_log(k0=k0, ddata=coll._ddata)
                     ]
 
-                keyX = _generic_check._check_var(
-                    keyX, 'keyX',
-                    allowed=lok,
-                )
+                try:
+                    keyX = _generic_check._check_var(
+                        keyX, keyXstr,
+                        allowed=lok,
+                    )
+                except Exception as err:
+                    msg = (
+                        err.args[0]
+                        + f"\nContraint on uniformity: {uniform}"
+                    )
+                    err.args = (msg,)
+                    raise err
 
                 refX = coll._ddata[keyX]['ref'][0]
 
@@ -425,6 +434,22 @@ def _check_keyXYZ(
             elif keyX in refs:
                 keyX, refX = 'index', keyX
 
+            elif keyX == 'index':
+                if already is None:
+                    refX = refs[dim_min - 1]
+                elif all([kk in already for kk in refs]): # TBC
+                    # sameref
+                    refX = refs[dim_min - 1]
+                    msg = (
+                        "Special case\n"
+                        "\t- refs: {refs}\n"
+                        f"\t- '{keyXstr}': {keyX}\n"
+                        f"\t- already: {already}"
+                    )
+                    raise Exception(msg)
+                else:
+                    refX = [kk for kk in refs if kk not in already][0]
+
             else:
                 msg = (
                     f"Arg '{keyXstr}' refers to unknow data:\n"
@@ -1132,8 +1157,13 @@ def plot_as_array_2d(
         ax2.set_ylabel('data')
         ax2.set_xlabel(labX)
 
-        ax1.set_xlim(ymin, ymax)
-        ax2.set_ylim(ymin, ymax)
+        if np.isfinite(ymin):
+            ax1.set_xlim(left=ymin)
+            ax2.set_ylim(bottom=ymin)
+        if np.isfinite(ymax):
+            ax1.set_xlim(right=ymax)
+            ax2.set_ylim(top=ymax)
+
 
         # axes for text
         ax3 = fig.add_subplot(gs[:3, 3], frameon=False)
@@ -2065,7 +2095,10 @@ def _plot_as_array_3d_label_axes(
         ax.yaxis.set_label_position('right')
         ax.xaxis.set_label_position('top')
 
-        ax.set_xlim(ymin, ymax)
+        if np.isfinite(ymin):
+            ax.set_xlim(left=ymin)
+        if np.isfinite(ymax):
+            ax.set_xlim(right=ymax)
 
         # y text ticks
         if ystr:
@@ -2090,7 +2123,10 @@ def _plot_as_array_3d_label_axes(
         ax.set_ylabel('data')
         ax.set_xlabel(labX)
 
-        ax.set_ylim(ymin, ymax)
+        if np.isfinite(ymin):
+            ax.set_ylim(bottom=ymin)
+        if np.isfinite(ymax):
+            ax.set_ylim(top=ymax)
 
         # x text ticks
         if xstr:
@@ -2113,7 +2149,10 @@ def _plot_as_array_3d_label_axes(
         ax.set_ylabel('data')
         ax.set_xlabel(labZ)
 
-        ax.set_ylim(ymin, ymax)
+        if np.isfinite(ymin):
+            ax.set_ylim(bottom=ymin)
+        if np.isfinite(ymax):
+            ax.set_ylim(top=ymax)
 
         # z text ticks
         if zstr:
@@ -2901,7 +2940,10 @@ def _plot_as_array_4d_label_axes(
         ax.yaxis.set_label_position('right')
         ax.xaxis.set_label_position('top')
 
-        ax.set_xlim(ymin, ymax)
+        if np.isfinite(ymin):
+            ax.set_xlim(left=ymin)
+        if np.isfinite(ymax):
+            ax.set_xlim(right=ymax)
 
         # y text ticks
         if ystr:

datastock/_plot_as_mobile_lines.py

@@ -58,6 +58,7 @@ def plot_as_mobile_lines(
     lkeys=None,
     bstr_dict=None,
     rotation=None,
+    show_commands=None,
     # figure-specific
     dax=None,
     dmargin=None,
@@ -184,7 +185,7 @@ def plot_as_mobile_lines(
         coll2.disconnect_old()
         coll2.connect()
 
-        coll2.show_commands()
+        coll2.show_commands(verb=show_commands)
         return coll2
     else:
         return coll2, dgroup

datastock/_plot_as_profile1d.py

@@ -62,6 +62,7 @@ def plot_as_profile1d(
     rotation=None,
     inverty=None,
     bck=None,
+    show_commands=None,
     # figure-specific
     dax=None,
     dmargin=None,
@@ -173,7 +174,7 @@ def plot_as_profile1d(
         coll2.disconnect_old()
         coll2.connect()
 
-        coll2.show_commands()
+        coll2.show_commands(verb=show_commands)
         return coll2
     else:
         return coll2, dgroup

datastock/version.py

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

{datastock-0.0.30.dist-info → datastock-0.0.32.dist-info}/METADATA

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

{datastock-0.0.30.dist-info → datastock-0.0.32.dist-info}/RECORD

@@ -5,34 +5,34 @@ datastock/_class.py,sha256=Az9PS3aSskiPMb1ekt78Y2ynBujYVc_cDjJxW9xH9g4,47
 datastock/_class0.py,sha256=oV6Ar7in66OnjsDK7RRhe_OSt-ifBKul-x2NbucjF98,5442
 datastock/_class1.py,sha256=l4W0atz_Q-ykO45eONzDtXkwCkcPKwuf2EuD9Ztwak4,29435
 datastock/_class1_binning.py,sha256=G1rbejlwoDRYANI_LY4QOKWA-BEikddVM3-EklROoZQ,28336
-datastock/_class1_check.py,sha256=3XeDHxRM8moV7eBw8AWM6QgSney4bJeiNONz3HBWm78,52465
+datastock/_class1_check.py,sha256=QN0o5Z9XOZAUIoe-dXTVNmbkj3l_v7U4lawcn8N0Yrw,52436
 datastock/_class1_compute.py,sha256=9ka4MXqTb2Gwe8ZnZR31rd5QDc7-nxuhFqXpQSn_sss,28211
 datastock/_class1_domain.py,sha256=TudSRoLedzU2qGOU6R1_Lx99MuqJzG0rOZl8-HZZfTU,6252
 datastock/_class1_interpolate.py,sha256=TQqrkQPMjiU4prksUkKUWSsDk7fq36GpyxX0kXL0hQo,37567
 datastock/_class1_uniformize.py,sha256=mYpOltqTDDjTUU_oJrRWAovW3GtI_y2kGUcH4ebHhHk,26440
 datastock/_class2.py,sha256=duGFZPSBNZ0dxbZUPvv90ryG7wSW_dM-kynpa0YKcCw,46673
 datastock/_class2_interactivity.py,sha256=YdM4cEjDrgh-bSsOzkkwtu-pqKoeqhSyfiZl2Udkl3E,16632
-datastock/_class3.py,sha256=9mIi6hIJNB0gRYi6i8qXnQXyn1KnTNyzvLvULmiJgfk,10366
+datastock/_class3.py,sha256=WKFQQ85zJB371zLiSFDQiPkZgfnUgo_jQpCP9YmShek,10642
 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=nfD4PIInb63uiwioknFf78dE5lGpgSxoOvT5BgP2nts,24443
 datastock/_generic_utils.py,sha256=iSZa_XOhOJW1Rtr5kH2dxcs_2WaAxcuFls_eEKgOOTw,15382
-datastock/_plot_BvsA_as_distribution.py,sha256=CWeKwIhPLoGmmu606aWFWmTCeKyEsstdWh5fpOekPYs,15347
+datastock/_plot_BvsA_as_distribution.py,sha256=fpRhlbv3Bk96buANC46Brc9hdLxkOAsoKpE5A9pohG0,15389
 datastock/_plot_BvsA_as_distribution_check.py,sha256=7OkzsxqXvJBe6uc_7IiZNwMYWryyI1vKUYYRCkPfz7Q,13002
-datastock/_plot_as_array.py,sha256=VjYzjrwTY7Qs9cBqLUlMhXFLR1siJTWww6XACenchcM,74355
-datastock/_plot_as_mobile_lines.py,sha256=E6UQypjqGSqxJGOi1kpyh5vitMz3pJVcfSjXnNjRC7U,22930
-datastock/_plot_as_profile1d.py,sha256=QbloI5POwtreSGhh2gXIxNYtkzrhS56QQWvpfBzSwXk,23290
+datastock/_plot_as_array.py,sha256=s3Jl0B_1gJ-SewSGfyjXrtzMG1utvcq-Vyb0Vmn-rzI,75861
+datastock/_plot_as_mobile_lines.py,sha256=c8StAA-msL_a333U3EHJILWDgo7siIZyDyEgMnJvK90,22972
+datastock/_plot_as_profile1d.py,sha256=rxMpLL-QMHqHiAYjH7gDXZOUkMVz3ps8SlUUVNXK8Bk,23332
 datastock/_plot_correlations.py,sha256=ITOypu_AEoKl0ihxocV-JVTXIHqut6p9TfG-xZmQysc,10175
 datastock/_plot_misc.py,sha256=XixTi2CiihKjtQP0TRycH0b25caWN1m35DgpsDeiWZE,21729
 datastock/_plot_text.py,sha256=wQPqjfpLyIioS2JeOt3E9C9HgYUJ49YEoOgRuKYvAR8,3143
 datastock/_saveload.py,sha256=8SM5AdRbcy2KZfDEq5Uesvf55DXzLvPxTMUUsZqhhmk,8885
-datastock/version.py,sha256=oV_71KsctU3AC_OUx1qUbDn4FW0WzvMO-59wmU0CZlk,80
+datastock/version.py,sha256=DoX-bepDn_EGe6LwIcMmvJjqwD_t5S7ZUGxeWnZ0YXA,80
 datastock/tests/__init__.py,sha256=teOo2xP0IO7PQMuMDmum61XVHe2TuxW3BiHiL73X8jQ,35
 datastock/tests/test_01_DataStock.py,sha256=rIDlqIGGR6gCFtjAw66G9CF3-Mne95XF0eXtUU7wYfc,15260
 datastock/tests/output/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-datastock-0.0.30.dist-info/LICENSE,sha256=V1uXqi3vxR0QhB4QdFyjkynl6jpN4wZmlB5EMYJk0NM,1068
-datastock-0.0.30.dist-info/METADATA,sha256=bsfmwxUQnn_tQ_yvO055gVxWbDgXiDmhfR8qXwjCTXc,8666
-datastock-0.0.30.dist-info/WHEEL,sha256=pkctZYzUS4AYVn6dJ-7367OJZivF2e8RA9b_ZBjif18,92
-datastock-0.0.30.dist-info/top_level.txt,sha256=BzJsLLK_zZw13WQCoMhC74qWVKalnVCjBxdPXvJn7HQ,25
-datastock-0.0.30.dist-info/RECORD,,
+datastock-0.0.32.dist-info/LICENSE,sha256=V1uXqi3vxR0QhB4QdFyjkynl6jpN4wZmlB5EMYJk0NM,1068
+datastock-0.0.32.dist-info/METADATA,sha256=7V40HnzvYSYxee3fNKOk7FVtvwpVgABiz7ETfUAulZQ,8666
+datastock-0.0.32.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+datastock-0.0.32.dist-info/top_level.txt,sha256=BzJsLLK_zZw13WQCoMhC74qWVKalnVCjBxdPXvJn7HQ,25
+datastock-0.0.32.dist-info/RECORD,,

{datastock-0.0.30.dist-info → datastock-0.0.32.dist-info}/WHEEL

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