labfreed 1.0.0a25__py3-none-any.whl → 1.0.0b26__py3-none-any.whl

labfreed/__init__.py

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

labfreed/labfreed_extended/app/app_infrastructure.py

@@ -4,7 +4,6 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
 import requests
 
 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
 
@@ -14,8 +13,6 @@ from labfreed.pac_id_resolver.services import ServiceGroup
 
         
 
-
-
 class Labfreed_App_Infrastructure():
     def __init__(self, markup = 'rich', language_preferences:list[str]|str='en', http_client:requests.Session|None=None, use_issuer_resolver_config=True):
         if isinstance(language_preferences, str):
@@ -30,7 +27,7 @@ class Labfreed_App_Infrastructure():
         self._http_client= http_client
         callback = http_attribute_request_default_callback_factory(http_client)
             
-        self._attribute_client = AttributeClient(http_post_callback=callback, cache_store=MemoryAttributeCache(), always_use_cached_value_for_minutes=1)
+        self._attribute_client = AttributeClient(http_post_callback=callback)
 
 
     def add_resolver_config(self, cit:str):
@@ -79,7 +76,7 @@ class Labfreed_App_Infrastructure():
         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 = {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)}
+                ags = {ag.group_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.attribute_groups = attribute_groups

labfreed/labfreed_extended/app/pac_info/pac_info.py

@@ -1,5 +1,3 @@
-
-
 from functools import cached_property
 from pathlib import Path
 from urllib.parse import urlparse
@@ -164,10 +162,10 @@ class PacInfo(BaseModel):
     @cached_property
     def image_url(self) -> str:
         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
+        if isinstance(image_attr.values, pyResource):
+            return image_attr.values.root
+        if isinstance(image_attr.values, str):
+            return image_attr.values
         
         
     @cached_property
@@ -180,7 +178,7 @@ class PacInfo(BaseModel):
         # there can be a display name in attributes, too
 
         if dn_attr := self._all_attributes.get(MetaAttributeKeys.DISPLAYNAME.value): 
-            dn = dn_attr.value
+            dn = dn_attr.values
             display_name = dn + f' ( aka {display_name} )' if display_name else dn
             
         if not display_name and self.main_category:
@@ -244,7 +242,7 @@ class PacInfo(BaseModel):
         
         printout.title1("Attributes")
         for ag in self.attribute_groups.values():  
-            printout.title2(f'{ag.label} (from {ag.origin})')
+            printout.title2(f'{ag.group_label} (from {ag.origin})')
             for v in ag.attributes.values():
                 v:pyAttribute
                 #print(f'{k}: ({v.label})           :: {v.value}  ')

labfreed/labfreed_extended/pac_issuer_lib/lib/attribute.py

@@ -1,6 +1,7 @@
 
 import logging
 from flask import render_template, request
+from labfreed.pac_attributes.api_data_models.request import AttributeRequestData
 from labfreed.pac_attributes.api_data_models.response import AttributeGroup
 from labfreed.pac_cat.pac_cat import PAC_CAT
 from labfreed.pac_cat.predefined_categories import Material_Device, Material_Consumable, Material_Substance
@@ -75,7 +76,7 @@ class DynamicDemoAttributeGroup(AttributeGroupDataSource):
             return None
         
         attributes = pyAttributes( [pyAttribute(key=d[0], value=d[1]) for d in self._data] ).to_payload_attributes()
-        return AttributeGroup(key=self._attribute_group_key, 
+        return AttributeGroup(group_key=self._attribute_group_key, 
                               attributes=attributes)
         
         
@@ -106,7 +107,7 @@ class SessionLocalDirectCall(requests.Session):
         self._request_handlers = request_handlers
         
     
-    def post(self, url, *args, **kwargs):
+    def get(self, url, *args, **kwargs):
     
         if is_self_request(url):
             # Case: server calls itself
@@ -122,11 +123,15 @@ class SessionLocalDirectCall(requests.Session):
         # Example: directly call the Flask view function instead of HTTP
         # You could map URLs to functions if you know your routing
         # For now, just return a mock response
-        rh = self._request_handlers.get(path.strip("/"))
+        path, pac = path.strip("/").rsplit("/", 1)
+        rh = self._request_handlers.get(path)
         
         r = Response()
         if rh:
-            body = rh.handle_attribute_request(json_request_body=kwargs.get("data"))
+            request_data = AttributeRequestData.from_http_request(pac_id = pac,
+                                                                params = kwargs.get('params'),
+                                                                 headers = kwargs.get('headers'))
+            body = rh.handle_attribute_request(request_data=request_data)
             r.status_code = 200
             r._content = body.encode("utf-8")
             r.encoding = "utf-8"
@@ -161,8 +166,6 @@ def is_self_request(url: str) -> bool:
     target_ip = resolve_ip(parsed.hostname.lower())
     current_ip = resolve_ip(request.host.split(":")[0].lower())
     
-    
-
     return target_ip == current_ip
 
 

labfreed/labfreed_extended/pac_issuer_lib/static/external-link.svg

@@ -1,7 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icons/external-link</title>
-    <g id="icons/external-link" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M5.10570888,18.8942911 C4.83722343,18.6258057 4.81484965,18.204406 5.03858752,17.9104349 L5.10570888,17.8336309 L15.9992174,6.94117952 L10.8105793,6.93942074 L10.7088087,6.93257412 C10.3427331,6.8829117 10.0605793,6.5691165 10.0605793,6.18942074 C10.0605793,5.81286295 10.3380887,5.50112097 10.6997498,5.44755266 L10.8105793,5.43942074 L18.5605793,5.43942074 L18.5605793,13.1894207 L18.5537326,13.2911913 C18.5090365,13.6206593 18.2503927,13.8821507 17.9223127,13.9311544 L17.8105793,13.9394207 L17.7088087,13.9325741 C17.3793407,13.8878779 17.1178493,13.6292342 17.0688456,13.3011542 L17.0605793,13.1894207 L17.0598776,8.00183969 L6.16636906,18.8942911 C5.87347584,19.1871843 5.3986021,19.1871843 5.10570888,18.8942911 Z" id="Icons/Navigation/External-Link/Dark" fill="#1C1847" fill-rule="nonzero"></path>
-    </g>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icons/external-link</title>
+    <g id="icons/external-link" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M5.10570888,18.8942911 C4.83722343,18.6258057 4.81484965,18.204406 5.03858752,17.9104349 L5.10570888,17.8336309 L15.9992174,6.94117952 L10.8105793,6.93942074 L10.7088087,6.93257412 C10.3427331,6.8829117 10.0605793,6.5691165 10.0605793,6.18942074 C10.0605793,5.81286295 10.3380887,5.50112097 10.6997498,5.44755266 L10.8105793,5.43942074 L18.5605793,5.43942074 L18.5605793,13.1894207 L18.5537326,13.2911913 C18.5090365,13.6206593 18.2503927,13.8821507 17.9223127,13.9311544 L17.8105793,13.9394207 L17.7088087,13.9325741 C17.3793407,13.8878779 17.1178493,13.6292342 17.0688456,13.3011542 L17.0605793,13.1894207 L17.0598776,8.00183969 L6.16636906,18.8942911 C5.87347584,19.1871843 5.3986021,19.1871843 5.10570888,18.8942911 Z" id="Icons/Navigation/External-Link/Dark" fill="#1C1847" fill-rule="nonzero"></path>
+    </g>
 </svg>

labfreed/labfreed_extended/pac_issuer_lib/static/logo.svg

@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg id="LabfreedLogo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 233" width="200" height="116.5">
-  <defs>
-    <style>
-      .cls-1 { fill: #51a1d7; }
-      .cls-2 { fill: #438ad7; }
-      .cls-3 { fill: #94d5e4; }
-      .cls-4 { fill: #4db9d2; }
-      .cls-5 { fill: #2b63bc; }
-      .brand-text {
-        font-family: Arial, sans-serif;
-        font-size: 24px;
-        font-weight: bold;
-        fill: #51a1d7;
-      }
-    </style>
-  </defs>
-
-  <!-- Half-size dove -->
-  <g transform="scale(0.5)">
-    <g>
-      <g>
-        <polygon class="cls-3" points="115.8 143.51 115.8 143.55 115.77 143.51 115.8 143.51"/>
-        <polygon class="cls-1" points="208.4 97.2 141.5 164.1 138.93 158.95 115.78 112.63 108.05 97.2 208.4 97.2"/>
-        <polygon class="cls-2" points="208.4 97.19 108.05 97.19 138.93 27.74 169.8 58.61 208.4 97.19"/>
-        <polygon class="cls-5" points="208.4 43.17 208.4 97.2 169.81 58.62 208.4 43.17"/>
-        <polygon class="cls-2" points="247 74.05 208.4 74.05 208.4 43.17 247 74.05"/>
-      </g>
-      <path class="cls-4" d="M108.05,189.82h.02v-7.72h-.02v7.72ZM108.06,143.51v7.72h.02v-7.72h-.02ZM108.06,158.93v15.45h.02v-15.45h-.02Z"/>
-      <path class="cls-2" d="M141.5,164.1l-2.57-5.15-23.15-46.32-7.72-15.43v46.3h.02v7.72h-.02v7.71h.02v15.45h-.02v7.72h.02v7.72h-.02v30.87l38.6-46.32-5.15-10.27ZM115.8,143.55l-.03-.05h.03v.05Z"/>
-      <rect class="cls-2" x="30.88" y="43.16" width="15.43" height="15.45"/>
-      <rect class="cls-2" x="15.43" y="27.73" width="15.44" height="15.44"/>
-      <rect class="cls-1" y="12.3" width="15.44" height="15.44"/>
-      <rect class="cls-2" x="61.75" y="74.04" width="15.43" height="15.45"/>
-      <rect class="cls-1" x="46.32" y="74.05" width="15.44" height="15.44"/>
-      <rect class="cls-1" x="30.87" y="89.49" width="15.44" height="15.44"/>
-      <rect class="cls-1" y="58.61" width="15.44" height="15.44"/>
-    </g>
-    <polygon class="cls-5" points="138.93 27.74 108.05 97.19 92.63 97.19 92.63 89.48 77.18 89.48 77.18 74.04 61.75 74.04 61.75 58.61 46.31 58.61 46.31 43.16 30.88 43.16 30.88 27.75 30.86 27.74 138.93 27.74"/>
-  </g>
-
-  <!-- Branding text -->
-  <text class="brand-text" x="0" y="130">Powered by LabFREED </text>
-</svg>
+<?xml version="1.0" encoding="UTF-8"?>
+<svg id="LabfreedLogo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 400 233" width="200" height="116.5">
+  <defs>
+    <style>
+      .cls-1 { fill: #51a1d7; }
+      .cls-2 { fill: #438ad7; }
+      .cls-3 { fill: #94d5e4; }
+      .cls-4 { fill: #4db9d2; }
+      .cls-5 { fill: #2b63bc; }
+      .brand-text {
+        font-family: Arial, sans-serif;
+        font-size: 24px;
+        font-weight: bold;
+        fill: #51a1d7;
+      }
+    </style>
+  </defs>
+
+  <!-- Half-size dove -->
+  <g transform="scale(0.5)">
+    <g>
+      <g>
+        <polygon class="cls-3" points="115.8 143.51 115.8 143.55 115.77 143.51 115.8 143.51"/>
+        <polygon class="cls-1" points="208.4 97.2 141.5 164.1 138.93 158.95 115.78 112.63 108.05 97.2 208.4 97.2"/>
+        <polygon class="cls-2" points="208.4 97.19 108.05 97.19 138.93 27.74 169.8 58.61 208.4 97.19"/>
+        <polygon class="cls-5" points="208.4 43.17 208.4 97.2 169.81 58.62 208.4 43.17"/>
+        <polygon class="cls-2" points="247 74.05 208.4 74.05 208.4 43.17 247 74.05"/>
+      </g>
+      <path class="cls-4" d="M108.05,189.82h.02v-7.72h-.02v7.72ZM108.06,143.51v7.72h.02v-7.72h-.02ZM108.06,158.93v15.45h.02v-15.45h-.02Z"/>
+      <path class="cls-2" d="M141.5,164.1l-2.57-5.15-23.15-46.32-7.72-15.43v46.3h.02v7.72h-.02v7.71h.02v15.45h-.02v7.72h.02v7.72h-.02v30.87l38.6-46.32-5.15-10.27ZM115.8,143.55l-.03-.05h.03v.05Z"/>
+      <rect class="cls-2" x="30.88" y="43.16" width="15.43" height="15.45"/>
+      <rect class="cls-2" x="15.43" y="27.73" width="15.44" height="15.44"/>
+      <rect class="cls-1" y="12.3" width="15.44" height="15.44"/>
+      <rect class="cls-2" x="61.75" y="74.04" width="15.43" height="15.45"/>
+      <rect class="cls-1" x="46.32" y="74.05" width="15.44" height="15.44"/>
+      <rect class="cls-1" x="30.87" y="89.49" width="15.44" height="15.44"/>
+      <rect class="cls-1" y="58.61" width="15.44" height="15.44"/>
+    </g>
+    <polygon class="cls-5" points="138.93 27.74 108.05 97.19 92.63 97.19 92.63 89.48 77.18 89.48 77.18 74.04 61.75 74.04 61.75 58.61 46.31 58.61 46.31 43.16 30.88 43.16 30.88 27.75 30.86 27.74 138.93 27.74"/>
+  </g>
+
+  <!-- Branding text -->
+  <text class="brand-text" x="0" y="130">Powered by LabFREED </text>
+</svg>

labfreed/pac_attributes/api_data_models/request.py

@@ -1,56 +1,104 @@
-from typing import   Self
-from pydantic import ConfigDict, model_validator
+from typing import   Any, Self
+from urllib.parse import unquote
+from werkzeug.datastructures import LanguageAccept
+from werkzeug.http import parse_accept_header
+from pydantic import ConfigDict, field_validator, model_validator
 from labfreed.labfreed_infrastructure import LabFREED_BaseModel, LabFREED_ValidationError, ValidationMsgLevel
 from labfreed.pac_id.pac_id import PAC_ID
 
+ATTR_GROUPS = 'attr_grps'
+ATTR_GROUPS_FWD_LKP= 'attr_fwd_lkp'
 
-class AttributeRequestPayload(LabFREED_BaseModel):
-    model_config = ConfigDict(frozen=True)
+
+class AttributeRequestData(LabFREED_BaseModel):  
+    model_config = ConfigDict(arbitrary_types_allowed=True)  
     
-    pac_ids: list[str]
-    language_preferences: list[str]|None = None
+    pac_id: str
+    language_preferences: LanguageAccept|None = None
     restrict_to_attribute_groups: list[str]|None = None
-    suppress_forward_lookup: bool = False
+    do_forward_lookup: bool = True
     
     def as_json(self):
         return self.model_dump_json()
     
     @classmethod
-    def from_json(cls, json):
+    def from_json(cls, json) -> Self:
         return cls.model_validate_json(json)
     
+    @classmethod
+    def from_http_request(cls, pac_id:str, params:dict, headers:dict):
+        restrict_to_attribute_groups = params.get(ATTR_GROUPS)
+        if restrict_to_attribute_groups == '':
+            restrict_to_attribute_groups = None
+        if restrict_to_attribute_groups:
+            restrict_to_attribute_groups = restrict_to_attribute_groups.split(',')
+            
+        fwd_lkp = params.get(ATTR_GROUPS_FWD_LKP,'true')
+        do_forward_lookup = fwd_lkp.lower() not in ['false', 'no', '0', 'n', 'off']
+        lang_hdr = headers.get('Accept-Language')
+        language_preferences: LanguageAccept = parse_accept_header(lang_hdr, LanguageAccept)
+        out = cls(pac_id=pac_id, 
+                            restrict_to_attribute_groups = restrict_to_attribute_groups,
+                            do_forward_lookup = do_forward_lookup,
+                            language_preferences=language_preferences
+                            )   
+        return out
+        
+
+    
     @model_validator(mode="before")
     @classmethod
-    def _handle_single_pac_url(cls, data):
-        p = data.get('pac_urls')
-        if isinstance(p, str):
-            data['pac_urls'] = [p]
-        return data
+    def _scalars_to_list(cls, d):
+        if isinstance(lp:= d.get("language_preferences"), str):
+            d["language_preferences"] = [lp]
+        if isinstance(rag := d.get("restrict_to_attribute_groups"), str):
+            d["restrict_to_attribute_groups"] = [rag]
+        return d
+    
     
+    @field_validator('language_preferences', mode='before')
+    @classmethod
+    def convert_language_preferences(cls,lp):
+        if isinstance(lp, LanguageAccept):
+            return lp
+        lq = [(lng, 1-i/len(lp)) for i, lng in enumerate(lp)]
+        return LanguageAccept(lq)
+        
+    
+    @model_validator(mode="after")
+    def _revert_url_encoding(self):
+        self.pac_id = unquote(self.pac_id)
+        if self.restrict_to_attribute_groups:
+            self.restrict_to_attribute_groups = [unquote(g) for g in self.restrict_to_attribute_groups]
+        return self
+           
     @model_validator(mode="after")
-    def _validate_pacs(self) -> Self:
-        if len(self.pac_ids) > 100:
+    def _validate_pacs(self) -> Self:           
+        try:
+            PAC_ID.from_url(self.pac_id)
+        except LabFREED_ValidationError:
             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_ids:
-            try:
-                PAC_ID.from_url(pac_url)
-            except LabFREED_ValidationError:
-                self._add_validation_message(
-                        source="pacs",
-                        level = ValidationMsgLevel.ERROR,
-                        msg='{pac_url} is not a valid PAC-ID'
-                    )
+                    source="pac_id",
+                    level = ValidationMsgLevel.ERROR,
+                    msg='{self.pac_id} is not a valid PAC-ID'
+                )
                 
         if not self.is_valid:
             raise LabFREED_ValidationError(message='Invalid request', validation_msgs=self.validation_messages())
                 
         return self
     
+    def language_preference_http_header(self) -> dict[str, str]:
+        if not self.language_preferences:
+            return {}
+        headers={'Accept-Language':  LanguageAccept(lq).to_header()}
+        return headers
+    
+    def request_params(self) -> dict[str, Any]:
+        params = {ATTR_GROUPS_FWD_LKP: self.do_forward_lookup}
+        if self.restrict_to_attribute_groups:
+            params.update({ATTR_GROUPS: ','.join(self.restrict_to_attribute_groups)})
+        return params
+        
     
     
-