labfreed 0.3.1a5__tar.gz → 0.3.1a6__tar.gz

{labfreed-0.3.1a5 → labfreed-0.3.1a6}/PKG-INFO

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

{labfreed-0.3.1a5 → labfreed-0.3.1a6}/labfreed/__init__.py

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

{labfreed-0.3.1a5 → labfreed-0.3.1a6}/labfreed/labfreed_extended/app/app_infrastructure.py

@@ -6,6 +6,7 @@ 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.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
 
@@ -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-0.3.1a5 → labfreed-0.3.1a6}/labfreed/labfreed_extended/app/pac_info.py

@@ -1,19 +1,20 @@
 
 
 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.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):
@@ -34,6 +35,29 @@ class PacInfo(BaseModel):
     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 meta := self.attributes.get(MetaAttributeKeys.GROUPKEY.value):
+            dn_attr = meta.attributes.get(MetaAttributeKeys.DISPLAYNAME.value)
+            if dn_attr: 
+                dn = dn_attr.value
+                display_name += f'  ( aka {dn} )'
+        return display_name
+        
+    
     
     
     def format_for_print(self, markup:str='rich') -> str:
@@ -62,10 +86,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-0.3.1a5 → labfreed-0.3.1a6}/labfreed/pac_attributes/client/client.py

@@ -49,7 +49,7 @@ 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)
@@ -140,7 +140,9 @@ class AttributeClient():
             
             if pac_id == pac:
                 attribute_groups_out = ags
-        return attribute_groups_out
+                return attribute_groups_out
+            else:
+                return []
             
                 
     

{labfreed-0.3.1a5 → labfreed-0.3.1a6}/labfreed/pac_attributes/pythonic/attribute_server_factory.py

@@ -68,7 +68,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,7 +86,7 @@ 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("/capabilities", methods=["GET"], strict_slashes=False)
         def capabilities():
             return request_handler.capabilities()
 

{labfreed-0.3.1a5 → labfreed-0.3.1a6}/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
 
@@ -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:
                 
@@ -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-0.3.1a5 → labfreed-0.3.1a6}/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: