labfreed 1.0.0a7__py3-none-any.whl → 1.0.0a9__py3-none-any.whl

labfreed/__init__.py

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

labfreed/labfreed_extended/app/app_infrastructure.py

@@ -71,7 +71,7 @@ class Labfreed_App_Infrastructure():
                 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.update(ags)
-        pac_info.attributes_groups = attribute_groups
+        pac_info.attribute_groups = attribute_groups
        
         return pac_info
     

labfreed/labfreed_extended/app/pac_info/pac_info.py

@@ -5,7 +5,7 @@ from pathlib import Path
 from urllib.parse import urlparse
 from jinja2 import Environment, FileSystemLoader, select_autoescape
 from pydantic import BaseModel, Field
-from labfreed.pac_attributes.pythonic.py_attributes import pyAttribute, pyAttributeGroup, pyAttributes, pyReference
+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_id.pac_id import PAC_ID
@@ -20,7 +20,7 @@ class PacInfo(BaseModel):
     """A convenient collection of information about a PAC-ID"""
     pac_id:PAC_ID
     user_handovers: list[ServiceGroup] = Field(default_factory=list)
-    attributes_groups:dict[str, pyAttributeGroup] = Field(default_factory=dict)
+    attribute_groups:dict[str, pyAttributeGroup] = Field(default_factory=dict)
     
     @property
     def pac_url(self):
@@ -44,8 +44,10 @@ class PacInfo(BaseModel):
     
     @property
     def image_url(self) -> str:
-        if meta := self.attributes_groups.get(MetaAttributeKeys.GROUPKEY.value):
-            image_attr = meta.attributes.get(MetaAttributeKeys.IMAGE.value)
+        image_attr = self._all_attributes.get(MetaAttributeKeys.IMAGE.value)
+        if isinstance(image_attr.value, pyResource):
+            return image_attr.value.root
+        if isinstance(image_attr.value, str):
             return image_attr.value
         
         
@@ -68,12 +70,18 @@ class PacInfo(BaseModel):
     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
+    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.attributes_groups.values():
+        for ag in self.attribute_groups.values():
             out.update(ag.attributes)   
         return out
     
@@ -105,7 +113,7 @@ class PacInfo(BaseModel):
         
         
         printout.title1("Attributes")
-        for ag in self.attributes_groups.values():  
+        for ag in self.attribute_groups.values():  
             printout.title2(f'{ag.label} (from {ag.origin})')
             for v in ag.attributes.values():
                 v:pyAttribute

labfreed/pac_attributes/client/attribute_cache.py

@@ -1,6 +1,6 @@
 
 
-from datetime import datetime, timedelta
+from datetime import UTC, datetime, timedelta
 from typing import Literal, Protocol
 
 
@@ -18,7 +18,7 @@ class CacheableAttributeGroup(AttributeGroup):
         if self.value_from is None:
             return False
         else:
-            return ( datetime.now() - timedelta(min=accept_cache_for_minutes)) > self.value_from 
+            return ( datetime.now(tz=UTC) - timedelta(minutes=accept_cache_for_minutes)) > self.value_from 
 
 
 

labfreed/pac_attributes/client/client.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-from datetime import datetime
+from datetime import UTC, datetime
 from typing import Protocol, runtime_checkable
 
 import requests
@@ -156,7 +156,7 @@ class AttributeClient():
                     origin=server_url, 
                     language=r.language, 
                     label=ag.label,
-                    value_from=datetime.now(tz=datetime.UTC)) 
+                    value_from=datetime.now(tz=UTC)) 
                 for ag in ag_for_pac.attribute_groups
                 ]
             self.cache_store.update(server_url, pac_from_response, ags)

labfreed/pac_attributes/pythonic/attribute_server_factory.py

@@ -93,7 +93,7 @@ class AttributeFlaskApp(Flask):
         def capabilities():
             doc_text = current_app.config.get('DOC_TEXT', "") 
             capabilities = request_handler.capabilities()
-            authentication_required = bool(current_app.config['AUTHENTICATOR'])
+            authentication_required = bool(current_app.config.get('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'''
@@ -109,7 +109,7 @@ class AttributeFlaskApp(Flask):
                 <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>
+                Consult <a href="https://github.com/ApiniLabs/PAC-Attributes"> the specification </a> for details. <br>
 
                 
                 {'This server <b> requires authentication </b> ' if authentication_required else ''}  

labfreed/pac_attributes/server/attribute_data_sources.py

@@ -31,12 +31,13 @@ class AttributeGroupDataSource(ABC):
     
 
 class Dict_DataSource(AttributeGroupDataSource):
-    def __init__(self, data:dict[str, list[AttributeBase]], uses_pac_cat_short_form=True, *args, **kwargs):
+    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()]):
             raise ValueError('Invalid data')
         
         self._data = data
         self.uses_pac_cat_short_form = uses_pac_cat_short_form
+        self._pac_to_key = pac_to_key
         
         super().__init__(*args, **kwargs)       
         
@@ -53,7 +54,9 @@ class Dict_DataSource(AttributeGroupDataSource):
         except:
             ... # might as well try to match the original input
             
-        attributes = self._data.get(pac_url)
+        
+        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     
         

labfreed/pac_attributes/server/server.py

