labfreed 0.2.5a13__tar.gz → 0.2.5a15__tar.gz

{labfreed-0.2.5a13 → labfreed-0.2.5a15}/PKG-INFO

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

{labfreed-0.2.5a13 → labfreed-0.2.5a15}/labfreed/__init__.py

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

{labfreed-0.2.5a13 → labfreed-0.2.5a15}/labfreed/trex/python_convenience/data_table.py

@@ -61,7 +61,7 @@ class DataTable(BaseModel):
             
     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]
@@ -72,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]

{labfreed-0.2.5a13 → labfreed-0.2.5a15}/labfreed/trex/python_convenience/quantity.py

@@ -7,12 +7,27 @@ class Quantity(BaseModel):
     value: float|int
     unit: str | None 
     '''unit. Use SI symbols. Set to None of the Quantity is dimensionless'''
-    significant_digits: int|None = None
+    log_least_significant_digit: int|None = None
+    
+    @model_validator(mode='before')
+    @classmethod
+    def decimals_to_log_significant_digits(cls, d:dict):
+        if decimals:= d.pop('decimals', None):
+            d['log_least_significant_digit'] = - decimals
+        return d
+    
+    @model_validator(mode='before')
+    @classmethod
+    def dimensionless_unit(cls, d:dict):
+        unit= d.get('decimals', None)
+        if unit in ['1', '', 'dimensionless']:
+            d['unit'] = None
+        return d
     
     @model_validator(mode='after')
     def significat_digits_for_int(self):
         if isinstance(self.value, int):
-            self.significant_digits = 0
+            self.log_least_significant_digit = 0
         return self
         
     @property
@@ -24,8 +39,8 @@ class Quantity(BaseModel):
         unit_symbol = self.unit
         if self.unit == "dimensionless" or not self.unit:
             unit_symbol = ""
-        if self.significant_digits is not None:
-            val = f"{self.value:.{self.significant_digits}f}"
+        if self.log_least_significant_digit is not None:
+            val = f"{self.value:.{self.log_least_significant_digit}f}"
         else:
             val = str(self.value)
         return f"{val} {unit_symbol}"