labfreed 0.3.1a4__tar.gz → 0.3.1a6__tar.gz

{labfreed-0.3.1a4 → labfreed-0.3.1a6}/PKG-INFO

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

{labfreed-0.3.1a4 → labfreed-0.3.1a6}/labfreed/__init__.py

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

{labfreed-0.3.1a4 → labfreed-0.3.1a6}/labfreed/labfreed_extended/app/app_infrastructure.py

@@ -3,11 +3,14 @@ from concurrent.futures import ThreadPoolExecutor, as_completed
 
 import requests
 
+from labfreed.labfreed_extended.app.pac_info import PacInfo
 from labfreed.pac_attributes.client.attribute_cache import MemoryAttributeCache
 from labfreed.pac_attributes.client.client import AttributeClient, attribute_request_default_callback_factory
+from labfreed.pac_attributes.pythonic.py_attributes import pyAttributeGroup
 from labfreed.pac_attributes.well_knonw_attribute_keys import MetaAttributeKeys
 from labfreed.well_known_extensions.display_name_extension import DisplayNameExtension
-from labfreed_extended.app.pac_info import PacInfo
+
+
 from labfreed.pac_id.pac_id import PAC_ID
 from labfreed.pac_id_resolver.resolver import PAC_ID_Resolver, cit_from_str
 from labfreed.pac_id_resolver.services import ServiceGroup
@@ -61,25 +64,15 @@ class Labfreed_App_Infrastructure():
         pac_info.user_handovers = sg_user_handovers
         
         # Attributes
-        attribute_groups = []
+        attribute_groups = {}
         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 = self._attribute_client.get_attributes(url, pac_id=pac.to_url(include_extensions=False), language_preferences=self._language_preferences)
+                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)}
                 if ags:
-                    attribute_groups.extend(ags)
+                    attribute_groups.update(ags)
         pac_info.attributes = attribute_groups
-        
-        if dn := pac.get_extension('N'):
-            dn = DisplayNameExtension.from_extension(dn)
-            pac_info.display_name = dn.display_name or ""
-        # there can be a display name in attributes, too
-        if meta := [ag for ag in pac_info.attributes if ag.key == MetaAttributeKeys.GROUPKEY.value]:
-            dn_attr = [a for a in meta[0].attributes if a.key == MetaAttributeKeys.DISPLAYNAME.value]
-            if dn_attr: 
-                dn = dn_attr[0].value
-                pac_info.display_name += f'  ( aka {dn} )'
-              
+       
         return pac_info
     
     

{labfreed-0.3.1a4 → labfreed-0.3.1a6}/labfreed/labfreed_extended/app/pac_info.py

@@ -1,19 +1,20 @@
 
 
 from pydantic import BaseModel, Field
-from labfreed_extended.pac_attributes.py_attributes import pyAttribute, pyAttributes
+from labfreed.pac_attributes.pythonic.py_attributes import pyAttribute, pyAttributeGroup, pyAttributes
+from labfreed.pac_attributes.well_knonw_attribute_keys import MetaAttributeKeys
 from labfreed.pac_cat.pac_cat import PAC_CAT
 from labfreed.pac_id.pac_id import PAC_ID
 from labfreed.pac_id_resolver.services import ServiceGroup
-from labfreed_extended.utilities.formatted_print import StringIOLineBreak
+from labfreed.labfreed_extended.app.formatted_print import StringIOLineBreak
+from labfreed.well_known_extensions.display_name_extension import DisplayNameExtension
 
 
 class PacInfo(BaseModel):
     """A convenient collection of information about a PAC-ID"""
     pac_id:PAC_ID
-    display_name:str|None = None
     user_handovers: list[ServiceGroup] = Field(default_factory=list)
-    attributes:pyAttributes = Field(default_factory=list)
+    attributes:dict[str, pyAttributeGroup] = Field(default_factory=dict)
     
     @property
     def pac_url(self):
