labfreed 1.0.0b26__py3-none-any.whl → 1.0.0b28__py3-none-any.whl

labfreed/__init__.py

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

labfreed/pac_attributes/api_data_models/request.py

@@ -1,3 +1,4 @@
+import re
 from typing import   Any, Self
 from urllib.parse import unquote
 from werkzeug.datastructures import LanguageAccept
@@ -27,14 +28,21 @@ class AttributeRequestData(LabFREED_BaseModel):
     
     @classmethod
     def from_http_request(cls, pac_id:str, params:dict, headers:dict):
+        # Azure seems to meddle with double slashes in a path, even if url encoded. This is to rectify this behaviour and add back a second slash if necessary
+        pac_id = re.sub('HTTPS:/{1,2}', 'HTTPS://', pac_id, re.IGNORECASE)
+        
         restrict_to_attribute_groups = params.get(ATTR_GROUPS)
         if restrict_to_attribute_groups == '':
             restrict_to_attribute_groups = None
         if restrict_to_attribute_groups:
             restrict_to_attribute_groups = restrict_to_attribute_groups.split(',')
             
-        fwd_lkp = params.get(ATTR_GROUPS_FWD_LKP,'true')
-        do_forward_lookup = fwd_lkp.lower() not in ['false', 'no', '0', 'n', 'off']
+        fwd_lkp = params.get(ATTR_GROUPS_FWD_LKP, True)
+        if fwd_lkp is True:
+            do_forward_lookup = True
+        else:
+            do_fwd_lookup =  fwd_lkp.lower() not in ['false', 'no', '0', 'n', 'off']
+
         lang_hdr = headers.get('Accept-Language')
         language_preferences: LanguageAccept = parse_accept_header(lang_hdr, LanguageAccept)
         out = cls(pac_id=pac_id, 
@@ -80,7 +88,7 @@ class AttributeRequestData(LabFREED_BaseModel):
             self._add_validation_message(
                     source="pac_id",
                     level = ValidationMsgLevel.ERROR,
-                    msg='{self.pac_id} is not a valid PAC-ID'
+                    msg=f'{self.pac_id} is not a valid PAC-ID'
                 )
                 
         if not self.is_valid:
@@ -91,7 +99,7 @@ class AttributeRequestData(LabFREED_BaseModel):
     def language_preference_http_header(self) -> dict[str, str]:
         if not self.language_preferences:
             return {}
-        headers={'Accept-Language':  LanguageAccept(lq).to_header()}
+        headers={'Accept-Language':  LanguageAccept(self.language_preferences).to_header()}
         return headers
     
     def request_params(self) -> dict[str, Any]:

labfreed/pac_attributes/pythonic/attribute_server_factory.py

@@ -4,7 +4,7 @@ import logging
 from typing import Any, Protocol
 from urllib.parse import unquote, unquote_plus
 
-from flask import Blueprint, current_app, redirect, url_for
+from flask import Blueprint, current_app, redirect, url_for, send_from_directory
 from labfreed.pac_attributes.api_data_models.request import AttributeRequestData
 from labfreed.pac_attributes.server.server import AttributeGroupDataSource, AttributeServerRequestHandler, InvalidRequestError, TranslationDataSource
 
@@ -76,8 +76,6 @@ class AttributeFlaskApp(Flask):
 
         @bp.get("/<path:pac_id_url_encoded>", strict_slashes=False)
         def handle_attribute_request(pac_id_url_encoded):
-            if pac_id_url_encoded in ['favicon.ico']:
-                return ''
             
             if authenticator and not authenticator(request):
                 return Response(
@@ -155,6 +153,10 @@ class AttributeFlaskApp(Flask):
     '''
         
             return response
+        
+        @bp.get("/favicon.<ext>", strict_slashes=False)
+        def favicon(ext):
+            return send_from_directory("static", f"favicon.{ext}")
 
         return bp
     

labfreed/pac_attributes/pythonic/py_attributes.py

@@ -5,6 +5,7 @@ import logging
 from typing import  Literal
 from enum import Enum
 import warnings
+from deprecated import deprecated
 from pydantic import RootModel, field_validator, model_validator
 
 from labfreed.labfreed_infrastructure import LabFREED_BaseModel
@@ -44,6 +45,11 @@ class pyAttribute(LabFREED_BaseModel):
         '''helper function to more conveniently iterate over value elements, even if it's scalar'''   
         return self.values if isinstance(self.values, list) else [self.values]
     
+    @property
+    @deprecated
+    def value(self):
+        return self.values
+    
     @model_validator(mode='before')
     def value_to_values(cls, d:dict):
         value =d.pop('value', None)
@@ -85,7 +91,7 @@ class pyAttributes(RootModel[list[pyAttribute]]):
                 items.append(BoolAttributeItemsElement(value=value))
              
             elif isinstance(value, datetime | date | time):
-                if not value.tzinfo:
+                if getattr(value, 'tzinfo', None) and not value.tzinfo:
                     warnings.warn(f'No timezone given for {value}. Assuming it is in UTC.')
                     value.replace(tzinfo=UTC)
                 items.append(DateTimeAttributeItemsElement(value=value))

labfreed/pac_id/url_parser.py

@@ -82,7 +82,7 @@ class PAC_Parser():
     @classmethod
     def _parse_pac_id(cls,id_str:str) -> "PAC_ID":
         # m = re.match('(HTTPS://)?(PAC.)?(?P<issuer>.+?\..+?)/(?P<identifier>.*)', id_str)
-        m = re.match('(HTTPS://)?(PAC.)?(?P<issuer>.+?)/(?P<identifier>.*)', id_str, re.IGNORECASE)
+        m = re.match('(HTTPS://)?(PAC\.)?(?P<issuer>.+?)/(?P<identifier>.*)', id_str, re.IGNORECASE)
         if not m:
             raise LabFREED_ValidationError(f'{id_str} does not match the pattern expected for PAC-ID')
         d = m.groupdict()

{labfreed-1.0.0b26.dist-info → labfreed-1.0.0b28.dist-info}/METADATA

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

{labfreed-1.0.0b26.dist-info → labfreed-1.0.0b28.dist-info}/RECORD

@@ -1,4 +1,4 @@
-labfreed/__init__.py,sha256=K7LpEGI6O9AnTM4dJgUI30LchIO5KnqPUh3gpWhhY4Q,339
+labfreed/__init__.py,sha256=6dNDBc-c9yS4FwmyZWmNsoq8OyAU4tz3HR2lTYcrhQs,339
 labfreed/labfreed_infrastructure.py,sha256=ss1PyJl-7Es-lEcxptmdYI9kDAHmh7HB_tAGkPC6UVs,10173
 labfreed/labfreed_extended/app/app_infrastructure.py,sha256=1867Nq40c8Q4bFyRv48vTIFDXoPeZTfYij9PSog6fkE,4427
 labfreed/labfreed_extended/app/formatted_print.py,sha256=DcwWP0ix1e_wYNIdceIp6cETkJdG2DqpU8Gs3aZAL40,1930
@@ -36,14 +36,14 @@ labfreed/labfreed_extended/pac_issuer_lib/templates/pac_info/card.jinja.html,sha
 labfreed/labfreed_extended/pac_issuer_lib/templates/pac_info/pac_info.jinja.html,sha256=xK0yM_ovRE8QS6N7hiXhGv-ya8C-s19YWhhMqJKYxFM,1518
 labfreed/pac_attributes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 labfreed/pac_attributes/well_knonw_attribute_keys.py,sha256=Z_QcQdbIil_EMpFqQcBnivEGMDauyoCMW8r62-EN2KM,547
-labfreed/pac_attributes/api_data_models/request.py,sha256=64BCChFKXA8Z91r5IxAtcVZ6XiCKcw9RQErok2b91cc,4045
+labfreed/pac_attributes/api_data_models/request.py,sha256=DhCGuwfRypq5fitZKS9Bvj8AFfCKaakKc-m6IMKj-3s,4410
 labfreed/pac_attributes/api_data_models/response.py,sha256=Hglfcvb7gC7uZrLsGfPewC290vp4qq4WsuM9S3UHQFI,8188
 labfreed/pac_attributes/api_data_models/server_capabilities_response.py,sha256=ypDm4f8xZZl036fp8PuIe6lJHNW5Zg1fItgUlnV75V0,178
 labfreed/pac_attributes/client/client.py,sha256=5d-G-1tHOx2PXW7KP366tWr4k4F1ykGHX9e-bauF6_w,7149
 labfreed/pac_attributes/client/client_attribute_group.py,sha256=lZXbMU_Yp7Q1iKc5WRqS6pzEz_mtwZaQ5fYZqJA6784,375
-labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=8OeWuHpJSW1mA0gWKLWPBZvq0n3VEfVOPQSmXNnp5dw,7673
+labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=VYyVfhTpNQlLtpMBGWcpnoQHIqehr3K44rdUT9dQepE,7774
 labfreed/pac_attributes/pythonic/excel_attribute_data_source.py,sha256=IBBGpHgt-HiZeB6dsLcjtqUPP2JdViLz2QMIDMjzmME,8467
-labfreed/pac_attributes/pythonic/py_attributes.py,sha256=VkkgKupJcM-kf0I5qRc5AiLSfi0vwnNgQv6neNtdRR8,7394
+labfreed/pac_attributes/pythonic/py_attributes.py,sha256=9ATeMia7PXZjRrpDouC5siDZ-dbDa6EPhyl7xCEDIG8,7552
 labfreed/pac_attributes/pythonic/py_dict_data_source.py,sha256=nAz6GA7Xx_0IORPPpt_Wl3sFJa1Q5Fnq5vdf1uQiJF8,531
 labfreed/pac_attributes/server/__init__.py,sha256=JvQ2kpQx62OUwP18bGhOWYU9an_nQW59Y8Lh7HyfVxY,301
 labfreed/pac_attributes/server/attribute_data_sources.py,sha256=92BiQ2QC00PSXeeb6XI0KNcD7ZF7bdOSZZcOrOwPr_o,2406
@@ -57,7 +57,7 @@ labfreed/pac_id/__init__.py,sha256=NGMbzkwQ4txKeT5pxdIZordwHO8J3_q84jzPanjKoHg,6
 labfreed/pac_id/extension.py,sha256=4_cQ-N3x8bRxboqC44Qnf6rGnYXvsvHOnlBaY7-Hf-8,2264
 labfreed/pac_id/id_segment.py,sha256=r5JU1SJuRXhZJJxy5T3xjrb598wIDTLpivSJhIUAzjQ,4526
 labfreed/pac_id/pac_id.py,sha256=DDcSYJ8DBWqIoW_usOT7eDjHZ9700cTYxeUgenHluOA,5378
-labfreed/pac_id/url_parser.py,sha256=F3SPiscfbPwZ0uMzgirJ1vwgaXclN546lBW46Ywo3nk,5979
+labfreed/pac_id/url_parser.py,sha256=mGtC7gjqmaX-rXekoLCVniZMbWJj0c_8DEUYMnbNhwA,5980
 labfreed/pac_id/url_serializer.py,sha256=01LB30pNMBtv2rYHsiE_4Ga2iVA515Boj4ikOIYhiBQ,3511
 labfreed/pac_id_resolver/__init__.py,sha256=RNBlrDOSR42gmSNH9wJVhK_xwEX45cvTKVgWW2bjh7Q,113
 labfreed/pac_id_resolver/cit_v1.py,sha256=JGlEH2d9awEu3HxPW7vu0uj4ZC3B02IdmFg7aJ4axQw,9833
@@ -90,7 +90,7 @@ labfreed/well_known_keys/labfreed/well_known_keys.py,sha256=p-hXwEEIs7p2SKn9DQeL
 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=J20d64H69qKDE3XlGdJoXIIh0G-d0jKoiIDsg9an5pk,1655
-labfreed-1.0.0b26.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-1.0.0b26.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-1.0.0b26.dist-info/METADATA,sha256=K8z2-hmoKb-cimYESItpZrexeEKNvSkvQkReD_W5wD8,19858
-labfreed-1.0.0b26.dist-info/RECORD,,
+labfreed-1.0.0b28.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-1.0.0b28.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-1.0.0b28.dist-info/METADATA,sha256=xn7Zie9NrWA3Zd1E__IiOsd8-mdnwy2u_IlUbAeTbaE,19858
+labfreed-1.0.0b28.dist-info/RECORD,,