adapta 2.11.9__py3-none-any.whl → 3.5.13__py3-none-any.whl

adapta/storage/blob/azure_storage_client.py

@@ -1,7 +1,7 @@
 """
  Storage Client implementation for Azure Cloud.
 """
-#  Copyright (c) 2023-2024. ECCO Sneaks & Data
+#  Copyright (c) 2023-2026. ECCO Data & AI and other project contributors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -21,7 +21,8 @@ from datetime import datetime, timedelta
 from functools import partial
 import signal
 from threading import Thread
-from typing import Union, Optional, Dict, Type, TypeVar, Iterator, List, Callable, final
+from typing import TypeVar, final
+from collections.abc import Iterator, Callable
 
 from azure.core.paging import ItemPaged
 from azure.storage.blob import (
@@ -32,6 +33,7 @@ from azure.storage.blob import (
     BlobProperties,
     ExponentialRetry,
     ContainerClient,
+    BlobLeaseClient,
 )
 
 from adapta.storage.blob.base import StorageClient
@@ -51,7 +53,7 @@ class AzureStorageClient(StorageClient):
     Azure Storage (Blob and ADLS) Client.
     """
 
-    def __init__(self, *, base_client: AzureClient, path: Union[AdlsGen2Path, WasbPath], implicit_login=True):
+    def __init__(self, *, base_client: AzureClient, path: AdlsGen2Path | WasbPath, implicit_login=True):
         super().__init__(base_client=base_client)
 
         # overrides default ExponentialRetry
@@ -69,18 +71,32 @@ class AzureStorageClient(StorageClient):
             self._storage_options = None
         else:
             self._storage_options = self._base_client.connect_storage(path)
-            connection_string = (
-                f"DefaultEndpointsProtocol=https;"
-                f"AccountName={self._storage_options['AZURE_STORAGE_ACCOUNT_NAME']};"
-                f"AccountKey={self._storage_options['AZURE_STORAGE_ACCOUNT_KEY']};"
-                f"BlobEndpoint=https://{self._storage_options['AZURE_STORAGE_ACCOUNT_NAME']}.blob.core.windows.net/;"
+            blob_endpoint = (
+                f"BlobEndpoint=https://{self._storage_options['AZURE_STORAGE_ACCOUNT_NAME']}.blob.core.windows.net/"
             )
+            endpoint_protocol = "DefaultEndpointsProtocol=https"
+
+            if "ADAPTA__AZURE_STORAGE_BLOB_ENDPOINT" in os.environ:
+                blob_endpoint = f'BlobEndpoint={os.environ["ADAPTA__AZURE_STORAGE_BLOB_ENDPOINT"]}'
+
+            if "ADAPTA__AZURE_STORAGE_DEFAULT_PROTOCOL" in os.environ:
+                endpoint_protocol = f"DefaultEndpointsProtocol={os.environ['ADAPTA__AZURE_STORAGE_DEFAULT_PROTOCOL']}"
+
+            connection_string = ";".join(
+                [
+                    endpoint_protocol,
+                    f"AccountName={self._storage_options['AZURE_STORAGE_ACCOUNT_NAME']}",
+                    f"AccountKey={self._storage_options['AZURE_STORAGE_ACCOUNT_KEY']}",
+                    blob_endpoint,
+                ]
+            )
+
             self._blob_service_client: BlobServiceClient = BlobServiceClient.from_connection_string(
                 connection_string, retry_policy=retry_policy
             )
 
     @classmethod
-    def create(cls, auth: AzureClient, endpoint_url: Optional[str] = None):
+    def create(cls, auth: AzureClient, endpoint_url: str | None = None):
         """
          Not used in Azure.
         :return:
@@ -120,14 +136,14 @@ class AzureStorageClient(StorageClient):
         self,
         data: T,
         blob_path: DataPath,
-        serialization_format: Type[SerializationFormat[T]],
-        metadata: Optional[Dict[str, str]] = None,
+        serialization_format: type[SerializationFormat[T]],
+        metadata: dict[str, str] | None = None,
         overwrite: bool = False,
     ) -> None:
         bytes_ = serialization_format().serialize(data)
         self._get_blob_client(blob_path).upload_blob(bytes_, metadata=metadata, overwrite=overwrite)
 
-    def get_blob_uri(self, blob_path: DataPath, **kwargs) -> str:
+    def get_blob_uri(self, blob_path: DataPath, expires_in_seconds: float = 3600.0, **kwargs) -> str:
         blob_client = self._get_blob_client(blob_path)
         azure_path = cast_path(blob_path)
 
@@ -137,7 +153,7 @@ class AzureStorageClient(StorageClient):
             container_name=azure_path.container,
             account_name=azure_path.account,
             permission=kwargs.get("permission", BlobSasPermissions(read=True)),
-            expiry=kwargs.get("expiry", datetime.utcnow() + timedelta(hours=1)),
+            expiry=datetime.utcnow() + timedelta(seconds=expires_in_seconds),
         )
 
         sas_token = (
@@ -148,18 +164,17 @@ class AzureStorageClient(StorageClient):
             else base_call(
                 user_delegation_key=self._blob_service_client.get_user_delegation_key(
                     key_start_time=datetime.utcnow() - timedelta(minutes=1),
-                    key_expiry_time=kwargs.get("expiry", datetime.utcnow() + timedelta(hours=1)),
+                    key_expiry_time=datetime.utcnow() + timedelta(seconds=expires_in_seconds),
                 ),
             )
         )
 
-        sas_uri = f"{blob_client.url}?{sas_token}"
-        return sas_uri
+        return f"{blob_client.url}?{sas_token}"
 
     def blob_exists(self, blob_path: DataPath) -> bool:
         return self._get_blob_client(blob_path).exists()
 
-    def _list_blobs(self, blob_path: DataPath) -> (ItemPaged[BlobProperties], Union[AdlsGen2Path, WasbPath]):
+    def _list_blobs(self, blob_path: DataPath) -> (ItemPaged[BlobProperties], AdlsGen2Path | WasbPath):
         azure_path = cast_path(blob_path)
 
         return (
@@ -170,8 +185,8 @@ class AzureStorageClient(StorageClient):
     def read_blobs(
         self,
         blob_path: DataPath,
-        serialization_format: Type[SerializationFormat[T]],
-        filter_predicate: Optional[Callable[[BlobProperties], bool]] = None,
+        serialization_format: type[SerializationFormat[T]],
+        filter_predicate: Callable[[BlobProperties], bool] | None = None,
     ) -> Iterator[T]:
         blobs_on_path, azure_path = self._list_blobs(blob_path)
 
@@ -211,8 +226,8 @@ class AzureStorageClient(StorageClient):
         self,
         blob_path: DataPath,
         local_path: str,
-        threads: Optional[int] = None,
-        filter_predicate: Optional[Callable[[BlobProperties], bool]] = None,
+        threads: int | None = None,
+        filter_predicate: Callable[[BlobProperties], bool] | None = None,
     ) -> None:
         def download_blob(blob: BlobProperties, container: str) -> None:
             write_path = os.path.join(local_path, blob.name)
@@ -229,7 +244,7 @@ class AzureStorageClient(StorageClient):
                         .readall()
                     )
 
-        def download_blob_list(blob_list: List[BlobProperties], container: str) -> None:
+        def download_blob_list(blob_list: list[BlobProperties], container: str) -> None:
             for blob_from_list in blob_list:
                 if blob_from_list:
                     download_blob(blob_from_list, container)
@@ -251,7 +266,7 @@ class AzureStorageClient(StorageClient):
             for blob_dir in blob_dirs:
                 os.makedirs(os.path.join(local_path, blob_dir.name), exist_ok=True)
 