@@ -34,6 +35,29 @@ class PacInfo(BaseModel):
     def summary(self):
         return self.pac_id.get_extension('SUM')
     
+    @property
+    def image_url(self) -> str:
+        if meta := self.attributes.get(MetaAttributeKeys.GROUPKEY.value):
+            image_attr = meta.attributes.get(MetaAttributeKeys.IMAGE.value)
+            return image_attr.value
+        
+        
+    @property
+    def display_name(self) -> str|None:
+        display_name = None
+        pac = self.pac_id
+        if dn := pac.get_extension('N'):
+            dn = DisplayNameExtension.from_extension(dn)
+            display_name = dn.display_name or ""
+        # there can be a display name in attributes, too
+        if meta := self.attributes.get(MetaAttributeKeys.GROUPKEY.value):
+            dn_attr = meta.attributes.get(MetaAttributeKeys.DISPLAYNAME.value)
+            if dn_attr: 
+                dn = dn_attr.value
+                display_name += f'  ( aka {dn} )'
+        return display_name
+        
+    
     
     
     def format_for_print(self, markup:str='rich') -> str:
@@ -62,10 +86,9 @@ class PacInfo(BaseModel):
         
         
         printout.title1("Attributes")
-        for ag in self.attributes:  
+        for ag in self.attributes.values():  
             printout.title2(f'{ag.label} (from {ag.origin})')
-            attributes = pyAttributes.from_payload_attributes(ag.attributes)
-            for k, v in attributes.items():
+            for v in ag.attributes.values():
                 v:pyAttribute
                 #print(f'{k}: ({v.label})           :: {v.value}  ')
                 printout.key_value(v.label, v.value)

{labfreed-0.3.1a4 → labfreed-0.3.1a6}/labfreed/pac_attributes/client/client.py

@@ -49,7 +49,7 @@ def attribute_request_default_callback_factory(session: requests.Session = None)
 
     def callback(url: str, attribute_request_body: str) -> tuple[int, str]:
         try:
-            resp = session.post(url, data=attribute_request_body, headers={'Content-Type': 'application/json'})
+            resp = session.post(url, data=attribute_request_body, headers={'Content-Type': 'application/json'}, timeout=10)
             return resp.status_code, resp.text
         except requests.exceptions.RequestException as e:
             return 500, str(e)
@@ -140,7 +140,9 @@ class AttributeClient():
             
             if pac_id == pac:
                 attribute_groups_out = ags
-        return attribute_groups_out
+                return attribute_groups_out
+            else:
+                return []
             
                 
     

{labfreed-0.3.1a4/labfreed/labfreed_extended/pac_attributes/server → labfreed-0.3.1a6/labfreed/pac_attributes/pythonic}/attribute_server_factory.py

@@ -68,7 +68,7 @@ class AttributeFlaskApp(Flask):
     ) -> Blueprint:
         bp = Blueprint("attribute", __name__)
 
