labfreed 1.0.0a15__py3-none-any.whl → 1.0.0a17__py3-none-any.whl

labfreed/__init__.py

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

labfreed/pac_attributes/pythonic/excel_attribute_data_source.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 import os
 from datetime import datetime
 from typing import Optional, Tuple, List, Dict
@@ -133,12 +134,35 @@ class LocalExcelAttributeDataSource(_BaseExcelAttributeDataSource):
 
     @cached(_cache)
     def _read_rows_and_last_changed(self) -> Tuple[List[tuple], Optional[datetime]]:
-        wb = load_workbook(filename=self._file_path, read_only=True, data_only=True)
-        ws = wb.active
-        rows = list(ws.iter_rows(values_only=True))
-        last_changed = wb.properties.modified
-        wb.close()
-        return rows, last_changed
+        logging.info(f"Attempting to load workbook: {self._file_path!r}")
+
+        try:
+            wb = load_workbook(
+                filename=self._file_path,
+                read_only=True,
+                data_only=True
+            )
+            ws = wb.active
+            logging.info(f"Workbook opened successfully. Active sheet: {ws.title!r}")
+
+            rows = list(ws.iter_rows(values_only=True))
+            logging.info(f"Read {len(rows)} rows from {self._file_path!r}")
+
+            last_changed = wb.properties.modified
+            logging.info(f"Workbook 'modified' property: {last_changed}")
+
+            wb.close()
+            return rows, last_changed
+
+        except FileNotFoundError:
+            logging.error(f"Workbook not found at: {self._file_path!r}", exc_info=True)
+            raise
+        except PermissionError:
+            logging.error(f"Permission denied when accessing: {self._file_path!r}", exc_info=True)
+            raise
+        except Exception as e:
+            logging.exception(f"Unexpected error reading workbook {self._file_path!r}: {e}")
+            raise
 
 
 # # ---------------------------------------------------------------------

labfreed/pac_id_resolver/resolver_config.py

@@ -74,7 +74,7 @@ class ResolverConfigEntry(LabFREED_BaseModel):
     
     @model_validator(mode='after')
     def _validate_service_type(self):
-        allowed_types = [ServiceType.ATTRIBUTE_SERVICE_GENERIC.value, ServiceType.USER_HANDOVER_GENERIC.value]
+        allowed_types = [ServiceType.ATTRIBUTE_SERVICE_GENERIC.value, ServiceType.USER_HANDOVER_GENERIC.value, ServiceType.ACTION_GENERIC.value]
         if self.service_type not in allowed_types:
             if isinstance(self.service_type, ServiceType):
                 s= self.service_type.value

labfreed/pac_id_resolver/resolver_config_common.py

@@ -7,6 +7,7 @@ from labfreed.labfreed_infrastructure import ValidationMsgLevel, _quote_texts
 class ServiceType(Enum):
     USER_HANDOVER_GENERIC = 'userhandover-generic'
     ATTRIBUTE_SERVICE_GENERIC = 'attributes-generic'
+    ACTION_GENERIC = "action-generic"
 
 
 def _validate_service_name(service_name):
@@ -62,7 +63,7 @@ def _validate_service_type(service_type):
             service_type= service_type.value
     else:
         service_type= service_type
