labfreed 1.0.0a12__py3-none-any.whl → 1.0.0a14__py3-none-any.whl

labfreed/__init__.py

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

labfreed/labfreed_extended/app/app_infrastructure.py

@@ -7,9 +7,6 @@ from labfreed.labfreed_extended.app.pac_info.pac_info import PacInfo
 from labfreed.pac_attributes.client.attribute_cache import MemoryAttributeCache
 from labfreed.pac_attributes.client.client import AttributeClient, http_attribute_request_default_callback_factory
 from labfreed.pac_attributes.pythonic.py_attributes import pyAttributeGroup
-from labfreed.pac_attributes.well_knonw_attribute_keys import MetaAttributeKeys
-from labfreed.well_known_extensions.display_name_extension import DisplayNameExtension
-
 
 from labfreed.pac_id.pac_id import PAC_ID
 from labfreed.pac_id_resolver.resolver import PAC_ID_Resolver, cit_from_str
@@ -35,11 +32,15 @@ class Labfreed_App_Infrastructure():
         self._attribute_client = AttributeClient(http_post_callback=callback, cache_store=MemoryAttributeCache(), always_use_cached_value_for_minutes=1)
 
 
-    def add_cit(self, cit:str):
+    def add_resolver_config(self, cit:str):
         cit = cit_from_str(cit)
         if not cit:
             raise ValueError('the cit could not be parsed. Neither as v1 or v2')
-        self._resolver._cits.append(cit)
+        self._resolver._resolver_configs.add(cit)
+        
+    def remove_resolver_config(self, resolver_config:str):
+        resolver_config = cit_from_str(resolver_config)
+        self._resolver._resolver_configs.discard(resolver_config)
         
         
     def process_pac(self, pac_url, markup=None):
@@ -63,6 +64,15 @@ class Labfreed_App_Infrastructure():
                 sg_user_handovers.append(ServiceGroup(origin=sg.origin, services=user_handovers))
         pac_info.user_handovers = sg_user_handovers
         
+        # Actions
+        sg_actions = []
+        for sg in service_groups:
+            actions = [s  for s in sg.services if s.service_type == 'action-generic']
+            
+            if actions:
+                sg_actions.append(ServiceGroup(origin=sg.origin, services=actions))
+        pac_info.actions = sg_actions
+        
         # Attributes
         attribute_groups = {}
         for sg in service_groups:  

labfreed/labfreed_extended/app/pac_info/pac_info.py

@@ -8,8 +8,9 @@ from pydantic import BaseModel, Field
 from labfreed.pac_attributes.pythonic.py_attributes import pyAttribute, pyAttributeGroup, pyAttributes, pyReference, pyResource
 from labfreed.pac_attributes.well_knonw_attribute_keys import MetaAttributeKeys
 from labfreed.pac_cat.pac_cat import PAC_CAT
+from labfreed.pac_cat.predefined_categories import PredefinedCategory
 from labfreed.pac_id.pac_id import PAC_ID
-from labfreed.pac_id_resolver.services import ServiceGroup
+from labfreed.pac_id_resolver.services import ServiceGroup, Service
 from labfreed.labfreed_extended.app.formatted_print import StringIOLineBreak
 from labfreed.trex.pythonic.data_table import DataTable
 from labfreed.trex.pythonic.pyTREX import pyTREX
@@ -19,30 +20,133 @@ from labfreed.well_known_extensions.display_name_extension import DisplayNameExt
 class PacInfo(BaseModel):
     """A convenient collection of information about a PAC-ID"""
     pac_id:PAC_ID
+
     user_handovers: list[ServiceGroup] = Field(default_factory=list)
+    actions: list[ServiceGroup] = Field(default_factory=list)
     attribute_groups:dict[str, pyAttributeGroup] = Field(default_factory=dict)
     
-    @property
+    
+    # info about pac-id
+    
+    @cached_property
+    def is_item_serialized(self) -> bool|None: #indicates if the item is at product level (e.g. BAL500), as opposed to a serialized instance thereof (e.g. BAL500 with SN 1234)
+        if not isinstance(self.pac_id, PAC_CAT):
+            return None
+        cat = self.main_category
+        if not isinstance(cat, PredefinedCategory):
+            return None
+        
+        return cat.is_serialized
+
+    
+    @cached_property
     def pac_url(self):
         return self.pac_id.to_url(include_extensions=False)
     
-    @property
+    @cached_property
     def main_category(self):
         if isinstance(self.pac_id, PAC_CAT):
             return self.pac_id.categories[0]
         else:
             return None
         
-    @property
-    def attached_data(self):
+        
+    
+    # attached data
+        
+    @cached_property
+    def attached_data(self) -> dict[str, pyTREX]:
         return { trex_ext.name: pyTREX.from_trex(trex=trex_ext.trex) for trex_ext in self.pac_id.get_extension_of_type('TREX')}
 
     
-    @property
-    def summary(self):
-        return self.pac_id.get_extension('SUM')
+    @cached_property
+    def summary(self) -> pyTREX:
+        return pyTREX.from_trex(self.pac_id.get_extension('SUM').trex)
+    
+    
+    @cached_property
+    def status(self) -> pyTREX:
+        return pyTREX.from_trex(self.pac_id.get_extension('STATUS').trex)
+
+        
+        
+        
+    # Handovers and Actions
+        
+    def get_user_handovers_by_intent(self, intent:str, partial_match=False) -> list[Service]:
+        services = [s for sg in self.user_handovers for s in sg.services if self._match_intent(intent, s.application_intents, partial_match)]
+        return services
+    
+    def get_user_handover_by_intent(self, intent:str, partial_match=False, mode="first"):
+        handovers = self.get_user_handovers_by_intent(intent=intent, partial_match=partial_match)
+        return self._pick_from_list(handovers, mode)
+        
+    
+    
+    def get_actions_by_intent(self, intent:str, partial_match=False) -> list[Service]:
+        actions = [s for sg in self.actions for s in sg.services if self._match_intent(intent, s.application_intents, partial_match)]
+        return actions
+    
+    def get_action_by_intent(self, intent:str, partial_match=False, mode="first"):
+        actions = self.get_actions_by_intent(intent=intent, partial_match=partial_match)
+        return self._pick_from_list(actions, mode)
+    
+    
+    def _match_intent(self, intent, intents, partial_match):
+            if partial_match:
+                # intent 'document' should match 'document-operation-manual' etc
+                return any([intent in i for i in intents])
+            else:
+                # only exact match
+                return intent in intents
+    
+    
+    @cached_property
+    def important_handovers(self) -> list[Service]:
+        return self.get_user_handovers_by_intent('important')
+    
+    
+    @cached_property
+    def important_actions(self) -> list[Service]:
+        return self.get_actions_by_intent('important')
+        
+        
+        
+        
+        
+        
+     # Attributes   
+        
+    @cached_property
+    def _all_attributes(self) -> dict[str, pyAttribute]:
+        out = {}
+        for ag in self.attribute_groups.values():
+            out.update(ag.attributes)   
+        return out
+    
+        
+    def get_attributes(self, key:str) -> list[pyAttribute]:
+        attributes = [a for k, a in self._all_attributes.items() if key in a.key]
+        return attributes  
     
