labfreed 0.3.1a5__py3-none-any.whl → 1.0.0a2__py3-none-any.whl

labfreed/__init__.py

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

labfreed/labfreed_extended/app/app_infrastructure.py

@@ -5,7 +5,8 @@ import requests
 
 from labfreed.labfreed_extended.app.pac_info import PacInfo
 from labfreed.pac_attributes.client.attribute_cache import MemoryAttributeCache
-from labfreed.pac_attributes.client.client import AttributeClient, attribute_request_default_callback_factory
+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
 
@@ -29,7 +30,7 @@ class Labfreed_App_Infrastructure():
         if not http_client:
             http_client = requests.Session()
         self._http_client= http_client
-        callback = attribute_request_default_callback_factory(http_client)
+        callback = http_attribute_request_default_callback_factory(http_client)
             
         self._attribute_client = AttributeClient(http_post_callback=callback, cache_store=MemoryAttributeCache())
 
@@ -63,25 +64,15 @@ class Labfreed_App_Infrastructure():
         pac_info.user_handovers = sg_user_handovers
         
         # Attributes
-        attribute_groups = []
+        attribute_groups = {}
         for sg in service_groups:  
             attributes_urls = [s.url  for s in sg.services if s.service_type == 'attributes-generic']
             for url in attributes_urls:
-                ags = self._attribute_client.get_attributes(url, pac_id=pac.to_url(include_extensions=False), language_preferences=self._language_preferences)
+                ags = {ag.key: pyAttributeGroup.from_attribute_group(ag) for ag in self._attribute_client.get_attributes(url, pac_id=pac.to_url(include_extensions=False), language_preferences=self._language_preferences)}
                 if ags:
-                    attribute_groups.extend(ags)
+                    attribute_groups.update(ags)
         pac_info.attributes = attribute_groups
-        
-        if dn := pac.get_extension('N'):
-            dn = DisplayNameExtension.from_extension(dn)
-            pac_info.display_name = dn.display_name or ""
-        # there can be a display name in attributes, too
-        if meta := [ag for ag in pac_info.attributes if ag.key == MetaAttributeKeys.GROUPKEY.value]:
-            dn_attr = [a for a in meta[0].attributes if a.key == MetaAttributeKeys.DISPLAYNAME.value]
-            if dn_attr: 
-                dn = dn_attr[0].value
-                pac_info.display_name += f'  ( aka {dn} )'
-              
+       
         return pac_info
     
     

labfreed/labfreed_extended/app/pac_info.py

@@ -1,19 +1,22 @@
 
 
+from functools import cached_property
 from pydantic import BaseModel, Field
-from labfreed.pac_attributes.pythonic.py_attributes import pyAttribute, pyAttributes
+from labfreed.pac_attributes.pythonic.py_attributes import pyAttribute, pyAttributeGroup, pyAttributes
+from labfreed.pac_attributes.well_knonw_attribute_keys import MetaAttributeKeys
 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.labfreed_extended.app.formatted_print import StringIOLineBreak
+from labfreed.trex.pythonic.pyTREX import pyTREX
+from labfreed.well_known_extensions.display_name_extension import DisplayNameExtension
 
 
 class PacInfo(BaseModel):
     """A convenient collection of information about a PAC-ID"""
     pac_id:PAC_ID
-    display_name:str|None = None
     user_handovers: list[ServiceGroup] = Field(default_factory=list)
-    attributes:pyAttributes = Field(default_factory=list)
+    attributes:dict[str, pyAttributeGroup] = Field(default_factory=dict)
     
     @property
     def pac_url(self):
@@ -28,12 +31,48 @@ class PacInfo(BaseModel):
         
     @property
     def attached_data(self):
-        return self.pac_id.get_extension_of_type('TREX')
+        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')
     
+    @property
+    def image_url(self) -> str:
+        if meta := self.attributes.get(MetaAttributeKeys.GROUPKEY.value):
+            image_attr = meta.attributes.get(MetaAttributeKeys.IMAGE.value)
+            return image_attr.value
+        
+        
+    @property
+    def display_name(self) -> str|None:
+        display_name = None
+        pac = self.pac_id
+        if dn := pac.get_extension('N'):
+            dn = DisplayNameExtension.from_extension(dn)
+            display_name = dn.display_name or ""
+        # there can be a display name in attributes, too
+
+        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
+        return display_name
+    
+    
+    @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    
+        
+        
+    @cached_property
+    def _all_attributes(self) -> dict[str, pyAttribute]:
+        out = {}
+        for ag in self.attributes.values():
+            out.update(ag.attributes)   
+        return out
+    
     
     
     def format_for_print(self, markup:str='rich') -> str:
@@ -62,10 +101,9 @@ class PacInfo(BaseModel):
         
         
         printout.title1("Attributes")
-        for ag in self.attributes:  
+        for ag in self.attributes.values():  
             printout.title2(f'{ag.label} (from {ag.origin})')
-            attributes = pyAttributes.from_payload_attributes(ag.attributes)
-            for k, v in attributes.items():
+            for v in ag.attributes.values():
                 v:pyAttribute
                 #print(f'{k}: ({v.label})           :: {v.value}  ')
                 printout.key_value(v.label, v.value)

labfreed/pac_attributes/api_data_models/request.py

@@ -7,7 +7,7 @@ from labfreed.pac_id.pac_id import PAC_ID
 class AttributeRequestPayload(LabFREED_BaseModel):
     model_config = ConfigDict(frozen=True)
     
-    pac_urls: list[str]
+    pac_ids: list[str]
     language_preferences: list[str]
     restrict_to_attribute_groups: list[str]|None = None
     suppress_forward_lookup: bool = False
@@ -29,14 +29,14 @@ class AttributeRequestPayload(LabFREED_BaseModel):
     
     @model_validator(mode="after")
     def _validate_pacs(self) -> Self:
-        if len(self.pac_urls) > 100:
+        if len(self.pac_ids) > 100:
             self._add_validation_message(
                         source="pacs",
                         level = ValidationMsgLevel.ERROR,
                         msg='The number of pac-ids must be limited to 100'
                     )
             
-        for pac_url in self.pac_urls:
+        for pac_url in self.pac_ids:
             try:
                 PAC_ID.from_url(pac_url)
             except LabFREED_ValidationError:

labfreed/pac_attributes/api_data_models/response.py

@@ -70,12 +70,12 @@ class TextAttribute(AttributeBase):
     
         
 class NumericValue(LabFREED_BaseModel):
-    magnitude: str
+    numerical_value: str
     unit: str
     
     @model_validator(mode='after')
     def _validate_value(self):
