labfreed 1.0.0a14__tar.gz → 1.0.0a16__tar.gz

{labfreed-1.0.0a14 → labfreed-1.0.0a16}/PKG-INFO

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

{labfreed-1.0.0a14 → labfreed-1.0.0a16}/labfreed/__init__.py

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

{labfreed-1.0.0a14 → labfreed-1.0.0a16}/labfreed/labfreed_extended/app/app_infrastructure.py

@@ -17,10 +17,11 @@ from labfreed.pac_id_resolver.services import ServiceGroup
 
 
 class Labfreed_App_Infrastructure():
-    def __init__(self, markup = 'rich', language_preferences:list[str]|str='en', http_client:requests.Session|None=None):
+    def __init__(self, markup = 'rich', language_preferences:list[str]|str='en', http_client:requests.Session|None=None, use_issuer_resolver_config=True):
         if isinstance(language_preferences, str):
             language_preferences = [language_preferences]
         self._language_preferences = language_preferences
+        self._use_issuer_resolver_config = use_issuer_resolver_config
         
         self._resolver = PAC_ID_Resolver()
         
@@ -48,7 +49,7 @@ class Labfreed_App_Infrastructure():
             pac = PAC_ID.from_url(pac_url)
         else:
             pac = pac_url
-        service_groups = self._resolver.resolve(pac, check_service_status=False)
+        service_groups = self._resolver.resolve(pac, check_service_status=False, use_issuer_resolver_config=self._use_issuer_resolver_config)
         
         pac_info = PacInfo(pac_id=pac)
                        

{labfreed-1.0.0a14 → labfreed-1.0.0a16}/labfreed/pac_attributes/api_data_models/response.py

@@ -121,6 +121,7 @@ class ResourceAttribute(AttributeBase):
     @model_validator(mode='after')
     def _validate_value(self):
         _validate_resource(self, self.value)
+        return self
 
 class ResourceListAttribute(AttributeBase):
     type: Literal["resource-list"]

{labfreed-1.0.0a14 → labfreed-1.0.0a16}/labfreed/pac_attributes/pythonic/excel_attribute_data_source.py

