labfreed 0.2.5a5__tar.gz → 0.2.5a7__tar.gz

{labfreed-0.2.5a5 → labfreed-0.2.5a7}/PKG-INFO

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

{labfreed-0.2.5a5 → labfreed-0.2.5a7}/labfreed/__init__.py

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

{labfreed-0.2.5a5 → labfreed-0.2.5a7}/labfreed/trex/python_convenience/data_table.py

@@ -20,7 +20,7 @@ class DataTable(BaseModel):
     @model_validator(mode='after')
     def get_row_template(self):
         for r in self.data:
-            if all(r is not None):
+            if all([e is not None for e in r]):
                 self._row_template = r.copy()
             break
         if not self._row_template:

{labfreed-0.2.5a5 → labfreed-0.2.5a7}/labfreed/trex/python_convenience/quantity.py

@@ -5,7 +5,8 @@ from labfreed.well_known_keys.unece.unece_units import unece_units
 class Quantity(BaseModel):
     ''' Represents a quantity'''
     value: float|int
-    unit: str
+    unit: str | None 
+    '''unit. Use SI symbols. Set to None of the Quantity is dimensionless'''
     significant_digits: int|None = None
     
     @model_validator(mode='after')
@@ -36,11 +37,14 @@ class Quantity(BaseModel):
     
     
 def unece_unit_code_from_quantity(q:Quantity):
+        if not q.unit:
+            return 'C63' # dimensionless
         by_name =   [ u['commonCode'] for u in unece_units() if u.get('name','') == q.unit] 
         by_symbol = [ u['commonCode'] for u in unece_units() if u.get('symbol','') == q.unit]
-        code = list(set(by_name) | set(by_symbol))
+        by_code = [ u['commonCode'] for u in unece_units() if u.get('commonCode','') == q.unit]
+        code = list(set(by_name) | set(by_symbol) | set(by_code))
         if len(code) != 1:
-            raise ValueError(f'No UNECE unit code found for Quantity {str(q)}' ) 
+            raise ValueError(f'No UNECE unit code found for Quantity {q}' ) 
         return code[0]