labfreed 0.2.5a0__py3-none-any.whl → 0.2.5a2__py3-none-any.whl

labfreed/__init__.py

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

labfreed/trex/python_convenience/data_table.py

@@ -11,7 +11,7 @@ from labfreed.trex.python_convenience.quantity import Quantity
 class DataTable(BaseModel):
     _row_template:list[str, Quantity | datetime | time | date | bool | str | base36] =  PrivateAttr(default_factory=list)
     col_names: list[str] = Field(default_factory=list)
-    data:list[list[Union[Quantity, datetime, time, date, bool, str, base36]]] = Field(default_factory=list)
+    data:list[list[Union[Quantity, datetime, time, date, bool, str, base36, None]]] = Field(default_factory=list)
     
     @property
     def row_template(self):

labfreed/trex/python_convenience/pyTREX.py

@@ -12,7 +12,7 @@ from labfreed.trex.python_convenience.quantity import Quantity, unece_unit_code_
 from labfreed.trex.table_segment import ColumnHeader, TableSegment
 from labfreed.trex.trex import TREX
 from labfreed.trex.trex_base_models import AlphanumericValue, BinaryValue, BoolValue, DateValue, ErrorValue, NumericValue, TextValue
-from labfreed.trex.value_segments import BoolSegment, TextSegment, NumericSegment, AlphanumericSegment, DateSegment, ValueSegment
+from labfreed.trex.value_segments import BoolSegment, ErrorSegment, TextSegment, NumericSegment, AlphanumericSegment, DateSegment, ValueSegment
 
 
 class pyTREX(RootModel[dict[str, Quantity | datetime | time | date | bool | str | base36 | DataTable]]):
@@ -33,7 +33,10 @@ class pyTREX(RootModel[dict[str, Quantity | datetime | time | date | bool | str
         '''Creates a TREX'''
         segments = list()
         for k, v in self.root.items():
-            if isinstance(v, bool):
+            if v is None:
+                value = _error_value_from_python_type(v)
+                segments.append(ErrorSegment(key=k, value=value.value))
+            elif isinstance(v, bool):
                 value = _bool_value_from_python_type(v)
                 segments.append(BoolSegment(key=k, value=value.value))
             elif isinstance(v, Quantity):
@@ -83,7 +86,9 @@ class pyTREX(RootModel[dict[str, Quantity | datetime | time | date | bool | str
                 for row in v.data:
                     r = []
                     for e in row:
-                        if isinstance(e, bool): # must come first otherwise int matches the bool
+                        if e is None:
+                            r.append(_error_value_from_python_type(e))
+                        elif isinstance(e, bool): # must come first otherwise int matches the bool
                             r.append(_bool_value_from_python_type(e))
                         elif isinstance(e, Quantity):
                             r.append(_numeric_value_from_python_type(e.value))
@@ -165,6 +170,8 @@ def _binary_value_from_python_type(v:base36|str):
     
 
 def _error_value_from_python_type(v:str):
+    if v in None:
+        v = '-'
     return ErrorValue(value = v)
     
 

labfreed/trex/table_segment.py

@@ -146,6 +146,7 @@ class TableSegment(TREX_Segment):
                             highlight_sub=[c for c in e.value]
                         )
                 i += 1
+        return self
                 
             
     def _get_col_index(self, col:str|int):

{labfreed-0.2.5a0.dist-info → labfreed-0.2.5a2.dist-info}/METADATA

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

{labfreed-0.2.5a0.dist-info → labfreed-0.2.5a2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-labfreed/__init__.py,sha256=riVWLa5laYxsK3qAh69PlVZgdMm2ent1IxOpLxhJehA,338
+labfreed/__init__.py,sha256=aEYEgLY66YSy0dew1X3NN1XK4O01jhkkVdA7RHBkbX4,338
 labfreed/labfreed_infrastructure.py,sha256=yxZkI0mPrHyeZGWKtgFIV9R54edSUcww-w1ExHt8F-o,9990
 labfreed/pac_cat/__init__.py,sha256=S4T-QgzcEDjup44WvHCY3_K30B6_e8ducR--DxBb_DM,554
 labfreed/pac_cat/category_base.py,sha256=lFQNiTUukyhWdaSCAI7CZxLtj6kNtnBCE4UsePwsGqE,1801
@@ -18,13 +18,13 @@ labfreed/pac_id_resolver/services.py,sha256=TPoH6YlSwa0hmawHpOiMwIpBAinhoRhMSoex
 labfreed/qr/__init__.py,sha256=fdKwP6W2Js--yMbBUdn-g_2uq2VqPpfQJeDLHsMDO-Y,61
 labfreed/qr/generate_qr.py,sha256=mSt-U872O3ReHB_UdS-MzYu0wRgdlKcAOEfTxg5CLRk,16616
 labfreed/trex/__init__.py,sha256=r0MYrGk_XxsqSKo9c2i9jRXApTDeTZD8QRXcRpkOVXY,428
-labfreed/trex/table_segment.py,sha256=VZRciE329lmnwfnaykVBaNlrkG80UrDVrjUgQMVREHM,9133
+labfreed/trex/table_segment.py,sha256=qlItBK1x3Qr7KUSM_L6dcmv3Y2fNhiqTaiXbXm5BKs0,9154
 labfreed/trex/trex.py,sha256=WDoPvuhiilLtRSIkntCmDGkFBnD6oRZg0E6hhoV-I2g,2400
 labfreed/trex/trex_base_models.py,sha256=3twGEZLYEznUyJ_ctcTcPYsy1qOciMRqLcslE9dxEqw,7567
 labfreed/trex/value_segments.py,sha256=mmjyEKWLlDIoiFlk2wKELOfWn2_0xwreNEBTs8RgjOY,3774
 labfreed/trex/python_convenience/__init__.py,sha256=dyAQG7t-uYN6VfGXbWIq2bHxGcGI63l7FS2-VPYs2RQ,137
-labfreed/trex/python_convenience/data_table.py,sha256=x0DRKEI6Sv1T5p5kUlQ_UcP-wH7haBVrQgTXHlF_ZSw,1758
-labfreed/trex/python_convenience/pyTREX.py,sha256=qiOJ6PGAfsbnfpQBI_G2_C-3DaKqTfIW5xdZReQVxI8,9824
+labfreed/trex/python_convenience/data_table.py,sha256=PRV9mTvH3KgbiernbvqWNaCYLOqhpPX6fnazw4sndOM,1764
+labfreed/trex/python_convenience/pyTREX.py,sha256=K0TgCy9H5J3l2wiIWtUEpjm0E8BkN7zXiyBWBPeziR0,10147
 labfreed/trex/python_convenience/quantity.py,sha256=d3w-ThY4Cp7n3fde8pct-X5kHc7vbVe1xsJQKROnLks,1470
 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.5a0.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-0.2.5a0.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-0.2.5a0.dist-info/METADATA,sha256=BirqG3bjdOqZ8ps6qvZQnwtTY_kJHN4ODVq1GDPkmf4,18092
-labfreed-0.2.5a0.dist-info/RECORD,,
+labfreed-0.2.5a2.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-0.2.5a2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-0.2.5a2.dist-info/METADATA,sha256=VIRc-Ih4-YA47CkkLQtXE8Lf_JVaiVQmZN8mJbGiqZw,18092
+labfreed-0.2.5a2.dist-info/RECORD,,