labfreed 1.0.0a22__py3-none-any.whl → 1.0.0a24__py3-none-any.whl

labfreed/__init__.py

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

labfreed/labfreed_extended/pac_issuer_lib/app_factory.py

@@ -82,10 +82,13 @@ class IssuerFlaskAppFactory():
                     app_secret:str|None = None,
                     pac_info_extender:PacInfoExtender|None = None,
                     resolver_macros:dict[str, str] = None,
-                    use_issuer_resolver_config=True,
+                    use_issuer_resolver_config=False,
                     feature_flags:dict|None = None):
         
         app =  Flask(__name__, static_folder=None, static_url_path='/static') 
+        
+        if not feature_flags:
+            feature_flags = dict()
         app.config['feature_flags'] = feature_flags
         
         app.wsgi_app = ProxyFix(app.wsgi_app, x_proto=1, x_host=1)
@@ -115,7 +118,7 @@ class IssuerFlaskAppFactory():
                             path_to_custom_resources:str|None = None,
                             pac_info_extender:PacInfoExtender|None = None,
                             resolver_macros:dict[str, str] = None, 
-                            use_issuer_resolver_config=True):
+                            use_issuer_resolver_config=False):
         
         logging.info('initializing Blueprint')
         

labfreed/pac_attributes/pythonic/py_attributes.py

@@ -112,7 +112,7 @@ class pyAttributes(RootModel[list[pyAttribute]]):
         
         elif isinstance(first_value, str):
             # capture quantities in the form of "100.0e5 g/L"
-            if Quantity.from_str_with_unit(first_value):
+            if Quantity.can_convert_to_quantity(first_value):
                 values = []
                 for v in value_list:
                     q = Quantity.from_str_with_unit(v)

labfreed/trex/pythonic/quantity.py

@@ -65,9 +65,19 @@ class Quantity(BaseModel):
         q = Quantity(value = num_val, unit=unit, log_least_significant_digit=log_least_significant_digit)
         return q
     
+    @classmethod
+    def can_convert_to_quantity(cls, value:str):
+        ''' assumes value and unit are separated by " " '''
+        m = re.match(r'^\s*(?P<mantissa>-?\d+(\.\d+)?)([Ee]-?(?P<exponent>\d+))?\s+(?P<unit>\S+)\s*$', value)
+        return bool(m) 
+    
     @classmethod
     def from_str_with_unit(cls, value:str):
         ''' assumes value and unit are separated by " " '''
+        m = re.match(r'^\s*(?P<mantissa>-?\d+(\.\d+)?)([Ee]-?(?P<exponent>\d+))?\s+(?P<unit>\S+)\s*$', value)
+        if not m:
+            print(f'{value} cannot be converted to Quantity')
+            return None
         try:
             parts = value.strip().split(' ', 1)
             if len(parts) == 2:

{labfreed-1.0.0a22.dist-info → labfreed-1.0.0a24.dist-info}/METADATA

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

