labfreed 0.2.5a10__py3-none-any.whl → 0.2.5a12__py3-none-any.whl

labfreed/__init__.py

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

labfreed/pac_cat/__init__.py

@@ -2,7 +2,7 @@ from .pac_cat import PAC_CAT
 from .category_base import Category
 from .predefined_categories import (
     Material_Device, Material_Substance, Material_Consumable, Material_Misc, Data_Method, Data_Result, Data_Progress, 
-    Data_Calibration, Data_Abstract, category_key_to_class_map
+    Data_Calibration, Data_Abstract, category_key_to_class_map  # noqa: F401
     )
 
 __all__ = [

labfreed/trex/python_convenience/pyTREX.py

@@ -2,6 +2,7 @@
 from datetime import date, datetime, time
 import logging
 import re
+from typing import Self
 
 from pydantic import RootModel
 from labfreed.well_known_keys.unece.unece_units import unece_unit
@@ -24,7 +25,7 @@ class pyTREX(RootModel[dict[str, Quantity | datetime | time | date | bool | str
 
     
     @classmethod
-    def from_trex(cls, trex:TREX) -> pyTREX:
+    def from_trex(cls, trex:TREX) -> Self:
         '''Creates a pyTREX from a TREX'''
         return {seg.key: _trex_segment_to_python_type(seg) for seg in trex.segments}
              
@@ -208,7 +209,7 @@ def _trex_value_to_python_type(v):
     '''Converts a TREX value to the corresponding python type'''
     if isinstance(v, NumericValue):
         if '.' not in v.value and 'E' not in v.value: 
-            return int(v)
+            return int(v.value)
         else:
             return float(v.value)  
         

labfreed/trex/trex_base_models.py

@@ -1,5 +1,4 @@
-from datetime import date, datetime, time
-import logging
+from datetime import datetime, time
 import re
 
 

labfreed/trex/value_segments.py

@@ -1,9 +1,7 @@
 from abc import ABC
-import logging
 import re
 from typing import Literal
 from pydantic import Field, model_validator
-from labfreed.utilities.base36 import base36
 from labfreed.well_known_keys.unece.unece_units import unece_unit_codes
 from labfreed.labfreed_infrastructure import ValidationMsgLevel
 from labfreed.trex.trex_base_models import AlphanumericValue, BinaryValue, BoolValue, DateValue, ErrorValue, NumericValue, TREX_Segment, TextValue, Value

{labfreed-0.2.5a10.dist-info → labfreed-0.2.5a12.dist-info}/METADATA

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

{labfreed-0.2.5a10.dist-info → labfreed-0.2.5a12.dist-info}/RECORD

@@ -1,6 +1,6 @@
-labfreed/__init__.py,sha256=HSaDUrgXPT3MmbOTW9Rxx_bgZB9Lab8VJAsB6oe4ij8,339
+labfreed/__init__.py,sha256=CyWg7r3iov_xVpMfaPsrTOI85vAFsQc7i2vHVchuK0I,339
 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/__init__.py,sha256=KNPtQzBD1XVohvG_ucOs7RJj-oi6biUTGB1k-T2o6pk,568
 labfreed/pac_cat/category_base.py,sha256=lFQNiTUukyhWdaSCAI7CZxLtj6kNtnBCE4UsePwsGqE,1801
 labfreed/pac_cat/pac_cat.py,sha256=AJUYDsyGOHy-sRRpXpY0awtbf3HCvn3RhMax6ofvYRA,5318
 labfreed/pac_cat/predefined_categories.py,sha256=5wnMCj-CrACV2W4lH13w7qynWIwi506G3uLNcxuJQGg,8832
@@ -20,11 +20,11 @@ labfreed/qr/generate_qr.py,sha256=mSt-U872O3ReHB_UdS-MzYu0wRgdlKcAOEfTxg5CLRk,16
 labfreed/trex/__init__.py,sha256=r0MYrGk_XxsqSKo9c2i9jRXApTDeTZD8QRXcRpkOVXY,428
 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/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=7iO5ZmIGGAKHR4pkShEG0tH1lj95-D52GhW2bQ1fXx4,2920
-labfreed/trex/python_convenience/pyTREX.py,sha256=4x7QzgFFVRyNnrJa9pJTOQGY8OjoJwiiwGUbnuoM-3g,10118
+labfreed/trex/python_convenience/pyTREX.py,sha256=U026jtsESo1h2H_EQi11A9AksafjRXgRsbWOwmI9z0E,10147
 labfreed/trex/python_convenience/quantity.py,sha256=NlbKsXmr-nvN42gLw1gGn7GVRTdaIuYZky7SLekdhI8,1729
 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.5a10.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-0.2.5a10.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-0.2.5a10.dist-info/METADATA,sha256=sbLQi9aWGAeILbLHWtcoxr8Ai1nlihxxT8vjSgWRapA,18093
-labfreed-0.2.5a10.dist-info/RECORD,,
+labfreed-0.2.5a12.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-0.2.5a12.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-0.2.5a12.dist-info/METADATA,sha256=8mhbHmfXPtskSfFoTKIkJegf-S8wwtIQkrolNEgeEv0,18093
+labfreed-0.2.5a12.dist-info/RECORD,,