datastock 0.0.39__tar.gz → 0.0.41__tar.gz

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

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

{datastock-0.0.39 → datastock-0.0.41}/datastock/_class1.py

@@ -617,6 +617,9 @@ class DataStock1(DataStock0):
         quant=None,
         name=None,
         units=None,
+        # exclude from search
+        key_exclude=None,
+        ref_exclude=None,
         # nearest-neighbour interpolation input
         values=None,
         indices=None,
@@ -666,6 +669,9 @@ class DataStock1(DataStock0):
             quant=quant,
             name=name,
             units=units,
+            # exclude from search
+            key_exclude=key_exclude,
+            ref_exclude=ref_exclude,
             # parameters
             values=values,
             indices=indices,
@@ -686,6 +692,9 @@ class DataStock1(DataStock0):
         # strategy for choosing common ref vector
         strategy=None,
         strategy_bounds=None,
+        # exclude from search
+        key_exclude=None,
+        ref_exclude=None,
         # values, indices
         values=None,
         indices=None,
@@ -719,6 +728,9 @@ class DataStock1(DataStock0):
             # strategy for choosing common ref vector
             strategy=strategy,
             strategy_bounds=strategy_bounds,
+            # exclude from search
+            key_exclude=key_exclude,
+            ref_exclude=ref_exclude,
             # parameters
             values=values,
             indices=indices,
@@ -1040,4 +1052,4 @@ class DataStock1(DataStock0):
 
 __all__ = [
     sorted([k0 for k0 in locals() if k0.startswith('DataStock')])[-1]
-]
+]

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

