labfreed 1.0.0b29__tar.gz → 1.0.0b31__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labfreed
-Version: 1.0.0b29
+Version: 1.0.0b31
 Summary: Python implementation of LabFREED building blocks
 Author-email: Reto Thürer <thuerer.r@buchi.com>
 Requires-Python: >=3.11
@@ -33,6 +33,7 @@ Requires-Dist: ruff>=0.11.5 ; extra == "dev"
 Requires-Dist: bleak>=2.0.0 ; extra == "experimental"
 Requires-Dist: Flask>=3.1.1 ; extra == "extended"
 Requires-Dist: openpyxl>=3.1.5 ; extra == "extended"
+Requires-Dist: flask-cors>=6.0.2 ; extra == "extended"
 Project-URL: Documentation, https://github.com/retothuerer/LabFREED?tab=readme-ov-file#readme
 Project-URL: Homepage, https://github.com/retothuerer/LabFREED
 Project-URL: Source, https://github.com/retothuerer/LabFREED

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

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

{labfreed-1.0.0b29 → labfreed-1.0.0b31}/labfreed/labfreed_extended/pac_issuer_lib/app_factory.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from functools import cache, partial, partialmethod
+from functools import cache, partial, partialmethod, wraps
 import logging
 import os
 from pathlib import Path
@@ -12,7 +12,9 @@ import jinja2
 from labfreed.labfreed_extended.pac_issuer_lib.lib.utils import add_ga_params, add_trace_id_params
 from pydantic import BaseModel, Field
 
-from flask import Blueprint, Flask, Response, current_app, flash, render_template, request, send_from_directory, session, url_for
+from flask import Blueprint, Flask, Response, current_app, flash, make_response, render_template, request, send_from_directory, session, url_for
+from flask_cors import CORS
+
 from werkzeug.middleware.proxy_fix import ProxyFix
 
 
@@ -106,6 +108,20 @@ class IssuerFlaskAppFactory():
                                     resolver_macros=resolver_macros,
                                     use_issuer_resolver_config = use_issuer_resolver_config)
         app.register_blueprint(bp)
+        
+        CORS(
+            app,
+            resources={
+                r"/resolver_config(\.ya?ml)?": {
+                    "origins": ["*"],
+                    "methods": ["GET"],
+                },
+                r"/attributes/.*": {
+                    "origins": ["*"],
+                    "methods": ["GET"]
+                },
+            },
+        )
         return app
     
     
@@ -373,6 +389,7 @@ class IssuerFlaskAppFactory():
         def resolver_configuration():
             return Response(bp._resolver_configuration, mimetype="application/x-yaml")
         
+       
         
         @bp_landing_page.get('/info_card')
         def pac_card():
@@ -479,15 +496,6 @@ render_context_utils = {
     
     
     
-        
-
-    
-        
-
-
-
-
-
 def attribute_data_from_module(module, default_language):
     try:
         ds = module.data_sources
@@ -508,5 +516,5 @@ def attribute_data_from_module(module, default_language):
     return attribute_data
 
 
-        
+
 

{labfreed-1.0.0b29 → labfreed-1.0.0b31}/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
 
@@ -161,6 +162,8 @@ class AttributeFlaskApp(Flask):
         return bp
     
     
+    
+    
 
 
 

{labfreed-1.0.0b29 → labfreed-1.0.0b31}/labfreed/pac_id_resolver/resolver_config.py

@@ -1,9 +1,10 @@
 import json
 import re
-from typing import Self
+from typing import Literal, Self
 from pydantic import Field, field_validator, model_validator
 import yaml
 import jsonpath_ng.ext as jsonpath
+from urllib.parse import quote as url_encode
 
 
 from labfreed.pac_id_resolver.services import Service, ServiceGroup
@@ -105,7 +106,7 @@ class ResolverConfigBlock(LabFREED_BaseModel):
 
 
 class ResolverConfig(LabFREED_BaseModel):
-    schema_version: str = Field(default='2.0')
+    schema_version: Literal["2.0"] = Field(default='2.0')
     '''Resolver Configuration'''
     origin: str = ''
     model_config = {
@@ -301,6 +302,7 @@ class ResolverConfig(LabFREED_BaseModel):
             res = self._evaluate_jsonpath(pac_id_json, expanded_placeholder) or ['']
             url:str = url.replace(f'{{{placeholder}}}', str(res[0]))
             url = url.strip()
+            url = url_encode(url)
             # res = self.substitute_jsonpath_expressions(expanded_placeholder, Patterns.jsonpath.value, as_bool=False)
             # url = url.replace(f'{{{placeholder}}}', res)
         return url

{labfreed-1.0.0b29 → labfreed-1.0.0b31}/pyproject.toml

@@ -44,6 +44,7 @@ dev = [
 extended = [
     "Flask>=3.1.1",
     "openpyxl>=3.1.5", 
+    "flask-cors>=6.0.2"
 ]
 experimental = [
     "bleak>=2.0.0"