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

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/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/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}"

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

@@ -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.dist-info → labfreed-0.2.5a15.dist-info}/RECORD

@@ -1,4 +1,4 @@
-labfreed/__init__.py,sha256=VM3BQHQMSYtH0ZAIY5fZWj4I7KoABakJMjohkJb9X1A,339
+labfreed/__init__.py,sha256=sGeuTG6NG1sI0kXknhWI6jg5Sp7tfxvucgvqdNQ3VYM,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,9 +23,9 @@ 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=SE1qKJ87XMwwbhcW_sfyZjRxi0QbaFkGpSt_OOJmoNc,3152
+labfreed/trex/python_convenience/data_table.py,sha256=De0UMVCUUPeK-bUTToRTvL88EywHf6EOPYjgoUHsUpA,3158
 labfreed/trex/python_convenience/pyTREX.py,sha256=U026jtsESo1h2H_EQi11A9AksafjRXgRsbWOwmI9z0E,10147
-labfreed/trex/python_convenience/quantity.py,sha256=NlbKsXmr-nvN42gLw1gGn7GVRTdaIuYZky7SLekdhI8,1729
+labfreed/trex/python_convenience/quantity.py,sha256=AQSfzdpbyTeEbwREfBwxBf3IDB-cvty7ivlV-6_f964,2247
 labfreed/utilities/base36.py,sha256=_yX8aQ1OwrK5tnJU1NUEzQSFGr9xAVnNvPObpNzCPYs,2895
 labfreed/well_known_extensions/__init__.py,sha256=CjZTjx8Cn8763Hhnv_--Wj1LcFpFs2cyQwWrrzOS4xM,246
 labfreed/well_known_extensions/default_extension_interpreters.py,sha256=3-BkJrAyBa99NN5Q2QPAm59CcWmPket-rvLzgltp8KY,201
@@ -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.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,,
+labfreed-0.2.5a15.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-0.2.5a15.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-0.2.5a15.dist-info/METADATA,sha256=Jakjy-5Gol8yYoUiDxVWu8TnQ1xsOVkP0fWeX5_-L5w,18093
+labfreed-0.2.5a15.dist-info/RECORD,,