@@ -904,7 +904,7 @@ def _check_ddata(
                                 v0.get('ref') is None
                                 or isinstance(v0.get('ref'), str)
                                 or (
-                                    isinstance(v0.get('ref'), tuple)
+                                    isinstance(v0.get('ref'), (list, tuple))
                                     and all([
                                         isinstance(rr, str)
                                         for rr in v0['ref']
@@ -977,6 +977,8 @@ def _check_ddata(
         # find ref
         if isinstance(v0['ref'], str):
             ddata[k0]['ref'] = (v0['ref'],)
+        elif isinstance(v0['ref'], list):
+            ddata[k0]['ref'] = tuple(v0['ref'])
 
         _check_data_ref(
             k0=k0,

{datastock-0.0.39 → datastock-0.0.41}/datastock/_class1_uniformize.py

@@ -43,6 +43,9 @@ def get_ref_vector(
     quant=None,
     name=None,
     units=None,
+    # exclude from search
+    key_exclude=None,
+    ref_exclude=None,
     # parameters
     values=None,
     indices=None,
@@ -52,6 +55,7 @@ def get_ref_vector(
 
     # ----------------
     # check inputs
+    # ----------------
 
     # ind_strict
     ind_strict = _generic_check._check_var(
@@ -82,6 +86,27 @@ def get_ref_vector(
         allowed=lkok,
     )
 
+    # key_exclude
+    if key_exclude is not None:
+        if isinstance(key_exclude, str):
+            key_exclude = [key_exclude]
+        key_exclude = _generic_check._check_var_iter(
+            key_exclude, 'key_exclude',
+            types=(list, tuple),
+            types_iter=str,
+        )
+
+    # ref_exclude
+    if ref_exclude is not None:
+        if isinstance(ref_exclude, str):
+            ref_exclude = [ref_exclude]
+        ref_exclude = _generic_check._check_var_iter(
+            ref_exclude, 'ref_exclude',
+            types=(list, tuple),
+            types_iter=str,
+        )
+
+    # key0 vs ref
     if key0 is None and ref is None:
         msg = "Please provide key0 or ref at least!"
         raise Exception(msg)
@@ -95,6 +120,7 @@ def get_ref_vector(
 
     # ------------------------
     # hasref, hasvect
+    # ------------------------
 
     hasref = None
     if ref is not None and key0 is not None:
@@ -109,8 +135,13 @@ def get_ref_vector(
     elif key0 is not None:
         refok = ddata[key0]['ref']
 
+    # ----------------------
     # identify possible vect
+    # ----------------------
+
     if hasref is not False:
+
+
         lp = [('dim', dim), ('quant', quant), ('name', name), ('units', units)]
         lk_vect = [
             k0 for k0, v0 in ddata.items()
@@ -121,6 +152,8 @@ def get_ref_vector(
                 or (vv is not None and v0[ss] == vv)
                 for ss, vv in lp
             ])
+            and (key_exclude is None or k0 not in key_exclude)
+            and (ref_exclude is None or v0['ref'][0] not in ref_exclude)
         ]
 
         # if key is provided
@@ -134,7 +167,7 @@ def get_ref_vector(
         # cases
         if len(lk_vect) == 0:
             if warn is True:
-                msg = "No matching vector found!"
+                msg = f"No vector found for key0 = '{key0}', ref '{ref}'!"
                 warnings.warn(msg)
             hasvect = False
 
@@ -148,27 +181,30 @@ def get_ref_vector(
                 hasref = True
 
         else:
-            if warn is True:
-                msg = (
-                    f"Multiple possible vectors found:\n{lk_vect}\n"
-                    f"\t- key0: {key0}\n"
-                    f"\t- ref: {ref}\n"
-                    f"\t- hasref: {hasref}\n"
-                    f"\t- refok: {refok}\n"
-                )
-                warnings.warn(msg)
+            msg = (
+                f"Multiple possible vectors found:\n{lk_vect}\n"
+                f"\t- key0: {key0}\n"
+                f"\t- ref: {ref}\n"
+                f"\t- hasref: {hasref}\n"
+                f"\t- refok: {refok}\n"
+            )
+            warnings.warn(msg)
             hasvect = False
     else:
         hasvect = False
 
+    # -------------------------
     # set hasref if not yet set
+
     if hasvect is False:
         key_vector = None
         if hasref is None:
             hasref = False
             ref = None
 
+    # ----------------------
     # consistency check
+
     assert hasref == (ref is not None)
     assert hasvect == (key_vector is not None)
 
@@ -180,6 +216,7 @@ def get_ref_vector(
 
     # -----------------
     # values vs indices
+    # -----------------
 
     dind = _get_ref_vector_values(
         dref=dref,
@@ -193,7 +230,9 @@ def get_ref_vector(
         indices=indices,
     )
 
+    # -----
     # val
+
     if dind is None:
         if key_vector is not None:
             val = ddata[key_vector]['data']
@@ -457,6 +496,9 @@ def get_ref_vector_common(
     quant=None,
     name=None,
     units=None,
+    # exclude from search
+    key_exclude=None,
+    ref_exclude=None,
     # strategy for choosing common ref vector
     strategy=None,
     strategy_bounds=None,
@@ -522,6 +564,10 @@ def get_ref_vector_common(
             quant=quant,
             name=name,
             units=units,
+            # exclude from search
+            key_exclude=key_exclude,
+            ref_exclude=ref_exclude,
+            # parameters
             values=None,
             indices=None,
         )
@@ -699,6 +745,9 @@ def get_ref_vector_common(
         dkeys=dkeys,
         key_vector=key_vector,
         val=val,
+        # exclude from search
+        key_exclude=key_exclude,
+        ref_exclude=ref_exclude,
         # values, indices
         values=values,
         indices=indices,
@@ -727,6 +776,9 @@ def _get_ref_vector_common_values(
     dkeys=None,
     key_vector=None,
     val=None,
+    # exclude from search
+    key_exclude=None,
+    ref_exclude=None,
     # values, indices
     values=None,
     indices=None,
@@ -755,6 +807,10 @@ def _get_ref_vector_common_values(
                 quant=quant,
                 name=name,
                 units=units,
+                # exclude from search
+                key_exclude=key_exclude,
+                ref_exclude=ref_exclude,
+                # parameters
                 values=values,
                 indices=indices,
             )

{datastock-0.0.39 → datastock-0.0.41}/datastock/_class2.py

@@ -87,12 +87,18 @@ class DataStock2(DataStock1):
 
         if isinstance(dtype, str):
             dtype = [dtype]
+        lok = [
+            'xdata', 'ydata',
+            'data', 'data.T',
+            'xy', 'alpha',
+            'txt', 'x', 'y', 'position',
+        ]
         dtype = _generic_check._check_var_iter(
             dtype,
             'dtype',
             types=(list, tuple),
             types_iter=str,
-            allowed=['xdata', 'ydata', 'data', 'data.T', 'xy', 'alpha', 'txt']
+            allowed=lok,
         )
         if len(dtype) != nref:
             msg = (

{datastock-0.0.39 → datastock-0.0.41}/datastock/_class2_interactivity.py

@@ -479,6 +479,15 @@ def get_fupdate(handle=None, dtype=None, norm=None, bstr=None):
             handle.set_alpha(norm(val))
     elif dtype == 'txt':
         func = lambda val, handle=handle, bstr=bstr: handle.set_text(bstr.format(val))
+    elif dtype == 'x':
+        def func(val, handle=handle):
+            handle.set_x(val)
+    elif dtype == 'y':
+        def func(val, handle=handle):
+            handle.set_y(val)
+    elif dtype == 'position':
+        def func(val, handle=handle):
+            handle.set_position(val)
     else:
         msg = f'Unknown mobile dtype: {dtype}'
         raise Exception(msg)
@@ -579,4 +588,4 @@ def _update_mobile(k0=None, dmobile=None, dref=None, ddata=None):
                     # ddata[dmobile[k0]['data'][ii]]['data'][
                         # dmobile[k0]['func_slice'][ii](iref[ii])
                     # ]
-                # )
+                # )

{datastock-0.0.39 → datastock-0.0.41}/datastock/_generic_utils.py

@@ -361,10 +361,14 @@ def compare_dict(
 
         # numpy arrays
         elif isinstance(d0[k0], np.ndarray):
-            if d0[k0].shape != d1[k0].shape:
-                dkeys[key] = f'!= shapes ({d0[k0].shape} vs {d1[k0].shape})'
-            elif not np.allclose(d0[k0], d1[k0], equal_nan=True):
-                dkeys[key] = "not allclose"
+            msg = _compare_arrays(
+                dname=dname,
+                k0=k0,
+                d0=d0,
+                d1=d1,
+            )
+            if msg is not None:
+                dkeys[key] = msg
 
         # sparse arrays
         elif scpsp.issparse(d0[k0]):
@@ -375,16 +379,15 @@ def compare_dict(
 
         # lists and tuples
         elif isinstance(d0[k0], (list, tuple)):
-            try:
-                if not d0[k0] == d1[k0]:
-                    dkeys[key] = "!= list/tuple values"
-            except Exception as err:
-                msg = (
-                    f"Don't know how to handle {key}:\n"
-                    f"\t- type: {type(d0[k0])}\n"
-                    f"\t- value: {d0[k0]}\n"
-                )
-                raise NotImplementedError(msg)
+            msg = _compare_list_tuple(
+                dname=dname,
+                k0=k0,
+                d0=d0,
+                d1=d1,
+                key=key,
+            )
+            if msg is not None:
+                dkeys[key] = msg
 
         # functions
         elif callable(d0[k0]):
@@ -423,6 +426,97 @@ def compare_dict(
     return _compare_dict_verb_return(dkeys, returnas, verb)
 
 
+def _compare_arrays(
+    dname=None,
+    k0=None,
+    d0=None,
+    d1=None,
+):
+
+    msg = None
+
+    # shape
+    if d0[k0].shape != d1[k0].shape:
+        msg = f'!= shapes ({d0[k0].shape} vs {d1[k0].shape})'
+
+    # dtype
+    elif not d0[k0].dtype == d1[k0].dtype:
+        msg = f"!= dtypes ({d0[k0].dtype} vs {d1[k0].dtype})"
+
+    # special case: array of str
+    if 'str' in d0[k0].dtype.name:
+        d0flat = d0[k0].ravel().tolist()
+        d1flat = d1[k0].ravel().tolist()
+        c0 = all([ss == d1flat[ii] for ii, ss in enumerate(d0flat)])
+    else:
+        try:
+            c0 = np.allclose(d0[k0], d1[k0], equal_nan=True)
+        except Exception as err:
+            msg = (
+                f"Failed to compare 2 arrays from '{dname}':\n"
+                f"\t- d0['{k0}'] = {d0[k0]}\n"
+                f"\t- d1['{k0}'] = {d1[k0]}\n"
+            )
+            raise Exception(msg) from err
+
+        if not c0:
+            msg = "not allclose"
+
+    return msg
+
+
+def _compare_list_tuple(
+    dname=None,
+    k0=None,
+    d0=None,
+    d1=None,
+    key=None,
+):
+
+    msg = None
+
+    # length
+    if len(d0[k0]) != len(d1[k0]):
+        msg = f'!= length ({len(d0[k0])} vs {len(d1[k0])})'
+
+    # content type
+    ltyp0 = [_simple_type(type(ss)) for ss in d0[k0]]
+    ltyp1 = [_simple_type(type(ss)) for ss in d1[k0]]
+    if any([t0 != t1 for t0, t1 in zip(ltyp0, ltyp1)]):
+        msg = f"!= content type ({ltyp0} vs {ltyp1})"
+
+    # content
+    for ii in range(len(d0[k0])):
+
+        if isinstance(d0[k0][ii], np.ndarray):
+            c0 = np.allclose(d0[k0][ii], d1[k0][ii])
+
+        else:
+
+            try:
+                c0 = d0[k0][ii] == d1[k0][ii]
+            except Exception as err:
+                msg = (
+                    f"Don't know how to handle {key}:\n"
+                    f"\t- type: {type(d0[k0])}\n"
+                    f"\t- value: {d0[k0]}\n"
+                )
+                raise NotImplementedError(msg) from err
+
+        if not c0:
+            msg = f"!= content at position {ii} ({d0[k0][ii]} vs {d1[k0][ii]})"
+            break
+
+    return msg
+
+
+def _simple_type(typ):
+    return ''.join([
+        ss for ss in typ.__name__.replace('_', '')
+        if not ss.isdigit()
+    ])
+
+
 def compare_obj(
     obj0=None,
     obj1=None,

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

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

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

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