labfreed 1.0.0b29__py3-none-any.whl → 1.0.0b31__py3-none-any.whl

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/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/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/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.dist-info → labfreed-1.0.0b31.dist-info}/METADATA

@@ -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.dist-info → labfreed-1.0.0b31.dist-info}/RECORD

@@ -1,9 +1,9 @@
-labfreed/__init__.py,sha256=uKG2k1_2wyXTtMzlKv9Gp53vzWg6gCQwubP6Uq8wet8,339
+labfreed/__init__.py,sha256=yGo_7_bwgMO8teUgi_H0AFb41hJ10wspYslKvwNtWlg,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
 labfreed/labfreed_extended/app/pac_info/pac_info.py,sha256=HWTYA20cIBpwUl4eRs5cNghCHs3_SOS9yARt11YN0XY,9078
-labfreed/labfreed_extended/pac_issuer_lib/app_factory.py,sha256=eeIaiCTXV7_aWwDgWhGVjDY4O9uSQoyDQl7YSXVhmA0,20072
+labfreed/labfreed_extended/pac_issuer_lib/app_factory.py,sha256=bSe3BaD9bcUAAdpLu9LrDgxwcqddmNI0GrkWQ0cVLvY,20470
 labfreed/labfreed_extended/pac_issuer_lib/lib/attribute.py,sha256=Nu2NpaPbFIzDMa17oESJK9pZ3Qv86H3fMmuY5kWre7M,7182
 labfreed/labfreed_extended/pac_issuer_lib/lib/bp_landing_page.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 labfreed/labfreed_extended/pac_issuer_lib/lib/utils.py,sha256=aUdJGFLx1HDDXGRqMVJuGn7uqzNXHrEb7cCA-nX920Y,651
@@ -41,7 +41,7 @@ labfreed/pac_attributes/api_data_models/response.py,sha256=8OhqMrZJSzQlSTG9bES7b
 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=VYyVfhTpNQlLtpMBGWcpnoQHIqehr3K44rdUT9dQepE,7774
+labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=myomxR9e5zOKmUpA5HSaarsUzHnotwDZ-QcGfe4ocRU,7830
 labfreed/pac_attributes/pythonic/excel_attribute_data_source.py,sha256=IBBGpHgt-HiZeB6dsLcjtqUPP2JdViLz2QMIDMjzmME,8467
 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
@@ -62,7 +62,7 @@ labfreed/pac_id/url_serializer.py,sha256=01LB30pNMBtv2rYHsiE_4Ga2iVA515Boj4ikOIY
 labfreed/pac_id_resolver/__init__.py,sha256=RNBlrDOSR42gmSNH9wJVhK_xwEX45cvTKVgWW2bjh7Q,113
 labfreed/pac_id_resolver/cit_v1.py,sha256=JGlEH2d9awEu3HxPW7vu0uj4ZC3B02IdmFg7aJ4axQw,9833
 labfreed/pac_id_resolver/resolver.py,sha256=anqteWexD7w78wzd1TjT06enkDIU-P-7NVKNWiASXLU,4127
-labfreed/pac_id_resolver/resolver_config.py,sha256=M52v2ps_dGTxQ6x-AV16m5eCbjg_vzwQARxzGTucdaU,12457
+labfreed/pac_id_resolver/resolver_config.py,sha256=cy11oznl5zppcqHPPSb5u9BbmM6Xz97JL6hAyANsKfk,12558
 labfreed/pac_id_resolver/resolver_config_common.py,sha256=JGbgT2YSBc3NQ5x9CV3diqYZgpDGWygGPd5flk4-hWk,2958
 labfreed/pac_id_resolver/services.py,sha256=IGEueWh2UeXKh6dIOs_ZNTvzguHPVuNB7SmV-FHPYns,2650
 labfreed/qr/__init__.py,sha256=fdKwP6W2Js--yMbBUdn-g_2uq2VqPpfQJeDLHsMDO-Y,61
@@ -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.0b29.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-1.0.0b29.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-1.0.0b29.dist-info/METADATA,sha256=Y-BIytNOndf-iSwFc_Lt6ck-NdzTsenSrKZaPsBPyls,19858
-labfreed-1.0.0b29.dist-info/RECORD,,
+labfreed-1.0.0b31.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-1.0.0b31.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-1.0.0b31.dist-info/METADATA,sha256=uKC23ulmwl-ZjKvUIqWowOToUUQpi7uvlEA0AWFCR14,19913
+labfreed-1.0.0b31.dist-info/RECORD,,