@@ -75,9 +75,10 @@ class _BaseExcelAttributeDataSource(AttributeGroupDataSource):
     Subclasses implement `_read_rows_and_last_changed()`.
     """
 
-    def __init__(self, *, base_url: str = "", cache_duration_seconds: int = 0, uses_pac_cat_short_form:bool=True, **kwargs):
+    def __init__(self, *, base_url: str = "", cache_duration_seconds: int = 0, uses_pac_cat_short_form:bool=True, pac_to_key=None, **kwargs):
         self._base_url = base_url
         self._uses_pac_cat_short_form = uses_pac_cat_short_form
+        self._pac_to_key = pac_to_key
         # allow instance-level TTL override
         try:
             _cache.ttl = int(cache_duration_seconds)
@@ -106,11 +107,16 @@ class _BaseExcelAttributeDataSource(AttributeGroupDataSource):
         except:
             ... # might as well try to match the original input
             
+        if f:= self._pac_to_key:
+            key = f(pac_url)
+        else:
+            key = pac_url
+            
         rows, last_changed = self._read_rows_and_last_changed()
-        d = _get_row_by_first_cell(rows, pac_url, self._base_url)
+        d = _get_row_by_first_cell(rows, key, self._base_url)
         if not d:
             return None
-        attributes = [pyAttribute(key=k, value=v) for k, v in d.items()]
+        attributes = [pyAttribute(key=k, value=v) for k, v in d.items() if v is not None]
         return AttributeGroup(
             key=self._attribute_group_key,
             attributes=pyAttributes(attributes).to_payload_attributes()

{labfreed-1.0.0a14 → labfreed-1.0.0a16}/labfreed/pac_attributes/pythonic/py_attributes.py

@@ -1,12 +1,12 @@
 
-from datetime import date, datetime, time
+from datetime import UTC, date, datetime, time
 import json
 from typing import  Literal
 import warnings
 from pydantic import RootModel, field_validator
 
 from labfreed.labfreed_infrastructure import LabFREED_BaseModel
-from labfreed.pac_attributes.api_data_models.response import AttributeBase, AttributeGroup, BoolAttribute, DateTimeAttribute,  NumericAttribute, NumericValue, ObjectAttribute, ReferenceAttribute, ResourceAttribute, TextAttribute
+from labfreed.pac_attributes.api_data_models.response import AttributeBase, AttributeGroup, BoolAttribute, BoolListAttribute, DateTimeAttribute, DateTimeListAttribute,  NumericAttribute, NumericListAttribute, NumericValue, ObjectAttribute, ReferenceAttribute, ReferenceListAttribute, ResourceAttribute, ResourceListAttribute, TextAttribute, TextListAttribute
 from labfreed.pac_attributes.client.attribute_cache import CacheableAttributeGroup
 from labfreed.pac_id.pac_id import PAC_ID
 from labfreed.trex.pythonic.quantity import Quantity
@@ -66,13 +66,21 @@ class pyAttributes(RootModel[list[pyAttribute]]):
         value_list = attribute.value_list
         first_value = value_list[0]
         if isinstance(first_value, bool):
-            return BoolAttribute(value=value_list, **common_args)
+            if len(value_list) == 1:
+                return BoolAttribute(value=value_list[0], **common_args)
+            else:
+                return BoolListAttribute(value=value_list, **common_args)
+         
             
         elif isinstance(first_value, datetime | date | time):
             for v in value_list:
                 if not v.tzinfo:
                     warnings.warn(f'No timezone given for {v}. Assuming it is in UTC.')
-            return DateTimeAttribute(value=value_list, **common_args)
+                    v.replace(tzinfo=UTC)
+            if len(value_list) == 1:
+                return DateTimeAttribute(value=value_list[0], **common_args)
+            else:
+                return DateTimeListAttribute(value=value_list, **common_args)
             # return DateTimeAttribute(value =_date_value_from_python_type(value).value, **common_args)
             
         
@@ -83,9 +91,13 @@ class pyAttributes(RootModel[list[pyAttribute]]):
                     v = Quantity(value=v, unit='dimensionless')
                 values.append(NumericValue(numerical_value=v.value_as_str(), 
                                             unit = v.unit))
-            num_attribute = NumericAttribute(value = values, **common_args)
-            num_attribute.print_validation_messages()
-            return num_attribute
+            if len(values) == 1:
+                num_attr = NumericAttribute(value=values[0], **common_args)
+            else:
+                num_attr = NumericListAttribute(value=values, **common_args)
+            num_attr.print_validation_messages()
+            
+            return num_attr
         
         elif isinstance(first_value, str):
             # capture quantities in the form of "100.0e5 g/L"
@@ -94,20 +106,37 @@ class pyAttributes(RootModel[list[pyAttribute]]):
                 for v in value_list:
                     q = Quantity.from_str_with_unit(v)
                     values.append( NumericValue(numerical_value=q.value_as_str(), unit = q.unit) )
-                return NumericAttribute(value = values,
-                                            **common_args)
-                
+                if len(values) == 1:
+                    return NumericAttribute(value=values[0], **common_args)
+                else:
+                    return NumericListAttribute(value=values, **common_args)
+
             else:
-                return TextAttribute(value = value_list, **common_args)
+                if len(value_list) == 1:
+                    return TextAttribute(value=value_list[0], **common_args)
+                else:
+                    return TextListAttribute(value=value_list, **common_args)
             
         elif isinstance(first_value, pyReference):
-            return ReferenceAttribute(value = [v.root for v in value_list], **common_args)
+            values = [v.root for v in value_list]
+            if len(values) == 1:
+                return ReferenceAttribute(value=values[0], **common_args)
+            else:
+                return ReferenceListAttribute(value=values, **common_args)
         
         elif isinstance(first_value, pyResource):
-            return ResourceAttribute(value = [v.root for v in value_list], **common_args)
+            values = [v.root for v in value_list]
+            if len(values) == 1:
+                return ResourceAttribute(value=values[0], **common_args)
+            else:
+                return ResourceListAttribute(value=values, **common_args)
             
         elif isinstance(first_value, PAC_ID):
-            return ReferenceAttribute(value = [v.to_url(include_extensions=False) for v in value_list], **common_args)
+            values = [v.to_url(include_extensions=False) for v in value_list]
+            if len(values) == 1:
+                return ReferenceAttribute(value=values[0], **common_args)
+            else:
+                return ReferenceListAttribute(value=values, **common_args)
         
         else: #this covers the last resort case of arbitrary objects. Must be json serializable.
             try :
@@ -124,25 +153,25 @@ class pyAttributes(RootModel[list[pyAttribute]]):
         for a in attributes:
             value_list = a.value if isinstance(a.value, list) else [a.value]
             match a:
-                case ReferenceAttribute():
+                case ReferenceAttribute() | ReferenceListAttribute():
                     values =  [pyReference(v) for v in value_list]
                     
-                case ResourceAttribute():
+                case ResourceAttribute() | ResourceListAttribute():
                     values =  [pyResource(v) for v in value_list]
                     
-                case NumericAttribute():                                       
+                case NumericAttribute() | NumericListAttribute():                                       
                     values = [ Quantity.from_str_value(value=v.numerical_value, unit=v.unit) for v in value_list]
 
-                case BoolAttribute():
+                case BoolAttribute() | BoolAttribute():
                     values = value_list
                     
-                case TextAttribute():
+                case TextAttribute() | TextListAttribute():
                     values = value_list
                     
-                case DateTimeAttribute():                    
+                case DateTimeAttribute() | DateTimeAttribute():                    
                     values = value_list
                 
-                case ObjectAttribute():
+                case ObjectAttribute() | ObjectAttribute():
                     values = value_list
 
                        

{labfreed-1.0.0a14 → labfreed-1.0.0a16}/labfreed/pac_id_resolver/resolver.py

@@ -101,11 +101,14 @@ class PAC_ID_Resolver():
          
         matches = []
         for cit in resolver_configs:
-            if isinstance(cit, CIT_v1):
-                # cit v1 has no concept of categories and implied keys. It would treat these segments as value segment
-                matches.append(cit.evaluate_pac_id(pac_id_catless))
-            else:
-                matches.append(cit.evaluate_pac_id(pac_id))
+            try:
+                if isinstance(cit, CIT_v1):
+                    # cit v1 has no concept of categories and implied keys. It would treat these segments as value segment
+                    matches.append(cit.evaluate_pac_id(pac_id_catless))
+                else:
+                    matches.append(cit.evaluate_pac_id(pac_id))
+            except Exception as e:
+                logging.error(f'Failed to resolve pac {pac_id.to_url()} with cit {cit.origin}')
         
         if check_service_status:
             for m in matches:

{labfreed-1.0.0a14 → labfreed-1.0.0a16}/labfreed/pac_id_resolver/resolver_config.py

@@ -74,7 +74,7 @@ class ResolverConfigEntry(LabFREED_BaseModel):
     
     @model_validator(mode='after')
     def _validate_service_type(self):
-        allowed_types = [ServiceType.ATTRIBUTE_SERVICE_GENERIC.value, ServiceType.USER_HANDOVER_GENERIC.value]
+        allowed_types = [ServiceType.ATTRIBUTE_SERVICE_GENERIC.value, ServiceType.USER_HANDOVER_GENERIC.value, ServiceType.ACTION_GENERIC.value]
         if self.service_type not in allowed_types:
             if isinstance(self.service_type, ServiceType):
                 s= self.service_type.value

{labfreed-1.0.0a14 → labfreed-1.0.0a16}/labfreed/pac_id_resolver/resolver_config_common.py

@@ -7,6 +7,7 @@ from labfreed.labfreed_infrastructure import ValidationMsgLevel, _quote_texts
 class ServiceType(Enum):
     USER_HANDOVER_GENERIC = 'userhandover-generic'
     ATTRIBUTE_SERVICE_GENERIC = 'attributes-generic'
+    ACTION_GENERIC = "action-generic"
 
 
 def _validate_service_name(service_name):
@@ -62,7 +63,7 @@ def _validate_service_type(service_type):
             service_type= service_type.value
     else:
         service_type= service_type
-    allowed_types = [ServiceType.ATTRIBUTE_SERVICE_GENERIC.value, ServiceType.USER_HANDOVER_GENERIC.value]
+    allowed_types = [ServiceType.ATTRIBUTE_SERVICE_GENERIC.value, ServiceType.USER_HANDOVER_GENERIC.value, ServiceType.ACTION_GENERIC.value]
     if service_type not in allowed_types:
         msg_dict.append( {
                 "level": ValidationMsgLevel.ERROR,