labfreed 0.2.5a12__tar.gz → 0.2.5a14__tar.gz

{labfreed-0.2.5a12 → labfreed-0.2.5a14}/PKG-INFO

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

{labfreed-0.2.5a12 → labfreed-0.2.5a14}/labfreed/__init__.py

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

{labfreed-0.2.5a12 → labfreed-0.2.5a14}/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,18 +47,21 @@ 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:
         if isinstance(col, str):
-            col_index = self.col_names.index()
+            col_index = self.col_names.index(col)
         else:
             col_index = col
         col_data = [row[col_index] for row in self.data]
@@ -66,14 +72,14 @@ class DataTable(BaseModel):
         return self.data[row_index]
     
     
-    def get_row_as_dict(self, row_index:int) -> list:
+    def get_row_as_dict(self, row_index:int) -> dict:
         d = {k:v for k, v in zip(self.col_names, self.data[row_index])}
         return d
     
     
     def get_cell(self, row_index:int, col:str|int):
         if isinstance(col, str):
-            col_index = self.col_names.index()
+            col_index = self.col_names.index(col)
         else:
             col_index = col
         return self.data[row_index][col_index]