{labfreed-1.0.0a22.dist-info → labfreed-1.0.0a24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-labfreed/__init__.py,sha256=ms99ZcsB1o6YUpXuP8IiPF0GLSYyATYh_lx8NuJXGfo,339
+labfreed/__init__.py,sha256=YJ0OVJt08uSlo0RzxUJM71nyql81qOyOpLqVVSxh_o4,339
 labfreed/labfreed_infrastructure.py,sha256=ss1PyJl-7Es-lEcxptmdYI9kDAHmh7HB_tAGkPC6UVs,10173
 labfreed/labfreed_extended/app/app_infrastructure.py,sha256=z3pxqYPgH8MFZJB2pR2mblpB7VrawQbXWJmz2nrZ6ZA,4581
 labfreed/labfreed_extended/app/formatted_print.py,sha256=DcwWP0ix1e_wYNIdceIp6cETkJdG2DqpU8Gs3aZAL40,1930
@@ -8,7 +8,7 @@ labfreed/labfreed_extended/app/pac_info/html_renderer/macros.jinja.html,sha256=1
 labfreed/labfreed_extended/app/pac_info/html_renderer/pac-info-style.css,sha256=C5pyD956fd6pJgUBjGxvxgL0Wbgq0v7ZLY4Vr-sJZ7A,4169
 labfreed/labfreed_extended/app/pac_info/html_renderer/pac_info.jinja.html,sha256=njXE9xexFdMlX65eDiwqE8PzbMATUOJAbwBCh5JvahY,1293
 labfreed/labfreed_extended/app/pac_info/html_renderer/pac_info_card.jinja.html,sha256=6UdsZtqJ3soSAYTKN43OB1Onm93WYz23TfM2GBYzJ-U,152
-labfreed/labfreed_extended/pac_issuer_lib/app_factory.py,sha256=Ezk32_YBdWOABMaSvnz0weP6aVSy-yxG1XhBdkofFQk,19993
+labfreed/labfreed_extended/pac_issuer_lib/app_factory.py,sha256=eeIaiCTXV7_aWwDgWhGVjDY4O9uSQoyDQl7YSXVhmA0,20072
 labfreed/labfreed_extended/pac_issuer_lib/lib/attribute.py,sha256=BH6yJNFrfEK6dcn7GSPKbfz-0wcJ0NEXrku1e18hVuQ,6797
 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
@@ -49,7 +49,7 @@ labfreed/pac_attributes/client/attribute_cache.py,sha256=ThUadWqQ5oM8DnAnvZuY4je
 labfreed/pac_attributes/client/client.py,sha256=AgOrk4tnn5txO50LCmJlhniazxkfeH8U-8yytGB58AM,7527
 labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=t3ARmsXdbdQ0QAgRkdHT_ScmpZhXzz3lZkN0WovzygQ,6174
 labfreed/pac_attributes/pythonic/excel_attribute_data_source.py,sha256=VEYrSb2r62GJeECc42ppTwZXsYJ-1oHoHQz7HbcM-_Y,8461
-labfreed/pac_attributes/pythonic/py_attributes.py,sha256=nhFGg7VPNI9ksNsbkSU6AzhuEf0GdFTIOxtPBZRjr9w,8707
+labfreed/pac_attributes/pythonic/py_attributes.py,sha256=SsZfrCjd6FJFDe_pmpKJQ2PGrpDfNacHlUzFDBxjWwc,8712
 labfreed/pac_attributes/pythonic/py_dict_data_source.py,sha256=nAz6GA7Xx_0IORPPpt_Wl3sFJa1Q5Fnq5vdf1uQiJF8,531
 labfreed/pac_attributes/server/__init__.py,sha256=JvQ2kpQx62OUwP18bGhOWYU9an_nQW59Y8Lh7HyfVxY,301
 labfreed/pac_attributes/server/attribute_data_sources.py,sha256=Jx7hFFoiMZmGcSHMEYv5PVf7PFn6iiGIz6uAAjsxswI,2348
@@ -81,7 +81,7 @@ labfreed/trex/value_segments.py,sha256=_fbDHDRfo7pxIWpzcbyjppv1VNd8Tnd-VXhbd6igI
 labfreed/trex/pythonic/__init__.py,sha256=dyAQG7t-uYN6VfGXbWIq2bHxGcGI63l7FS2-VPYs2RQ,137
 labfreed/trex/pythonic/data_table.py,sha256=KGyA5hRdDOOkJB0EOyjmzbbMusgYkBB_2SIFzrJ25yI,3148
 labfreed/trex/pythonic/pyTREX.py,sha256=wWYYb9pyZB01ObGOHf8gXzvMyAGzuCTduHzP03yvKj8,10157
-labfreed/trex/pythonic/quantity.py,sha256=jmhHfmEclYBQ1cLmOtmV7Ull4S0qHKIYVE0uhtNFFz0,5441
+labfreed/trex/pythonic/quantity.py,sha256=8WpJ73EgOdWin25R-zx8y_Tumt1sbYHFmx0dGES41Ew,5930
 labfreed/utilities/base36.py,sha256=_yX8aQ1OwrK5tnJU1NUEzQSFGr9xAVnNvPObpNzCPYs,2895
 labfreed/utilities/ensure_utc_time.py,sha256=1ZTTzyIt7IimQ4ArTzdgw5hxiabkkplltbQe3Wdt2ZQ,307
 labfreed/utilities/translations.py,sha256=XY4Wud_BfXswUOpebdh0U_D2bMzb2vqluuGWzFK-3uU,1851
@@ -96,7 +96,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.0a22.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-1.0.0a22.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-1.0.0a22.dist-info/METADATA,sha256=DcbGgkdbyV63M41BScw5aTLXaqe896ASS0RJoy_I33w,19858
-labfreed-1.0.0a22.dist-info/RECORD,,
+labfreed-1.0.0a24.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-1.0.0a24.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-1.0.0a24.dist-info/METADATA,sha256=EczsCKycg7KL5b5uX61-3KzgTpZl_bg1hkn2gb1GLL0,19858
+labfreed-1.0.0a24.dist-info/RECORD,,