-    allowed_types = [ServiceType.ATTRIBUTE_SERVICE_GENERIC.value, ServiceType.USER_HANDOVER_GENERIC.value]
+    allowed_types = [ServiceType.ATTRIBUTE_SERVICE_GENERIC.value, ServiceType.USER_HANDOVER_GENERIC.value, ServiceType.ACTION_GENERIC.value]
     if service_type not in allowed_types:
         msg_dict.append( {
                 "level": ValidationMsgLevel.ERROR,

{labfreed-1.0.0a15.dist-info → labfreed-1.0.0a17.dist-info}/METADATA

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

{labfreed-1.0.0a15.dist-info → labfreed-1.0.0a17.dist-info}/RECORD

@@ -1,4 +1,4 @@
-labfreed/__init__.py,sha256=KcYeV-IKg3wMT_uly3-IR3OXlZrdLQS5Ip81OWnjx7s,339
+labfreed/__init__.py,sha256=sobB_PG2qoDQWufbzxqtQjolcmyFZBRPKqk3tCd5gb0,339
 labfreed/labfreed_infrastructure.py,sha256=ss1PyJl-7Es-lEcxptmdYI9kDAHmh7HB_tAGkPC6UVs,10173
 labfreed/labfreed_extended/app/app_infrastructure.py,sha256=yfxPBDPatxHPrIPmpzdhQB7Yd3lIxGsm8ZXUM04N8nQ,4583
 labfreed/labfreed_extended/app/formatted_print.py,sha256=DcwWP0ix1e_wYNIdceIp6cETkJdG2DqpU8Gs3aZAL40,1930
@@ -17,7 +17,7 @@ labfreed/pac_attributes/client/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5
 labfreed/pac_attributes/client/attribute_cache.py,sha256=ThUadWqQ5oM8DnAnvZuY4jeA3Mg06ePNEcRP5wCsadc,2222
 labfreed/pac_attributes/client/client.py,sha256=FjvyEpZEGYrZkuaQoqH9QFstrwHmrsIdaymxz8uQjwQ,7510
 labfreed/pac_attributes/pythonic/attribute_server_factory.py,sha256=3OeFjBdlMR4DMIzHVo5-A_y935e2_lOqvFCLKgxjsEY,6159
-labfreed/pac_attributes/pythonic/excel_attribute_data_source.py,sha256=zbsXiH9vry0ZqmPwUY_cr1t9xP4P3W5o5Khu9IE0e0I,7465
+labfreed/pac_attributes/pythonic/excel_attribute_data_source.py,sha256=wHvw6oGdGT_IxdC7MbHmtQKb5jDPJggQ1UvvFPAEpHo,8349
 labfreed/pac_attributes/pythonic/py_attributes.py,sha256=vjRNjg-PpsQSaidpPtkiyQL_10dcD-9JAz89gAYMFJA,8307
 labfreed/pac_attributes/pythonic/py_dict_data_source.py,sha256=nAz6GA7Xx_0IORPPpt_Wl3sFJa1Q5Fnq5vdf1uQiJF8,531
 labfreed/pac_attributes/server/__init__.py,sha256=JvQ2kpQx62OUwP18bGhOWYU9an_nQW59Y8Lh7HyfVxY,301
@@ -37,8 +37,8 @@ labfreed/pac_id/url_serializer.py,sha256=01LB30pNMBtv2rYHsiE_4Ga2iVA515Boj4ikOIY
 labfreed/pac_id_resolver/__init__.py,sha256=RNBlrDOSR42gmSNH9wJVhK_xwEX45cvTKVgWW2bjh7Q,113
 labfreed/pac_id_resolver/cit_v1.py,sha256=JGlEH2d9awEu3HxPW7vu0uj4ZC3B02IdmFg7aJ4axQw,9833
 labfreed/pac_id_resolver/resolver.py,sha256=anqteWexD7w78wzd1TjT06enkDIU-P-7NVKNWiASXLU,4127
-labfreed/pac_id_resolver/resolver_config.py,sha256=2j3j5UsVoWqU9NjciN3j-Fs53diGi4FQEvoz8ng103Y,12388
-labfreed/pac_id_resolver/resolver_config_common.py,sha256=jzoDOxog8YW68q7vyvDGCZcVcgIzJHXlMt8KwgVnx6o,2885
+labfreed/pac_id_resolver/resolver_config.py,sha256=hvi9x2o-1323FCRsUg6RG_ZuQRVLgTlYQ7owBTXhjW4,12422
+labfreed/pac_id_resolver/resolver_config_common.py,sha256=JGbgT2YSBc3NQ5x9CV3diqYZgpDGWygGPd5flk4-hWk,2958
 labfreed/pac_id_resolver/services.py,sha256=vtnxLm38t4PNOf73cXh6UZOtWZZOGxfBCfXUDRxGHog,2592
 labfreed/qr/__init__.py,sha256=fdKwP6W2Js--yMbBUdn-g_2uq2VqPpfQJeDLHsMDO-Y,61
 labfreed/qr/generate_qr.py,sha256=mSt-U872O3ReHB_UdS-MzYu0wRgdlKcAOEfTxg5CLRk,16616
@@ -65,7 +65,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.0a15.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
-labfreed-1.0.0a15.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
-labfreed-1.0.0a15.dist-info/METADATA,sha256=H4-dgXHNjGoidqKB1QKwTshKi2Pov7qhbHH8A1v3dwQ,19775
-labfreed-1.0.0a15.dist-info/RECORD,,
+labfreed-1.0.0a17.dist-info/licenses/LICENSE,sha256=gHFOv9FRKHxO8cInP3YXyPoJnuNeqrvcHjaE_wPSsQ8,1100
+labfreed-1.0.0a17.dist-info/WHEEL,sha256=G2gURzTEtmeR8nrdXUJfNiB3VYVxigPQ-bEQujpNiNs,82
+labfreed-1.0.0a17.dist-info/METADATA,sha256=Jar31mke8Tfi0VLd8eijEh-HM3FRqp55qgYwTk-BOKE,19775
+labfreed-1.0.0a17.dist-info/RECORD,,