-        @bp.route("/", methods=["POST"])
+        @bp.route("/", methods=["POST"], strict_slashes=False)
         def handle_attribute_request():
             if authenticator and not authenticator(request):
                 return Response(
@@ -86,7 +86,7 @@ class AttributeFlaskApp(Flask):
                 return "The request was valid, but the server encountered an error", 500
             return response_body
 
-        @bp.route("/capabilities", methods=["GET"])
+        @bp.route("/capabilities", methods=["GET"], strict_slashes=False)
         def capabilities():
             return request_handler.capabilities()
 

labfreed-0.3.1a6/labfreed/pac_attributes/pythonic/excel_attribute_data_source.py

@@ -0,0 +1,181 @@
+from __future__ import annotations
+
+import os
+from datetime import datetime
+from typing import Optional, Tuple, List, Dict
+from urllib.parse import urlparse, urlsplit, urlunsplit, parse_qsl, urlencode
+
+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
+
+try:
+    from openpyxl import load_workbook
+except ImportError:
+    raise ImportError("Please install labfreed with the [extended] extra: pip install labfreed[extended]")
+
+# ---------------------------------------------------------------------
+# Cache (shared by all instances). TTL can be overridden per instance.
+# ---------------------------------------------------------------------
+_cache = TTLCache(maxsize=128, ttl=0)
+
+
+# ---------------------------------------------------------------------
+# Helpers
+# ---------------------------------------------------------------------
+def _is_sharepoint_url(s: str) -> bool:
+    try:
+        parsed = urlparse(s)
+        if parsed.scheme not in {"http", "https"}:
+            return False
+        host = (parsed.netloc or "").lower()
+        return ("sharepoint.com" in host) or ("1drv.ms" in host)
+    except Exception:
+        return False
+
+
+def _is_local_path(s: str) -> bool:
+    return os.path.exists(s) if not _is_sharepoint_url(s) else False
+
+
+def _ensure_download_query(u: str) -> str:
+    parts = urlsplit(u)
+    q = dict(parse_qsl(parts.query, keep_blank_values=True))
+    # Preserve all params (guest tokens, etc.), just force file response.
+    q["download"] = "1"
+    return urlunsplit((parts.scheme, parts.netloc, parts.path, urlencode(q, doseq=True), parts.fragment))
+
+
+def _get_row_by_first_cell(sheet_rows: List[tuple], match_value: str, base_url: str) -> Optional[Dict[str, object]]:
+    if not sheet_rows:
+        return None
+    headers = sheet_rows[0]
+    for row in sheet_rows[1:]:
+        if not row:
+            continue
+        first = str(row[0]).strip() if row[0] is not None else ""
+        if first == match_value:
+            return {
+                base_url + str(headers[i]).strip(): row[i]
+                for i in range(1, len(headers))
+                if headers[i] is not None
+            }
+    return None
+
+
+# ---------------------------------------------------------------------
+# Base class
+# ---------------------------------------------------------------------
+class _BaseExcelAttributeDataSource(AttributeGroupDataSource):
+    """
+    Common mapping logic from Excel rows to AttributeGroup.
+    Subclasses implement `_read_rows_and_last_changed()`.
+    """
+
+    def __init__(self, *, base_url: str = "", cache_duration_seconds: int = 0, **kwargs):
+        self._base_url = base_url
+        # allow instance-level TTL override
+        try:
+            _cache.ttl = int(cache_duration_seconds)
+        except Exception:
+            pass
+        super().__init__(**kwargs)
+
+    def is_static(self) -> bool:
+        return False
+
+    def _read_rows_and_last_changed(self) -> Tuple[List[tuple], Optional[datetime]]:
+        raise NotImplementedError
+
+    @property
+    def provides_attributes(self) -> List[str]:
+        rows, _ = self._read_rows_and_last_changed()
+        if not rows:
+            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]
+        rows, last_changed = self._read_rows_and_last_changed()
+        d = _get_row_by_first_cell(rows, pac_url, self._base_url)
+        if not d:
+            return None
+        attributes = [pyAttribute(key=k, value=v) for k, v in d.items()]
+        return AttributeGroup(
+            key=self._attribute_group_key,
+            attributes=pyAttributes(attributes).to_payload_attributes(),
+            state_of=last_changed,
+        )
+
+
+# ---------------------------------------------------------------------
+# Local file implementation
+# ---------------------------------------------------------------------
+class LocalExcelAttributeDataSource(_BaseExcelAttributeDataSource):
+    def __init__(self, file_path: str, **kwargs):
+        self._file_path = file_path
+        super().__init__(**kwargs)
+
+    @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
+
+
+# # ---------------------------------------------------------------------
+# # SharePoint/OneDrive (anonymous only)
+# # ---------------------------------------------------------------------
+# class SharePointExcelAttributeDataSource(_BaseExcelAttributeDataSource):
+#     """
+#     Anonymous 'anyone with the link' reader for SharePoint/OneDrive Excel.
+#     No MSAL, no AAD app permissions.
+#     """
+
+#     def __init__(self, url: str, *, timeout: int = 30, **kwargs):
+#         self._url = url
+#         self._timeout = timeout
+#         super().__init__(**kwargs)
+
+#     @cached(_cache)
+#     def _read_rows_and_last_changed(self) -> Tuple[List[tuple], Optional[datetime]]:
+#         content, last_changed = self._download_bytes_anon(self._url, timeout=self._timeout)
+#         with io.BytesIO(content) as fh:
+#             wb = load_workbook(filename=fh, read_only=True, data_only=True)
+#             ws = wb.active
+#             rows = list(ws.iter_rows(values_only=True))
+#             wb_last = wb.properties.modified  # often None for streamed files
+#             wb.close()
+#         return rows, (wb_last or last_changed)
+
+#     def _download_bytes_anon(self, url: str, *, timeout: int) -> Tuple[bytes, Optional[datetime]]:
+#         u = _ensure_download_query(url)
+#         headers = {"User-Agent": "python-requests/anon-sharepoint-downloader"}
+#         resp = requests.get(u, headers=headers, timeout=timeout, allow_redirects=True)
+#         resp.raise_for_status()
+
+#         last = None
+#         lm_hdr = resp.headers.get("Last-Modified")
+#         if lm_hdr:
+#             try:
+#                 last = parsedate_to_datetime(lm_hdr)
+#                 if last.tzinfo is None:
+#                     last = last.replace(tzinfo=timezone.utc)
+#                 else:
+#                     last = last.astimezone(timezone.utc)
+#             except Exception:
+#                 last = None
+#         return resp.content, last
+
+
+
+
+__all__ = [
+    "LocalExcelAttributeDataSource",
+]

