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

labfreed/pac_attributes/pythonic/py_attributes.py

@@ -1,14 +1,18 @@
 
 from datetime import UTC, date, datetime, time
 import json
+import logging
 from typing import  Literal
 from enum import Enum
 import warnings
-from pydantic import RootModel, field_validator
+from pydantic import RootModel, field_validator, model_validator
 
 from labfreed.labfreed_infrastructure import LabFREED_BaseModel
-from labfreed.pac_attributes.api_data_models.response import AttributeBase, AttributeGroup, BoolAttribute, BoolListAttribute, DateTimeAttribute, DateTimeListAttribute,  NumericAttribute, NumericListAttribute, NumericValue, ObjectAttribute,ObjectListAttribute, ReferenceAttribute, ReferenceListAttribute, ResourceAttribute, ResourceListAttribute, TextAttribute, TextListAttribute
-from labfreed.pac_attributes.client.attribute_cache import CacheableAttributeGroup
+from labfreed.pac_attributes.api_data_models.response import (Attribute, AttributeItemsElementBase, AttributeGroup, 
+                                                              BoolAttributeItemsElement, DateTimeAttributeItemsElement, NumericAttributeItemsElement,  
+                                                              ObjectAttributeItemsElement, ReferenceAttributeItemsElement,  ResourceAttributeItemsElement,
+                                                              TextAttributeItemsElement)
+from labfreed.pac_attributes.client.client_attribute_group import ClientAttributeGroup
 from labfreed.pac_id.pac_id import PAC_ID
 from labfreed.trex.pythonic.quantity import Quantity
 
@@ -33,15 +37,21 @@ AllowedList = list[AllowedValue]
 class pyAttribute(LabFREED_BaseModel):
     key:str
     label:str = ""
-    value: AllowedValue | AllowedList
+    values: AllowedValue | AllowedList
     
     @property
     def value_list(self):    
         '''helper function to more conveniently iterate over value elements, even if it's scalar'''   
-        return self.value if isinstance(self.value, list) else [self.value]
+        return self.values if isinstance(self.values, list) else [self.values]
     
+    @model_validator(mode='before')
+    def value_to_values(cls, d:dict):
+        value =d.pop('value', None)
+        if value is not None:
+            d['values'] = value
+        return d
     
-    @field_validator('value', mode='before')
+    @field_validator('values', mode='before')
     def handle_one_element_list(v):
         if isinstance(v, list) and len(v)==1:
             return v[0]
@@ -58,147 +68,109 @@ class pyAttribute(LabFREED_BaseModel):
     
 
 class pyAttributes(RootModel[list[pyAttribute]]):
-    def to_payload_attributes(self) -> list[AttributeBase]:
-        out = []
+    def to_payload_attributes(self) -> dict[str, Attribute]:
+        out = {}
         for e in self.root:
-            apt = self._attribute_to_attribute_payload_type(e)
-            if isinstance(apt.value, list) and len(apt.value) ==1:
-                apt.value = apt.value[0]
-            out.append(apt)
+            payload_attr = self._attribute_to_attribute_payload_type(e)
+            out.update({e.key: payload_attr})
         return out
     
             
     @staticmethod        
-    def _attribute_to_attribute_payload_type(attribute:pyAttribute) -> AttributeBase:
-        common_args = {
-            "key": attribute.key,
-            "label": attribute.label,
-        }
-        value_list = attribute.value_list
-        first_value = value_list[0]
-        if isinstance(first_value, bool):
-            if len(value_list) == 1:
-                return BoolAttribute(value=value_list[0], **common_args)
-            else:
-                return BoolListAttribute(value=value_list, **common_args)
-         
+    def _attribute_to_attribute_payload_type(attribute:pyAttribute) -> AttributeItemsElementBase:
+        items = []
+        for value in attribute.value_list:
             
