labfreed 1.0.0a15__tar.gz → 1.0.0a17__tar.gz

{labfreed-1.0.0a15 → labfreed-1.0.0a17}/PKG-INFO

@@ -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 → labfreed-1.0.0a17}/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-1.0.0a15 → labfreed-1.0.0a17}/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-1.0.0a15 → labfreed-1.0.0a17}/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-1.0.0a15 → labfreed-1.0.0a17}/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,