-    @property
+    def get_attribute(self, key:str, mode="first"):        
+        attributes = self.get_attributes(key)
+        return self._pick_from_list(attributes, mode)
+
+        
+    def _pick_from_list(self, list, mode):
+        if mode not in ['first', 'last']:
+            raise ValueError('mode must be "first or "last" ')
+        
+        if not list:
+            return None
+        if mode == 'first':
+            return list[0]
+        if mode == 'last':
+            return list[-1]
+        
+        
+    @cached_property
     def image_url(self) -> str:
         image_attr = self._all_attributes.get(MetaAttributeKeys.IMAGE.value)
         if isinstance(image_attr.value, pyResource):
@@ -51,7 +155,7 @@ class PacInfo(BaseModel):
             return image_attr.value
         
         
-    @property
+    @cached_property
     def display_name(self) -> str|None:
         display_name = None
         pac = self.pac_id
@@ -63,30 +167,41 @@ class PacInfo(BaseModel):
         if dn_attr := self._all_attributes.get(MetaAttributeKeys.DISPLAYNAME.value): 
             dn = dn_attr.value
             display_name = dn + f' ( aka {display_name} )' if display_name else dn
+            
+        if not display_name and self.main_category:
+            seg_240 = [s for s in self.main_category.segments if s.key=="240"]
+            display_name = seg_240[0].value
+            
         return display_name
     
     
-    @property
+    @cached_property
     def safety_pictograms(self) -> dict[str, pyAttribute]:
         pictogram_attributes = {k: a for k, a in self._all_attributes.items() if "https://labfreed.org/ghs/pictogram/" in a.key}
         return pictogram_attributes    
     
     
-    @property
+    @cached_property
     def qualification_state(self) -> pyAttribute:
         if state := self._all_attributes.get("https://labfreed.org/qualification/status"): 
             return state
+
+    
+         
+
+
         
-        
-    @cached_property
-    def _all_attributes(self) -> dict[str, pyAttribute]:
-        out = {}
-        for ag in self.attribute_groups.values():
-            out.update(ag.attributes)   
-        return out
     
     
     
+    
+    
+    
+    
+    
+########
+    
+    
     def format_for_print(self, markup:str='rich') -> str:
         
         printout = StringIOLineBreak(markup=markup)
@@ -126,37 +241,6 @@ class PacInfo(BaseModel):
     
     
     
-    def render_html(self, hide_attribute_groups:list[str]=[]) -> str:        
-        return PACInfo_HTMLRenderer.render_template('pac_info_main.jinja.html', 
-                               pac_info = self, 
-                               hide_attribute_groups=hide_attribute_groups
-                               )
-        
-    def render_html_card(self) -> str:
-        return PACInfo_HTMLRenderer.render_template('pac_info_card.jinja.html', 
-                               pac_info = self
-                               )
-    
-        
-class PACInfo_HTMLRenderer():
-    TEMPLATES_DIR = Path(__file__).parent / "html_renderer"
-    jinja_env = Environment(
-        loader=FileSystemLoader(str(TEMPLATES_DIR), encoding="utf-8"),
-        autoescape=select_autoescape(enabled_extensions=("html", "jinja", "jinja2", "jinja.html")),
-    )
-    
-    @classmethod
-    def render_template(cls, template_name:str, pac_info:PacInfo, hide_attribute_groups):
-        # --- Jinja env pointing at /html_renderer ---
-        template = cls.jinja_env.get_template("pac_info.jinja.html")
-        html = template.render(
-            pac=pac_info.pac_id,
-            pac_info=pac_info,  # your object
-            hide_attribute_groups=hide_attribute_groups,
-            is_data_table = lambda value: isinstance(value, DataTable),
-            is_url = lambda s: isinstance(s, str) and urlparse(s).scheme in ('http', 'https') and bool(urlparse(s).netloc),
-            is_image = lambda s: isinstance(s, str) and s.lower().startswith('http') and s.lower().endswith(('.jpg','.jpeg','.png','.gif','.bmp','.webp','.svg','.tif','.tiff')),
-            is_reference = lambda s: isinstance(s, pyReference) ,
-        )
-        return html
-        
+
+    
+    

labfreed/labfreed_infrastructure.py

@@ -4,6 +4,10 @@ import re
 from pydantic import BaseModel, ConfigDict, Field, PrivateAttr, field_validator
 from typing import Any, List, Set
 
+import warnings
+import functools
+import inspect
+
 from rich import print
 from rich.table import Table
 
@@ -256,3 +260,11 @@ def _filter_warnings(val_msg:list[ValidationMessage]) -> list[ValidationMessage]
 def _quote_texts(texts:list[str]):
     return ','.join([f"'{t}'" for t in texts])
 
+
+
+
+
+
+
+
+

labfreed/pac_attributes/api_data_models/response.py

@@ -36,7 +36,7 @@ class AttributeBase(LabFREED_BaseModel, ABC):
     
 class DateTimeAttribute(AttributeBase):
     type: Literal["datetime"] 
-    value: datetime | list[datetime]
+    value: datetime
     
     @field_validator('value', mode='before')
     def set_utc__if_naive(cls, value):
