labfreed 0.2.5a10__tar.gz → 0.2.5a12__tar.gz

{labfreed-0.2.5a10 → labfreed-0.2.5a12}/PKG-INFO

@@ -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 → labfreed-0.2.5a12}/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-0.2.5a10 → labfreed-0.2.5a12}/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-0.2.5a10 → labfreed-0.2.5a12}/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-0.2.5a10 → labfreed-0.2.5a12}/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-0.2.5a10 → labfreed-0.2.5a12}/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