labfreed 0.2.5a11__py3-none-any.whl → 0.2.5a13__py3-none-any.whl

labfreed/__init__.py

@@ -2,7 +2,7 @@
 Python implementation of LabFREED building blocks
 '''
 
-__version__ = "0.2.5a11"
+__version__ = "0.2.5a13"
 
 from labfreed.pac_id import *  # noqa: F403
 from labfreed.pac_cat import * # noqa: F403

labfreed/trex/python_convenience/data_table.py

@@ -19,6 +19,9 @@ class DataTable(BaseModel):
     
     @model_validator(mode='after')
     def get_row_template(self):
+        if not self.data: # data not initialized during construction. This is valid
+            return self
+        
         for r in self.data:
             if all([e is not None for e in r]):
                 self._row_template = r.copy()
@@ -28,7 +31,7 @@ class DataTable(BaseModel):
         return self
         
        
-    def append(self, row:list):
+    def append(self, row:list, validate=True):
         if not isinstance(row, list):
             raise ValueError('row must be a list of values')
         if not self._row_template:
@@ -44,13 +47,16 @@ class DataTable(BaseModel):
                 unit = self._row_template[i].unit
                 row[i] = Quantity(value=e, unit=unit)     
         self.data.append(row)
+        if validate:
+            self.model_rebuild()
         
         
     def extend(self, iterable):
         for item in iterable:
             if not len(item) == len(self._row_template):
                 raise ValueError('row is not of same length as the row template.')
-            self.data.append(item) 
+            self.append(item, validate=False) 
+        self.model_rebuild()
        
             
     def get_column(self, col:str|int) -> list:

labfreed/trex/python_convenience/pyTREX.py

@@ -209,7 +209,7 @@ def _trex_value_to_python_type(v):
     '''Converts a TREX value to the corresponding python type'''
     if isinstance(v, NumericValue):
         if '.' not in v.value and 'E' not in v.value: 
-            return int(v)
+            return int(v.value)
         else:
             return float(v.value)  
         

{labfreed-0.2.5a11.dist-info → labfreed-0.2.5a13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labfreed
-Version: 0.2.5a11
+Version: 0.2.5a13
 Summary: Python implementation of LabFREED building blocks
 Author-email: Reto Thürer <thuerer.r@buchi.com>
 Requires-Python: >=3.11

{labfreed-0.2.5a11.dist-info → labfreed-0.2.5a13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-labfreed/__init__.py,sha256=wEdznFeY9l8zQjKIU9Vb0IYDOVLGpTkv13urupnfe_U,339
+labfreed/__init__.py,sha256=VM3BQHQMSYtH0ZAIY5fZWj4I7KoABakJMjohkJb9X1A,339
 labfreed/labfreed_infrastructure.py,sha256=yxZkI0mPrHyeZGWKtgFIV9R54edSUcww-w1ExHt8F-o,9990
 labfreed/pac_cat/__init__.py,sha256=KNPtQzBD1XVohvG_ucOs7RJj-oi6biUTGB1k-T2o6pk,568
 labfreed/pac_cat/category_base.py,sha256=lFQNiTUukyhWdaSCAI7CZxLtj6kNtnBCE4UsePwsGqE,1801
@@ -23,8 +23,8 @@ labfreed/trex/trex.py,sha256=WDoPvuhiilLtRSIkntCmDGkFBnD6oRZg0E6hhoV-I2g,2400
 labfreed/trex/trex_base_models.py,sha256=591559BISc82fyIoEP_dq_GHDbPCVzApx7FM3TRQPlY,7545
 labfreed/trex/value_segments.py,sha256=qizDsinE-ddta8jzkJbGT3OUjHpYhI2GwxjZ6InzLDs,3712
 labfreed/trex/python_convenience/__init__.py,sha256=dyAQG7t-uYN6VfGXbWIq2bHxGcGI63l7FS2-VPYs2RQ,137
-labfreed/trex/python_convenience/data_table.py,sha256=7iO5ZmIGGAKHR4pkShEG0tH1lj95-D52GhW2bQ1fXx4,2920
-labfreed/trex/python_convenience/pyTREX.py,sha256=ZtSH0sQgXkHgFGLRwsZ4QuTu_Vmaruzr1e7Djg2xfr4,10141
+labfreed/trex/python_convenience/data_table.py,sha256=SE1qKJ87XMwwbhcW_sfyZjRxi0QbaFkGpSt_OOJmoNc,3152
+labfreed/trex/python_convenience/pyTREX.py,sha256=U026jtsESo1h2H_EQi11A9AksafjRXgRsbWOwmI9z0E,10147
 labfreed/trex/python_convenience/quantity.py,sha256=NlbKsXmr-nvN42gLw1gGn7GVRTdaIuYZky7SLekdhI8,1729
 labfreed/utilities/base36.py,sha256=_yX8aQ1OwrK5tnJU1NUEzQSFGr9xAVnNvPObpNzCPYs,2895
 labfreed/well_known_extensions/__init__.py,sha256=CjZTjx8Cn8763Hhnv_--Wj1LcFpFs2cyQwWrrzOS4xM,246
@@ -38,7 +38,7 @@ labfreed/well_known_keys/labfreed/well_known_keys.py,sha256=nqk66kHdSwJTJfMKlP-x
 labfreed/well_known_keys/unece/UneceUnits.json,sha256=kwfQSp_nTuWbADfBBgqTWrvPl6XtM5SedEVLbMJrM7M,898953
 labfreed/well_known_keys/unece/__init__.py,sha256=MSP9lmjg9_D9iqG9Yq2_ajYfQSNS9wIT7FXA1c--59M,122
 labfreed/well_known_keys/unece/unece_units.py,sha256=gNDQk6KGl-nGMf9Ycq_fQ8P2xxKITgLkcQWPd4H49gI,1630
-labfreed-0.2.5a11.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-0.2.5a11.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-0.2.5a11.dist-info/METADATA,sha256=OmMlr8uCF7V3mekOkJgOoRZAybKwFTPQAxtJK9pORrU,18093
-labfreed-0.2.5a11.dist-info/RECORD,,
+labfreed-0.2.5a13.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-0.2.5a13.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-0.2.5a13.dist-info/METADATA,sha256=6ymOp3hKT20wDfTkw09wxl6jNzJQUkI9Qpwok22xh4E,18093
+labfreed-0.2.5a13.dist-info/RECORD,,