@@ -44,60 +44,113 @@ class DateTimeAttribute(AttributeBase):
             return ensure_utc(value)
         else:
             return value
+        
+class DateTimeListAttribute(AttributeBase):
+    type: Literal["datetime-list"] 
+    value: list[datetime]
+    
+    @field_validator('value', mode='before')
+    def set_utc__if_naive(cls, value):
+        value_out = []
+        for v in value:
+            if isinstance(v, datetime):
+                value_out.append(ensure_utc(v))
+            else:
+                return ValueError(f'{v} is of type {type(v)}. It must be datetime')
+    
+    
     
 class BoolAttribute(AttributeBase):
     type: Literal["bool"] 
-    value: bool | list[bool]
+    value: bool
+    
+class BoolListAttribute(AttributeBase):
+    type: Literal["bool-list"] 
+    value: list[bool]
+
+
+
     
 class TextAttribute(AttributeBase):
     type: Literal["text"] 
-    value: str | list[str]
+    value: str
+    
+    @model_validator(mode='after')
+    def _validate_value(self):
+        _validate_text(self, self.value)
+        return self
+    
+class TextListAttribute(AttributeBase):
+    type: Literal["text-list"] 
+    value: list[str]
     
     @model_validator(mode='after')
     def _validate_value(self):
         l = [self.value] if isinstance(self.value, str) else self.value
         for v in l:
-            if len(v) > 5000: 
-                self._add_validation_message(
-                    source="Text Attribute",
-                    level=ValidationMsgLevel.WARNING,  # noqa: F821
-                    msg=f"Text attribute {v} exceeds 5000 characters. It is recommended to stay below",
-                    highlight_pattern = f'{v}'
-                )
+            _validate_text(self, v)
         return self
+    
+
+def _validate_text(mdl:LabFREED_BaseModel, v):
+    if len(v) > 5000: 
+        mdl._add_validation_message(
+            source="Text Attribute",
+            level=ValidationMsgLevel.WARNING,  # noqa: F821
+            msg=f"Text attribute {v} exceeds 5000 characters. It is recommended to stay below",
+            highlight_pattern = f'{v}'
+        )
             
 
+
 class ReferenceAttribute(AttributeBase):
     type: Literal["reference"]
-    value: str | list[str]
+    value: str 
+    
+class ReferenceListAttribute(AttributeBase):
+    type: Literal["reference-list"]
+    value: list[str]
+    
     
+        
 
 class ResourceAttribute(AttributeBase):
     type: Literal["resource"]
-    value: str | list[str]
+    value: str 
+    
+    @model_validator(mode='after')
+    def _validate_value(self):
+        _validate_resource(self, self.value)
+
+class ResourceListAttribute(AttributeBase):
+    type: Literal["resource-list"]
+    value: list[str]
     
     @model_validator(mode='after')
     def _validate_value(self):
         value_list = self.value if isinstance(self.value, list) else [self.value]
         for v in value_list:
-            r = urlparse(v)
-            if not all([r.scheme, r.netloc]):
-                self._add_validation_message(
-                    source="Resource Attribute",
-                    level=ValidationMsgLevel.ERROR,  # noqa: F821
-                    msg=f"Must be a valid url",
-                    highlight_pattern = f'{v}'
-                )
-            pattern = re.compile(r"\.\w{1,3}$", re.IGNORECASE)
-            if not bool(pattern.search(v)):
-                self._add_validation_message(
-                    source="Resource Attribute",
-                    level=ValidationMsgLevel.WARNING,  # noqa: F821
-                    msg=f"It is RECOMMENDED resource links end with a file extension",
-                    highlight_pattern = f'{v}'
-                )
+            _validate_resource(self, v)
         return self
     
+def _validate_resource(mdl:LabFREED_BaseModel, v):
+    r = urlparse(v)
+    if not all([r.scheme, r.netloc]):
+        mdl._add_validation_message(
+            source="Resource Attribute",
+            level=ValidationMsgLevel.ERROR,  # noqa: F821
+            msg="Must be a valid url",
+            highlight_pattern = f'{v}'
+        )
+    pattern = re.compile(r"\.\w{1,3}$", re.IGNORECASE)
+    if not bool(pattern.search(v)):
+        mdl._add_validation_message(
+            source="Resource Attribute",
+            level=ValidationMsgLevel.WARNING,  # noqa: F821
+            msg="It is RECOMMENDED resource links end with a file extension",
+            highlight_pattern = f'{v}'
+        )
+    
         
         
 class NumericValue(LabFREED_BaseModel):
@@ -151,11 +204,22 @@ class NumericValue(LabFREED_BaseModel):
 
 class NumericAttribute(AttributeBase):
     type: Literal["numeric"] 
-    value: NumericValue | list[NumericValue]
+    value: NumericValue 
+    
+class NumericListAttribute(AttributeBase):
+    type: Literal["numeric-list"] 
+    value: list[NumericValue]
+    
+    
     
 class ObjectAttribute(AttributeBase):
     type: Literal["object"] 
-    value: dict[str, Any] |list[dict[str, Any]]
+    value: dict[str, Any]
+    
+    
+class ObjectListAttribute(AttributeBase):
+    type: Literal["object-list"] 
+    value: list[dict[str, Any]]
            
 
      
@@ -168,7 +232,15 @@ Attribute = Annotated[
         TextAttribute,
         NumericAttribute,
         ResourceAttribute,
-        ObjectAttribute
+        ObjectAttribute,
+        
+        ReferenceListAttribute,
+        DateTimeListAttribute,
+        BoolListAttribute,
+        TextListAttribute,
+        NumericListAttribute,
+        ResourceListAttribute,
+        ObjectListAttribute
     ],
     Field(discriminator="type")
 ]

labfreed/pac_attributes/pythonic/attribute_server_factory.py

@@ -11,7 +11,6 @@ except ImportError:
     raise ImportError("Please install labfreed with the [extended] extra: pip install labfreed[extended]")
 
 
-# from fastapi import FastAPI, Request
 
 class Authenticator(Protocol):
     def __call__(self, request) -> bool: ...

labfreed/pac_cat/category_base.py

@@ -55,7 +55,7 @@ class Category(LabFREED_BaseModel):
                     k = f"{field_name} ({ field_info.alias})"
                 else:
                     k = f"{field_name}"