{labfreed-0.3.1a4/labfreed/labfreed_extended/pac_attributes → labfreed-0.3.1a6/labfreed/pac_attributes/pythonic}/py_attributes.py

@@ -6,9 +6,10 @@ import warnings
 from pydantic import RootModel
 
 from labfreed.labfreed_infrastructure import LabFREED_BaseModel
-from labfreed.pac_attributes.api_data_models.response import AttributeBase, BoolAttribute, DateTimeAttribute,  NumericAttribute, NumericValue, ObjectAttribute, ReferenceAttribute, TextAttribute
+from labfreed.pac_attributes.api_data_models.response import AttributeBase, AttributeGroup, BoolAttribute, DateTimeAttribute,  NumericAttribute, NumericValue, ObjectAttribute, ReferenceAttribute, TextAttribute
+from labfreed.pac_attributes.client.attribute_cache import CacheableAttributeGroup
 from labfreed.pac_id.pac_id import PAC_ID
-from labfreed.trex.python_convenience.quantity import Quantity
+from labfreed.trex.pythonic.quantity import Quantity
 
 
 class pyReference(RootModel[str]):
@@ -30,6 +31,7 @@ class pyAttribute(LabFREED_BaseModel):
 class pyAttributes(RootModel[list[pyAttribute]]):
     def to_payload_attributes(self) -> list[AttributeBase]:
         return [self._attribute_to_attribute_payload_type(e) for e in self.root]
+    
             
     @staticmethod        
     def _attribute_to_attribute_payload_type(attribute:pyAttribute) -> AttributeBase:
@@ -86,7 +88,7 @@ class pyAttributes(RootModel[list[pyAttribute]]):
         
     @staticmethod
     def from_payload_attributes(attributes:list[AttributeBase]) -> 'pyAttributes':
-        out = dict()
+        out = list()
         for a in attributes:
             match a:
                 
@@ -116,8 +118,16 @@ class pyAttributes(RootModel[list[pyAttribute]]):
                             #    valid_until=datetime(**_parse_date_time_str(a.valid_until)),
                             #    observed_at=datetime(**_parse_date_time_str(a.value))
             )
