labfreed 1.0.0b26__tar.gz → 1.0.0b28__tar.gz

{labfreed-1.0.0b26 → labfreed-1.0.0b28}/PKG-INFO

@@ -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 → labfreed-1.0.0b28}/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-1.0.0b26 → labfreed-1.0.0b28}/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-1.0.0b26 → labfreed-1.0.0b28}/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.0b26 → labfreed-1.0.0b28}/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-1.0.0b26 → labfreed-1.0.0b28}/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 → labfreed-1.0.0b28}/tst_attr.py

@@ -17,32 +17,33 @@ import threading
 from werkzeug.serving import make_server
 
 
-
-
+MfgDate = "https://labfreed.org/terms/example/MfgDate"
+MaxWeight = "https://labfreed.org/terms/example/MaxWeight"
+CalWeight = "https://labfreed.org/terms/example/CalWeight"
+NominalWeight = "https://labfreed.org/terms/example/NominalWeight"
 
 data_source = pyDict_DataSource(attribute_group_key='ProductionData', 
                             data = {
                                 "HTTPS://PAC.METTORIUS.COM/-MD/BAL500/12340": pyAttributes([
-                                    pyAttribute(key="MfgDate", value=datetime(year=2015, month=10, day=1, hour=10, minute=12)),
-                                    pyAttribute(key="MaxWeight", values=Quantity(value=100.00, unit='g', log_least_significant_digit=-2)),
-                                    pyAttribute(key="CalWeight", values=pyReference('HTTPS://PAC.METTORIUS.COM/-MD/CALWEIGH/A00002')),
-                                    pyAttribute(key="multitext", values=["foo", "bar"])
+                                    pyAttribute(key=MfgDate, value=datetime(year=2015, month=10, day=1, hour=10, minute=12)),
+                                    pyAttribute(key=MaxWeight, values=Quantity(value=100.00, unit='g', log_least_significant_digit=-2)),
+                                    pyAttribute(key=CalWeight, values=pyReference('HTTPS://PAC.METTORIUS.COM/-MD/CALWEIGH/A00002'))
                                 ]),
                                 "HTTPS://PAC.METTORIUS.COM/-MD/BAL500/000001": pyAttributes([
-                                    pyAttribute(key="MfgDate", value=datetime(year=2015, month=10, day=1, hour=10, minute=12)),
-                                    pyAttribute(key="MaxWeight", values=Quantity(value=100.00, unit='g', log_least_significant_digit=-2)),
-                                    pyAttribute(key="CalWeight", values=pyReference('HTTPS://PAC.METTORIUS.COM/-MD/CALWEIGH/A00002'))
+                                    pyAttribute(key=MfgDate, value=datetime(year=2015, month=10, day=1, hour=10, minute=12)),
+                                    pyAttribute(key=MaxWeight, values=Quantity(value=100.00, unit='g', log_least_significant_digit=-2)),
+                                    pyAttribute(key=CalWeight, values=pyReference('HTTPS://PAC.METTORIUS.COM/-MD/CALWEIGH/A00002'))
                                 ]),
                                 "HTTPS://PAC.METTORIUS.COM/-MD/BAL500/12341": pyAttributes([
-                                    pyAttribute(key="MfgDate", values=datetime(year=2015, month=10, day=1, hour=10, minute=12)),
-                                    pyAttribute(key="MaxWeight", values=Quantity(value=111.00, unit='g', log_least_significant_digit=2))
+                                    pyAttribute(key=MfgDate, values=datetime(year=2015, month=10, day=1, hour=10, minute=12)),
+                                    pyAttribute(key=MaxWeight, values=Quantity(value=111.00, unit='g', log_least_significant_digit=2))
                                 ]),
                                 "HTTPS://PAC.METTORIUS.COM/-MD/BAL500/12342": pyAttributes([
-                                    pyAttribute(key="MfgDate", values=datetime(year=2015, month=10, day=1, hour=10, minute=12)),
-                                    pyAttribute(key="MaxWeight", values=Quantity(value=100.00, unit='g'))
+                                    pyAttribute(key=MfgDate, values=datetime(year=2015, month=10, day=1, hour=10, minute=12)),
+                                    pyAttribute(key=MaxWeight, values=Quantity(value=100.00, unit='g'))
                                 ]),
                                 "HTTPS://PAC.METTORIUS.COM/-MD/CALWEIGH/A00002": pyAttributes([
-                                    pyAttribute(key="NominalWeight", values=Quantity(value=50.00, unit='g'))
+                                    pyAttribute(key=NominalWeight, values=Quantity(value=50.00, unit='g'))
                                 ])
                                 }
                 )