@@ -134,20 +134,22 @@ class AttributeServerRequestHandler():
             if dn := self._get_display_name_for_key(ag.key, language):
                 ag.label = dn
             else:
-                ag.label = string.capwords(
-                    re.sub(r'([a-z])([A-Z])', r'\1 \2',  
-                           re.sub('-_', '',
-                                  ag.key.split('/')[-1])
-                           )
-                    )
+                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:
                 if dn := self._get_display_name_for_key(a.key, language):
                     a.label = dn
                 else:
-                    a.label = a.key.split('/')[-1]
+                    a.label = self.fallback_label(a.key)
                     rich.print(f"[yellow]WARNING:[/yellow] No translation for '{a.key}' in '{language}'. Falling back to '{a.label}' ")
                     
+        
+    def fallback_label(self, key:str):
+        l = key.split('/')[-1]
+        l = re.sub(r'([a-z])([A-Z])', r'\1 \2', l)
+        l = re.sub(r'[-_]', ' ', l)
+        l = string.capwords(l)
+        return l                 
             
         
     def _get_display_name_for_key(self, key, language:str): 

{labfreed-1.0.0a7.dist-info → labfreed-1.0.0a9.dist-info}/METADATA

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

{labfreed-1.0.0a7.dist-info → labfreed-1.0.0a9.dist-info}/RECORD

@@ -1,8 +1,8 @@
-labfreed/__init__.py,sha256=2M8GLQGnuUWBRUGzOt9MJDSVqxWBbFRcTDuQhOuTu6M,338
+labfreed/__init__.py,sha256=wQI1Zn83JUEA_A8Tdaf1P78-Pa_Lg_T5uxCPmj46wN8,338
 labfreed/labfreed_infrastructure.py,sha256=YZmU-kgopyB1tvpTR_k_uIt1Q2ezexMrWvu-HaP65IE,10104
-labfreed/labfreed_extended/app/app_infrastructure.py,sha256=0dO1dXu1DZykRH3gnta34vz5MzEEXUfK1D-tsjNqCaE,4036
+labfreed/labfreed_extended/app/app_infrastructure.py,sha256=F5UHHt8-r7jigQudOsJ-yV4lWKHFsxNhI4uGP_h53lE,4035
 labfreed/labfreed_extended/app/formatted_print.py,sha256=DcwWP0ix1e_wYNIdceIp6cETkJdG2DqpU8Gs3aZAL40,1930
-labfreed/labfreed_extended/app/pac_info/pac_info.py,sha256=rb5mraJNsPsm7ujhk6WJmm9tXByhv0E8QTOCcgSaO_U,6159
+labfreed/labfreed_extended/app/pac_info/pac_info.py,sha256=hsJunO4adKcLi7PBZNAJYeqzOH31_j95JzuvEV8lNVY,6427
 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
@@ -14,15 +14,15 @@ labfreed/pac_attributes/api_data_models/request.py,sha256=-CI3rU_Bzw2DZGSS06Jl4z
 labfreed/pac_attributes/api_data_models/response.py,sha256=eGh474ILEcBC1ijhs1ZZfdhNWRxiPeccGS8aw0zzt0U,6934
 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=DbVk6MTOmzNhaf1IDVhzmnlBXiSMPX9Gur43tlBOSdM,2207
-labfreed/pac_attributes/client/client.py,sha256=psOvlYsnK4zPp2jFHHgTPpwjRo8-uJOGLEESXyi-e_I,7510
-labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=_wasafjBlwvzOaM6-uPgqPethsDQHEpaXoiRW7w9aV0,5759
+labfreed/pac_attributes/client/attribute_cache.py,sha256=ThUadWqQ5oM8DnAnvZuY4jeA3Mg06ePNEcRP5wCsadc,2222
+labfreed/pac_attributes/client/client.py,sha256=DcD9wG3Zc7Iznr5Wlrwp17QgE2tjPxITgmjmSQonvAo,7506
+labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=DatCagOpbuURssP5M6sjvhPK-yilq8xSjuHTGaKCVJ0,5739
 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
 labfreed/pac_attributes/server/__init__.py,sha256=JvQ2kpQx62OUwP18bGhOWYU9an_nQW59Y8Lh7HyfVxY,301
-labfreed/pac_attributes/server/attribute_data_sources.py,sha256=CAPoEc6OQycfc9jU66aL7K4K90ZDrEGG8fXfbVfDKao,2175
-labfreed/pac_attributes/server/server.py,sha256=HKfy5XbDM4AOpfeGrkxqGcfMtaMCoWP_qkJ-etBRROg,9077
+labfreed/pac_attributes/server/attribute_data_sources.py,sha256=7-YQeBcn5ndsZWeeW_-YgG7obF5qvXoH-AFPpmXWn1I,2337
+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
@@ -64,7 +64,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.0a7.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-1.0.0a7.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-1.0.0a7.dist-info/METADATA,sha256=D-1dE3dyCXPqcuD860PyNHInj0MAu0b3eezsHvy2pV0,19740
-labfreed-1.0.0a7.dist-info/RECORD,,
+labfreed-1.0.0a9.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-1.0.0a9.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-1.0.0a9.dist-info/METADATA,sha256=QdAoKgVWGUOJHTaWiyq4FExbgpzuIqY3jTFNjcyuXus,19740
+labfreed-1.0.0a9.dist-info/RECORD,,