-            out.update( { a.key: attr } )
+            out.append(attr )
         return out
             
             
         
+class pyAttributeGroup(CacheableAttributeGroup):
+    attributes:dict[str,pyAttribute]
+    
+    @staticmethod
+    def from_attribute_group(attribute_group:AttributeGroup):
+        data = vars(attribute_group).copy()
+        data["attributes"] = {a.key: a for a in pyAttributes.from_payload_attributes(attribute_group.attributes)}
+        return pyAttributeGroup(**data)

labfreed-0.3.1a6/labfreed/pac_attributes/pythonic/py_dict_data_source.py

@@ -0,0 +1,13 @@
+from labfreed.pac_attributes.pythonic.py_attributes import pyAttributes
+from labfreed.pac_attributes.server.attribute_data_sources import Dict_DataSource
+
+
+class pyDict_DataSource(Dict_DataSource):
+    def __init__(self, data:dict[str, pyAttributes], *args, **kwargs):
+        if not all([isinstance(e, pyAttributes) for e in data.values()]):
+            raise ValueError('Invalid data')
+        d = {k: v.to_payload_attributes() for k,v in data.items()}
+        super().__init__(data=d, *args, **kwargs)
+
+        
+    

{labfreed-0.3.1a4 → labfreed-0.3.1a6}/labfreed/pac_attributes/server/__init__.py

@@ -1,3 +1,3 @@
-from labfreed.pac_attributes.server.server import AttributeServerRequestHandler
-from labfreed.pac_attributes.server.attribute_data_sources import Dict_DataSource
-from labfreed.pac_attributes.server.translation_data_sources import DictTranslationDataSource
+from labfreed.pac_attributes.server.server import AttributeServerRequestHandler  # noqa: F401
+from labfreed.pac_attributes.server.attribute_data_sources import Dict_DataSource  # noqa: F401
+from labfreed.pac_attributes.server.translation_data_sources import DictTranslationDataSource  # noqa: F401

{labfreed-0.3.1a4 → labfreed-0.3.1a6}/labfreed/pac_attributes/server/attribute_data_sources.py

@@ -1,7 +1,6 @@
 from abc import ABC, abstractmethod, abstractproperty
 from datetime import datetime, timezone
-from labfreed.pac_attributes.api_data_models.response import VALID_FOREVER, AttributeGroup
-from labfreed_extended.pac_attributes.py_attributes import pyAttributes
+from labfreed.pac_attributes.api_data_models.response import VALID_FOREVER, AttributeBase, AttributeGroup
 
 
 class AttributeGroupDataSource(ABC):
@@ -30,10 +29,11 @@ class AttributeGroupDataSource(ABC):
     
 
 class Dict_DataSource(AttributeGroupDataSource):
-    def __init__(self, data:dict[str, pyAttributes], *args, **kwargs):
-        if not all([isinstance(e, pyAttributes) for e in data.values()]):
+    def __init__(self, data:dict[str, list[AttributeBase]], *args, **kwargs):
+        if not all([isinstance(e, list) for e in data.values()]):
             raise ValueError('Invalid data')
-        self._data:pyAttributes = data
+        
+        self._data = data
         self._state_of = datetime.now(tz=timezone.utc)
         
         super().__init__(*args, **kwargs)       
@@ -41,17 +41,16 @@ class Dict_DataSource(AttributeGroupDataSource):
     
     @property
     def provides_attributes(self):
-        return [a.key for attributes in self._data.values() for a in attributes.root]
+        return [a.key for attributes in self._data.values() for a in attributes]
     
            
     def attributes(self, pac_url: str) -> AttributeGroup:
         if not self._include_extensions:
             pac_url = pac_url.split('*')[0]
         
-        attributes:pyAttributes = self._data.get(pac_url)
+        attributes = self._data.get(pac_url)
         if not attributes:
-            return None
-        attributes = attributes.to_payload_attributes()
+            return None     
         
         
         valid_until = VALID_FOREVER if self._is_static else None

{labfreed-0.3.1a4 → labfreed-0.3.1a6}/labfreed/pac_attributes/server/server.py

@@ -4,7 +4,7 @@ import warnings
 import rich
 
 from labfreed.pac_attributes.api_data_models.request import AttributeRequestPayload
-from labfreed.pac_attributes.api_data_models.response import AttributeResponsePayload,  AttributesOfPACID, ReferenceAttribute
+from labfreed.pac_attributes.api_data_models.response import AttributeResponsePayload, AttributesOfPACID, ReferenceAttribute
 from labfreed.pac_attributes.api_data_models.server_capabilities_response import ServerCapabilities
 from labfreed.pac_attributes.server.attribute_data_sources import AttributeGroupDataSource
 from labfreed.pac_attributes.server.translation_data_sources import TranslationDataSource

{labfreed-0.3.1a4 → labfreed-0.3.1a6}/labfreed/pac_id_resolver/resolver.py

@@ -67,10 +67,10 @@ class PAC_ID_Resolver():
     def resolve(self, pac_id:PAC_ID|str, check_service_status=True, use_issuer_cit=True) -> list[ServiceGroup]:
         '''Resolve a PAC-ID'''
         if isinstance(pac_id, str):
-            pac_id = PAC_CAT.from_url(pac_id)
             pac_id_catless = PAC_ID.from_url(pac_id, try_pac_cat=False)
+            pac_id = PAC_CAT.from_url(pac_id)
         
-        # it's likely to h
+        # it's likely to
         if isinstance(pac_id, PAC_ID):
             pac_id_catless = PAC_ID.from_url(pac_id.to_url(), try_pac_cat=False)
         else:

{labfreed-0.3.1a4/labfreed/trex/python_convenience → labfreed-0.3.1a6/labfreed/trex/pythonic}/data_table.py

@@ -5,7 +5,7 @@ from typing import Union
 from pydantic import BaseModel, Field, PrivateAttr, model_validator
 
 from labfreed.utilities.base36 import base36
-from labfreed.trex.python_convenience.quantity import Quantity
+from labfreed.trex.pythonic.quantity import Quantity
 
 
 class DataTable(BaseModel):

{labfreed-0.3.1a4/labfreed/trex/python_convenience → labfreed-0.3.1a6/labfreed/trex/pythonic}/pyTREX.py

@@ -6,10 +6,10 @@ from typing import Self
 
 from pydantic import RootModel
 from labfreed.well_known_keys.unece.unece_units import unece_unit
-from labfreed.trex.python_convenience.data_table import DataTable
+from labfreed.trex.pythonic.data_table import DataTable
 from labfreed.utilities.base36 import from_base36, base36, to_base36
 
-from labfreed.trex.python_convenience.quantity import Quantity, unece_unit_code_from_quantity
+from labfreed.trex.pythonic.quantity import Quantity, unece_unit_code_from_quantity
 from labfreed.trex.table_segment import ColumnHeader, TableSegment
 from labfreed.trex.trex import TREX
 from labfreed.trex.trex_base_models import AlphanumericValue, BinaryValue, BoolValue, DateValue, ErrorValue, NumericValue, TextValue

labfreed-0.3.1a4/labfreed/labfreed_extended/pac_attributes/server/excel_attribute_data_source.py

@@ -1,129 +0,0 @@
-from datetime import datetime
-
-import os
-from urllib.parse import urlparse
-from cachetools import TTLCache, cached
-
-from labfreed.pac_attributes.api_data_models.response import AttributeGroup
-from labfreed.pac_attributes.server.server import AttributeGroupDataSource
-from labfreed.labfreed_extended.pac_attributes.py_attributes import pyAttribute, pyAttributes
-
-
-try:
-    from openpyxl import load_workbook
-except ImportError:
-    raise ImportError("Please install labfreed with the [extended] extra: pip install labfreed[extended]")
-
-
-cache = TTLCache(maxsize=128, ttl=0)
-
-
-class ExcelAttributeDataSource(AttributeGroupDataSource):
-    '''
-    Demonstrates how to analyze the PAC-ID and it's extensions to provide some data
-    '''
-    def __init__(self, file_path:str, cache_duration_seconds:int=0, base_url:str="", *args, **kwargs):
-        self._file_path = file_path
-        self._base_url = base_url
-
-        
-        if is_sharepoint_url(file_path):
-            self._file_location = "sharepoint"
-        else: 
-            self._file_location = "local"
-            
-        super().__init__(*args, **kwargs)
-            
-         
-    def is_static(self) -> bool:
-        return False
-    
-    @property
-    def provides_attributes(self):
-        if self._file_location == "local":
-            rows, last_changed = read_excel_openpyxl(self._file_path)
-            headers = [self._base_url + r for r in rows[0][1:] ]
-        elif self._file_location == "sharepoint":
-            raise NotImplementedError('Sharepoint Access not implemented')
-        return headers
-    
-    
-    def attributes(self, pac_url: str) -> AttributeGroup:
-        if not self._include_extensions:
-            pac_url = pac_url.split('*')[0]
-        
-        if self._file_location == "local":
-            rows, last_changed = read_excel_openpyxl(self._file_path)
-        elif self._file_location == "sharepoint":
-            raise NotImplementedError('Sharepoint Access not implemented')
-        
-        d = get_row_by_first_cell(rows, pac_url, self._base_url)
-        if not d:
-            return None
-        
-        attributes = [pyAttribute(key=k, value=v) for k,v in d.items()]
-        
-            
-        return AttributeGroup(key=self._attribute_group_key, 
-                              attributes=pyAttributes(attributes).to_payload_attributes(),
-                              state_of=last_changed)
-    
-    
-    
-@cached(cache)
-def read_excel_openpyxl(path: str, worksheet: str = None) -> list[tuple]:
-    """
-    Read and cache Excel worksheet as list of rows (including headers),
-    then close the workbook.
-    """
-    wb = load_workbook(filename=path, read_only=True, data_only=True)
-    ws = wb[worksheet] if worksheet else wb.active
-
-    rows = list(ws.iter_rows(values_only=True))
-    
-    last_changed: datetime | None = wb.properties.modified
-    wb.close()  # immediately release the file
-
-    return rows, last_changed  # list of tuples (header + data rows)
-
-
-def get_row_by_first_cell(sheet_rows: list[tuple], match_value: str, base_url:str) -> dict | None:
-    """
-    Takes list of rows and returns the first row where the first cell == match_value,
-    as a dict using headers from the first row.
-    """
-    if not sheet_rows:
-        return None
-
-    headers = sheet_rows[0]
-    for row in sheet_rows[1:]:
-        if not row:
-            continue
-        first = str(row[0]).strip() if row[0] is not None else ""
-        if first == match_value:
-            return {
-                base_url + str(headers[i]).strip(): row[i]
-                for i in range(1, len(headers))
-                if headers[i] is not None
-            }
-
-    return None
-
-        
-        
-def is_sharepoint_url(s: str) -> bool:
-    try:
-        parsed = urlparse(s)
-        if parsed.scheme not in {"http", "https"}:
-            return False
-        if "sharepoint.com" in parsed.netloc or "1drv.ms" in parsed.netloc:
-            return True
-        return False
-    except Exception:
-        return False
-
-def is_local_path(s: str) -> bool:
-    if is_sharepoint_url(s):
-        return False
-    # Treat anything that's not a URL and points to an existing file as a local path
-    return os.path.exists(s)

labfreed-0.3.1a4/labfreed/pac_attributes/client/__init__.py

@@ -1 +0,0 @@
-import labfreed.utilities.translations