labfreed 1.0.0b28__tar.gz → 1.0.0b30__tar.gz

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

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

{labfreed-1.0.0b28 → labfreed-1.0.0b30}/labfreed/__init__.py

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

{labfreed-1.0.0b28 → labfreed-1.0.0b30}/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.0b28 → labfreed-1.0.0b30}/labfreed/pac_attributes/pythonic/attribute_server_factory.py

@@ -1,10 +1,11 @@
 from enum import Enum
+from functools import wraps
 import json
 import logging
 from typing import Any, Protocol
 from urllib.parse import unquote, unquote_plus
 
-from flask import Blueprint, current_app, redirect, url_for, send_from_directory
+from flask import Blueprint, current_app, make_response, 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
 
@@ -75,6 +76,7 @@ class AttributeFlaskApp(Flask):
 
 
         @bp.get("/<path:pac_id_url_encoded>", strict_slashes=False)
+        @cors_attributes
         def handle_attribute_request(pac_id_url_encoded):
             
             if authenticator and not authenticator(request):
@@ -161,6 +163,26 @@ class AttributeFlaskApp(Flask):
         return bp
     
     
+def cors_attributes(fn):
+    @wraps(fn)
+    def wrapper(*args, **kwargs):
+        # Preflight
+        if request.method == "OPTIONS":
+            response = make_response()
+            response.headers["Access-Control-Allow-Origin"] = "*"
+            response.headers["Access-Control-Allow-Methods"] = "GET, OPTIONS"
+            response.headers["Access-Control-Allow-Headers"] = "Content-Type, Authorization"
+            response.headers["Access-Control-Max-Age"] = "86400"
+            return response
+
+        # Actual request
+        response = make_response(fn(*args, **kwargs))
+        response.headers["Access-Control-Allow-Origin"] = "*"
+        return response
+
+    return wrapper
+    
+