nucliadb-utils 4.0.3.post602__py3-none-any.whl → 4.0.3.post604__py3-none-any.whl

nucliadb_utils/settings.py

@@ -114,11 +114,16 @@ class StorageSettings(BaseSettings):
         description="Number of days that uploaded files are kept in Nulia's processing engine",
     )
 
-    azure_connection_string: Optional[str] = Field(
+    azure_account_url: Optional[str] = Field(
         default=None,
-        description="Azure Storage connection string: https://docs.microsoft.com/en-us/azure/storage/common/storage-configure-connection-string",  # noqa
+        description="Azure Account URL. The driver implementation uses Azure's default credential authentication method: https://learn.microsoft.com/en-us/python/api/azure-identity/azure.identity.defaultazurecredential?view=azure-python",  # noqa
+        examples=["https://<storageaccountname>.blob.core.windows.net"],
     )
 
+    # For testing purposes: Azurite docker image requires a connection string as it
+    # doesn't support Azure's default credential authentication method
+    azure_connection_string: Optional[str] = None
+
 
 storage_settings = StorageSettings()
 

nucliadb_utils/storages/azure.py

@@ -25,6 +25,7 @@ from datetime import datetime
 from typing import AsyncGenerator, AsyncIterator, Optional, Union
 
 from azure.core.exceptions import ResourceExistsError, ResourceNotFoundError
+from azure.identity import DefaultAzureCredential
 from azure.storage.blob import BlobProperties, BlobType, ContentSettings
 from azure.storage.blob.aio import BlobServiceClient
 
@@ -161,11 +162,12 @@ class AzureStorage(Storage):
 
     def __init__(
         self,
-        connection_string: str,
+        account_url: str,
         deadletter_bucket: str = "deadletter",
         indexing_bucket: str = "indexing",
+        connection_string: Optional[str] = None,
     ):
-        self.object_store = AzureObjectStore(connection_string)
+        self.object_store = AzureObjectStore(account_url, connection_string=connection_string)
         self.deadletter_bucket = deadletter_bucket
         self.indexing_bucket = indexing_bucket
 
@@ -215,7 +217,8 @@ class AzureStorage(Storage):
 
 
 class AzureObjectStore(ObjectStore):
-    def __init__(self, connection_string: str):
+    def __init__(self, account_url: str, connection_string: Optional[str] = None):
+        self.account_url = account_url
         self.connection_string = connection_string
         self._service_client: Optional[BlobServiceClient] = None
 
@@ -226,7 +229,13 @@ class AzureObjectStore(ObjectStore):
         return self._service_client
 
     async def initialize(self):
-        self._service_client = BlobServiceClient.from_connection_string(self.connection_string)
+        if self.connection_string:
+            # For testing purposes
+            self._service_client = BlobServiceClient.from_connection_string(self.connection_string)
+        else:
+            self._service_client = BlobServiceClient(
+                self.account_url, credential=DefaultAzureCredential()
+            )
 
     async def finalize(self):
         try:

nucliadb_utils/tests/azure.py

@@ -74,6 +74,7 @@ class AzuriteFixture:
     port: int
     container: BaseImage
     connection_string: str
+    account_url: str
 
 
 def get_connection_string(host, port) -> str:
@@ -99,6 +100,7 @@ def azurite() -> Generator[AzuriteFixture, None, None]:
             port=port,
             container=container.container_obj,
             connection_string=get_connection_string(host, port),
+            account_url=f"http://{host}:{port}/devstoreaccount1",
         )
     finally:
         container.stop()
@@ -107,6 +109,7 @@ def azurite() -> Generator[AzuriteFixture, None, None]:
 @pytest.fixture(scope="function")
 async def azure_storage(azurite):
     storage = AzureStorage(
+        account_url=azurite.account_url,
         connection_string=azurite.connection_string,
     )
     MAIN[Utility.STORAGE] = storage

nucliadb_utils/utilities.py

@@ -101,10 +101,11 @@ async def get_storage(
     if storage_settings.file_backend == FileBackendConfig.AZURE:
         from nucliadb_utils.storages.azure import AzureStorage
 
-        if storage_settings.azure_connection_string is None:
-            raise ConfigurationError("AZURE_CONNECTION_STRING env var not configured")
+        if storage_settings.azure_account_url is None:
+            raise ConfigurationError("AZURE_ACCOUNT_URL env variable not configured")
 
         azureutil = AzureStorage(
+            account_url=storage_settings.azure_account_url,
             connection_string=storage_settings.azure_connection_string,
         )
 

{nucliadb_utils-4.0.3.post602.dist-info → nucliadb_utils-4.0.3.post604.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nucliadb_utils
-Version: 4.0.3.post602
+Version: 4.0.3.post604
 Home-page: https://nuclia.com
 License: BSD
 Classifier: Development Status :: 4 - Beta
@@ -23,8 +23,8 @@ Requires-Dist: PyNaCl
 Requires-Dist: pyjwt >=2.4.0
 Requires-Dist: memorylru >=1.1.2
 Requires-Dist: mrflagly
-Requires-Dist: nucliadb-protos >=4.0.3.post602
-Requires-Dist: nucliadb-telemetry >=4.0.3.post602
+Requires-Dist: nucliadb-protos >=4.0.3.post604
+Requires-Dist: nucliadb-telemetry >=4.0.3.post604
 Provides-Extra: cache
 Requires-Dist: redis >=4.3.4 ; extra == 'cache'
 Requires-Dist: orjson >=3.6.7 ; extra == 'cache'
@@ -44,6 +44,7 @@ Requires-Dist: aiofiles >=0.8.0 ; extra == 'storages'
 Requires-Dist: backoff >=1.11.1 ; extra == 'storages'
 Requires-Dist: google-auth >=2.4.1 ; extra == 'storages'
 Requires-Dist: azure-storage-blob >=12.20.0 ; extra == 'storages'
+Requires-Dist: azure-identity >=1.16.1 ; extra == 'storages'
 
 # nucliadb util python library
 

{nucliadb_utils-4.0.3.post602.dist-info → nucliadb_utils-4.0.3.post604.dist-info}/RECORD

@@ -12,11 +12,11 @@ nucliadb_utils/nats.py,sha256=zTAXECDXeCPtydk3F_6EMFDZ059kK0UYUU_tnWoxgXs,8208
 nucliadb_utils/partition.py,sha256=jBgy4Hu5Iwn4gjbPPcthSykwf-qNx-GcLAIwbzPd1d0,1157
 nucliadb_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucliadb_utils/run.py,sha256=HpAIM8xbR7UpVC2_7xOjB4fYbUVykyPP6yHrv2RD3DI,1707
-nucliadb_utils/settings.py,sha256=VXZuq-4-RvsUsMIjL-wRRjzCqM-b_AnTHsW_hGrax_o,7281
+nucliadb_utils/settings.py,sha256=AaOtQZVRqRcMnUyN1l1MpR10lANaDT2uPrbhmTyn6uk,7647
 nucliadb_utils/signals.py,sha256=JRNv2y9zLtBjOANBf7krGfDGfOc9qcoXZ6N1nKWS2FE,2674
 nucliadb_utils/store.py,sha256=kQ35HemE0v4_Qg6xVqNIJi8vSFAYQtwI3rDtMsNy62Y,890
 nucliadb_utils/transaction.py,sha256=mwcI3aIHAvU5KOGqd_Uz_d1XQzXhk_-NWY8NqU1lfb0,7307
-nucliadb_utils/utilities.py,sha256=Vb7lXUSDtqS_7tNqI4CDQD2woHO_JFUGSjC2Yj4-uEA,14135
+nucliadb_utils/utilities.py,sha256=puBRsquZEM3gnXNI8wPwXzG1gN8Gg86B7g-oJFlrXQQ,14188
 nucliadb_utils/audit/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb_utils/audit/audit.py,sha256=dn5ZnCVQUlCcvdjzaORghbrjk9QgVGrtkfIftq30Bp8,2819
 nucliadb_utils/audit/basic.py,sha256=NViey6mKbCXqRTLDBX2xNTcCg9I-2e4oB2xkekuhDvM,3392
@@ -39,7 +39,7 @@ nucliadb_utils/nuclia_usage/protos/kb_usage_pb2_grpc.pyi,sha256=6RIsZ2934iodEckf
 nucliadb_utils/nuclia_usage/utils/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb_utils/nuclia_usage/utils/kb_usage_report.py,sha256=E1eUSFXBVNzQP9Q2rWj9y3koCO5S7iKwckny_AoLKuk,3870
 nucliadb_utils/storages/__init__.py,sha256=5Qc8AUWiJv9_JbGCBpAn88AIJhwDlm0OPQpg2ZdRL4U,872
-nucliadb_utils/storages/azure.py,sha256=7cWbe144WIwt10IM6XPRThkjeg5M_U0WInj4Jk75THw,15591
+nucliadb_utils/storages/azure.py,sha256=egMDwLNIGSQyVevuySt2AswzFdNAcih05BbRg3-p8IU,16015
 nucliadb_utils/storages/exceptions.py,sha256=mm_wX4YRtp7u7enkk_4pMSlX5AQQuFbq4xLmupVDt3Y,2502
 nucliadb_utils/storages/gcs.py,sha256=WblkxWoa1brevsJV3ebiE6s7Wb_eXFScw41202f5uP4,26999
 nucliadb_utils/storages/local.py,sha256=NxC_nMBd38NDsR266DSgoBLdQlvUwf0_sd50r-BLI0E,10288
@@ -51,15 +51,15 @@ nucliadb_utils/storages/storage.py,sha256=Ask2f1xuQHxavF3uKXXrmjOeY7w3ZljpZlcvmI
 nucliadb_utils/storages/utils.py,sha256=8g2rIwJeYIumQLOB47Yw1rx3twlhRB_cJxer65QfZmk,1479
 nucliadb_utils/tests/__init__.py,sha256=Oo9CAE7B0eW5VHn8sHd6o30SQzOWUhktLPRXdlDOleA,1456
 nucliadb_utils/tests/asyncbenchmark.py,sha256=x4be2IwCawle9zWgMOJkmwoUwk5p1tv7cLQGmybkEOg,10587
-nucliadb_utils/tests/azure.py,sha256=ji-BV54m_MHAB9KdSToYgsZ8OZZ-C5Yq2VqWOYZNMs4,3668
+nucliadb_utils/tests/azure.py,sha256=7viGeUPC-HnRn7PG6cyDe8HhRsgOoAsU6tcuav3gl1A,3796
 nucliadb_utils/tests/fixtures.py,sha256=rmix1VGpPULBxJd_5ScgVD4Z0nRrkNOVt-uTW_WoURU,2144
 nucliadb_utils/tests/gcs.py,sha256=Ii8BCHUAAxFIzX67pKTRFRgbqv3FJ6DrPAdAx2Xod1Y,3036
 nucliadb_utils/tests/indexing.py,sha256=YW2QhkhO9Q_8A4kKWJaWSvXvyQ_AiAwY1VylcfVQFxk,1513
 nucliadb_utils/tests/local.py,sha256=c3gZJJWmvOftruJkIQIwB3q_hh3uxEhqGIAVWim1Bbk,1343
 nucliadb_utils/tests/nats.py,sha256=Tosonm9A9cusImyji80G4pgdXEHNVPaCLT5TbFK_ra0,7543
 nucliadb_utils/tests/s3.py,sha256=YB8QqDaBXxyhHonEHmeBbRRDmvB7sTOaKBSi8KBGokg,2330
-nucliadb_utils-4.0.3.post602.dist-info/METADATA,sha256=zYwnmt6KeiIBlFx0O7risLDV6mob6HkYxFGMTNZEm0c,2096
-nucliadb_utils-4.0.3.post602.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-nucliadb_utils-4.0.3.post602.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
-nucliadb_utils-4.0.3.post602.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nucliadb_utils-4.0.3.post602.dist-info/RECORD,,
+nucliadb_utils-4.0.3.post604.dist-info/METADATA,sha256=Phr4NyXmgKXlT-rQFz2UPNlkunJrWUKLEi20-7tCDZc,2157
+nucliadb_utils-4.0.3.post604.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+nucliadb_utils-4.0.3.post604.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
+nucliadb_utils-4.0.3.post604.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+nucliadb_utils-4.0.3.post604.dist-info/RECORD,,