labfreed 0.2.8a0__tar.gz → 0.2.9__tar.gz

{labfreed-0.2.8a0 → labfreed-0.2.9}/CHANGELOG.md

@@ -1,4 +1,10 @@
 ## Change Log
+### v0.2.9
+- bugfix in serialization of PAC-CAT with multiple categories
+  
+### v0.2.8
+- option to pass cache to resolver for speedier check of service availability
+
 ### v0.2.7
 - Improved README. No functional changes
   

{labfreed-0.2.8a0 → labfreed-0.2.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labfreed
-Version: 0.2.8a0
+Version: 0.2.9
 Summary: Python implementation of LabFREED building blocks
 Author-email: Reto Thürer <thuerer.r@buchi.com>
 Requires-Python: >=3.11
@@ -23,6 +23,7 @@ Requires-Dist: typer>=0.15.2
 Requires-Dist: PyYAML>=6.0.2
 Requires-Dist: jsonpath-ng>=1.7.0
 Requires-Dist: requests>=2.32.3
+Requires-Dist: requests_cache>=1.2.1
 Requires-Dist: pytest>=8.3.5 ; extra == "dev"
 Requires-Dist: pdoc>=15.0.1 ; extra == "dev"
 Requires-Dist: flit>=3.12.0 ; extra == "dev"
@@ -105,7 +106,7 @@ pac.print_validation_messages()
 >> Validation Results                                                                                                                   
 >> ┌───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
 >> │ **RECOMMENDATION** in id segment value bal500                                                                                     │
->> │ Characters 'a','l','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
+>> │ Characters 'l','a','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
 >> │                                                                                                                                   │
 >> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                                    │
 >> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
@@ -115,7 +116,7 @@ pac.print_validation_messages()
 >> │ HTTPS://PAC.METTORIUS.COM/-MD/bal500/👉@👈1234                                                                                    │
 >> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
 >> │ **RECOMMENDATION** in id segment value bal500                                                                                     │
->> │ Characters 'a','l','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
+>> │ Characters 'l','a','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
 >> │                                                                                                                                   │
 >> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                                    │
 >> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
@@ -248,7 +249,7 @@ trex.print_validation_messages()
 >> Validation Results                                            
 >> ┌────────────────────────────────────────────────────────────┐
 >> │ **ERROR** in TREX table column Date                        │
->> │ Column header key contains invalid characters: 'a','t','e' │
+>> │ Column header key contains invalid characters: 'e','t','a' │
 >> │                                                            │
 >> │ STOP$T.D:20240505T1306                                     │
 >> │ +TEMP$KEL:10.15                                            │
@@ -256,9 +257,9 @@ trex.print_validation_messages()
 >> │ +COMMENT$T.A:FOO                                           │
 >> │ +COMMENT2$T.T:12G3                                         │
 >> │ +TABLE$$DURATION$HUR:D👉ate👈$T.D:OK$T.B:COMMENT$T.A::     │
->> │  1:20250513T080159.146:T:FOO::                             │
->> │  1.1:20250513T080159.146:T:BAR::                           │
->> │  1.3:20250513T080159.146:F:BLUBB                           │
+>> │  1:20250522T163256.043:T:FOO::                             │
+>> │  1.1:20250522T163256.043:T:BAR::                           │
+>> │  1.3:20250522T163256.043:F:BLUBB                           │
 >> └────────────────────────────────────────────────────────────┘
 ```
 #### Combine PAC-ID and TREX and serialize
@@ -270,12 +271,14 @@ pac_str = pac.to_url()
 print(pac_str)
 ```
 ```text
->> HTTPS://PAC.METTORIUS.COM/21:1234*MYTREX$TREX/STOP$T.D:20240505T1306+TEMP$KEL:10.15+OK$T.B:F+COMMENT$T.A:FOO+COMMENT2$T.T:12G3+TABLE$$DURATION$HUR:Date$T.D:OK$T.B:COMMENT$T.A::1:20250513T080159.146:T:FOO::1.1:20250513T080159.146:T:BAR::1.3:20250513T080159.146:F:BLUBB
+>> HTTPS://PAC.METTORIUS.COM/21:1234*MYTREX$TREX/STOP$T.D:20240505T1306+TEMP$KEL:10.15+OK$T.B:F+COMMENT$T.A:FOO+COMMENT2$T.T:12G3+TABLE$$DURATION$HUR:Date$T.D:OK$T.B:COMMENT$T.A::1:20250522T163256.043:T:FOO::1.1:20250522T163256.043:T:BAR::1.3:20250522T163256.043:F:BLUBB
 ```
 ## PAC-ID Resolver
 
 ```python
 from labfreed import PAC_ID_Resolver, load_cit  
+import requests_cache
+
 # Get a CIT
 dir = os.path.join(os.getcwd(), 'examples')
 p = os.path.join(dir, 'cit_mine.yaml')       
@@ -294,8 +297,10 @@ cit2.origin = 'MY_COMPANY'
 ```python
 # resolve a pac id
 pac_str = 'HTTPS://PAC.METTORIUS.COM/-MS/X3511/CAS:7732-18-5'
-service_groups = PAC_ID_Resolver(cits=[cit, cit2]).resolve(pac_str)
+service_groups = PAC_ID_Resolver(cits=[cit, cit2]).resolve(pac_str, check_service_status=False)
+cached_session = requests_cache.CachedSession(backend='memory', expire_after=60)
 for sg in service_groups:
+    sg.update_states(cached_session)
     sg.print()
     
 ```
@@ -327,6 +332,12 @@ for sg in service_groups:
 
 <!-- BEGIN CHANGELOG -->
 ## Change Log
+### v0.2.9
+- bugfix in serialization of PAC-CAT with multiple categories
+  
+### v0.2.8
+- option to pass cache to resolver for speedier check of service availability
+
 ### v0.2.7
 - Improved README. No functional changes
   

{labfreed-0.2.8a0 → labfreed-0.2.9}/README.md

@@ -70,7 +70,7 @@ pac.print_validation_messages()
 >> Validation Results                                                                                                                   
 >> ┌───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
 >> │ **RECOMMENDATION** in id segment value bal500                                                                                     │
->> │ Characters 'a','l','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
+>> │ Characters 'l','a','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
 >> │                                                                                                                                   │
 >> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                                    │
 >> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
@@ -80,7 +80,7 @@ pac.print_validation_messages()
 >> │ HTTPS://PAC.METTORIUS.COM/-MD/bal500/👉@👈1234                                                                                    │
 >> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
 >> │ **RECOMMENDATION** in id segment value bal500                                                                                     │
->> │ Characters 'a','l','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
+>> │ Characters 'l','a','b' should not be used., Characters SHOULD be limited to upper case letters (A-Z), numbers (0-9), '-' and '+'  │
 >> │                                                                                                                                   │
 >> │ HTTPS://PAC.METTORIUS.COM/-MD/👉bal👈500/@1234                                                                                    │
 >> ├───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┤
@@ -213,7 +213,7 @@ trex.print_validation_messages()
 >> Validation Results                                            
 >> ┌────────────────────────────────────────────────────────────┐
 >> │ **ERROR** in TREX table column Date                        │
->> │ Column header key contains invalid characters: 'a','t','e' │
+>> │ Column header key contains invalid characters: 'e','t','a' │
 >> │                                                            │
 >> │ STOP$T.D:20240505T1306                                     │
 >> │ +TEMP$KEL:10.15                                            │
@@ -221,9 +221,9 @@ trex.print_validation_messages()
 >> │ +COMMENT$T.A:FOO                                           │
 >> │ +COMMENT2$T.T:12G3                                         │
 >> │ +TABLE$$DURATION$HUR:D👉ate👈$T.D:OK$T.B:COMMENT$T.A::     │
->> │  1:20250513T080159.146:T:FOO::                             │
->> │  1.1:20250513T080159.146:T:BAR::                           │
->> │  1.3:20250513T080159.146:F:BLUBB                           │
+>> │  1:20250522T163256.043:T:FOO::                             │
+>> │  1.1:20250522T163256.043:T:BAR::                           │
+>> │  1.3:20250522T163256.043:F:BLUBB                           │
 >> └────────────────────────────────────────────────────────────┘
 ```
 #### Combine PAC-ID and TREX and serialize
@@ -235,12 +235,14 @@ pac_str = pac.to_url()
 print(pac_str)
 ```
 ```text
->> HTTPS://PAC.METTORIUS.COM/21:1234*MYTREX$TREX/STOP$T.D:20240505T1306+TEMP$KEL:10.15+OK$T.B:F+COMMENT$T.A:FOO+COMMENT2$T.T:12G3+TABLE$$DURATION$HUR:Date$T.D:OK$T.B:COMMENT$T.A::1:20250513T080159.146:T:FOO::1.1:20250513T080159.146:T:BAR::1.3:20250513T080159.146:F:BLUBB
+>> HTTPS://PAC.METTORIUS.COM/21:1234*MYTREX$TREX/STOP$T.D:20240505T1306+TEMP$KEL:10.15+OK$T.B:F+COMMENT$T.A:FOO+COMMENT2$T.T:12G3+TABLE$$DURATION$HUR:Date$T.D:OK$T.B:COMMENT$T.A::1:20250522T163256.043:T:FOO::1.1:20250522T163256.043:T:BAR::1.3:20250522T163256.043:F:BLUBB
 ```
 ## PAC-ID Resolver
 
 ```python
 from labfreed import PAC_ID_Resolver, load_cit  
+import requests_cache
+
 # Get a CIT
 dir = os.path.join(os.getcwd(), 'examples')
 p = os.path.join(dir, 'cit_mine.yaml')       
@@ -259,8 +261,10 @@ cit2.origin = 'MY_COMPANY'
 ```python
 # resolve a pac id
 pac_str = 'HTTPS://PAC.METTORIUS.COM/-MS/X3511/CAS:7732-18-5'
-service_groups = PAC_ID_Resolver(cits=[cit, cit2]).resolve(pac_str)
+service_groups = PAC_ID_Resolver(cits=[cit, cit2]).resolve(pac_str, check_service_status=False)
+cached_session = requests_cache.CachedSession(backend='memory', expire_after=60)
 for sg in service_groups:
+    sg.update_states(cached_session)
     sg.print()
     
 ```
@@ -292,6 +296,12 @@ for sg in service_groups:
 
 <!-- BEGIN CHANGELOG -->
 ## Change Log
+### v0.2.9
+- bugfix in serialization of PAC-CAT with multiple categories
+  
+### v0.2.8
+- option to pass cache to resolver for speedier check of service availability
+
 ### v0.2.7
 - Improved README. No functional changes
   

{labfreed-0.2.8a0 → labfreed-0.2.9}/labfreed/__init__.py

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

{labfreed-0.2.8a0 → labfreed-0.2.9}/labfreed/pac_id/url_serializer.py

@@ -37,8 +37,9 @@ class PACID_Serializer():
         ''' Serializes the PAC-ID'''
         
         if isinstance(pac, PAC_CAT) and use_short_notation is not None:
+            segments = []
             for c in pac.categories:
-                segments = [IDSegment(value=c.key)]
+                segments.append(IDSegment(value=c.key))
                 if isinstance(c, PredefinedCategory):
                     segments += c._get_segments(use_short_notation=use_short_notation)
                 else:

{labfreed-0.2.8a0 → labfreed-0.2.9}/pyproject.toml

@@ -16,7 +16,8 @@ dependencies = [
     "typer>=0.15.2",
     "PyYAML>=6.0.2",
     "jsonpath-ng>=1.7.0",
-    "requests>=2.32.3"
+    "requests>=2.32.3",
+    "requests_cache>=1.2.1"
 ]
 classifiers = [
     "License :: OSI Approved :: MIT License",