labfreed 1.0.0a2__py3-none-any.whl → 1.0.0a3__py3-none-any.whl

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/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/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/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     

{labfreed-1.0.0a2.dist-info → labfreed-1.0.0a3.dist-info}/METADATA

@@ -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.dist-info → labfreed-1.0.0a3.dist-info}/RECORD

@@ -1,4 +1,4 @@
-labfreed/__init__.py,sha256=o2qxE39XObi_KwNFEMO1fKgVTLltzbQn3tl5YQnhFXg,338
+labfreed/__init__.py,sha256=feEsSamwMYNQXaiqTt0oe0dEoLnkS-SJ5-YIdMtkerE,338
 labfreed/labfreed_infrastructure.py,sha256=YZmU-kgopyB1tvpTR_k_uIt1Q2ezexMrWvu-HaP65IE,10104
 labfreed/labfreed_extended/app/app_infrastructure.py,sha256=1VMc_Vtjwof9hwzSG95KuIUjT1h7uNsWf_lTORYFFuQ,3981
 labfreed/labfreed_extended/app/formatted_print.py,sha256=DcwWP0ix1e_wYNIdceIp6cETkJdG2DqpU8Gs3aZAL40,1930
@@ -10,13 +10,13 @@ labfreed/pac_attributes/api_data_models/response.py,sha256=4VliJuKM_r-J-xaLEqfcd
 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=eWFy7h-T6gd25ENj9pLvSadNFRrzzIineqBoov2cGyw,2688
-labfreed/pac_attributes/client/client.py,sha256=Sfvbr8WMW8NOL6_tkWFvU0IybKnzyC0XydmcEFUyb5s,7102
+labfreed/pac_attributes/client/client.py,sha256=J606oYqcJ98NI0w1bSoahys5t7Wxy4CXjJVGUXyj2Zs,7347
 labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=_wasafjBlwvzOaM6-uPgqPethsDQHEpaXoiRW7w9aV0,5759
-labfreed/pac_attributes/pythonic/excel_attribute_data_source.py,sha256=mS310M3UOKuv00mJsRAK7acfTdyOw9c-_9UHXKuAqvs,6923
+labfreed/pac_attributes/pythonic/excel_attribute_data_source.py,sha256=Mvn-uIMWZjQJfSOMVY244yCKpnYeR4btc9Pe4BL8_4M,7313
 labfreed/pac_attributes/pythonic/py_attributes.py,sha256=LoPSH5DWdPTKq-3d2CT-7tTfkqYN9s53sNEeSq_6fHg,5615
 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=bCFqozKBEVdR8etRJjG9RCE5Uea9SMudPN4Mwh-iQr4,2083
+labfreed/pac_attributes/server/attribute_data_sources.py,sha256=gfaERhFrn3SIoSNRiVzchuxpt2ttoe3gw0-fMmv12hU,2448
 labfreed/pac_attributes/server/server.py,sha256=_Rzi_vzX02o0g03lbm-fdg5AJHJnESDWD7cJEKRFs8w,8841
 labfreed/pac_attributes/server/translation_data_sources.py,sha256=axALOqfP840sOSdVCRYtrens97mm-hpfONMUyuVlCrY,2145
 labfreed/pac_cat/__init__.py,sha256=KNPtQzBD1XVohvG_ucOs7RJj-oi6biUTGB1k-T2o6pk,568
@@ -59,7 +59,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.0a2.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-1.0.0a2.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-1.0.0a2.dist-info/METADATA,sha256=5puhyvihc2xCJlVdQjfPAXbwsllH_x4LmYBz-xzgM-E,19740
-labfreed-1.0.0a2.dist-info/RECORD,,
+labfreed-1.0.0a3.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-1.0.0a3.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-1.0.0a3.dist-info/METADATA,sha256=y5M4I537vHyGZcYkVCEuFrOi4uMVLp74Yz21tne3WQM,19740
+labfreed-1.0.0a3.dist-info/RECORD,,