-        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.')
-                    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)
-            
-        
-        elif isinstance(first_value, Quantity|int|float):
-            values = []
-            for v in value_list:
-                if not isinstance(v, Quantity):
-                    v = Quantity(value=v, unit='dimensionless')
-                values.append(NumericValue(numerical_value=v.value_as_str(), 
-                                            unit = v.unit))
-            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"
-            if Quantity.can_convert_to_quantity(first_value):
-                values = []
-                for v in value_list:
-                    q = Quantity.from_str_with_unit(v)
-                    values.append( NumericValue(numerical_value=q.value_as_str(), unit = q.unit) )
-                if len(values) == 1:
-                    return NumericAttribute(value=values[0], **common_args)
+            if isinstance(value, bool):
+                items.append(BoolAttributeItemsElement(value=value))
+             
+            elif isinstance(value, datetime | date | time):
+                if not value.tzinfo:
+                    warnings.warn(f'No timezone given for {value}. Assuming it is in UTC.')
+                    value.replace(tzinfo=UTC)
+                items.append(DateTimeAttributeItemsElement(value=value))
+                
+            elif isinstance(value, Quantity|int|float):
+                if not isinstance(value, Quantity):
+                    value = Quantity(value=value, unit='dimensionless')
+                v = f"{value.value_as_str()} {value.unit}"
+                items.append(NumericAttributeItemsElement(value=v))    
+                
+            elif isinstance(value, str):
+                # capture quantities in the form of "100.0e5 g/L"
+                if Quantity.can_convert_to_quantity(value):
+                    q = Quantity.from_str_with_unit(value)
+                    v = f"{q.value_as_str()} {q.unit}"
+                    items.append(NumericAttributeItemsElement(value=v))      
                 else:
-                    return NumericListAttribute(value=values, **common_args)
+                    items.append(TextAttributeItemsElement(value=value))
 
-            else:
-                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):
-            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):
-            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):
-            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 :
-                values = [json.loads(json.dumps(v)) for v in value_list]
-                if len(values) == 1:
-                    return ObjectAttribute(value=values[0], **common_args)
-                else:
-                    return ObjectListAttribute(value=values, **common_args)
-            except TypeError as e:  # noqa: F841
-                raise ValueError(f'Invalid Type: {type(first_value)} cannot be converted to attribute. You may want to use ObjectAttribute, but would have to implement the conversion from your python type yourself.')
+            elif isinstance(value, pyReference):
+                items.append(ReferenceAttributeItemsElement(value=value.root))
+
+            elif isinstance(value, pyResource):
+                items.append(ResourceAttributeItemsElement(value=value.root))
+                
+            elif isinstance(value, PAC_ID):
+                v = value.to_url(include_extensions=False)
+                items.append(ReferenceAttributeItemsElement(value=v))
+                
+            else: #this covers the last resort case of arbitrary objects. Must be json serializable.
+                try :
+                    v = json.loads(json.dumps(value))
+                    items.append(ObjectAttributeItemsElement(value=v))
+                except TypeError as e:  # noqa: F841
+                    raise ValueError(f'Invalid Type: {type(value)} cannot be converted to attribute. You may want to use ObjectAttribute, but would have to implement the conversion from your python type yourself.')
         
+                    
+        if not all(type(e) is type(items[0]) for e in items):
+            logging.warning("Not all elements in items have the same type. This might cause unexpected behaviour in clients.")
         
+        attr = Attribute(key=attribute.key,
+                         label= attribute.label,
+                         items=items)
+        return attr
+            
+  
         
     @staticmethod
-    def from_payload_attributes(attributes:list[AttributeBase]) -> 'pyAttributes':
+    def from_payload_attributes(attributes:dict[str, Attribute]) -> 'pyAttributes':
         out = list()
-        for a in attributes:
-            value_list = a.value if isinstance(a.value, list) else [a.value]
-            match a:
-                case ReferenceAttribute() | ReferenceListAttribute():
-                    values =  [pyReference(v) for v in value_list]
-                    
-                case ResourceAttribute() | ResourceListAttribute():
-                    values =  [pyResource(v) for v in value_list]
-                    
-                case NumericAttribute() | NumericListAttribute():                                       
-                    values = [ Quantity.from_str_value(value=v.numerical_value, unit=v.unit) for v in value_list]
+        for a in attributes.values():
+            values = []
+            for v in a.items:
+                match v:
+                    case ReferenceAttributeItemsElement() :
+                        values.append(pyReference(v.value))
+                        
+                    case ResourceAttributeItemsElement() :
+                        values.append(pyResource(v.value))
+                        
+                    case NumericAttributeItemsElement() :                                       
+                        values.append(Quantity.from_str_value(value=v._numerical_value, unit=v._unit))
 
-                case BoolAttribute() | BoolListAttribute():
-                    values = value_list
+                    case BoolAttributeItemsElement() :
+                        values.append(v.value)
+                        
+                    case TextAttributeItemsElement() :
+                        values.append(v.value)
+                        
+                    case DateTimeAttributeItemsElement() :                    
+                        values.append(v.value)
                     
-                case TextAttribute() | TextListAttribute():
-                    values = value_list
-                    
-                case DateTimeAttribute() | DateTimeListAttribute():                    
-                    values = value_list
-                
-                case ObjectAttribute() | ObjectListAttribute():
-                    values = value_list
-
-                       
+                    case ObjectAttributeItemsElement() :
+                        values.append(v.value)
+   
             attr = pyAttribute(key=a.key, 
-                               label=a.label,
-                               value=values
+                            label=a.label,
+                            values=values
             )
             out.append(attr )
         return out
             
             
         
-class pyAttributeGroup(CacheableAttributeGroup):
+class pyAttributeGroup(ClientAttributeGroup):
     attributes:dict[str,pyAttribute]
     
     @staticmethod

labfreed/pac_attributes/server/attribute_data_sources.py

@@ -1,8 +1,6 @@
 from abc import ABC, abstractmethod, abstractproperty
-from datetime import datetime, timezone
-from labfreed.pac_attributes.api_data_models.response import AttributeBase, AttributeGroup
+from labfreed.pac_attributes.api_data_models.response import Attribute, AttributeGroup
 from labfreed.pac_cat.pac_cat import PAC_CAT
-from labfreed.pac_id.pac_id import PAC_ID
 
 
 class AttributeGroupDataSource(ABC):
@@ -31,8 +29,8 @@ class AttributeGroupDataSource(ABC):
     
 
 class Dict_DataSource(AttributeGroupDataSource):
-    def __init__(self, data:dict[str, list[AttributeBase]], uses_pac_cat_short_form=True, pac_to_key: callable = None, *args, **kwargs):
-        if not all([isinstance(e, list) for e in data.values()]):
+    def __init__(self, data:dict[str, dict[str, Attribute]], uses_pac_cat_short_form=True, pac_to_key: callable = None, *args, **kwargs):
+        if not all([isinstance(e, dict) for e in data.values()]):
             raise ValueError('Invalid data')
         
         self._data = data
@@ -44,7 +42,7 @@ class Dict_DataSource(AttributeGroupDataSource):
     
     @property
     def provides_attributes(self):
-        return list(set([a.key for attributes in self._data.values() for a in attributes]))
+        return list(set([a.key for attributes in self._data.values() for a in attributes.values()]))
     
            
     def attributes(self, pac_url: str) -> AttributeGroup:
@@ -58,9 +56,12 @@ class Dict_DataSource(AttributeGroupDataSource):
         lookup_key = self._pac_to_key(pac_url) if self._pac_to_key else pac_url
         attributes = self._data.get(lookup_key)
         if not attributes:
-            return None     
+            if 'default' in self._data.keys():
+                attributes = self._data.get('default', None)
+            else:
+                return None  
         