-            out.update({k : v } ) 
+                out.update({k : v } ) 
             
         for s in getattr(self, 'additional_segments', []):
             out.update( {s.key or '' : s.value })

labfreed/pac_cat/predefined_categories.py

@@ -1,5 +1,5 @@
 ## Materials
-from abc import ABC
+from abc import ABC, abstractproperty
 from pydantic import Field, computed_field, model_validator
 
 from labfreed.labfreed_infrastructure import ValidationMsgLevel
@@ -18,6 +18,10 @@ class PredefinedCategory(Category, ABC):
     def segments(self) -> list[IDSegment]:
         return self._get_segments(use_short_notation=False)
     
+    @abstractproperty
+    def is_serialized(self) -> bool:
+        pass
+    
     def _get_segments(self, use_short_notation=False) -> list[IDSegment]:
         segments = []
         can_omit_keys = use_short_notation # keeps track of whether keys can still be omitted. That is the case when the segment recommendation is followed
@@ -65,12 +69,17 @@ class Material_Device(PredefinedCategory):
         if not self.serial_number:
             self._add_validation_message(
                     source=f"Category {self.key}",
-                    level = ValidationMsgLevel.ERROR,
-                    msg=f'Category key {self.key} is missing mandatory field Serial Number',
+                    level = ValidationMsgLevel.WARNING,
+                    msg=f'Category key {self.key} is missing field Serial Number. Check that you are indeed to a product and not a specific device.',
                     highlight_pattern = f"{self.key}"
             )
         return self
     
+    @property
+    def is_serialized(self) -> bool:
+        return bool(self.serial_number)
+    
+    
 class Material_Substance(PredefinedCategory):
     '''Represents the -MS category'''
     key: str =         Field(default='-MS', frozen=True)
@@ -93,6 +102,11 @@ class Material_Substance(PredefinedCategory):
             )
         return self
     
+    @property
+    def is_serialized(self) -> bool:
+        return bool(self.batch_number or self.container_number or self.aliquot)
+    
+    
 class Material_Consumable(PredefinedCategory):
     '''Represents the -MC category'''
     key: str = Field(default='-MC', frozen=True)
@@ -115,6 +129,11 @@ class Material_Consumable(PredefinedCategory):
             )
         return self
     
+    @property
+    def is_serialized(self) -> bool:
+        return bool(self.batch_number or self.serial_number or self.aliquot)
+    
+    
 class Material_Misc(Material_Consumable):
     '''Represents the -MX category'''
     # same fields as Consumable
@@ -128,6 +147,8 @@ class Material_Misc(Material_Consumable):
     ''' Category segments, which are not defined in the specification'''
     
 
+    
+
 
 ## Data
 class Data_Abstract(PredefinedCategory, ABC):
@@ -147,6 +168,11 @@ class Data_Abstract(PredefinedCategory, ABC):
                     highlight_pattern = f"{self.key}"
             )
         return self
+    
+    @property
+    def is_serialized(self) -> bool:
+        return True
+    
 
 class Data_Result(Data_Abstract):
     '''Represents the -DR category'''
@@ -215,6 +241,11 @@ class Processor_Abstract(PredefinedCategory, ABC):
                     highlight_pattern = f"{self.key}"
             )
         return self
+    
+    @property
+    def is_serialized(self) -> bool:
+        return bool(self.processor_instance)
+    
 
 class Processor_Software(Processor_Abstract):
     '''Represents the -PS category'''
@@ -233,6 +264,31 @@ class Processor_Misc(Processor_Abstract):
     ''' Category segments, which are not defined in the specification'''
     
     
