labfreed 1.0.0a2__tar.gz → 1.0.0a3__tar.gz

{labfreed-1.0.0a2 → labfreed-1.0.0a3}/PKG-INFO

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

{labfreed-1.0.0a2 → labfreed-1.0.0a3}/labfreed/__init__.py

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

{labfreed-1.0.0a2 → labfreed-1.0.0a3}/labfreed/pac_attributes/client/client.py

@@ -144,8 +144,9 @@ class AttributeClient():
 
         
         # update cache
+        attribute_groups_out = []
         for ag_for_pac in r.pac_attributes:
-            pac = PAC_ID.from_url(ag_for_pac.pac_id)
+            pac_from_response = PAC_ID.from_url(ag_for_pac.pac_id)
             ags = [
                 CacheableAttributeGroup(
                     key= ag.key, 
@@ -156,13 +157,15 @@ class AttributeClient():
                     state_of=ag.state_of) 
                 for ag in ag_for_pac.attribute_groups
                 ]
-            self.cache_store.update(server_url, pac, ags)
+            self.cache_store.update(server_url, pac_from_response, ags)
             
-            if pac_id == pac:
+            # compare pac_id from response with pac_id we need attributes for.
+            # if identical this is the part of the response we care about. other PAC-ID are just for the cache
+            if pac_id.to_url() == pac_from_response.to_url():
                 attribute_groups_out = ags
-                return attribute_groups_out
-            else:
-                return []
+        
+        return attribute_groups_out
+
             
                 
     

{labfreed-1.0.0a2 → labfreed-1.0.0a3}/labfreed/pac_attributes/pythonic/excel_attribute_data_source.py

@@ -10,6 +10,7 @@ from cachetools import TTLCache, cached
 from labfreed.pac_attributes.api_data_models.response import AttributeGroup
 from labfreed.pac_attributes.pythonic.py_attributes import pyAttribute, pyAttributes
 from labfreed.pac_attributes.server.server import AttributeGroupDataSource
+from labfreed.pac_cat.pac_cat import PAC_CAT
 
 try:
     from openpyxl import load_workbook
@@ -74,8 +75,9 @@ class _BaseExcelAttributeDataSource(AttributeGroupDataSource):
     Subclasses implement `_read_rows_and_last_changed()`.
     """
 
-    def __init__(self, *, base_url: str = "", cache_duration_seconds: int = 0, **kwargs):
+    def __init__(self, *, base_url: str = "", cache_duration_seconds: int = 0, uses_pac_cat_short_form:bool=True, **kwargs):
         self._base_url = base_url
+        self._uses_pac_cat_short_form = uses_pac_cat_short_form
         # allow instance-level TTL override
         try:
             _cache.ttl = int(cache_duration_seconds)
@@ -96,9 +98,14 @@ class _BaseExcelAttributeDataSource(AttributeGroupDataSource):
             return []
         return [self._base_url + r for r in rows[0][1:]]
 
-    def attributes(self, pac_url: str) -> Optional[AttributeGroup]:
-        if not self._include_extensions:
-            pac_url = pac_url.split('*')[0]
+    def attributes(self, pac_url:str) -> Optional[AttributeGroup]:
+        try:
+            p = PAC_CAT.from_url(pac_url)
+            pac_url = p.to_url(use_short_notation=self._uses_pac_cat_short_form, include_extensions=self._include_extensions)
+            print(f'Lookup in Excel of {pac_url}')
+        except:
+            ... # might as well try to match the original input
+            
         rows, last_changed = self._read_rows_and_last_changed()
         d = _get_row_by_first_cell(rows, pac_url, self._base_url)
         if not d:

{labfreed-1.0.0a2 → labfreed-1.0.0a3}/labfreed/pac_attributes/server/attribute_data_sources.py

@@ -1,6 +1,8 @@
 from abc import ABC, abstractmethod, abstractproperty
 from datetime import datetime, timezone
 from labfreed.pac_attributes.api_data_models.response import VALID_FOREVER, AttributeBase, AttributeGroup
+from labfreed.pac_cat.pac_cat import PAC_CAT
+from labfreed.pac_id.pac_id import PAC_ID
 
 
 class AttributeGroupDataSource(ABC):
@@ -29,12 +31,13 @@ class AttributeGroupDataSource(ABC):
     
 
 class Dict_DataSource(AttributeGroupDataSource):
-    def __init__(self, data:dict[str, list[AttributeBase]], *args, **kwargs):
+    def __init__(self, data:dict[str, list[AttributeBase]], uses_pac_cat_short_form=True, *args, **kwargs):
         if not all([isinstance(e, list) for e in data.values()]):
             raise ValueError('Invalid data')
         
         self._data = data
         self._state_of = datetime.now(tz=timezone.utc)
+        self.uses_pac_cat_short_form = uses_pac_cat_short_form
         
         super().__init__(*args, **kwargs)       
         
@@ -45,9 +48,12 @@ class Dict_DataSource(AttributeGroupDataSource):
     
            
     def attributes(self, pac_url: str) -> AttributeGroup:
-        if not self._include_extensions:
-            pac_url = pac_url.split('*')[0]
-        
+        try:
+            p = PAC_CAT.from_url(pac_url)
+            pac_url = p.to_url(use_short_notation=self.uses_pac_cat_short_form, include_extensions=self._include_extensions)
+        except:
+            ... # might as well try to match the original input
+            
         attributes = self._data.get(pac_url)
         if not attributes:
             return None