-            blob_lists: List[List[BlobProperties]] = chunk_list(blob_files, threads)
+            blob_lists: list[list[BlobProperties]] = chunk_list(blob_files, threads)
             thread_list = [
                 Thread(target=download_blob_list, args=(blob_list, azure_path.container)) for blob_list in blob_lists
             ]
@@ -263,7 +278,7 @@ class AzureStorageClient(StorageClient):
     def list_blobs(
         self,
         blob_path: DataPath,
-        filter_predicate: Optional[Callable[[BlobProperties], bool]] = lambda blob: blob.size != 0,  # Skip folders
+        filter_predicate: Callable[[BlobProperties], bool] | None = lambda blob: blob.size != 0,  # Skip folders
     ) -> Iterator[DataPath]:
         blobs_on_path, azure_path = self._list_blobs(blob_path)
 
@@ -275,6 +290,31 @@ class AzureStorageClient(StorageClient):
                     path=blob.name,
                 )
 
+    def list_matching_prefixes(
+        self, blob_path: DataPath, delimiter: str = "/", timeout_seconds: int = 3600
+    ) -> Iterator[DataPath]:
+        """
+        List blobs in accordance with a hierarchy, as delimited by the specified delimiter character.
+        For example, calling list_matching_prefixes(AldsGen2Path.from_hdfs_path(path), delimiter="/"),
+        where path=abfss://c@a.dfs.core.windows.net/my/pre will return:
+        abfss://c@a.dfs.core.windows.net/my/pre1
+        abfss://c@a.dfs.core.windows.net/my/preadad
+        abfss://c@a.dfs.core.windows.net/my/preeqweq
+
+        but will not return abfss://c@a.dfs.core.windows.net/my/pre1/pre2
+        """
+        azure_path = cast_path(blob_path)
+        for prefix in self._get_container_client(azure_path).walk_blobs(
+            name_starts_with=blob_path.path,
+            delimiter=delimiter,
+            timeout=timeout_seconds,
+        ):
+            yield AdlsGen2Path(
+                account=azure_path.account,
+                container=azure_path.container,
+                path=prefix.name,
+            )
+
     def delete_blob(
         self,
         blob_path: DataPath,
@@ -283,6 +323,18 @@ class AzureStorageClient(StorageClient):
 
         self._get_container_client(azure_path).delete_blob(blob_path.path)
 
+    def delete_leased_blob(self, blob_path: DataPath) -> None:
+        """
+        Azure specific deletion that takes care of a leased blob
+        """
+        azure_path = cast_path(blob_path)
+        blob_client = self._get_blob_client(azure_path)
+
+        if blob_client.get_blob_properties().lease.state == "leased":
+            BlobLeaseClient(blob_client).break_lease()
+
+        self._get_container_client(azure_path).delete_blob(blob_path.path)
+
     def copy_blob(self, blob_path: DataPath, target_blob_path: DataPath, doze_period_ms=1000) -> None:
         source_url = self.get_blob_uri(blob_path)
         self._get_blob_client(target_blob_path).start_copy_from_url(source_url)

adapta/storage/blob/base.py

@@ -1,7 +1,7 @@
 """
  Abstraction for storage operations.
 """
-#  Copyright (c) 2023-2024. ECCO Sneaks & Data
+#  Copyright (c) 2023-2026. ECCO Data & AI and other project contributors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -17,7 +17,8 @@
 #
 
 from abc import ABC, abstractmethod
-from typing import Optional, Dict, Type, TypeVar, Iterator, Callable
+from typing import TypeVar
+from collections.abc import Iterator, Callable
 
 from adapta.security.clients import AuthenticationClient
 from adapta.storage.models.base import DataPath
@@ -36,7 +37,7 @@ class StorageClient(ABC):
         self._base_client = base_client
 
     @classmethod
-    def create(cls, auth: AuthenticationClient, endpoint_url: Optional[str] = None):
+    def create(cls, auth: AuthenticationClient, endpoint_url: str | None = None):
         """
          Creates a Storage client using the AuthenticationClient to set up its session.
 
@@ -47,12 +48,13 @@ class StorageClient(ABC):
         """
 
     @abstractmethod
-    def get_blob_uri(self, blob_path: DataPath, **kwargs) -> str:
+    def get_blob_uri(self, blob_path: DataPath, expires_in_seconds: float = 3600.0, **kwargs) -> str:
         """
          Generates a URL which can be used to download this blob.
 
-        :param blob_path:
-        :param kwargs:
+        :param blob_path: Path to the blob.
+        :param expires_in_seconds: Expiration time in seconds.
+        :param kwargs: Optional parameters to pass to the signing client.
         :return:
         """
 
@@ -70,8 +72,8 @@ class StorageClient(ABC):
         self,
         data: T,
         blob_path: DataPath,
-        serialization_format: Type[SerializationFormat[T]],
-        metadata: Optional[Dict[str, str]] = None,
+        serialization_format: type[SerializationFormat[T]],
+        metadata: dict[str, str] | None = None,
         overwrite: bool = False,
     ) -> None:
         """
@@ -101,7 +103,7 @@ class StorageClient(ABC):
     def list_blobs(
         self,
         blob_path: DataPath,
-        filter_predicate: Optional[Callable[[...], bool]] = None,
+        filter_predicate: Callable[[...], bool] | None = None,
     ) -> Iterator[DataPath]:
         """
         Lists blobs in blob_path