+    
+class Misc(Category, ABC):
+    '''@private'''
+    key: str = Field(default='-X', frozen=True)
+    id:str|None =                    Field(              alias='21')
+    additional_segments: list[IDSegment] = Field(default_factory=list, exclude=True)
+    ''' Category segments, which are not defined in the specification'''
+    
+    @model_validator(mode='after')
+    def _validate_mandatory_fields(self):
+        if not self.id:
+            self._add_validation_message(
+                    source=f"Category {self.key}",
+                    level = ValidationMsgLevel.ERROR,
+                    msg=f"Category key {self.key} is missing mandatory field 'ID'",
+                    highlight_pattern = f"{self.key}"
+            )
+        return self
+    
+    @property
+    def is_serialized(self) -> bool:
+        return bool(self.id)
+    
+    
+    
 category_key_to_class_map  = {
         '-MD': Material_Device,
         '-MS': Material_Substance,
@@ -245,5 +301,6 @@ category_key_to_class_map  = {
         '-DS': Data_Static,
         '-DX': Data_Misc,
         '-PS': Processor_Software,
-        '-PX': Processor_Misc
+        '-PX': Processor_Misc,
+        '-X':Misc
 }

labfreed/pac_id/extension.py

@@ -1,7 +1,7 @@
 
 from abc import ABC, abstractproperty
 
-from pydantic import model_validator
+from pydantic import computed_field, model_validator
 
 from labfreed.labfreed_infrastructure import LabFREED_BaseModel, ValidationMsgLevel
 
@@ -29,6 +29,7 @@ class Extension(LabFREED_BaseModel,ExtensionBase):
     type:str|None
     data_:str
     
+    @computed_field
     @property
     def data(self) -> str:
         return self.data_

labfreed/pac_id_resolver/cit_v1.py

@@ -1,25 +1,27 @@
 
 import re
 
+from deprecated import deprecated
+
 from pydantic import Field, model_validator
 from labfreed.labfreed_infrastructure import LabFREED_BaseModel, ValidationMessage, ValidationMsgLevel
 from labfreed.pac_id.pac_id import PAC_ID
 from labfreed.pac_id_resolver.services import Service, ServiceGroup
-from labfreed.pac_id_resolver.cit_common import ( _add_msg_to_cit_entry_model, 
+from labfreed.pac_id_resolver.resolver_config_common import ( _add_msg_to_cit_entry_model, 
                                                  _validate_service_name, 
                                                  _validate_application_intent, 
                                                  _validate_service_type,
                                                  ServiceType)
 
 
-
+@deprecated("Use ResolverConfig")
 class CITEntry_v1(LabFREED_BaseModel):
     applicable_if: str = Field(..., min_length=1)
     service_name: str = Field(..., min_length=1)
     application_intent:str = Field(..., min_length=1)
     service_type:ServiceType|str
     template_url:str = Field(..., min_length=1)
-    
+        
     
     @model_validator(mode='after')
     def _validate_model(self):
@@ -67,7 +69,7 @@ class CITEntry_v1(LabFREED_BaseModel):
     
     
 
-
+@deprecated("Use ResolverConfig")
 class CIT_v1(LabFREED_BaseModel):
     origin:str = ''
     entries:list[CITEntry_v1]
@@ -187,6 +189,16 @@ class CIT_v1(LabFREED_BaseModel):
         for e in self.entries:
             s += '\t'.join([e.service_name, e.application_intent, e.service_type.value, e.applicable_if, e.template_url]) + '\n'
         return s
+    
+    # hash and equal are only used to avoid adding the same cit multiple times. 
+    # we can live with some instances, where it does not work 
+    def __hash__(self):
+        return self.model_dump_json().__hash__()
+    
+    def __eq__(self, other):
+        if not isinstance(other, CIT_v1):
+            return False
+        return self.model_dump() == other.model_dump()
 
 
 

labfreed/pac_id_resolver/resolver.py

@@ -2,14 +2,13 @@ from functools import lru_cache
 import logging
 from typing import Self
 from requests import get
-
-
+from deprecated import deprecated
 
 from labfreed.pac_cat.pac_cat import PAC_CAT
 from labfreed.pac_id.pac_id import PAC_ID
 from labfreed.pac_id_resolver.services import ServiceGroup
 from labfreed.pac_id_resolver.cit_v1 import CIT_v1
-from labfreed.pac_id_resolver.cit_v2 import CIT_v2
+from labfreed.pac_id_resolver.resolver_config import ResolverConfig
 
 
 
@@ -22,49 +21,67 @@ def load_cit(path):
         return cit_from_str(s)
 
     
-def cit_from_str(s:str, origin:str='') -> CIT_v1|CIT_v2:
+@deprecated("cit version 1 is deprecated. use resolvber config and load with ResolverConfig.from_yaml(s)")
+def cit_from_str(s:str, origin:str='') -> CIT_v1|ResolverConfig:
     try:
-        cit2 = CIT_v2.from_yaml(s)
+        cit2 = ResolverConfig.from_yaml(s)
         cit_version = 'v2'
-    except Exception:
+    except Exception as e1:
         cit2 = None
     try:
         cit1 = CIT_v1.from_csv(s, origin)
         cit_version = 'v1'  # noqa: F841
-    except Exception:
+    except Exception as e2:
         cit1 = None
     
     cit = cit2 or cit1 or None
     return cit
 
 @lru_cache
-def _get_issuer_cit(issuer:str):
+def _get_issuer_resolver_config(issuer:str):
     '''Gets the issuer's cit.'''
+    # V2
+    url = 'HTTPS://PAC.' + issuer + '/resolver_config.yaml'
+    try:
+        r = get(url, timeout=2)
+        if r.status_code < 400:
+            config_str = r.text
+            resolver_config = ResolverConfig.from_yaml(config_str)
+            return resolver_config
+        else: 
+            logging.error(f"Could not get CIT V2 form {issuer}")
+    except Exception:
+        logging.error(f"Could not get CIT V2 form {issuer}")
+        
+        
+    # V1 (as fallback)
     url = 'HTTPS://PAC.' + issuer + '/coupling-information-table'
     try:
         r = get(url, timeout=2)
         if r.status_code < 400:
-            cit_str = r.text
+            config_str = r.text
+            cit = CIT_v1.from_csv(config_str, '')
+            return cit
         else: 
             logging.error(f"Could not get CIT form {issuer}")
-            cit_str  = None
     except Exception:
         logging.error(f"Could not get CIT form {issuer}")
-        cit_str  = None
-    cit = cit_from_str(cit_str, origin=issuer)
-    return cit
+        
+    # no cit found
+    return None 
+
     
 
 
 class PAC_ID_Resolver():
-    def __init__(self, cits:list[CIT_v2|CIT_v1]=None) -> Self:
+    def __init__(self, resolver_configs:list[ResolverConfig|CIT_v1]=None) -> Self:
         '''Initialize the resolver with coupling information tables'''
-        if not cits:
-            cits = []
-        self._cits = cits
+        if not resolver_configs:
+            resolver_configs = []
+        self._resolver_configs = set(resolver_configs)
             
         
-    def resolve(self, pac_id:PAC_ID|str, check_service_status=True, use_issuer_cit=True) -> list[ServiceGroup]:
+    def resolve(self, pac_id:PAC_ID|str, check_service_status=True, use_issuer_resolver_config=True) -> list[ServiceGroup]:
         '''Resolve a PAC-ID'''
         if isinstance(pac_id, str):
             pac_id_catless = PAC_ID.from_url(pac_id, try_pac_cat=False)
@@ -77,13 +94,13 @@ class PAC_ID_Resolver():
             raise ValueError('pac_id is invalid. Should be a PAC-ID in url form or a PAC-ID object')
     
                 
-        cits = self._cits.copy()
-        if use_issuer_cit:
-            if issuer_cit := _get_issuer_cit(pac_id.issuer):
-                cits.append(issuer_cit)
+        resolver_configs = self._resolver_configs.copy()
+        if use_issuer_resolver_config:
+            if issuer_resolver_config := _get_issuer_resolver_config(pac_id.issuer):
+                resolver_configs.add(issuer_resolver_config)
          
         matches = []
-        for cit in cits:
+        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))

labfreed/pac_id_resolver/{cit_v2.py → resolver_config.py}

@@ -8,18 +8,18 @@ import jsonpath_ng.ext as jsonpath
 
 from labfreed.pac_id_resolver.services import Service, ServiceGroup
 from labfreed.labfreed_infrastructure import LabFREED_BaseModel, ValidationMsgLevel, _quote_texts
