labfreed 1.0.0a7__tar.gz → 1.0.0a8__tar.gz

{labfreed-1.0.0a7 → labfreed-1.0.0a8}/PKG-INFO

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

{labfreed-1.0.0a7 → labfreed-1.0.0a8}/labfreed/__init__.py

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

{labfreed-1.0.0a7 → labfreed-1.0.0a8}/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-1.0.0a7 → labfreed-1.0.0a8}/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-1.0.0a7 → labfreed-1.0.0a8}/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-1.0.0a7 → labfreed-1.0.0a8}/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-1.0.0a7 → labfreed-1.0.0a8}/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-1.0.0a7 → labfreed-1.0.0a8}/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):