-        value = self.magnitude
+        value = self.numerical_value
         if not_allowed_chars := set(re.sub(r'[0-9\.\-\+Ee]', '', value)):
             self._add_validation_message(
                 source="Numeric Attribute",
@@ -160,7 +160,7 @@ class AttributeGroup(LabFREED_BaseModel):
 
 
 class AttributesOfPACID(LabFREED_BaseModel):
-    pac_url: str
+    pac_id: str
     attribute_groups: list[AttributeGroup]
     
     

labfreed/pac_attributes/client/client.py

@@ -10,6 +10,7 @@ from pydantic import ValidationError
 from labfreed.pac_attributes.api_data_models.request import AttributeRequestPayload
 from labfreed.pac_attributes.api_data_models.response import AttributeResponsePayload
 from labfreed.pac_attributes.client.attribute_cache import AttributeCache, CacheableAttributeGroup
+from labfreed.pac_attributes.server.server import AttributeServerRequestHandler
 from labfreed.pac_id.pac_id import PAC_ID
 
 
@@ -35,7 +36,7 @@ class AttributeRequestCallback(Protocol):
         ...
 
 
-def attribute_request_default_callback_factory(session: requests.Session = None) -> AttributeRequestCallback:
+def http_attribute_request_default_callback_factory(session: requests.Session = None) -> AttributeRequestCallback:
     """ Returns a default implementation of AttributeRequestCallback using `requests` package.
 
     Args:
@@ -49,12 +50,31 @@ def attribute_request_default_callback_factory(session: requests.Session = None)
 
     def callback(url: str, attribute_request_body: str) -> tuple[int, str]:
         try:
-            resp = session.post(url, data=attribute_request_body, headers={'Content-Type': 'application/json'})
+            resp = session.post(url, data=attribute_request_body, headers={'Content-Type': 'application/json'}, timeout=10)
             return resp.status_code, resp.text
         except requests.exceptions.RequestException as e:
             return 500, str(e)
     return callback
 
+
+def local_attribute_request_callback_factory(request_handler:AttributeServerRequestHandler) -> AttributeRequestCallback:
+    """ Returns a default implementation of AttributeRequestCallback using `requests` package.
+
+    Args:
+        request_handler: The request handler
+
+    Returns:
+        AttributeRequestCallback: a callback following the AttributeRequestCallback protocol.
+    """
+
+    def callback(url: str, attribute_request_body: str) -> tuple[int, str]:
+        try:
+            resp = request_handler.handle_attribute_request(attribute_request_body)
+            return 200, resp
+        except requests.exceptions.RequestException as e:
+            return 500, str(e)
+    return callback
+
         
     
 
@@ -104,7 +124,7 @@ class AttributeClient():
                 return attribute_groups
         
         # no valid data found in cache > request to server
-        attribute_request_body = AttributeRequestPayload(pac_urls=[pac_id.to_url()], 
+        attribute_request_body = AttributeRequestPayload(pac_ids=[pac_id.to_url()], 
                                                             restrict_to_attribute_groups=restrict_to_attribute_groups,
                                                             language_preferences=language_preferences
                                 )
@@ -125,7 +145,7 @@ class AttributeClient():
         
         # update cache
         for ag_for_pac in r.pac_attributes:
-            pac = PAC_ID.from_url(ag_for_pac.pac_url)
+            pac = PAC_ID.from_url(ag_for_pac.pac_id)
             ags = [
                 CacheableAttributeGroup(
                     key= ag.key, 
@@ -140,7 +160,9 @@ class AttributeClient():
             
             if pac_id == pac:
                 attribute_groups_out = ags
-        return attribute_groups_out
+                return attribute_groups_out
+            else:
+                return []
             
                 
     

labfreed/pac_attributes/pythonic/attribute_server_factory.py

@@ -1,7 +1,8 @@
 from enum import Enum
 from typing import Any, Protocol
 
-from flask import Blueprint
+from flask import Blueprint, current_app
+from labfreed.pac_attributes.api_data_models.request import AttributeRequestPayload
 from labfreed.pac_attributes.server.server import AttributeGroupDataSource, AttributeServerRequestHandler, InvalidRequestError, TranslationDataSource
 
 try:
@@ -30,7 +31,8 @@ class AttributeServerFactory():
                            default_language:str,
                            translation_data_sources:list[TranslationDataSource],
                            authenticator: Authenticator|None,
-                           framework:Webframework=Webframework.FLASK
+                           framework:Webframework=Webframework.FLASK,
+                           doc_text:str=""
                            ):
         
         if not authenticator:
@@ -43,7 +45,7 @@ class AttributeServerFactory():
             
         match(framework):
             case Webframework.FLASK:
-                app = AttributeFlaskApp(request_handler,authenticator=authenticator)
+                app = AttributeFlaskApp(request_handler,authenticator=authenticator, doc_text=doc_text)
                 return app
             case Webframework.FASTAPI:
                 raise NotImplementedError('FastAPI webapp not implemented')
@@ -53,10 +55,11 @@ class AttributeServerFactory():
 
             
 class AttributeFlaskApp(Flask):
-    def __init__(self, request_handler: AttributeServerRequestHandler, authenticator: Authenticator | None = None, **kwargs: Any):
+    def __init__(self, request_handler: AttributeServerRequestHandler, authenticator: Authenticator | None = None, doc_text:str="", **kwargs: Any):
         super().__init__(__name__, **kwargs)
         self.config['ATTRIBUTE_REQUEST_HANDLER'] = request_handler
         self.config['AUTHENTICATOR'] = authenticator
+        self.config['DOC_TEXT'] = doc_text
         
         bp = self.create_attribute_blueprint(request_handler, authenticator)
         self.register_blueprint(bp)
@@ -68,7 +71,7 @@ class AttributeFlaskApp(Flask):
     ) -> Blueprint:
         bp = Blueprint("attribute", __name__)
 
-        @bp.route("/", methods=["POST"])
+        @bp.route("/", methods=["POST"], strict_slashes=False)
         def handle_attribute_request():
             if authenticator and not authenticator(request):
                 return Response(
@@ -86,9 +89,40 @@ class AttributeFlaskApp(Flask):
                 return "The request was valid, but the server encountered an error", 500
             return response_body
 
-        @bp.route("/capabilities", methods=["GET"])
+        @bp.route("/", methods=["GET"], strict_slashes=False)
         def capabilities():
-            return request_handler.capabilities()
+            doc_text = current_app.config.get('DOC_TEXT', "") 
+            capabilities = request_handler.capabilities()
+            authentication_required = bool(current_app.config['AUTHENTICATOR'])
+            example_request = AttributeRequestPayload(pac_ids=['HTTPS://PAC.METTORIUS.COM/EXAMPLE'], language_preferences=['fr', 'de']).model_dump_json(indent=2, exclude_none=True, exclude_unset=True)
+            server_address = request.url.rstrip('/')
+            response = f'''
+                <body>
+                This is a <h1>LabFREED attribute server </h1>
+                <h2>Capabilities</h2>
+                Available Attribute Groups: {', '.join([f'<a href="{ag}"> {ag} </a>' for ag in capabilities.available_attribute_groups])} <br>
+                
+                Supported Languages: {', '.join([f'<b> {l} </b>' for l in capabilities.supported_languages])}  <br>
+                Default Language: <b>{capabilities.default_language}</b> <br>
+                
+
+                <h2>How to use</h2>
+                Make a <b>POST</b> request to <a href="{server_address}">{server_address}</a> with the following body:
+                <pre>{example_request}</pre>
+                Consult {'<a href="https://github.com/ApiniLabs/PAC-Attributes"> the specification </a>' if doc_text else ""} for details. <br>
+
+                
+                {'This server <b> requires authentication </b> ' if authentication_required else ''}  
+                <br>
+                
+                {"<h2>Further Information</h2>"if doc_text else ""} 
+                {doc_text or ""} 
+                
+
+                </body>
+            '''
+        
+            return response
 
         return bp
     

labfreed/pac_attributes/pythonic/py_attributes.py

@@ -6,7 +6,8 @@ import warnings
 from pydantic import RootModel
 
 from labfreed.labfreed_infrastructure import LabFREED_BaseModel
-from labfreed.pac_attributes.api_data_models.response import AttributeBase, BoolAttribute, DateTimeAttribute,  NumericAttribute, NumericValue, ObjectAttribute, ReferenceAttribute, TextAttribute
+from labfreed.pac_attributes.api_data_models.response import AttributeBase, AttributeGroup, BoolAttribute, DateTimeAttribute,  NumericAttribute, NumericValue, ObjectAttribute, ReferenceAttribute, TextAttribute
+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
 
@@ -54,7 +55,7 @@ class pyAttributes(RootModel[list[pyAttribute]]):
         elif isinstance(attribute.value, Quantity|int|float):
             if not isinstance(attribute.value, Quantity):
                 value = Quantity(value=attribute.value, unit='dimensionless')
-            num_attribute = NumericAttribute(value = NumericValue(magnitude=value.value_as_str(), 
+            num_attribute = NumericAttribute(value = NumericValue(numerical_value=value.value_as_str(), 
                                              unit = value.unit),
                                               **common_args)
             num_attribute.print_validation_messages()
@@ -63,7 +64,7 @@ class pyAttributes(RootModel[list[pyAttribute]]):
         elif isinstance(value, str):
             # capture quantities in the form of "100.0e5 g/L"
             if q := Quantity.from_str_with_unit(value):
-                return NumericAttribute(value = NumericValue(magnitude=q.value_as_str(), 
+                return NumericAttribute(value = NumericValue(numerical_value=q.value_as_str(), 
                                              unit = q.unit),
                                               **common_args)
             else:
@@ -87,7 +88,7 @@ class pyAttributes(RootModel[list[pyAttribute]]):
         
     @staticmethod
     def from_payload_attributes(attributes:list[AttributeBase]) -> 'pyAttributes':
-        out = dict()
+        out = list()
         for a in attributes:
             match a:
                 
@@ -95,7 +96,7 @@ class pyAttributes(RootModel[list[pyAttribute]]):
                     value =  pyReference(a.value)
                     
                 case NumericAttribute():                                       
-                    value = Quantity.from_str_value(value=a.value.magnitude, unit=a.value.unit)
+                    value = Quantity.from_str_value(value=a.value.numerical_value, unit=a.value.unit)
 
                 case BoolAttribute():
                     value = a.value
@@ -117,8 +118,16 @@ class pyAttributes(RootModel[list[pyAttribute]]):
                             #    valid_until=datetime(**_parse_date_time_str(a.valid_until)),
                             #    observed_at=datetime(**_parse_date_time_str(a.value))
             )
-            out.update( { a.key: attr } )
+            out.append(attr )
         return out
             
             
         
+class pyAttributeGroup(CacheableAttributeGroup):
+    attributes:dict[str,pyAttribute]
+    
+    @staticmethod
+    def from_attribute_group(attribute_group:AttributeGroup):
+        data = vars(attribute_group).copy()
+        data["attributes"] = {a.key: a for a in pyAttributes.from_payload_attributes(attribute_group.attributes)}
+        return pyAttributeGroup(**data)

labfreed/pac_attributes/server/server.py

@@ -60,7 +60,7 @@ class AttributeServerRequestHandler():
             raise InvalidRequestError
         attributes_for_pac_id = []
         referenced_pac_ids = set()
-        for pac_url in r.pac_urls:
+        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)
@@ -103,7 +103,7 @@ class AttributeServerRequestHandler():
                 traceback.print_exc()
                 raise e
                         
-        return AttributesOfPACID(pac_url=pac_url, # return the pac_url as given, i.e. with the extension if there was one
+        return AttributesOfPACID(pac_id=pac_url, # return the pac_url as given, i.e. with the extension if there was one
                                  attribute_groups=attribute_groups)
         
     
@@ -120,44 +120,6 @@ class AttributeServerRequestHandler():
                         pass
         return referenced_pacs
             
-    # def get_translations(self, attributes_for_pac_id): 
-    #     ontology_map = {}  # ontology name → list of TermTranslations
-
-    #     for ag_for_pac in attributes_for_pac_id:
-    #         for ag in ag_for_pac.attribute_groups:
-    #             ag: AttributeGroup
-    #             ontology_name = ag.ontology
-    #             translation_data_source: TranslationDataSource = self._translation_data_sources.get(ontology_name, {})
-
-    #             attribute_keys = [a.key for a in ag.attributes]
-    #             all_keys = set([ag.key] + attribute_keys)
-
-    #             for k in all_keys:
-    #                 t = translation_data_source.get_translations_for(k)
-    #                 if t:
-    #                     ontology_map.setdefault(ontology_name, []).append(t)
-
-    #     translations_by_ontology = [ TranslationsForOntology(ontology=name, terms=terms) for name, terms in ontology_map.items()
-    #                                 ]
-    #     return translations_by_ontology
-    
-    
-    # def _get_display_name_for_key(self, key, requested_languages:str): 
-    #     for tds in self._translation_data_sources:
-    #         if term := tds.get_translations_for(key):
-    #             # try the languages requested by the user
-    #             for l in requested_languages:
-    #                 if dn := term.in_language(l):
-    #                     return dn
-    #             # remove the country codes and try the again
-    #             for l_fallback in [l.split('-')[0] for l in requested_languages]:
-    #                 if dn := term.in_language(l_fallback):
-    #                     return dn
-    #             # use the server fallback language
-    #             if dn := term.in_language(self._default_language):
-    #                 return 
-    #     warnings.warn(f'No translation for {key}')
-    #     return None
     
     def _add_display_names(self, attributes_of_pac:AttributesOfPACID, language:str) -> str:
         ''' 
@@ -181,9 +143,6 @@ class AttributeServerRequestHandler():
                     
             
         
-            
-            
-    
     def _get_display_name_for_key(self, key, language:str): 
         '''call this only with a language you know there is a translation for'''
         for tds in self._translation_data_sources:
@@ -211,10 +170,10 @@ class AttributeServerRequestHandler():
                 
                 
         
-    def capabilities(self):
+    def capabilities(self) -> ServerCapabilities:
         return ServerCapabilities(supported_languages=self._supported_languages,
                                   default_language=self._default_language,
-                                  available_attribute_groups= [ds.attribute_group_key for ds in self._attribute_group_data_sources]).model_dump_json()
+                                  available_attribute_groups= [ds.attribute_group_key for ds in self._attribute_group_data_sources])
     
 
             

labfreed/pac_attributes/well_knonw_attribute_keys.py

@@ -6,6 +6,6 @@ class MetaAttributeKeys(Enum):
     IMAGE = "https://schema.org/image"
     ALIAS = "https://schema.org/alternateName"
     DESCRIPTION = "https://schema.org/description"
-    GROUPKEY = "https://labfreed.org/attribute_metadata_group"
+    GROUPKEY = "https://labfreed.org/terms/attribute_group_metadata"
     
     

labfreed/pac_cat/category_base.py

@@ -44,14 +44,14 @@ class Category(LabFREED_BaseModel):
         s = '\n'.join( [f"{field_name} \t ({field_info.alias or ''}): \t {getattr(self, field_name)}" for  field_name, field_info in self.model_fields.items() if getattr(self, field_name)]) 
         return s 
     
-    def segments_as_dict(self):
+    def segments_as_dict(self, include_alias=False):
         ''' returns the segments in a dict, with nice keys and values'''
         out = dict()
         for  field_name, field_info in self.model_fields.items():
             if field_name =='additional_segments':
                 continue
             if v := getattr(self, field_name):
-                if field_info.alias:
+                if field_info.alias and include_alias:
                     k = f"{field_name} ({ field_info.alias})"
                 else:
                     k = f"{field_name}"

labfreed/pac_id/url_parser.py

@@ -82,7 +82,7 @@ class PAC_Parser():
     @classmethod
     def _parse_pac_id(cls,id_str:str) -> "PAC_ID":
         # m = re.match('(HTTPS://)?(PAC.)?(?P<issuer>.+?\..+?)/(?P<identifier>.*)', id_str)
-        m = re.match('(HTTPS://)?(PAC.)?(?P<issuer>.+?)/(?P<identifier>.*)', id_str)
+        m = re.match('(HTTPS://)?(PAC.)?(?P<issuer>.+?)/(?P<identifier>.*)', id_str, re.IGNORECASE)
         if not m:
             raise LabFREED_ValidationError(f'{id_str} does not match the pattern expected for PAC-ID')
         d = m.groupdict()

labfreed/pac_id_resolver/cit_v2.py

@@ -105,6 +105,7 @@ class CITBlock_v2(LabFREED_BaseModel):
 
 
 class CIT_v2(LabFREED_BaseModel):
+    schema_version: str = Field(default='2.0')
     '''Coupling Information Table (CIT)'''
     origin: str = ''
     model_config = {

labfreed/pac_id_resolver/resolver.py

@@ -67,10 +67,10 @@ class PAC_ID_Resolver():
     def resolve(self, pac_id:PAC_ID|str, check_service_status=True, use_issuer_cit=True) -> list[ServiceGroup]:
         '''Resolve a PAC-ID'''
         if isinstance(pac_id, str):
-            pac_id = PAC_CAT.from_url(pac_id)
             pac_id_catless = PAC_ID.from_url(pac_id, try_pac_cat=False)
+            pac_id = PAC_CAT.from_url(pac_id)
         
-        # it's likely to h
+        # it's likely to
         if isinstance(pac_id, PAC_ID):
             pac_id_catless = PAC_ID.from_url(pac_id.to_url(), try_pac_cat=False)
         else:

labfreed/trex/pythonic/pyTREX.py

@@ -215,7 +215,7 @@ def _trex_value_to_python_type(v):
         
     elif isinstance(v,DateValue):
         d = v._date_time_dict
-        if d.get('year') and d.get('hour'): # input is only a time
+        if d.get('year') and d.get('hour') is not None: # input is only a time
             return datetime(**d)
         elif d.get('year'):
             return date(**d)

labfreed/trex/pythonic/quantity.py

@@ -24,11 +24,12 @@ class Quantity(BaseModel):
         #dimensionless_unit
         unit:str= d.get('unit')
         if unit and unit in ['1', '', 'dimensionless']:
-            d['unit'] = None
+            unit = None
+            d['unit'] = unit
         
         #try to coerce to ucum. catch the two most likely mistakes to use blanks for multiplication and ^ for exponents.
         if unit:
-            unit = unit.replace('/ ', '/').replace(' /', '/').replace(' ', '.').replace('^', '')
+            unit = unit.replace('/ ', '/').replace(' /', '/').replace(' ', '.').replace('^', '').replace('·','.')
             d['unit'] = unit
             
         return d
@@ -122,8 +123,9 @@ class Quantity(BaseModel):
     
     def __str__(self):
         unit_symbol = self.unit
-        if self.unit == "dimensionless" or not self.unit:
+        if self.unit in [ "1", "dimensionless"] or not self.unit:
             unit_symbol = ""
+        unit_symbol = unit_symbol.replace('.', '·')
         val = self.value_as_str()
         return f"{val} {unit_symbol}"
       

{labfreed-0.3.1a5.dist-info → labfreed-1.0.0a2.dist-info}/METADATA

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

{labfreed-0.3.1a5.dist-info → labfreed-1.0.0a2.dist-info}/RECORD

@@ -1,39 +1,39 @@
-labfreed/__init__.py,sha256=Gp9Q1dgFaKojedBoRsfKbL67CroxQPmGsZmKZrldqck,338
+labfreed/__init__.py,sha256=o2qxE39XObi_KwNFEMO1fKgVTLltzbQn3tl5YQnhFXg,338
 labfreed/labfreed_infrastructure.py,sha256=YZmU-kgopyB1tvpTR_k_uIt1Q2ezexMrWvu-HaP65IE,10104
-labfreed/labfreed_extended/app/app_infrastructure.py,sha256=kDWjxkLd9p9-RBMRtAUkg8rg2BHdQ8TltgkTWEm9G1U,4396
+labfreed/labfreed_extended/app/app_infrastructure.py,sha256=1VMc_Vtjwof9hwzSG95KuIUjT1h7uNsWf_lTORYFFuQ,3981
 labfreed/labfreed_extended/app/formatted_print.py,sha256=DcwWP0ix1e_wYNIdceIp6cETkJdG2DqpU8Gs3aZAL40,1930
-labfreed/labfreed_extended/app/pac_info.py,sha256=8_EC1YtBy1JsWtlrRW1gP6GK7aPdOO3AfLLUnwtiGvc,2601
+labfreed/labfreed_extended/app/pac_info.py,sha256=oiU940sUJiV3yfNLOmkCsn7Go4qui_jijULeHTOFgrg,4163
 labfreed/pac_attributes/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-labfreed/pac_attributes/well_knonw_attribute_keys.py,sha256=ruHawnr1AffuhdKz1j1Nx67QphvcpmWsObgZhkuwkH0,318
-labfreed/pac_attributes/api_data_models/request.py,sha256=x-GuFYhCIpqAKa1AHs968OfD8O2cJKg14YUw2hTKVg4,1871
-labfreed/pac_attributes/api_data_models/response.py,sha256=czqQ59myLsN4WNgCdI_dnxRG8hSw4YI062XOPydfePU,5715
+labfreed/pac_attributes/well_knonw_attribute_keys.py,sha256=axE81MeJ3G_Wy1PbmNAXH6SfPtl96NXvQJMyrvK10t4,324
+labfreed/pac_attributes/api_data_models/request.py,sha256=-CI3rU_Bzw2DZGSS06Jl4zajrxMkfPGhKHWmIfnmWlk,1868
+labfreed/pac_attributes/api_data_models/response.py,sha256=4VliJuKM_r-J-xaLEqfcdW3JTe2BGG_hQSCaHPG3-xM,5726
 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=eWFy7h-T6gd25ENj9pLvSadNFRrzzIineqBoov2cGyw,2688
-labfreed/pac_attributes/client/client.py,sha256=EdGWxi22DBx67-t_ICvm3YJGy0wwU1sMn4efwXtkvWg,6231
-labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=1rRsZG-7Rm-kbxxj3vYMCfnagPw-uNxjylPKhYXf0ZA,3844
+labfreed/pac_attributes/client/client.py,sha256=Sfvbr8WMW8NOL6_tkWFvU0IybKnzyC0XydmcEFUyb5s,7102
+labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=_wasafjBlwvzOaM6-uPgqPethsDQHEpaXoiRW7w9aV0,5759
 labfreed/pac_attributes/pythonic/excel_attribute_data_source.py,sha256=mS310M3UOKuv00mJsRAK7acfTdyOw9c-_9UHXKuAqvs,6923
-labfreed/pac_attributes/pythonic/py_attributes.py,sha256=K9NTPH606cBepVKwyThbfGvd26WAzjbc5L64MTLKcV4,5134
+labfreed/pac_attributes/pythonic/py_attributes.py,sha256=LoPSH5DWdPTKq-3d2CT-7tTfkqYN9s53sNEeSq_6fHg,5615
 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=bCFqozKBEVdR8etRJjG9RCE5Uea9SMudPN4Mwh-iQr4,2083
-labfreed/pac_attributes/server/server.py,sha256=0dM9BmL0u_6g8O-v7_tPRUj6og2LwlhrcPiDPFdp5Bo,10772
+labfreed/pac_attributes/server/server.py,sha256=_Rzi_vzX02o0g03lbm-fdg5AJHJnESDWD7cJEKRFs8w,8841
 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=nFa-y1IiTnPV1xz3RibqkEINISvP045329z8QgbsJ-4,2483
+labfreed/pac_cat/category_base.py,sha256=wVejYgDnUIUQ71q05ctophtZY2w9fD-PZ0xk3wUAEkQ,2522
 labfreed/pac_cat/pac_cat.py,sha256=wcb_fhvgjS2xmqTsxS8_Oibvr1nsQt5zr8aUajLfK1E,5578
 labfreed/pac_cat/predefined_categories.py,sha256=5wnMCj-CrACV2W4lH13w7qynWIwi506G3uLNcxuJQGg,8832
 labfreed/pac_id/__init__.py,sha256=NGMbzkwQ4txKeT5pxdIZordwHO8J3_q84jzPanjKoHg,675
 labfreed/pac_id/extension.py,sha256=NgLexs1LbRMMm4ETrn5m4EY2iWoMDgOTb0UV556jatQ,2227
 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=9_VHqklm7veknmZitKXw0-Yerl99bmeKYqnPUQPMDAw,5964
+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=1Nywuv9cpROiOt7X326ePpgajPAe4F9nGqylqaZcsxY,11794
-labfreed/pac_id_resolver/resolver.py,sha256=Rh_pccjFhtvpR5Bz_F0GPjZunl07eh42u3gQgacumYc,3079
+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/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
@@ -44,8 +44,8 @@ labfreed/trex/trex_base_models.py,sha256=591559BISc82fyIoEP_dq_GHDbPCVzApx7FM3TR
 labfreed/trex/value_segments.py,sha256=_fbDHDRfo7pxIWpzcbyjppv1VNd8Tnd-VXhbd6igI8g,3698
 labfreed/trex/pythonic/__init__.py,sha256=dyAQG7t-uYN6VfGXbWIq2bHxGcGI63l7FS2-VPYs2RQ,137
 labfreed/trex/pythonic/data_table.py,sha256=KGyA5hRdDOOkJB0EOyjmzbbMusgYkBB_2SIFzrJ25yI,3148
-labfreed/trex/pythonic/pyTREX.py,sha256=WZPp8pZIrlibiLBz2vnXZoJOnxjrJ4Vll9eA-w5K_Ks,10145
-labfreed/trex/pythonic/quantity.py,sha256=CzK3kCXopTl11qOCirkaiThDvMN6m1FbpLMrsHy2NkI,5336
+labfreed/trex/pythonic/pyTREX.py,sha256=wWYYb9pyZB01ObGOHf8gXzvMyAGzuCTduHzP03yvKj8,10157
+labfreed/trex/pythonic/quantity.py,sha256=jmhHfmEclYBQ1cLmOtmV7Ull4S0qHKIYVE0uhtNFFz0,5441
 labfreed/utilities/base36.py,sha256=_yX8aQ1OwrK5tnJU1NUEzQSFGr9xAVnNvPObpNzCPYs,2895
 labfreed/utilities/ensure_utc_time.py,sha256=1ZTTzyIt7IimQ4ArTzdgw5hxiabkkplltbQe3Wdt2ZQ,307
 labfreed/utilities/translations.py,sha256=XY4Wud_BfXswUOpebdh0U_D2bMzb2vqluuGWzFK-3uU,1851
@@ -59,7 +59,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-0.3.1a5.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-0.3.1a5.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-0.3.1a5.dist-info/METADATA,sha256=w6gukW0c5-ctDkwyhbWbAPAFm-uZ-bUsKss-gW57wtM,19740
-labfreed-0.3.1a5.dist-info/RECORD,,
+labfreed-1.0.0a2.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-1.0.0a2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-1.0.0a2.dist-info/METADATA,sha256=5puhyvihc2xCJlVdQjfPAXbwsllH_x4LmYBz-xzgM-E,19740
+labfreed-1.0.0a2.dist-info/RECORD,,