-from labfreed.pac_id_resolver.cit_common import ( ServiceType)
+from labfreed.pac_id_resolver.resolver_config_common import ( ServiceType)
 
 
 __all__ = [
-    "CIT_v2",
-    "CITBlock_v2",
-    "CITEntry_v2"
+    "ResolverConfig",
+    "ResolverConfigBlock",
+    "ResolverConfigEntry"
 ]
 
 
 
-class CITEntry_v2(LabFREED_BaseModel):
+class ResolverConfigEntry(LabFREED_BaseModel):
     service_name: str
     application_intents:list[str]
     service_type:ServiceType |str
@@ -92,9 +92,9 @@ class CITEntry_v2(LabFREED_BaseModel):
     
     
 
-class CITBlock_v2(LabFREED_BaseModel):
+class ResolverConfigBlock(LabFREED_BaseModel):
     applicable_if: str  = Field(default='True', alias='if')
-    entries: list[CITEntry_v2]
+    entries: list[ResolverConfigEntry]
     
     @field_validator('applicable_if', mode='before')
     @classmethod
@@ -104,21 +104,21 @@ class CITBlock_v2(LabFREED_BaseModel):
     
 
 
-class CIT_v2(LabFREED_BaseModel):
+class ResolverConfig(LabFREED_BaseModel):
     schema_version: str = Field(default='2.0')
-    '''Coupling Information Table (CIT)'''
+    '''Resolver Configuration'''
     origin: str = ''
     model_config = {
         "extra": "allow"
     }
     '''@private'''
-    cit: list[CITBlock_v2] = Field(default_factory=list)
+    config: list[ResolverConfigBlock] = Field(default_factory=list)
     
     @model_validator(mode='after')
     def _validate_origin(self):
         if len(self.origin) == 0:
             self._add_validation_message(level=ValidationMsgLevel.WARNING,
-                                        source='CIT origin',
+                                        source='ResolverConfig origin',
                                         msg='Origin should not be empty'
                                         )
         return self
@@ -136,27 +136,38 @@ class CIT_v2(LabFREED_BaseModel):
     def __str__(self):
         yml = yaml.dump(self.model_dump()                        )
         return yml
+     
+    # hash and equal are only used to avoid adding the same resolver config multiple times. 
+    # we can live with some instances, where it does not work 
+    def __hash__(self):
+        return self.model_dump_json().__hash__()
+    
+    def __eq__(self, other):
+        if not isinstance(other, ResolverConfig):
+            return False
+        return self.model_dump() == other.model_dump()
+    
     
     def evaluate_pac_id(self, pac):
         pac_id_json = pac.to_dict()
-        cit_evaluated = ServiceGroup(origin=self.origin)   
-        for block in self.cit:
+        resolver_config_evaluated = ServiceGroup(origin=self.origin)   
+        for block in self.config:
             _, is_applicable = self._evaluate_applicable_if(pac_id_json, block.applicable_if)
             if not is_applicable:
                 continue
 
             for e in block.entries:
                 if e.errors():
-                    continue #make this stable against errors in the cit
+                    continue #make this stable against errors in the resolver config
                 url = self._eval_url_template(pac_id_json, e.template_url)
