datastock 0.0.36__tar.gz → 0.0.37__tar.gz

{datastock-0.0.36/datastock.egg-info → datastock-0.0.37}/PKG-INFO

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

{datastock-0.0.36 → datastock-0.0.37}/datastock/_class1.py

@@ -450,6 +450,7 @@ class DataStock1(DataStock0):
         inc_allrefs=None,
         # output
         coll2=None,
+        inplace=None,
         return_keys=None,
     ):
         """ Extract some selected data and return as new instance
@@ -478,6 +479,7 @@ class DataStock1(DataStock0):
             inc_allrefs=inc_allrefs,
             # output
             coll2=coll2,
+            inplace=inplace,
             return_keys=return_keys,
         )
 

{datastock-0.0.36 → datastock-0.0.37}/datastock/_class1_compute.py

@@ -718,6 +718,7 @@ def _extract_instance(
     inc_allrefs=None,
     # output
     coll2=None,
+    inplace=None,
     return_keys=None,
 ):
 
@@ -728,7 +729,7 @@ def _extract_instance(
     (
         keys,
         inc_monot, inc_vectors, inc_allrefs,
-        return_keys,
+        inplace, return_keys,
     ) = _extract_check(**locals())
 
     # -----------------
@@ -749,7 +750,11 @@ def _extract_instance(
     # -------------------
 
     if coll2 is None:
-        coll2 = coll.__class__()
+        if inplace is True:
+            coll2 = coll
+        else:
+            coll2 = coll.__class__()
+
 
     # ------------------------
     # Populate
@@ -803,6 +808,7 @@ def _extract_check(
     vectors=None,
     # output
     coll2=None,
+    inplace=None,
     return_keys=None,
 ):
 
@@ -859,6 +865,13 @@ def _extract_check(
         default=False,
     )
 
+    # inplace
+    inplace = _generic_check._check_var(
+        inplace, 'inplace',
+        types=bool,
+        default=False,
+    )
+
     # coll2
     if coll2 is not None:
         c0 = (
@@ -872,7 +885,7 @@ def _extract_check(
     return (
         keys,
         inc_monot, inc_vectors, inc_allrefs,
-        return_keys,
+        inplace, return_keys,
     )
 
 

{datastock-0.0.36 → datastock-0.0.37}/datastock/_plot_as_array.py

@@ -97,6 +97,7 @@ def plot_as_array(
         inc_vectors=False,
         inc_allrefs=False,
         return_keys=True,
+        inplace=inplace,
     )
     key = [kk for kk in key if kk not in lk][0]
     ndim = coll2.ddata[key]['data'].ndim
@@ -325,7 +326,8 @@ def _check_keyXYZ(
                         islog = _check_uniform_log(k0=keyX, ddata=coll._ddata)
                         msg += f"\t- uniform linear: {islin}\n"
                         msg += f"\t- uniform log:    {islog}\n"
-                    msg += f"Provided: '{keyX}'\nAllowed values: {lok}\n"
+                    msg += f"Allowed values: {lok}\nProvided: '{keyX}'\n"
+                    msg += f"Value:\n{coll.ddata[keyX]['data']}\n"
                     err.args = (msg,)
                     raise err
 

{datastock-0.0.36 → datastock-0.0.37}/datastock/version.py

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

{datastock-0.0.36 → datastock-0.0.37/datastock.egg-info}/PKG-INFO

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