labfreed 1.0.0b27__tar.gz → 1.0.0b29__tar.gz

{labfreed-1.0.0b27 → labfreed-1.0.0b29}/PKG-INFO

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

{labfreed-1.0.0b27 → labfreed-1.0.0b29}/labfreed/__init__.py

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

{labfreed-1.0.0b27 → labfreed-1.0.0b29}/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,6 +28,9 @@ 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
@@ -84,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:

{labfreed-1.0.0b27 → labfreed-1.0.0b29}/labfreed/pac_attributes/api_data_models/response.py

@@ -1,6 +1,6 @@
 
 from abc import ABC
-from datetime import  datetime
+from datetime import  datetime, date
 import re
 from typing import  Annotated, Any,  Literal, Union, get_args
 from urllib.parse import urlparse
@@ -43,7 +43,7 @@ class AttributeItemsElementBase(LabFREED_BaseModel, ABC):
     
 class DateTimeAttributeItemsElement(AttributeItemsElementBase):
     type: Literal["datetime"] = "datetime"
-    value: datetime
+    value: date | datetime
     
     @field_validator('value', mode='after')
     def set_utc__if_naive(cls, value):

{labfreed-1.0.0b27 → labfreed-1.0.0b29}/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-1.0.0b27 → labfreed-1.0.0b29}/labfreed/pac_attributes/pythonic/py_attributes.py

@@ -91,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-1.0.0b27 → labfreed-1.0.0b29}/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()