labfreed 0.2.5a20__py3-none-any.whl → 0.2.5a22__py3-none-any.whl

labfreed/__init__.py

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

labfreed/pac_id_resolver/resolver.py

@@ -63,7 +63,7 @@ class PAC_ID_Resolver():
         self._cits = cits
             
         
-    def resolve(self, pac_id:PAC_ID|str) -> list[ServiceGroup]:
+    def resolve(self, pac_id:PAC_ID|str, check_service_status=True) -> list[ServiceGroup]:
         '''Resolve a PAC-ID'''
         if isinstance(pac_id, str):
             pac_id = PAC_CAT.from_url(pac_id)
@@ -72,6 +72,10 @@ class PAC_ID_Resolver():
             self._cits.append(issuer_cit)
          
         matches = [cit.evaluate_pac_id(pac_id) for cit in self._cits]
+        
+        if check_service_status:
+            for m in matches:
+                m.update_states()   
         return matches
             
     

labfreed/trex/python_convenience/pyTREX.py

@@ -77,9 +77,9 @@ class pyTREX(RootModel[dict[str, Quantity | datetime | time | date | bool | str
                         if re.fullmatch(r'[A-Z0-9\-\.]*', rt):
                             t = 'T.A'
                         else:
-                            t = 'T.X'
+                            t = 'T.T'
                     elif isinstance(rt, base36):
-                        t = 'T.X'
+                        t = 'T.T'
                     
                     headers.append(ColumnHeader(key=nm, type=t))
                 data = []
@@ -238,7 +238,7 @@ def _trex_value_to_python_type(v):
         return decoded
         
     elif isinstance(v, BinaryValue):
-        decoded = bytes(from_base36(v.value))
+        decoded = bytes(from_base36(v.value), encoding='utf-8')
         return decoded
         
     elif isinstance(v, ErrorValue):

{labfreed-0.2.5a20.dist-info → labfreed-0.2.5a22.dist-info}/METADATA

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

{labfreed-0.2.5a20.dist-info → labfreed-0.2.5a22.dist-info}/RECORD

@@ -1,4 +1,4 @@
-labfreed/__init__.py,sha256=UrNO1uzyBVb5kxiexHscJ2DEWc6XTCABRFg4YhyfNRU,339
+labfreed/__init__.py,sha256=3RVSAhyE9FV9v1Fm9wRroBieDrCsoqsXYikr_9tvaRQ,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
@@ -13,7 +13,7 @@ labfreed/pac_id/url_serializer.py,sha256=3D5pwcAP4ZrCQ22BRtxIwqWrFtZuY9913hCLPJN
 labfreed/pac_id_resolver/__init__.py,sha256=RNBlrDOSR42gmSNH9wJVhK_xwEX45cvTKVgWW2bjh7Q,113
 labfreed/pac_id_resolver/cit_v1.py,sha256=G5CitglgN9Vg0yoNPApcgcI1GjOgW6k4HUwqpJgINKQ,5800
 labfreed/pac_id_resolver/cit_v2.py,sha256=J7KsYUKSz4k7lqSHmLnouRY-etEbwmcj35O5SqVRm-o,11594
-labfreed/pac_id_resolver/resolver.py,sha256=x0XR0aWQVLptjtEwft8VPjggJEd8leTypQPUdzSyBaI,2160
+labfreed/pac_id_resolver/resolver.py,sha256=5v8p7hM4dkjygClN1isYVy-BpCMZouBn5tVHzXR6Qso,2300
 labfreed/pac_id_resolver/services.py,sha256=TPoH6YlSwa0hmawHpOiMwIpBAinhoRhMSoexop0YscI,2462
 labfreed/qr/__init__.py,sha256=fdKwP6W2Js--yMbBUdn-g_2uq2VqPpfQJeDLHsMDO-Y,61
 labfreed/qr/generate_qr.py,sha256=mSt-U872O3ReHB_UdS-MzYu0wRgdlKcAOEfTxg5CLRk,16616
@@ -24,7 +24,7 @@ labfreed/trex/trex_base_models.py,sha256=591559BISc82fyIoEP_dq_GHDbPCVzApx7FM3TR
 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=De0UMVCUUPeK-bUTToRTvL88EywHf6EOPYjgoUHsUpA,3158
-labfreed/trex/python_convenience/pyTREX.py,sha256=U026jtsESo1h2H_EQi11A9AksafjRXgRsbWOwmI9z0E,10147
+labfreed/trex/python_convenience/pyTREX.py,sha256=mja3EDF4yPCfPyotlG6FEtIuGC0_q9mk3X1VFq5lz-U,10165
 labfreed/trex/python_convenience/quantity.py,sha256=Uwu43SKCLN5C8MssRHEdiZbBIJ4C4hhLHVr25UUG_7I,2261
 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.5a20.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-0.2.5a20.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-0.2.5a20.dist-info/METADATA,sha256=Y__eRv3RYKAzoTEbOvniHjWDQCDhU0cjCgTykEBc3bA,18093
-labfreed-0.2.5a20.dist-info/RECORD,,
+labfreed-0.2.5a22.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-0.2.5a22.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-0.2.5a22.dist-info/METADATA,sha256=XALiaFCjKEkmXi6pgb_XxLCRfL0azXWCHqh2d41Bwrc,18093
+labfreed-0.2.5a22.dist-info/RECORD,,