@@ -115,8 +117,8 @@ class StorageClient(ABC):
     def read_blobs(
         self,
         blob_path: DataPath,
-        serialization_format: Type[SerializationFormat[T]],
-        filter_predicate: Optional[Callable[[...], bool]] = None,
+        serialization_format: type[SerializationFormat[T]],
+        filter_predicate: Callable[[...], bool] | None = None,
     ) -> Iterator[T]:
         """
          Reads data under provided path into the given format.
@@ -132,8 +134,8 @@ class StorageClient(ABC):
         self,
         blob_path: DataPath,
         local_path: str,
-        threads: Optional[int] = None,
-        filter_predicate: Optional[Callable[[...], bool]] = None,
+        threads: int | None = None,
+        filter_predicate: Callable[[...], bool] | None = None,
     ) -> None:
         """
          Reads data under provided path into the given format.

adapta/storage/blob/local_storage_client.py

@@ -2,7 +2,7 @@
  Storage Client implementation for a regular filesystem.
 """
 
-#  Copyright (c) 2023-2024. ECCO Sneaks & Data
+#  Copyright (c) 2023-2026. ECCO Data & AI and other project contributors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -20,9 +20,10 @@
 import os.path
 import shutil
 
-from typing import final, Optional, Callable, Type, Iterator, Dict
+from typing import final
+from collections.abc import Callable, Iterator
 
-from adapta.security.clients import LocalClient
+from adapta.security.clients import LocalClient, AuthenticationClient
 from adapta.storage.blob.base import StorageClient, T
 from adapta.storage.models import DataPath, LocalPath, parse_data_path
 from adapta.storage.models.format import SerializationFormat
@@ -34,11 +35,14 @@ class LocalStorageClient(StorageClient):
     Local Storage Client, primarily for unit tests.
     """
 
+    def __init__(self):
+        super().__init__(base_client=LocalClient())
+
     @classmethod
-    def create(cls, auth: StorageClient, endpoint_url: Optional[str] = None):
-        raise NotImplementedError("Not supported by this client")
+    def create(cls, auth: AuthenticationClient, endpoint_url: str | None = None):
+        return cls()
 
-    def get_blob_uri(self, blob_path: DataPath, **kwargs) -> str:
+    def get_blob_uri(self, blob_path: DataPath, expires_in_seconds: float = 3600.0, **kwargs) -> str:
         return cast_path(blob_path).path
 
     def blob_exists(self, blob_path: DataPath) -> bool:
@@ -48,8 +52,8 @@ class LocalStorageClient(StorageClient):
         self,
         data: T,
         blob_path: DataPath,
-        serialization_format: Type[SerializationFormat[T]],
-        metadata: Optional[Dict[str, str]] = None,
+        serialization_format: type[SerializationFormat[T]],
+        metadata: dict[str, str] | None = None,
         overwrite: bool = False,
     ) -> None:
         bytes_ = serialization_format().serialize(data)
@@ -64,28 +68,36 @@ class LocalStorageClient(StorageClient):
         os.remove(cast_path(blob_path).path)
 
     def list_blobs(
-        self, blob_path: DataPath, filter_predicate: Optional[Callable[[...], bool]] = None
+        self, blob_path: DataPath, filter_predicate: Callable[[...], bool] | None = None
     ) -> Iterator[DataPath]:
         for blob in os.listdir(cast_path(blob_path).path):
+            if filter_predicate is not None and not filter_predicate(blob):
+                continue
             yield LocalPath(path=blob)
 
     def read_blobs(
         self,
         blob_path: DataPath,
-        serialization_format: Type[SerializationFormat[T]],
-        filter_predicate: Optional[Callable[[...], bool]] = None,
+        serialization_format: type[SerializationFormat[T]],
+        filter_predicate: Callable[[...], bool] | None = None,
     ) -> Iterator[T]:
         dir_path = cast_path(blob_path).path
-        for blob in os.listdir(dir_path):
-            with open(os.path.join(dir_path, blob), "rb") as blob_file:
+        if os.path.isdir(dir_path):
+            for blob in os.listdir(dir_path):
+                if filter_predicate is not None and not filter_predicate(blob):
+                    continue
+                with open(os.path.join(dir_path, blob), "rb") as blob_file:
+                    yield serialization_format().deserialize(blob_file.read())
+        else:
+            with open(dir_path, "rb") as blob_file:
                 yield serialization_format().deserialize(blob_file.read())
 
     def download_blobs(
         self,
         blob_path: DataPath,
         local_path: str,
-        threads: Optional[int] = None,
-        filter_predicate: Optional[Callable[[...], bool]] = None,
+        threads: int | None = None,
+        filter_predicate: Callable[[...], bool] | None = None,
     ) -> None:
         raise NotImplementedError("Not supported by this client")
 
@@ -98,7 +110,7 @@ class LocalStorageClient(StorageClient):
     @classmethod
     def for_storage_path(cls, path: str) -> "StorageClient":
         _ = cast_path(parse_data_path(path))
-        return cls(base_client=LocalClient())
+        return cls()
 
 
 def cast_path(blob_path: DataPath) -> LocalPath:

adapta/storage/blob/s3_storage_client.py

@@ -1,7 +1,7 @@
 """
  Storage Client implementation for AWS S3.
 """
-#  Copyright (c) 2023-2024. ECCO Sneaks & Data
+#  Copyright (c) 2023-2026. ECCO Data & AI and other project contributors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,8 +18,8 @@
 
 import os
 
-from typing import Optional, Callable, Type, Iterator, Dict, TypeVar, final
-from datetime import timedelta
+from typing import TypeVar, final
+from collections.abc import Callable, Iterator
 from boto3 import Session
 from botocore.config import Config
 from botocore.exceptions import ClientError
@@ -41,7 +41,7 @@ class S3StorageClient(StorageClient):
     S3 Storage Client.
     """
 
-    def __init__(self, *, base_client: AwsClient, s3_resource: Optional[Session] = None):
+    def __init__(self, *, base_client: AwsClient, s3_resource: Session | None = None):
         super().__init__(base_client=base_client)
         self._base_client = base_client
         self._s3_resource = s3_resource if s3_resource is not None else base_client.session.resource("s3")
@@ -50,10 +50,10 @@ class S3StorageClient(StorageClient):
     def create(
         cls,
         auth: AwsClient,
-        endpoint_url: Optional[str] = None,
-        session_callable: Optional[Callable[[], Session]] = None,
+        endpoint_url: str | None = None,
+        session_callable: Callable[[], Session] | None = None,
     ):
-        def _get_endpoint_url() -> Optional[str]:
+        def _get_endpoint_url() -> str | None:
             if endpoint_url:
                 return endpoint_url
             if auth.get_credentials():
@@ -65,19 +65,12 @@ class S3StorageClient(StorageClient):
 
         return cls(base_client=auth, s3_resource=auth.session.resource("s3", endpoint_url=_get_endpoint_url()))
 
-    def get_blob_uri(self, blob_path: DataPath, **kwargs) -> str:
-        """Returns a signed URL for a blob in S3 storage.
-
-        :param blob_path: Path to blob
-
-        :return: The signed URL for the given blob path
-        """
+    def get_blob_uri(self, blob_path: DataPath, expires_in_seconds: float = 3600.0, **kwargs) -> str:
         s3_path = cast_path(blob_path)
         params = {
             "Bucket": s3_path.bucket,
             "Key": s3_path.path,
         }
-        expiry_time = int(kwargs.get("expiry", timedelta(hours=1).total_seconds()))
         signature_version = kwargs.get("signature_version", "s3v4")
         signing_client = self._base_client.session.client(
             "s3",
@@ -85,7 +78,9 @@ class S3StorageClient(StorageClient):
             config=Config(signature_version=signature_version),
         )
 
-        return signing_client.generate_presigned_url(ClientMethod="get_object", Params=params, ExpiresIn=expiry_time)
+        return signing_client.generate_presigned_url(
+            ClientMethod="get_object", Params=params, ExpiresIn=int(expires_in_seconds)
+        )
 
     def blob_exists(self, blob_path: DataPath) -> bool:
         """Checks if blob located at blob_path exists
@@ -105,8 +100,8 @@ class S3StorageClient(StorageClient):
         self,
         data: T,
         blob_path: DataPath,
-        serialization_format: Type[SerializationFormat[T]],
-        metadata: Optional[Dict[str, str]] = None,
+        serialization_format: type[SerializationFormat[T]],
+        metadata: dict[str, str] | None = None,
         overwrite: bool = False,
     ) -> None:
         """
@@ -140,7 +135,7 @@ class S3StorageClient(StorageClient):
         self._s3_resource.Bucket(s3_path.bucket).Object(blob_path.path).delete()
 
     def list_blobs(
-        self, blob_path: DataPath, filter_predicate: Optional[Callable[[...], bool]] = None
+        self, blob_path: DataPath, filter_predicate: Callable[[...], bool] | None = None
     ) -> Iterator[DataPath]:
         """
         Lists blobs in S3 storage.
@@ -173,8 +168,8 @@ class S3StorageClient(StorageClient):
     def read_blobs(
         self,
         blob_path: DataPath,
-        serialization_format: Type[SerializationFormat[T]],
-        filter_predicate: Optional[Callable[[...], bool]] = None,
+        serialization_format: type[SerializationFormat[T]],
+        filter_predicate: Callable[[...], bool] | None = None,
     ) -> Iterator[T]:
         """
          Reads data under provided path into the given format.
@@ -194,8 +189,8 @@ class S3StorageClient(StorageClient):
         self,
         blob_path: DataPath,
         local_path: str,
-        threads: Optional[int] = None,
-        filter_predicate: Optional[Callable[[...], bool]] = None,
+        threads: int | None = None,
+        filter_predicate: Callable[[...], bool] | None = None,
     ) -> None:
         """
         Downloads blobs from S3 storage to a local path.
@@ -286,4 +281,4 @@ class S3StorageClient(StorageClient):
         Generate client instance that can operate on the provided path. Always uses EnvironmentCredentials/
         """
         _ = cast_path(parse_data_path(path))
-        return cls(base_client=AwsClient())
+        return cls.create(auth=AwsClient())

adapta/storage/cache/__init__.py

@@ -2,7 +2,7 @@
   Import index.
 """
 
-#  Copyright (c) 2023-2024. ECCO Sneaks & Data
+#  Copyright (c) 2023-2026. ECCO Data & AI and other project contributors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

adapta/storage/cache/_base.py

@@ -1,7 +1,7 @@
 """
   Generic key-value cache.
 """
-#  Copyright (c) 2023-2024. ECCO Sneaks & Data
+#  Copyright (c) 2023-2026. ECCO Data & AI and other project contributors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@
 
 from abc import ABC, abstractmethod
 from datetime import timedelta
-from typing import Any, List, Optional
+from typing import Any
 
 
 class KeyValueCache(ABC):
@@ -37,7 +37,7 @@ class KeyValueCache(ABC):
         """
 
     @abstractmethod
-    def exists(self, key: str, attribute: Optional[str] = None) -> bool:
+    def exists(self, key: str, attribute: str | None = None) -> bool:
         """
           Checks if a cache key is present. If an attribute is provided, should also check
           if a value possesses this attributes.
@@ -48,7 +48,7 @@ class KeyValueCache(ABC):
         """
 
     @abstractmethod
-    def multi_exists(self, keys: List[str]) -> bool:
+    def multi_exists(self, keys: list[str]) -> bool:
         """
          Checks if all keys exist
 
@@ -57,7 +57,7 @@ class KeyValueCache(ABC):
         """
 
     @abstractmethod
-    def multi_get(self, keys: List[str]) -> List[Any]:
+    def multi_get(self, keys: list[str]) -> list[Any]:
         """
           Reads multiple keys in a single call.
 

adapta/storage/cache/redis_cache.py

@@ -1,7 +1,7 @@
 """
   Key-value cache based on Redis.
 """
-#  Copyright (c) 2023-2024. ECCO Sneaks & Data
+#  Copyright (c) 2023-2026. ECCO Data & AI and other project contributors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.
@@ -19,7 +19,7 @@
 import os
 import ssl
 from datetime import timedelta
-from typing import Any, List, Optional
+from typing import Any
 
 import redis
 from redis import default_backoff
@@ -65,13 +65,13 @@ class RedisCache(KeyValueCache):
                 ssl=True,
             )
 
-    def multi_exists(self, keys: List[str]) -> bool:
+    def multi_exists(self, keys: list[str]) -> bool:
         return self._redis.exists(*keys) == len(keys)
 
     def evict(self, key: str) -> None:
         self._redis.delete(key)
 
-    def exists(self, key: str, attribute: Optional[str] = None) -> bool:
+    def exists(self, key: str, attribute: str | None = None) -> bool:
         if not attribute:
             return self._redis.exists(key) == 1
 
@@ -83,7 +83,7 @@ class RedisCache(KeyValueCache):
 
         return self._redis.hgetall(key)
 
-    def multi_get(self, keys: List[str]) -> List[Any]:
+    def multi_get(self, keys: list[str]) -> list[Any]:
         return self._redis.mget(keys)
 
     def set(

adapta/storage/database/__init__.py

@@ -1,4 +1,7 @@
-#  Copyright (c) 2023-2024. ECCO Sneaks & Data
+"""
+Import index
+"""
+#  Copyright (c) 2023-2026. ECCO Data & AI and other project contributors.
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 #  you may not use this file except in compliance with the License.

adapta/storage/database/{README.md → v2/README.md}

@@ -1,5 +1,7 @@
 # Database Clients
 
+**This is a deprecated module. Please use the new module `adapta.storage.database.v3` instead.**
+
 Supported clients:
 
 - Generic ODBC

adapta/storage/database/v2/__init__.py

@@ -0,0 +1,17 @@
+"""
+Import index
+"""
+#  Copyright (c) 2023-2026. ECCO Data & AI and other project contributors.
+#
+#  Licensed under the Apache License, Version 2.0 (the "License");
+#  you may not use this file except in compliance with the License.
+#  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#