labfreed 0.0.19__tar.gz → 0.1.0__tar.gz

{labfreed-0.0.19 → labfreed-0.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labfreed
-Version: 0.0.19
+Version: 0.1.0
 Summary: Python implementation of LabFREED building blocks
 Author-email: Reto Thürer <thuerer.r@buchi.com>
 Description-Content-Type: text/markdown
@@ -19,7 +19,7 @@ Requires-Dist: typer>=0.15.2
 [![Tests](https://github.com/retothuerer/LabFREED/actions/workflows/ci.yml/badge.svg)](https://github.com/retothuerer/LabFREED/actions/workflows/ci.yml)
 -->
 
-This is a Python implementation of [LabFREED](www.labfreed.wega-it.com) building blocks.
+This is a Python implementation of [LabFREED](https://labfreed.wega-it.com) building blocks.
 
 ## Supported Building Blocks
 - PAC-ID
@@ -38,11 +38,16 @@ pip install labfreed
 ## Usage Examples
 > ⚠️ **Note:** These examples are building on each other. Imports and parsing are not repeated in each example.
 <!-- BEGIN EXAMPLES -->
+```python
+# import built ins
+import os
+```
 ### Parse a simple PAC-ID
 
 ```python
 from labfreed.IO.parse_pac import PAC_Parser
 
+
 # Parse the PAC-ID
 pac_str = 'HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234'
 pac_id = PAC_Parser().parse(pac_str).pac_id
@@ -60,7 +65,7 @@ Note that the PAC-ID -- while valid -- uses characters which are not recommended
 There is a nice function to highlight problems
 
 ```python
-pac_id.print_validation_messages()
+pac_id.print_validation_messages(target='markdown')
 ```
 ```text
 >> =======================================
@@ -68,15 +73,15 @@ pac_id.print_validation_messages()
 >> ---------------------------------------
 >> 
 >>  Recommendation  in      id segment value bal500
->> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
->> Characters l a b should not be used.
+>> HTTPS://PAC.METTORIUS.COM/-MD/🔸b🔸🔸a🔸🔸l🔸500/@1234
+>> Characters a b l should not be used.
 >> 
 >>  Recommendation  in      id segment value @1234
->> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
+>> HTTPS://PAC.METTORIUS.COM/-MD/bal500/🔸@🔸1234
 >> Characters @ should not be used.
 >> 
 >>  Warning  in     Category -MD
->> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
+>> HTTPS://PAC.METTORIUS.COM/🔸-MD🔸/bal500/@1234
 >> Category key -MD is not a well known key. It is recommended to use well known keys only
 ```
 ### Save as QR Code
@@ -144,12 +149,12 @@ print(f'WEIGHT = {v}')
 from labfreed.PAC_ID.data_model import PACID, IDSegment
 from labfreed.utilities.well_known_keys import WellKnownKeys
 
-pac_id = PACID(issuer='METTORIUS:COM', identifier=[IDSegment(key=WellKnownKeys.SERIAL, value='1234')])
+pac_id = PACID(issuer='METTORIUS.COM', identifier=[IDSegment(key=WellKnownKeys.SERIAL, value='1234')])
 pac_str = pac_id.serialize()
 print(pac_str)
 ```
 ```text
->> HTTPS://PAC.METTORIUS:COM/21:1234
+>> HTTPS://PAC.METTORIUS.COM/21:1234
 ```
 #### Create a TREX 
 TREX can conveniently be created from a python dictionary.
@@ -174,7 +179,7 @@ trex.update(
 )
 
 # Create a table
-table = DataTable(['DURATION', 'DATE', 'OK', 'COMMENT'])
+table = DataTable(['DURATION', 'Date', 'OK', 'COMMENT'])
 table.append([Quantity(value=1, unit=Unit(symbol='h', name='hour')), datetime.now(), True, 'FOO'])
 table.append([                                                 1.1,  datetime.now(), True, 'BAR'])
 table.append([                                                 1.3,  datetime.now(), False, 'BLUBB'])
@@ -182,11 +187,24 @@ table.append([                                                 1.3,  datetime.no
 trex.update({'TABLE': table})
 
 # Validation also works the same way for TREX
-if trex.get_nested_validation_messages():
-    trex.print_validation_messages()
-
-# Side Note: The TREX can be turned back into a dict
+trex.print_validation_messages(target='markdown')
+```
+```text
+>> =======================================
+>> Validation Results
+>> ---------------------------------------
+>> 
+>>  Error  in       TREX table column Date
+>> DEMO$TREX/STOP$T.D:20240505T1306+TEMP$KEL:10.15+OK$T.B:F+COMMENT$T.A:FOO+COMMENT2$T.T:12G3+TABLE$$DURATION$HUR:D🔸a🔸🔸t🔸🔸e🔸$T.D:OK$T.B:COMMENT$T.A::1:20250410T094130.847:T:FOO::1.1:20250410T094130.847:T:BAR::1.3
+>> :20250410T094130.847:F:BLUBB
+>> Column header key contains invalid characters: t,a,e
+```
+```python
+# there is an error. 'Date' uses lower case. Lets fix it
 d = trex.dict()
+d['TABLE'].col_names[1] = 'DATE'
+trex = TREX(name_='DEMO') 
+trex.update(d)
 ```
 #### Combine PAC-ID and TREX and serialize
 
@@ -198,7 +216,34 @@ pac_str = pac_with_trex.serialize()
 print(pac_str)
 ```
 ```text
->> HTTPS://PAC.METTORIUS:COM/21:1234*DEMO$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:20250409T082814.766:T:FOO::1.1:20250409T082814.766:T:BAR::1.3:20250409T082814.766:F:BLUBB
+>> HTTPS://PAC.METTORIUS.COM/21:1234*DEMO$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:20250410T094130.847:T:FOO::1.1:20250410T094130.847:T:BAR::1.3:20250410T094130.847:F:BLUBB
+```
+## PAC-ID Resolver
+
+```python
+from labfreed.PAC_ID_Resolver.resolver import PAC_ID_Resolver, load_cit
+# Get a CIT
+dir = os.path.dirname(__file__)
+p = os.path.join(dir, 'cit_mine.yaml')       
+cit = load_cit(p)
+
+# validate the CIT
+cit.is_valid()
+cit.print_validation_messages()
+```
+```text
+>> [Error during execution: name '__file__' is not defined]
+```
+```python
+# resolve a pac id
+service_groups = PAC_ID_Resolver(cits=[cit]).resolve(pac_with_trex)
+for sg in service_groups:
+    sg.print()
+    
+5
+```
+```text
+>> [Error during execution: name 'cit' is not defined]
 ```
 <!-- END EXAMPLES -->
 
@@ -206,7 +251,16 @@ print(pac_str)
 
 ## Change Log
 
+### v0.1.0
+- DRAFT Support for PAC-ID Resolver
+
+### v0.0.20
+- bugfix in TREX table to dict conversion
+- markdown compatible validation printing 
+
 ### v0.0.19
 - supports PAC-ID, PAC-CAT, TREX and DisplayName
 - QR generation 
 - ok-ish test coverage
+
+

{labfreed-0.0.19 → labfreed-0.1.0}/README.md

@@ -6,7 +6,7 @@
 [![Tests](https://github.com/retothuerer/LabFREED/actions/workflows/ci.yml/badge.svg)](https://github.com/retothuerer/LabFREED/actions/workflows/ci.yml)
 -->
 
-This is a Python implementation of [LabFREED](www.labfreed.wega-it.com) building blocks.
+This is a Python implementation of [LabFREED](https://labfreed.wega-it.com) building blocks.
 
 ## Supported Building Blocks
 - PAC-ID
@@ -25,11 +25,16 @@ pip install labfreed
 ## Usage Examples
 > ⚠️ **Note:** These examples are building on each other. Imports and parsing are not repeated in each example.
 <!-- BEGIN EXAMPLES -->
+```python
+# import built ins
+import os
+```
 ### Parse a simple PAC-ID
 
 ```python
 from labfreed.IO.parse_pac import PAC_Parser
 
+
 # Parse the PAC-ID
 pac_str = 'HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234'
 pac_id = PAC_Parser().parse(pac_str).pac_id
@@ -47,7 +52,7 @@ Note that the PAC-ID -- while valid -- uses characters which are not recommended
 There is a nice function to highlight problems
 
 ```python
-pac_id.print_validation_messages()
+pac_id.print_validation_messages(target='markdown')
 ```
 ```text
 >> =======================================
@@ -55,15 +60,15 @@ pac_id.print_validation_messages()
 >> ---------------------------------------
 >> 
 >>  Recommendation  in      id segment value bal500
->> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
->> Characters l a b should not be used.
+>> HTTPS://PAC.METTORIUS.COM/-MD/🔸b🔸🔸a🔸🔸l🔸500/@1234
+>> Characters a b l should not be used.
 >> 
 >>  Recommendation  in      id segment value @1234
->> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
+>> HTTPS://PAC.METTORIUS.COM/-MD/bal500/🔸@🔸1234
 >> Characters @ should not be used.
 >> 
 >>  Warning  in     Category -MD
->> HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234
+>> HTTPS://PAC.METTORIUS.COM/🔸-MD🔸/bal500/@1234
 >> Category key -MD is not a well known key. It is recommended to use well known keys only
 ```
 ### Save as QR Code
@@ -131,12 +136,12 @@ print(f'WEIGHT = {v}')
 from labfreed.PAC_ID.data_model import PACID, IDSegment
 from labfreed.utilities.well_known_keys import WellKnownKeys
 
-pac_id = PACID(issuer='METTORIUS:COM', identifier=[IDSegment(key=WellKnownKeys.SERIAL, value='1234')])
+pac_id = PACID(issuer='METTORIUS.COM', identifier=[IDSegment(key=WellKnownKeys.SERIAL, value='1234')])
 pac_str = pac_id.serialize()
 print(pac_str)
 ```
 ```text
->> HTTPS://PAC.METTORIUS:COM/21:1234
+>> HTTPS://PAC.METTORIUS.COM/21:1234
 ```
 #### Create a TREX 
 TREX can conveniently be created from a python dictionary.
@@ -161,7 +166,7 @@ trex.update(
 )
 
 # Create a table
-table = DataTable(['DURATION', 'DATE', 'OK', 'COMMENT'])
+table = DataTable(['DURATION', 'Date', 'OK', 'COMMENT'])
 table.append([Quantity(value=1, unit=Unit(symbol='h', name='hour')), datetime.now(), True, 'FOO'])
 table.append([                                                 1.1,  datetime.now(), True, 'BAR'])
 table.append([                                                 1.3,  datetime.now(), False, 'BLUBB'])
@@ -169,11 +174,24 @@ table.append([                                                 1.3,  datetime.no
 trex.update({'TABLE': table})
 
 # Validation also works the same way for TREX
-if trex.get_nested_validation_messages():
-    trex.print_validation_messages()
-
-# Side Note: The TREX can be turned back into a dict
+trex.print_validation_messages(target='markdown')
+```
+```text
+>> =======================================
+>> Validation Results
+>> ---------------------------------------
+>> 
+>>  Error  in       TREX table column Date
+>> DEMO$TREX/STOP$T.D:20240505T1306+TEMP$KEL:10.15+OK$T.B:F+COMMENT$T.A:FOO+COMMENT2$T.T:12G3+TABLE$$DURATION$HUR:D🔸a🔸🔸t🔸🔸e🔸$T.D:OK$T.B:COMMENT$T.A::1:20250410T094130.847:T:FOO::1.1:20250410T094130.847:T:BAR::1.3
+>> :20250410T094130.847:F:BLUBB
+>> Column header key contains invalid characters: t,a,e
+```
+```python
+# there is an error. 'Date' uses lower case. Lets fix it
 d = trex.dict()
+d['TABLE'].col_names[1] = 'DATE'
+trex = TREX(name_='DEMO') 
+trex.update(d)
 ```
 #### Combine PAC-ID and TREX and serialize
 
@@ -185,7 +203,34 @@ pac_str = pac_with_trex.serialize()
 print(pac_str)
 ```
 ```text
->> HTTPS://PAC.METTORIUS:COM/21:1234*DEMO$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:20250409T082814.766:T:FOO::1.1:20250409T082814.766:T:BAR::1.3:20250409T082814.766:F:BLUBB
+>> HTTPS://PAC.METTORIUS.COM/21:1234*DEMO$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:20250410T094130.847:T:FOO::1.1:20250410T094130.847:T:BAR::1.3:20250410T094130.847:F:BLUBB
+```
+## PAC-ID Resolver
+
+```python
+from labfreed.PAC_ID_Resolver.resolver import PAC_ID_Resolver, load_cit
+# Get a CIT
+dir = os.path.dirname(__file__)
+p = os.path.join(dir, 'cit_mine.yaml')       
+cit = load_cit(p)
+
+# validate the CIT
+cit.is_valid()
+cit.print_validation_messages()
+```
+```text
+>> [Error during execution: name '__file__' is not defined]
+```
+```python
+# resolve a pac id
+service_groups = PAC_ID_Resolver(cits=[cit]).resolve(pac_with_trex)
+for sg in service_groups:
+    sg.print()
+    
+5
+```
+```text
+>> [Error during execution: name 'cit' is not defined]
 ```
 <!-- END EXAMPLES -->
 
@@ -193,7 +238,15 @@ print(pac_str)
 
 ## Change Log
 
+### v0.1.0
+- DRAFT Support for PAC-ID Resolver
+
+### v0.0.20
+- bugfix in TREX table to dict conversion
+- markdown compatible validation printing 
+
 ### v0.0.19
 - supports PAC-ID, PAC-CAT, TREX and DisplayName
 - QR generation 
-- ok-ish test coverage
+- ok-ish test coverage
+

labfreed-0.1.0/cit_mine.yaml

@@ -0,0 +1,22 @@
+origin: MINE
+
+cit:
+# Test
+- if: 
+  entries:
+  - service_type: userhandover-generic
+    service_name: AAAAAAAAAAAAAAAAAAhhhhhh
+    application_intents:
+      - foo
+    template_url: https://AAAAAAAAAAAA.{$.pac.issuer}.com/{$.pac.identifier[1].value}
+
+
+
+
+
+
+
+
+
+
+

{labfreed-0.0.19 → labfreed-0.1.0}/examples.py

@@ -1,8 +1,11 @@
+# import built ins
+import os
 ''' 
 ### Parse a simple PAC-ID 
 '''
 from labfreed.IO.parse_pac import PAC_Parser
 
+
 # Parse the PAC-ID
 pac_str = 'HTTPS://PAC.METTORIUS.COM/-MD/bal500/@1234'
 pac_id = PAC_Parser().parse(pac_str).pac_id
@@ -17,7 +20,7 @@ print(f'PAC-ID is valid: {is_valid}')
 Note that the PAC-ID -- while valid -- uses characters which are not recommended (results in larger QR code).
 There is a nice function to highlight problems
 '''
-pac_id.print_validation_messages()
+pac_id.print_validation_messages(target='markdown')
 
 '''
 ### Save as QR Code
@@ -65,7 +68,7 @@ print(f'WEIGHT = {v}')
 from labfreed.PAC_ID.data_model import PACID, IDSegment
 from labfreed.utilities.well_known_keys import WellKnownKeys
 
-pac_id = PACID(issuer='METTORIUS:COM', identifier=[IDSegment(key=WellKnownKeys.SERIAL, value='1234')])
+pac_id = PACID(issuer='METTORIUS.COM', identifier=[IDSegment(key=WellKnownKeys.SERIAL, value='1234')])
 pac_str = pac_id.serialize()
 print(pac_str)
 
@@ -93,7 +96,7 @@ trex.update(
 )
 
 # Create a table
-table = DataTable(['DURATION', 'DATE', 'OK', 'COMMENT'])
+table = DataTable(['DURATION', 'Date', 'OK', 'COMMENT'])
 table.append([Quantity(value=1, unit=Unit(symbol='h', name='hour')), datetime.now(), True, 'FOO'])
 table.append([                                                 1.1,  datetime.now(), True, 'BAR'])
 table.append([                                                 1.3,  datetime.now(), False, 'BLUBB'])
@@ -101,11 +104,13 @@ table.append([                                                 1.3,  datetime.no
 trex.update({'TABLE': table})
 
 # Validation also works the same way for TREX
-if trex.get_nested_validation_messages():
-    trex.print_validation_messages()
-
-# Side Note: The TREX can be turned back into a dict
+trex.print_validation_messages(target='markdown')
+''''''
+# there is an error. 'Date' uses lower case. Lets fix it
 d = trex.dict()
+d['TABLE'].col_names[1] = 'DATE'
+trex = TREX(name_='DEMO') 
+trex.update(d)
 
 ''' 
 #### Combine PAC-ID and TREX and serialize
@@ -120,3 +125,23 @@ print(pac_str)
 
 
 
+'''
+## PAC-ID Resolver
+'''
+from labfreed.PAC_ID_Resolver.resolver import PAC_ID_Resolver, load_cit
+# Get a CIT
+dir = os.path.dirname(__file__)
+p = os.path.join(dir, 'cit_mine.yaml')       
+cit = load_cit(p)
+
+# validate the CIT
+cit.is_valid()
+cit.print_validation_messages()
+
+''''''
+# resolve a pac id
+service_groups = PAC_ID_Resolver(cits=[cit]).resolve(pac_with_trex)
+for sg in service_groups:
+    sg.print()
+    
+5

{labfreed-0.0.19 → labfreed-0.1.0}/labfreed/IO/parse_pac.py

@@ -19,7 +19,7 @@ from ..validation import ValidationMessage, LabFREEDValidationError
 
 
 class PACID_With_Extensions(BaseModelWithValidationMessages):
-    pac_id: PACID
+    pac_id: PACID = Field(serialization_alias='pac')
     extensions: list[Extension] = Field(default_factory=list)
     
     def __str__(self):

{labfreed-0.0.19 → labfreed-0.1.0}/labfreed/PAC_CAT/data_model.py

@@ -14,7 +14,7 @@ class PAC_CAT(PACID):
     ''' 
     Extends a PAC-ID with interpretation of the identifier as categories
     '''
-    categories:list[Category] = Field(default_factory=list())
+    categories:list[Category] = Field(default_factory=list)
     
     @property
     def identifier(self) -> list[IDSegment]:
@@ -175,7 +175,7 @@ class Category(BaseModelWithValidationMessages):
         "populate_by_name": True
     }
     key:str
-    additional_segments: list[IDSegment] = Field(default_factory=list)   
+    additional_segments: list[IDSegment] = Field(default_factory=list, exclude=True)   
     
     @computed_field
     @property

{labfreed-0.0.19 → labfreed-0.1.0}/labfreed/PAC_ID/data_model.py

@@ -96,7 +96,7 @@ class IDSegment(BaseModelWithValidationMessages):
 
 class PACID(BaseModelWithValidationMessages):
     issuer:str
-    identifier: conlist(IDSegment, min_length=1) = Field(..., default_factory=list()) # type: ignore # exclude=True prevents this from being serialized by Pydantic
+    identifier: conlist(IDSegment, min_length=1) = Field(..., default_factory=list) # type: ignore # exclude=True prevents this from being serialized by Pydantic
         
         
     @model_validator(mode='after')

labfreed-0.1.0/labfreed/PAC_ID_Resolver/cit.yaml

@@ -0,0 +1,92 @@
+origin: PAC.METTORIUS.COM
+
+macros:     
+    shop: &shop
+      service_type: userhandover-generic
+      service_name: Shop
+      application_intents:
+        - showdevicemanual-apinilabs
+      template_url: https://mettorius.com/shop/an={$.pac.identifier.categories[1].segments['240'].value}
+        
+    manual: &manual
+      service_type: userhandover-generic
+      service_name: Manual
+      application_intents:
+        - showdevicemanual-apinilabs
+      template_url: https://mettorius.com/om/an={$..*['240'].value}
+        
+    CoA: &coa
+      service_type: userhandover-generic
+      service_name: CoA
+      application_intents:
+        - showCoA-apinilabs
+      template_url: https://mettorius.com/downloads/an={$..*['240'].value}
+
+    dummy: &dummy
+      service_type: userhandover-generic
+      application_intents:
+        - dummy
+      template_url: https://mettorius.com/om/an={$..*['240'].value}
+
+
+cit:
+# Test
+- if: mettorius.com == $.pac.issuer
+  entries:
+  - <<: *shop
+  - <<: *manual
+
+# Instruments
+- if: mettorius.com == $.pac.issuer AND $.pac.id.categories['-MD']
+  entries:
+  - <<: *shop
+  - <<: *manual
+    
+
+# Consumables
+- if: mettorius.com == $.pac.issuer AND $.pac.id.categories['-MC']
+  entries:
+  - <<: *shop
+  - <<: *manual
+  - <<: *coa
+
+
+
+# Showcase for logic
+##############################
+
+# multiline string
+- if: "($.pac.issuer == mettorius.com) 
+       AND $.pac.id.categories['-MD']"
+  entries:
+  - <<: *dummy
+    service_name: multiline applicable_if
+
+# folded string
+- if: | 
+    ($.pac.issuer == mettorius.com) 
+    AND $.pac.id.categories['-MD']
+  entries:
+  - <<: *dummy
+    service_name: folded applicable_if
+
+# multiline  string
+- if: | 
+    NOT NOT ($.pac.issuer == mettorius.com) 
+    AND $.pac.id.categories['-MD']
+  entries:
+  - <<: *dummy
+    service_name: multiline applicable_if
+
+- if: NOT ($.pac.issuer != METTORIUS.COM)
+  entries:
+  - <<: *dummy
+    service_name: _3
+
+
+
+
+
+
+
+

labfreed-0.1.0/labfreed/PAC_ID_Resolver/data_types.py

@@ -0,0 +1,59 @@
+from pydantic import BaseModel, Field, field_validator
+from rich import print
+from rich.table import Table
+
+from labfreed.validation import BaseModelWithValidationMessages
+
+
+class CITEntry(BaseModelWithValidationMessages):
+    service_name: str
+    application_intents:list[str]
+    service_type:str
+    template_url:str
+    
+
+class CITBlock(BaseModelWithValidationMessages):
+    applicable_if: str  = Field(default='True', alias='if')
+    entries: list[CITEntry]
+    
+    @field_validator('applicable_if', mode='before')
+    @classmethod
+    def convert_if(cls, v):
+        return v if v is not None else 'True'
+    
+
+class CIT(BaseModelWithValidationMessages):
+    origin: str = ''
+    macros:dict = Field(default_factory=dict)
+    cit: list[CITBlock] = Field(default_factory=list)
+    
+    
+
+    
+class Service(BaseModelWithValidationMessages):
+    service_name: str
+    application_intents:list[str]
+    service_type:str
+    url:str
+    
+    
+class CITEvaluated(BaseModelWithValidationMessages):
+    origin: str = ""
+    services: list[Service] = Field(default_factory=list)
+    
+    def __str__(self):
+        out = [f'CIT (origin {self.origin})']
+        for s in self.services:
+            out.append(f'{s.service_name}\t\t\t{s.url}')
+        return '\n'.join(out)
+    
+    def print(self):
+        table = Table(title=f"Services from origin '{self.origin}")
+
+        table.add_column("Service Name")
+        table.add_column("URL")
+        
+        for s in self.services:
+            table.add_row(s.service_name, s.url)
+
+        print(table)

labfreed-0.1.0/labfreed/PAC_ID_Resolver/resolver.py

@@ -0,0 +1,221 @@
+import os
+import re
+import yaml
+import json
+import jsonpath_ng.ext as jsonpath
+
+
+from labfreed.IO.parse_pac import PAC_Parser, PACID_With_Extensions
+from labfreed.PAC_ID_Resolver.data_types import CIT, CITEntry, CITEvaluated, Service
+
+from labfreed.PAC_ID_Resolver.non_needed.query_tools import JSONPathTools
+
+
+def load_cit(path):
+    with open(path, 'r') as f:
+        cit = yaml.safe_load(f)
+        cit = CIT.model_validate(cit)
+        return cit
+
+
+class PAC_ID_Resolver():
+    def __init__(self, cits:list[CIT]=None):
+        if not cits:
+            cits = []
+        self.cits = cits
+        
+        # load the default cit
+        dir = os.path.dirname(__file__)
+        fn ='cit.yaml'
+        p = os.path.join(dir, fn)       
+        with open(p, 'r') as f:
+            cit = yaml.safe_load(f)
+            cit = CIT.model_validate(cit)
+            self.cits.append(cit)
+        
+        
+    def resolve(self, pac_id:PACID_With_Extensions|str):
+        if isinstance(pac_id, str):
+            pac_id = PAC_Parser().parse(pac_id)
+        
+        pac_id_json = pac_id.model_dump(by_alias=True)
+        
+        
+        # dir = os.path.dirname(__file__)
+        # p = os.path.join(dir, 'pac-id.json')
+        # with open(p , 'r') as f:
+        #     _json = f.read()
+        #     pac_id_json = json.loads(_json)
+        
+        matches = [self._evaluate_against_cit(pac_id_json, cit) for cit in self.cits]
+        return matches
+            
+
+    def _evaluate_against_cit(self, pac_id_json, cit:CIT):
+        cit_evaluated = CITEvaluated(origin=cit.origin)   
+        for block in cit.cit:
+            _, is_applicable = self._evaluate_applicable_if(pac_id_json, block.applicable_if)
+            if not is_applicable:
+                continue
+
+            for e in block.entries:
+                url = self.eval_url_template(pac_id_json, e.template_url)
+                cit_evaluated.services.append(Service(  
+                                                        service_name=e.service_name,
+                                                        application_intents=e.application_intents,
+                                                        service_type=e.service_type,
+                                                        url = url
+                                    )
+                              )            
+        return cit_evaluated
+    
+    
+    def _evaluate_applicable_if(self, pac_id_json:str, expression) -> tuple[str, bool]:
+        expression = self._apply_convenience_substitutions(expression)
+        
+        tokens = self._tokenize_jsonpath_expression(expression)
+        expression_for_eval = self._expression_from_tokens(pac_id_json, tokens)
+        applicable = eval(expression_for_eval, {}, {})
+        
+        return expression_for_eval, applicable
+    
+    
+    def _apply_convenience_substitutions(self, query):
+        ''' applies a few substitutions, which enable abbreviated syntax.'''
+        
+        # allow access to array elements by key
+        q_mod = re.sub(r"\[('.+?')\]", r"[?(@.key == \1)]", query )
+        
+        # allow shorter path
+        # substitutions = [
+        #     (r'(?<=^)id', 'pac.id'),
+        #     (r'(?<=^)cat', 'pac.id.cat'),
+        #     (r'(?<=\.)id(?=\.)', 'identifier'),
+        #     (r'(?<=\.)cat$', 'categories'),
+        #     (r'(?<=\.)cat(?=\[)', 'categories'),
+        #     (r'(?<=\.)seg$', 'segments'),
+        #     (r'(?<=\.)seg(?=\[)', 'segments'),
+        #     (r'(?<=^)isu', 'pac.isu'),
+        #     (r'(?<=\.)isu', 'issuer'),
+        #     (r'(?<=^)ext', 'pac.ext'),
+        #     (r'(?<=\.)ext(?=$)', 'extensions'),
+        #     (r'(?<=\.)ext(?=\[)', 'extensions'),
+        # ]
+        # for sub in substitutions:
+        #     q_mod = re.sub(sub[0], sub[1], q_mod)
+        
+        return q_mod
+    
+
+    def _tokenize_jsonpath_expression(self, expr: str):
+        token_pattern = re.compile(
+            r"""
+            (?P<LPAREN>\() |
+            (?P<RPAREN>\)) |
+            (?P<LOGIC>\bAND\b|\bOR\b|\bNOT\b) |
+            (?P<OPERATOR>==|!=|<=|>=|<|>) |
+            (?P<JSONPATH>
+                \$                               # starts with $
+                (?:
+                    [^\s\[\]()]+                # path segments, dots, etc.
+                    |
+                    \[                           # open bracket
+                        (?:                     # non-capturing group
+                            [^\[\]]+            # anything but brackets
+                            |
+                            \[[^\[\]]*\]        # nested brackets (1 level)
+                        )*
+                    \]
+                )+                              # one or more bracket/segment blocks
+            ) |
+            (?P<LITERAL>
+                [A-Za-z_][\w\.\-]*[A-Za-z0-9]   # domain-like literals
+            )
+            """,
+            re.VERBOSE
+        )
+
+        tokens = []
+        pos = 0
+        while pos < len(expr):
+            match = token_pattern.match(expr, pos)
+            if match:
+                group_type = match.lastgroup
+                value = match.group().strip()
+                tokens.append((value, group_type))
+                pos = match.end()
+            elif expr[pos].isspace():
+                pos += 1  # skip whitespace
+            else:
+                raise SyntaxError(f"Unexpected character at position {pos}: {expr[pos]}")
+
+        return tokens
+    
+    
+    def _expression_from_tokens(self, pac_id_json:str, tokens: tuple[str, str]):
+        out  = []
+        for i in range(len(tokens)):
+            prev_token = tokens[i-1] if i > 0 else (None, None)
+            curr_token = tokens[i]
+            next_token = tokens[i+1] if i < len(tokens)-1 else (None, None)
+            if curr_token[1] == 'JSONPATH':
+                res = self._evaluate_jsonpath(pac_id_json, curr_token[0])
+                
+                if prev_token[1] == 'OPERATOR' or next_token[1] == 'OPERATOR':
+                    # if token is part of comparison return the value of the node
+                    if len(res) == 0:
+                        out.append('""')
+                    else:
+                        out.append(f'"{res[0].upper()}"')
+                else:
+                    # if token is not part of comparison evaluate to boolean
+                    if len(res) == 0:
+                        out.append(False)
+                    else:
+                        out.append(True)
+                        
+            elif curr_token[1] == 'LOGIC':
+                out.append(curr_token[0].lower())  
+                
+            elif curr_token[1] == 'LITERAL':
+                t = curr_token[0]
+                if t[0] != '"':
+                    t = '"' + t
+                if t[-1] != '"':
+                    t = t + '"' 
+                out.append(t.upper())    
+            else:
+                out.append(curr_token[0])
+                
+        s = ' '.join([str(e) for e in out])
+        return s
+                    
+
+    
+    
+    def eval_url_template(self, pac_id_json, url_template):
+        url = url_template
+        placeholders = re.findall(r'\{(.+?)\}', url_template)
+        for placeholder in placeholders:
+            expanded_placeholder = self._apply_convenience_substitutions(placeholder)
+            res = self._evaluate_jsonpath(pac_id_json, expanded_placeholder) or ['']
+            url = url.replace(f'{{{placeholder}}}', str(res[0]))
+            # res = self.substitute_jsonpath_expressions(expanded_placeholder, Patterns.jsonpath.value, as_bool=False)
+            # url = url.replace(f'{{{placeholder}}}', res)
+        return url
+    
+
+    
+    
+    def _evaluate_jsonpath(self, pac_id_json, jp_query):
+        jsonpath_expr = jsonpath.parse(jp_query)
+        matches = [match.value for match in jsonpath_expr.find(pac_id_json)]
+        return matches
+    
+    
+
+    
+    
+if __name__ == '__main__':
+    r = PAC_ID_Resolver()
+    r.resolve()

{labfreed-0.0.19 → labfreed-0.1.0}/labfreed/TREX/data_model.py

@@ -436,7 +436,7 @@ class TREX_Table(TREX_Segment):
             self.add_validation_message(
                     source=f"Table {self.key}",
                     type="Error",
-                    msg=f"Size mismatch: Table header contains {self.col_names} keys, while most rows have {most_common_len}",
+                    msg=f"Size mismatch: Table header contains {self.column_names} keys, while most rows have {most_common_len}",
                     highlight_pattern = self.key
             )
             expected_row_len = most_common_len
@@ -527,7 +527,7 @@ class TREX_Table(TREX_Segment):
                     r.append(Quantity(value=e.value, unit=unit))
                 else:
                     r.append(e.value_to_python_type())
-                table.append(r)
+            table.append(r)
         return table
         
         

{labfreed-0.0.19 → labfreed-0.1.0}/labfreed/__init__.py

@@ -2,4 +2,4 @@
 Python implementation of LabFREED building blocks
 '''
 
-__version__ = "0.0.19"
+__version__ = "0.1.0"

{labfreed-0.0.19 → labfreed-0.1.0}/labfreed/validation.py

@@ -15,7 +15,7 @@ class ValidationMessage(BaseModel):
     problem_msg:str
     recommendation_msg: str = ""
     highlight:str = "" #this can be used to highlight problematic parts
-    highlight_sub:list[str] = Field(default_factory=list())
+    highlight_sub:list[str] = Field(default_factory=list)
         
     @property
     def emphazised_highlight(self):
@@ -113,7 +113,7 @@ class BaseModelWithValidationMessages(BaseModel):
         return filter_warnings(self.get_nested_validation_messages())
     
     
-    def print_validation_messages(self, str_to_highlight_in=None):
+    def print_validation_messages(self, str_to_highlight_in=None, target='console'):
         if not str_to_highlight_in:
             str_to_highlight_in = str(self)
         msgs = self.get_nested_validation_messages()
@@ -124,6 +124,10 @@ class BaseModelWithValidationMessages(BaseModel):
                         ]
                         )
         )
+        
+        if not msgs:
+            print('All clear!')
+            return
 
         for m in msgs:
             if m.type.casefold() == "error":
@@ -133,7 +137,13 @@ class BaseModelWithValidationMessages(BaseModel):
                 
             text = Text.from_markup(f'\n [bold {color}]{m.type} [/bold {color}] in \t {m.source}' )
             print(text)
-            formatted_highlight = m.emphazised_highlight.replace('emph', f'bold {color}')
+            match target:
+                case 'markdown':
+                    formatted_highlight = m.emphazised_highlight.replace('emph', f'🔸').replace('[/', '').replace('[', '').replace(']', '')
+                case 'console':     
+                    formatted_highlight = m.emphazised_highlight.replace('emph', f'bold {color}')
+                case 'html':
+                    formatted_highlight = m.emphazised_highlight.replace('emph', f'b').replace('[', '<').replace(']', '>')
             fmtd = str_to_highlight_in.replace(m.highlight, formatted_highlight)
             fmtd = Text.from_markup(fmtd)
             print(fmtd)

{labfreed-0.0.19 → labfreed-0.1.0}/main.py

@@ -1,5 +1,10 @@
 
 from datetime import datetime
+import os
+
+import yaml
+from labfreed.IO.parse_pac import PAC_Parser
+from labfreed.PAC_ID_Resolver.resolver import PAC_ID_Resolver, load_cit
 from labfreed.TREX.data_model import TREX
 from labfreed.TREX.parse import TREX_Parser
 from labfreed.DisplayNameExtension.DisplayNameExtension import DisplayNames
@@ -9,10 +14,25 @@ from labfreed.PAC_CAT.data_model import *
 from labfreed.utilities.base36 import base36
 from labfreed.utilities.utility_types import DataTable, Quantity, Unit
 
-from labfreed.QR_Generator.generate_qr import save_qr_with_markers
+from labfreed.IO.generate_qr import save_qr_with_markers
 
 if __name__ == "__main__":
     
+    pac = PAC_Parser().parse('HTTPS://PAC.METTORIUS.COM/-DR/MADFGAI/-MD/ABCG/ACG/PC:1234')
+    
+    dir = os.path.dirname(__file__)
+    p = os.path.join(dir, 'cit_internal.yaml')       
+    cit = load_cit(p)
+
+    services = PAC_ID_Resolver(cits=[cit]).resolve(pac)
+    
+
+    cat = PAC_CAT.from_pac_id(pac.pac_id)
+    cat.identifier
+    jsn = cat.model_dump_json(indent=2)
+    print(jsn)
+    
+    
     
     save_qr_with_markers('HTTPS://PAC.METTORIUS.COM/-MD/ABCG/ACG') 
     

labfreed-0.0.19/labfreed/IO/generate_label.py

@@ -1,81 +0,0 @@
-import os
-
-from .generate_qr import generate_qr_with_markers_svg
-
-from labfreed.PAC_ID.data_model import  PACID
-from labfreed.DisplayNameExtension.DisplayNameExtension import DisplayNames
-from labfreed.IO.parse_pac import PACID_With_Extensions
-
-
-    
-
-    
-def generate_label_200_100(pac_url, pac:PACID_With_Extensions):
-    title, infos = get_label_fields(pac)
-    pac_svg = generate_qr_with_markers_svg(pac_url, height=60, width=100, border=0)
-    label = _generate_label(pac_svg, 200, 100, title, infos)
-    return label
-
-def generate_label_credit_card_size(pac_url, pac:PACID_With_Extensions):
-    title, infos = get_label_fields(pac)
-    pac_svg = generate_qr_with_markers_svg(pac_url, height=100, width=200, border=0)
-    label = _generate_label(pac_svg, 240, 150, title, infos)
-    return label
-    
-    
-def _generate_label(qr_svg, width, height, title=None, infos=[]):
-    if not qr_svg:
-        raise ValueError("no valid qr given")
-    env = Environment(
-		loader=FileSystemLoader(os.path.join(os.path.dirname(__file__), "templates")),
-		autoescape=select_autoescape()
-	)
-    template = env.get_template("pac_label.jinja.svg")
-    svg = template.render(width=width, height= height, pac_qr=qr_svg, title=title, info1=infos[0], info2=infos[1], info3=infos[2])
-    
-    return svg
-
-
-
-def get_label_fields(pac:PACID_With_Extensions) -> tuple[str, list[tuple[str, str]]]:
-    '''
-    returns a list of exactly length 3. Containing either info tuples (key value) or None
-    '''
-    if dn_extension := next((e for e in pac.extensions if isinstance(e, DisplayNames)), None): #find extension of type DisplayName
-        title = dn_extension.display_names[0]
-    else:
-        title = ""
-    
-    infos = []
-    cat = pac.pac_id.identifier.categories[0]
-    for s in cat.segments:
-        lbl = pretty_print_segment_label(cat.key, s.key)
-        infos.append((lbl, s.value))
-        
-    while len(infos) < 3:
-        infos.append(None)
-    
-    if len(infos) > 3:
-        infos = infos[0:3]
-           
-    return title,infos
-
-
-def pretty_print_segment_label(category:str, segment_key:str):
-    if not segment_key:
-        return 'no key'
-    
-    cat = CAT_from_category_key(category)
-    if cat:
-        alias_to_field = {v.alias: k for k, v in cat.model_fields.items() if v.alias}
-        segment_label = alias_to_field.get(segment_key, segment_key)
-        segment_label = segment_label.replace('_', ' ').title()
-        
-        segment_label = segment_label.replace('Id', 'ID')
-        
-    else:
-        segment_label = segment_key
-    
-    return segment_label
-    
-