-                cit_evaluated.services.append(Service(  
+                resolver_config_evaluated.services.append(Service(  
                                                         service_name=e.service_name,
                                                         application_intents=e.application_intents,
                                                         service_type=e.service_type,
                                                         url = url
                                     )
                               )            
-        return cit_evaluated
+        return resolver_config_evaluated
     
     
     def _evaluate_applicable_if(self, pac_id_json:str, expression) -> tuple[str, bool]:

labfreed/well_known_extensions/default_extension_interpreters.py

@@ -1,7 +1,7 @@
-from .display_name_extension import DisplayNameExtension
+from .text_base36_extension import TextBase36Extension
 from .trex_extension import TREX_Extension
 
 default_extension_interpreters = {
     'TREX': TREX_Extension,
-    'N': DisplayNameExtension
+    'TEXT': TextBase36Extension
 }

labfreed/well_known_extensions/display_name_extension.py

@@ -1,27 +1,35 @@
 import logging
 from typing import Literal, Self
-from pydantic import computed_field
+from pydantic import  model_validator
 from labfreed.labfreed_infrastructure import LabFREED_BaseModel
 from labfreed.pac_id.extension import ExtensionBase
-from labfreed.utilities.base36 import from_base36, to_base36
+from labfreed.well_known_extensions.text_base36_extension import TextBase36Extension
 
+from labfreed.utilities.base36 import from_base36
 
-class DisplayNameExtension(ExtensionBase, LabFREED_BaseModel):
+
+class DisplayNameExtension(TextBase36Extension, LabFREED_BaseModel):
     name:Literal['N'] = 'N'
     type:Literal['TEXT'] = 'TEXT'
-    display_name: str       
+    display_name: str      
     
-    @computed_field
-    @property
-    def data(self)->str:
-        # return '/'.join([to_base36(dn) for dn in self.display_name])
-        return to_base36(self.display_name).root
+    @model_validator(mode='before')
+    def move_display_name_to_text(cls, data):
+        # if display_name provided, move it to text
+        if isinstance(data, dict) and 'display_name' in data:
+            data['text'] = data.pop('display_name')
+        return data
     
     @staticmethod
     def from_extension(ext:ExtensionBase) -> Self:
         return DisplayNameExtension.create(name=ext.name,
                                   type=ext.type,
                                   data=ext.data)
+
+    @property
+    def display_name(self) -> str:
+        return self.text 
+    
     
     @staticmethod
     def create(*, name, type, data):

labfreed/well_known_extensions/text_base36_extension.py

@@ -0,0 +1,38 @@
+import logging
+from typing import Literal, Self
+from pydantic import computed_field
+from labfreed.labfreed_infrastructure import LabFREED_BaseModel
+from labfreed.pac_id.extension import ExtensionBase
+from labfreed.utilities.base36 import from_base36, to_base36
+
+
+class TextBase36Extension(ExtensionBase, LabFREED_BaseModel):
+    name:str 
+    type:Literal['TEXT'] = 'TEXT'
+    text: str       
+    
+    @computed_field
+    @property
+    def data(self)->str:
+        # return '/'.join([to_base36(dn) for dn in self.display_name])
+        return to_base36(self.text).root
+    
+    @staticmethod
+    def from_extension(ext:ExtensionBase) -> Self:
+        return TextBase36Extension.create(name=ext.name,
+                                  type=ext.type,
+                                  data=ext.data)
+    
+    @staticmethod
+    def create(*, name, type, data):
+            
+        if type != 'TEXT':
+            logging.warning(f'Type {name} was given, but this extension should only be used with type "TEXT". Will try to parse data as display names')
+        
+        text = from_base36(data)
+         
+        return TextBase36Extension(name=name, text=text)
+    
+    def __str__(self):
+        return 'Text: '+ self.text
+

{labfreed-1.0.0a12.dist-info → labfreed-1.0.0a14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: labfreed
-Version: 1.0.0a12
+Version: 1.0.0a14
 Summary: Python implementation of LabFREED building blocks
 Author-email: Reto Thürer <thuerer.r@buchi.com>
 Requires-Python: >=3.11
@@ -25,6 +25,7 @@ Requires-Dist: jsonpath-ng>=1.7.0
 Requires-Dist: requests>=2.32.3
 Requires-Dist: requests_cache>=1.2.1
 Requires-Dist: cachetools>=6.1.0
+Requires-Dist: deprecated>=1.2.18
 Requires-Dist: pytest>=8.3.5 ; extra == "dev"
 Requires-Dist: pdoc>=15.0.1 ; extra == "dev"
 Requires-Dist: flit>=3.12.0 ; extra == "dev"

{labfreed-1.0.0a12.dist-info → labfreed-1.0.0a14.dist-info}/RECORD

@@ -1,8 +1,8 @@
-labfreed/__init__.py,sha256=-fXxBGDTAB52CShnD0wjQuE28pAU8dOzgFwDx7EybBk,339
-labfreed/labfreed_infrastructure.py,sha256=YZmU-kgopyB1tvpTR_k_uIt1Q2ezexMrWvu-HaP65IE,10104
-labfreed/labfreed_extended/app/app_infrastructure.py,sha256=F5UHHt8-r7jigQudOsJ-yV4lWKHFsxNhI4uGP_h53lE,4035
+labfreed/__init__.py,sha256=fen6oZE4WpF77ck1RZ-1lkwRwBtLfUO6RU1CO2W91Hs,339
+labfreed/labfreed_infrastructure.py,sha256=ss1PyJl-7Es-lEcxptmdYI9kDAHmh7HB_tAGkPC6UVs,10173
+labfreed/labfreed_extended/app/app_infrastructure.py,sha256=Kkpmw6VZZIxJ6mXRQmX_unS-coHVbKAnlr9VOZNSqyU,4418
 labfreed/labfreed_extended/app/formatted_print.py,sha256=DcwWP0ix1e_wYNIdceIp6cETkJdG2DqpU8Gs3aZAL40,1930
-labfreed/labfreed_extended/app/pac_info/pac_info.py,sha256=hsJunO4adKcLi7PBZNAJYeqzOH31_j95JzuvEV8lNVY,6427
+labfreed/labfreed_extended/app/pac_info/pac_info.py,sha256=9Wre1wAmMZObeh7Ed46KA38nBWcXhqGD0m9vTHfkkS8,8397
 labfreed/labfreed_extended/app/pac_info/html_renderer/external-link.svg,sha256=H5z9s4VvHq09UnHdqfrYNsx-Whljc0gE4qKJ6-3kfgQ,1158
 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
@@ -11,12 +11,12 @@ labfreed/labfreed_extended/app/pac_info/html_renderer/pac_info_card.jinja.html,s
 labfreed/pac_attributes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 labfreed/pac_attributes/well_knonw_attribute_keys.py,sha256=axE81MeJ3G_Wy1PbmNAXH6SfPtl96NXvQJMyrvK10t4,324
 labfreed/pac_attributes/api_data_models/request.py,sha256=N-kXlJWYqh-F1TzNunCwHUPhme3bSLJMgb9aAHWGOy4,1880
-labfreed/pac_attributes/api_data_models/response.py,sha256=eGh474ILEcBC1ijhs1ZZfdhNWRxiPeccGS8aw0zzt0U,6934
+labfreed/pac_attributes/api_data_models/response.py,sha256=MbpzaSnAQgvdrzYxCAtdfr480Vg4XMBBbZPKP9yirf4,8475
 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=FjvyEpZEGYrZkuaQoqH9QFstrwHmrsIdaymxz8uQjwQ,7510
-labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=AtoOICmAGQY_ZkCcnPW4t8kv3LHaro-a-Ylm04j-Dbc,6199
+labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=3OeFjBdlMR4DMIzHVo5-A_y935e2_lOqvFCLKgxjsEY,6159
 labfreed/pac_attributes/pythonic/excel_attribute_data_source.py,sha256=oP4OHj0DTlH4dD7OlL1qxtX4y9KcuDTCd9Bi_FruP6A,7276
 labfreed/pac_attributes/pythonic/py_attributes.py,sha256=FXSp9_P0o-GuZSDvXtD2fU4g82lglMu9f_-8KPMkEP0,6821
 labfreed/pac_attributes/pythonic/py_dict_data_source.py,sha256=nAz6GA7Xx_0IORPPpt_Wl3sFJa1Q5Fnq5vdf1uQiJF8,531
@@ -25,20 +25,20 @@ labfreed/pac_attributes/server/attribute_data_sources.py,sha256=7-YQeBcn5ndsZWee
 labfreed/pac_attributes/server/server.py,sha256=tPOPezRC3YEE0i-MJIc23Me6EARaSqzyFdUNjUzqtdI,9117
 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=D7BzsdF0-JIgag5L2XZJRF4T2LOH5RLh1MMszflkmV8,2526
+labfreed/pac_cat/category_base.py,sha256=XAuvfJSCsQ3Ypi5WujtaCmt5isj7Qsx7-zJa9Sm0XVY,2530
 labfreed/pac_cat/pac_cat.py,sha256=wcb_fhvgjS2xmqTsxS8_Oibvr1nsQt5zr8aUajLfK1E,5578
-labfreed/pac_cat/predefined_categories.py,sha256=wpaZtsZxOvWoJI9M-p1s7tW8Kp_Dmvi7_pw1YdBG-ug,11121
+labfreed/pac_cat/predefined_categories.py,sha256=dyyF90mdPV-RGjk3NG8AQRbEQDcxtP95w2DwfDeO-_8,12775
 labfreed/pac_id/__init__.py,sha256=NGMbzkwQ4txKeT5pxdIZordwHO8J3_q84jzPanjKoHg,675
-labfreed/pac_id/extension.py,sha256=NgLexs1LbRMMm4ETrn5m4EY2iWoMDgOTb0UV556jatQ,2227
+labfreed/pac_id/extension.py,sha256=4_cQ-N3x8bRxboqC44Qnf6rGnYXvsvHOnlBaY7-Hf-8,2264
 labfreed/pac_id/id_segment.py,sha256=r5JU1SJuRXhZJJxy5T3xjrb598wIDTLpivSJhIUAzjQ,4526
 labfreed/pac_id/pac_id.py,sha256=DDcSYJ8DBWqIoW_usOT7eDjHZ9700cTYxeUgenHluOA,5378
 labfreed/pac_id/url_parser.py,sha256=F3SPiscfbPwZ0uMzgirJ1vwgaXclN546lBW46Ywo3nk,5979
 labfreed/pac_id/url_serializer.py,sha256=01LB30pNMBtv2rYHsiE_4Ga2iVA515Boj4ikOIYhiBQ,3511
 labfreed/pac_id_resolver/__init__.py,sha256=RNBlrDOSR42gmSNH9wJVhK_xwEX45cvTKVgWW2bjh7Q,113
-labfreed/pac_id_resolver/cit_common.py,sha256=jzoDOxog8YW68q7vyvDGCZcVcgIzJHXlMt8KwgVnx6o,2885
-labfreed/pac_id_resolver/cit_v1.py,sha256=TVvOWJA6-wmBkwzoHBqNuwV-tndRTSKAK07k56eoJBU,9326
-labfreed/pac_id_resolver/cit_v2.py,sha256=iDEvUb9A3ocX_ijewTIK3p951CIESnKyI7upjrd3Vjw,11842
-labfreed/pac_id_resolver/resolver.py,sha256=IxI57XRZfGHZigym6_f5tnt3ycwU5LnfXs5n1D9pPDs,3077
+labfreed/pac_id_resolver/cit_v1.py,sha256=JGlEH2d9awEu3HxPW7vu0uj4ZC3B02IdmFg7aJ4axQw,9833
+labfreed/pac_id_resolver/resolver.py,sha256=ExVMuKN_g6VFmHkW8WFgXunxFbvfPsan9jBQmn_MYIs,3956
+labfreed/pac_id_resolver/resolver_config.py,sha256=2j3j5UsVoWqU9NjciN3j-Fs53diGi4FQEvoz8ng103Y,12388
+labfreed/pac_id_resolver/resolver_config_common.py,sha256=jzoDOxog8YW68q7vyvDGCZcVcgIzJHXlMt8KwgVnx6o,2885
 labfreed/pac_id_resolver/services.py,sha256=vtnxLm38t4PNOf73cXh6UZOtWZZOGxfBCfXUDRxGHog,2592
 labfreed/qr/__init__.py,sha256=fdKwP6W2Js--yMbBUdn-g_2uq2VqPpfQJeDLHsMDO-Y,61
 labfreed/qr/generate_qr.py,sha256=mSt-U872O3ReHB_UdS-MzYu0wRgdlKcAOEfTxg5CLRk,16616
@@ -55,8 +55,9 @@ labfreed/utilities/base36.py,sha256=_yX8aQ1OwrK5tnJU1NUEzQSFGr9xAVnNvPObpNzCPYs,
 labfreed/utilities/ensure_utc_time.py,sha256=1ZTTzyIt7IimQ4ArTzdgw5hxiabkkplltbQe3Wdt2ZQ,307
 labfreed/utilities/translations.py,sha256=XY4Wud_BfXswUOpebdh0U_D2bMzb2vqluuGWzFK-3uU,1851
 labfreed/well_known_extensions/__init__.py,sha256=CjZTjx8Cn8763Hhnv_--Wj1LcFpFs2cyQwWrrzOS4xM,246
-labfreed/well_known_extensions/default_extension_interpreters.py,sha256=3-BkJrAyBa99NN5Q2QPAm59CcWmPket-rvLzgltp8KY,201
-labfreed/well_known_extensions/display_name_extension.py,sha256=Si2uJ0IGSO3-XyqlYwG7MovnT10oJ3JdOQAyjoZt2Rc,1477
+labfreed/well_known_extensions/default_extension_interpreters.py,sha256=6r2h47g8sZAyuN25DS0S0CdNQbyYRMFljdkDSrnnll0,201
+labfreed/well_known_extensions/display_name_extension.py,sha256=txZelIj-B4_ycudaQJsFr0TFuiNRe5wEMQ9hE9wtd-Q,1737
+labfreed/well_known_extensions/text_base36_extension.py,sha256=2SYWuKx2FlnkkSsZS5Z97QqMx10Kk67kzj5-BEoAo8E,1262
 labfreed/well_known_extensions/trex_extension.py,sha256=tffklaambkFPExcIDRAG9GJ7CHXeuFAagl6FuwS-2kI,929
 labfreed/well_known_keys/gs1/__init__.py,sha256=LOFycgqS6OuV8t22TmtHy-ZI2iuXc3jJfVFwRFVDM3I,103
 labfreed/well_known_keys/gs1/gs1_ai_enum_sorted.py,sha256=qSWD7bpTJQdQhXbZHJc20TRdqrnrxICD79goXWr6B-g,1405
@@ -64,7 +65,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.0a12.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-1.0.0a12.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-1.0.0a12.dist-info/METADATA,sha256=GLF4TztQScD3K3HSoiTDs3_QrhSRwz1t-NsaeJn0lts,19741
-labfreed-1.0.0a12.dist-info/RECORD,,
+labfreed-1.0.0a14.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-1.0.0a14.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-1.0.0a14.dist-info/METADATA,sha256=OiIaarhRnwP3FAkV3Q6_1tkW5v4pj_Y84RUxcmJWBBY,19775
+labfreed-1.0.0a14.dist-info/RECORD,,