-        return AttributeGroup(key=self._attribute_group_key, 
+        return AttributeGroup(group_key=self._attribute_group_key, 
                               attributes=attributes)
         
         

labfreed/pac_attributes/server/server.py

@@ -4,9 +4,10 @@ import traceback
 import warnings
 
 import rich
+from werkzeug.datastructures.accept import LanguageAccept
 
-from labfreed.pac_attributes.api_data_models.request import AttributeRequestPayload
-from labfreed.pac_attributes.api_data_models.response import AttributeResponsePayload, AttributesOfPACID, ReferenceAttribute
+from labfreed.pac_attributes.api_data_models.request import AttributeRequestData
+from labfreed.pac_attributes.api_data_models.response import AttributeResponsePayload, AttributesOfPACID, ReferenceAttributeItemsElement
 from labfreed.pac_attributes.api_data_models.server_capabilities_response import ServerCapabilities
 from labfreed.pac_attributes.server.attribute_data_sources import AttributeGroupDataSource
 from labfreed.pac_attributes.server.translation_data_sources import TranslationDataSource
@@ -55,23 +56,25 @@ class AttributeServerRequestHandler():
                     
                
         
-    def handle_attribute_request(self, json_request_body:str) -> str:
+    def handle_attribute_request(self, request_data:AttributeRequestData) -> str:
+        if not isinstance(request_data, AttributeRequestData):
+            raise ValueError('request_data most be of AttributeRequestData')
         try:
-            r = AttributeRequestPayload.model_validate_json(json_request_body)
-        except Exception:
+            r = AttributeRequestData.model_validate(request_data)
+        except Exception as e:
+            print(e)
             raise InvalidRequestError
         attributes_for_pac_id = []
         referenced_pac_ids = set()
-        for pac_url in r.pac_ids:
-            attributes_for_pac = self._get_attributes_for_pac_id(pac_url=pac_url, 
-                                                                restrict_to_attribute_groups = r.restrict_to_attribute_groups)
-            attributes_for_pac_id.append(attributes_for_pac)
-            ref = self._get_referenced_pac_ids(attributes_for_pac)
-            if ref:
-                referenced_pac_ids.update(ref)
+        attributes_for_pac = self._get_attributes_for_pac_id(pac_url=r.pac_id, 
+                                                            restrict_to_attribute_groups = r.restrict_to_attribute_groups)
+        attributes_for_pac_id.append(attributes_for_pac)
+        ref = self._get_referenced_pac_ids(attributes_for_pac)
+        if ref:
+            referenced_pac_ids.update(ref)
             
         # also find attributes of referenced pac-ids 
-        if not r.suppress_forward_lookup:
+        if r.do_forward_lookup:
             for pac_url in referenced_pac_ids:
                 attributes_for_pac = self._get_attributes_for_pac_id(pac_url=pac_url, 
                                                                     restrict_to_attribute_groups = r.restrict_to_attribute_groups)
@@ -82,7 +85,7 @@ class AttributeServerRequestHandler():
         for e in attributes_for_pac_id:
             self._add_display_names(e, response_language)
             
-        response = AttributeResponsePayload(pac_attributes=attributes_for_pac_id, language=response_language
+        response = AttributeResponsePayload(data=attributes_for_pac_id, language=response_language
                     ).to_json()
         return response
     
@@ -113,13 +116,14 @@ class AttributeServerRequestHandler():
     def _get_referenced_pac_ids(self, attributes_for_pac:AttributesOfPACID):
         referenced_pacs = []
         for ag in attributes_for_pac.attribute_groups:
-            for a in ag.attributes :
-                if isinstance(a, ReferenceAttribute):
-                    try:
-                        PAC_ID.from_url(a.value)
-                        referenced_pacs.append(a.value)
-                    except Exception:
-                        pass
+            for a in ag.attributes.values() :
+                for e in a.items:
+                    if isinstance(e, ReferenceAttributeItemsElement):
+                        try:
+                            PAC_ID.from_url(e.value)
+                            referenced_pacs.append(e.value)
+                        except Exception:
+                            pass
         return referenced_pacs
             
     
@@ -131,12 +135,12 @@ class AttributeServerRequestHandler():
         this function should never get into the situation not to find translations.
         '''
         for ag in attributes_of_pac.attribute_groups:
-            if dn := self._get_display_name_for_key(ag.key, language):
-                ag.label = dn
+            if dn := self._get_display_name_for_key(ag.group_key, language):
+                ag.group_label = dn
             else:
-                ag.label = self.fallback_label(ag.key)
-                rich.print(f"[yellow]WARNING:[/yellow] No translation for '{ag.key}' in '{language}'. Falling back to '{ag.label}'")
-            for a in ag.attributes:
+                ag.group_label = self.fallback_label(ag.group_key)
+                rich.print(f"[yellow]WARNING:[/yellow] No translation for '{ag.group_key}' in '{language}'. Falling back to '{ag.group_label}'")
+            for a in ag.attributes.values():
                 if dn := self._get_display_name_for_key(a.key, language):
                     a.label = dn
                 else:
@@ -161,21 +165,13 @@ class AttributeServerRequestHandler():
         return None
                 
                 
-    def _find_response_language(self, requested_languages):
+    def _find_response_language(self, requested_languages:LanguageAccept):
         '''finds the language the server will respond in'''
         if not requested_languages:
             return self._default_language
-        
-        for language in requested_languages:
-            if language in self._supported_languages:
-                return language
-            
-        # remove the country codes and try the again
-        for l_fallback in [lang.split('-')[0] for lang in requested_languages]:
-            if language in self._supported_languages:
-                return l_fallback
+        best_match = requested_languages.best_match(self._supported_languages, default="en")
+        return best_match
 
-        return self._default_language
                 
                 
         

labfreed/pac_id_resolver/resolver_config.py

@@ -299,7 +299,8 @@ class ResolverConfig(LabFREED_BaseModel):
         for placeholder in placeholders:
             expanded_placeholder = self._apply_convenience_substitutions(placeholder)
             res = self._evaluate_jsonpath(pac_id_json, expanded_placeholder) or ['']
-            url = url.replace(f'{{{placeholder}}}', str(res[0]))
+            url:str = url.replace(f'{{{placeholder}}}', str(res[0]))
+            url = url.strip()
             # res = self.substitute_jsonpath_expressions(expanded_placeholder, Patterns.jsonpath.value, as_bool=False)
             # url = url.replace(f'{{{placeholder}}}', res)
         return url

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

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

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

@@ -1,15 +1,10 @@
-labfreed/__init__.py,sha256=YJ0OVJt08uSlo0RzxUJM71nyql81qOyOpLqVVSxh_o4,339
+labfreed/__init__.py,sha256=K7LpEGI6O9AnTM4dJgUI30LchIO5KnqPUh3gpWhhY4Q,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/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=4yu_LwFKFdExA2bOIR9NxAMiOaxkkdtdoZ9SjhT5HtU,9071
-labfreed/labfreed_extended/app/pac_info/html_renderer/external-link.svg,sha256=KXVLyywqSOhBV4xAiCLsK6yJPUPj8O08M2__qSceM3M,1164
-labfreed/labfreed_extended/app/pac_info/html_renderer/macros.jinja.html,sha256=1S-dxibPwJshtdelsmyA4LpgOm84L6RTXPNO93gmPfg,5964
-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/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/lib/attribute.py,sha256=BH6yJNFrfEK6dcn7GSPKbfz-0wcJ0NEXrku1e18hVuQ,6797
+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
 labfreed/labfreed_extended/pac_issuer_lib/static/cancel.svg,sha256=pLsrB5Jm5OtG2JXk4jXv7D9z9RmPsNz1eVKrsQT_6zI,1201
@@ -22,8 +17,8 @@ labfreed/labfreed_extended/pac_issuer_lib/static/cat-MC.svg,sha256=p9r3_N7yDYFDU
 labfreed/labfreed_extended/pac_issuer_lib/static/cat-MD.svg,sha256=aBtWtcxbkKkYtzjVfs1koLo6lKdi-mwHYQq0BUACsVQ,1829
 labfreed/labfreed_extended/pac_issuer_lib/static/cat-MS.svg,sha256=ZuFKjoyoDf_69XpYnA-1BhV01vUisPZ2lBDCphXOFGU,740
 labfreed/labfreed_extended/pac_issuer_lib/static/cat-MX.svg,sha256=26wATJTEjIS9jGBHDC9UIHjQL7xvVTLm0YK2gPs9Kr8,816
-labfreed/labfreed_extended/pac_issuer_lib/static/external-link.svg,sha256=H5z9s4VvHq09UnHdqfrYNsx-Whljc0gE4qKJ6-3kfgQ,1158
-labfreed/labfreed_extended/pac_issuer_lib/static/logo.svg,sha256=GtxzNn1_TTz57PymPf4RHq_qH6KVtELHN-dvbkbCeE0,2252
+labfreed/labfreed_extended/pac_issuer_lib/static/external-link.svg,sha256=KXVLyywqSOhBV4xAiCLsK6yJPUPj8O08M2__qSceM3M,1164
+labfreed/labfreed_extended/pac_issuer_lib/static/logo.svg,sha256=T-uPnEI8ylQAg7t4avCWIcvtybImrwkir8_R3cnzGI4,2296
 labfreed/labfreed_extended/pac_issuer_lib/static/menu.svg,sha256=_gvLbHEGigZKlSRU1VpD67sRpNlXUAB_HtJUQVfXOgc,1251
 labfreed/labfreed_extended/pac_issuer_lib/static/search.svg,sha256=lYyQaukECdUnf3nusxSm5RG_6PdPDknCr6y4Fqs7CWg,577
 labfreed/labfreed_extended/pac_issuer_lib/static/styles.css,sha256=o1rz7bL1z4IoQowS9Lf_umfFZgOe-mYuECSDveIvPWE,7603
@@ -31,7 +26,7 @@ labfreed/labfreed_extended/pac_issuer_lib/static/styles_brand.css,sha256=0O8lt8z
 labfreed/labfreed_extended/pac_issuer_lib/static/styles_pac_info.css,sha256=uARZ5o36O4K3hGDv6WNEqrTd5M-lUBdF-FwYj4iEuIA,5341
 labfreed/labfreed_extended/pac_issuer_lib/templates/flash_error_messages.jinja.html,sha256=qt5HNdDwfpvOVel6SQUAv9EukN6lpCXyL0fDz6sMorw,235
 labfreed/labfreed_extended/pac_issuer_lib/templates/footer.jinja.html,sha256=kt8ifovVWI8ccXrXyzijHZ0Rb4Xj5KhWgXx8wrccNsY,118
-labfreed/labfreed_extended/pac_issuer_lib/templates/main.jinja.html,sha256=0B3akxzwjBGG6v0bzoyYLS3zbRxb4rIaRORYqPT7eeE,2417
+labfreed/labfreed_extended/pac_issuer_lib/templates/main.jinja.html,sha256=WJDz-Sqa4TnGPb4yxFslffIc3YB3tWJ1QRpIMj6uOPA,2536
 labfreed/labfreed_extended/pac_issuer_lib/templates/navbar.jinja.html,sha256=RXZqyQi8D6Ik17s1-P31GyaEr8Et-3FSbl9RUR68TLM,1751
 labfreed/labfreed_extended/pac_issuer_lib/templates/pac_issuer_error.jinja.html,sha256=WGAEVOTmsUqG2_wi6xkR8Cpof4EnCChwmsw6k1LPqtE,108
 labfreed/labfreed_extended/pac_issuer_lib/templates/pac_issuer_landing_page.jinja.html,sha256=8Rv1_Azxy3BskdEWBvmXr-nRYh3xXngjsGgfRCvOOLM,205
@@ -41,19 +36,18 @@ labfreed/labfreed_extended/pac_issuer_lib/templates/pac_info/card.jinja.html,sha
 labfreed/labfreed_extended/pac_issuer_lib/templates/pac_info/pac_info.jinja.html,sha256=xK0yM_ovRE8QS6N7hiXhGv-ya8C-s19YWhhMqJKYxFM,1518
 labfreed/pac_attributes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 labfreed/pac_attributes/well_knonw_attribute_keys.py,sha256=Z_QcQdbIil_EMpFqQcBnivEGMDauyoCMW8r62-EN2KM,547
-labfreed/pac_attributes/api_data_models/request.py,sha256=N-kXlJWYqh-F1TzNunCwHUPhme3bSLJMgb9aAHWGOy4,1880
-labfreed/pac_attributes/api_data_models/response.py,sha256=-oiRn_NifnnQ464NlDDPhp_SrU1ZIK9p7fhXCNI0iSY,8519
+labfreed/pac_attributes/api_data_models/request.py,sha256=64BCChFKXA8Z91r5IxAtcVZ6XiCKcw9RQErok2b91cc,4045
+labfreed/pac_attributes/api_data_models/response.py,sha256=Hglfcvb7gC7uZrLsGfPewC290vp4qq4WsuM9S3UHQFI,8188
 labfreed/pac_attributes/api_data_models/server_capabilities_response.py,sha256=ypDm4f8xZZl036fp8PuIe6lJHNW5Zg1fItgUlnV75V0,178
-labfreed/pac_attributes/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-labfreed/pac_attributes/client/attribute_cache.py,sha256=ThUadWqQ5oM8DnAnvZuY4jeA3Mg06ePNEcRP5wCsadc,2222
-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=SsZfrCjd6FJFDe_pmpKJQ2PGrpDfNacHlUzFDBxjWwc,8712
+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=8OeWuHpJSW1mA0gWKLWPBZvq0n3VEfVOPQSmXNnp5dw,7673
+labfreed/pac_attributes/pythonic/excel_attribute_data_source.py,sha256=IBBGpHgt-HiZeB6dsLcjtqUPP2JdViLz2QMIDMjzmME,8467
+labfreed/pac_attributes/pythonic/py_attributes.py,sha256=VkkgKupJcM-kf0I5qRc5AiLSfi0vwnNgQv6neNtdRR8,7394
 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
-labfreed/pac_attributes/server/server.py,sha256=tPOPezRC3YEE0i-MJIc23Me6EARaSqzyFdUNjUzqtdI,9117
+labfreed/pac_attributes/server/attribute_data_sources.py,sha256=92BiQ2QC00PSXeeb6XI0KNcD7ZF7bdOSZZcOrOwPr_o,2406
+labfreed/pac_attributes/server/server.py,sha256=Q5rjWCT6ZicLTMyR59bIC4bCIr8p50kS5p6cwv_wjtw,9114
 labfreed/pac_attributes/server/translation_data_sources.py,sha256=axALOqfP840sOSdVCRYtrens97mm-hpfONMUyuVlCrY,2145
 labfreed/pac_cat/__init__.py,sha256=KNPtQzBD1XVohvG_ucOs7RJj-oi6biUTGB1k-T2o6pk,568
 labfreed/pac_cat/category_base.py,sha256=XAuvfJSCsQ3Ypi5WujtaCmt5isj7Qsx7-zJa9Sm0XVY,2530
@@ -68,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=hvi9x2o-1323FCRsUg6RG_ZuQRVLgTlYQ7owBTXhjW4,12422
+labfreed/pac_id_resolver/resolver_config.py,sha256=M52v2ps_dGTxQ6x-AV16m5eCbjg_vzwQARxzGTucdaU,12457
 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
@@ -96,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.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,,
+labfreed-1.0.0b26.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-1.0.0b26.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-1.0.0b26.dist-info/METADATA,sha256=K8z2-hmoKb-cimYESItpZrexeEKNvSkvQkReD_W5wD8,19858
+labfreed-1.0.0b26.dist-info/RECORD,,

labfreed/labfreed_extended/app/pac_info/html_renderer/external-link.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icons/external-link</title>
-    <g id="icons/external-link" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M5.10570888,18.8942911 C4.83722343,18.6258057 4.81484965,18.204406 5.03858752,17.9104349 L5.10570888,17.8336309 L15.9992174,6.94117952 L10.8105793,6.93942074 L10.7088087,6.93257412 C10.3427331,6.8829117 10.0605793,6.5691165 10.0605793,6.18942074 C10.0605793,5.81286295 10.3380887,5.50112097 10.6997498,5.44755266 L10.8105793,5.43942074 L18.5605793,5.43942074 L18.5605793,13.1894207 L18.5537326,13.2911913 C18.5090365,13.6206593 18.2503927,13.8821507 17.9223127,13.9311544 L17.8105793,13.9394207 L17.7088087,13.9325741 C17.3793407,13.8878779 17.1178493,13.6292342 17.0688456,13.3011542 L17.0605793,13.1894207 L17.0598776,8.00183969 L6.16636906,18.8942911 C5.87347584,19.1871843 5.3986021,19.1871843 5.10570888,18.8942911 Z" id="Icons/Navigation/External-Link/Dark" fill="#1C1847" fill-rule="nonzero"></path>
-    </g>
-</svg>