labfreed 1.0.0a22__tar.gz → 1.0.0a24__tar.gz

{labfreed-1.0.0a22 → labfreed-1.0.0a24}/PKG-INFO

@@ -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 → labfreed-1.0.0a24}/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-1.0.0a22 → labfreed-1.0.0a24}/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-1.0.0a22 → labfreed-1.0.0a24}/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-1.0.0a22 → labfreed-1.0.0a24}/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: