nucliadb-utils 6.8.1.post4988__py3-none-any.whl → 6.8.1.post5003__py3-none-any.whl

nucliadb_utils/settings.py

@@ -125,6 +125,12 @@ class StorageSettings(BaseSettings):
         examples=["https://<storageaccountname>.blob.core.windows.net"],
     )
 
+    azure_kb_account_url: Optional[str] = Field(
+        default=None,
+        description="Azure Account URL for KB containers. If unspecified, uses `azure_account_url`",  # 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

nucliadb_utils/storages/azure.py

@@ -162,22 +162,32 @@ class AzureStorageField(StorageField):
 
 class AzureStorage(Storage):
     field_klass = AzureStorageField
-    object_store: ObjectStore
+    object_store: AzureObjectStore
+    kb_object_store: AzureObjectStore
     source = CloudFile.AZURE
 
     def __init__(
         self,
         account_url: str,
+        kb_account_url: str,
         deadletter_bucket: Optional[str] = "deadletter",
         indexing_bucket: Optional[str] = "indexing",
         connection_string: Optional[str] = None,
     ):
         self.object_store = AzureObjectStore(account_url, connection_string=connection_string)
+        self.kb_object_store = AzureObjectStore(kb_account_url, connection_string=connection_string)
         self.deadletter_bucket = deadletter_bucket
         self.indexing_bucket = indexing_bucket
 
+    def object_store_for_bucket(self, bucket_name: str) -> AzureObjectStore:
+        if bucket_name in [self.indexing_bucket, self.deadletter_bucket]:
+            return self.object_store
+        else:
+            return self.kb_object_store
+
     async def initialize(self, service_name: Optional[str] = None):
         await self.object_store.initialize()
+        await self.kb_object_store.initialize()
         for bucket in [
             self.deadletter_bucket,
             self.indexing_bucket,
@@ -194,39 +204,39 @@ class AzureStorage(Storage):
 
     async def delete_upload(self, uri: str, bucket_name: str):
         try:
-            await self.object_store.delete(bucket_name, uri)
+            await self.object_store_for_bucket(bucket_name).delete(bucket_name, uri)
         except KeyError:
             pass
 
     async def create_bucket(self, bucket_name: str, kbid: Optional[str] = None):
-        if await self.object_store.bucket_exists(bucket_name):
+        if await self.object_store_for_bucket(bucket_name).bucket_exists(bucket_name):
             return
-        await self.object_store.bucket_create(bucket_name)
+        await self.object_store_for_bucket(bucket_name).bucket_create(bucket_name)
 
     def get_bucket_name(self, kbid: str):
         return f"nucliadb-{kbid}"
 
     async def create_kb(self, kbid: str) -> bool:
         bucket_name = self.get_bucket_name(kbid)
-        return await self.object_store.bucket_create(bucket_name)
+        return await self.kb_object_store.bucket_create(bucket_name)
 
     async def schedule_delete_kb(self, kbid: str) -> bool:
         bucket_name = self.get_bucket_name(kbid)
-        deleted, _ = await self.object_store.bucket_delete(bucket_name)
+        deleted, _ = await self.kb_object_store.bucket_delete(bucket_name)
         return deleted
 
     async def delete_kb(self, kbid: str) -> tuple[bool, bool]:
         bucket_name = self.get_bucket_name(kbid)
-        return await self.object_store.bucket_delete(bucket_name)
+        return await self.kb_object_store.bucket_delete(bucket_name)
 
     async def iterate_objects(
         self, bucket: str, prefix: str, start: Optional[str] = None
     ) -> AsyncGenerator[ObjectInfo, None]:
-        async for obj in self.object_store.iterate(bucket, prefix, start):
+        async for obj in self.object_store_for_bucket(bucket).iterate(bucket, prefix, start):
             yield obj
 
-    async def insert_object(self, bucket_name: str, key: str, data: bytes) -> None:
-        await self.object_store.insert(bucket_name, key, data)
+    async def insert_object(self, bucket: str, key: str, data: bytes) -> None:
+        await self.object_store_for_bucket(bucket).insert(bucket, key, data)
 
 
 class AzureObjectStore(ObjectStore):

nucliadb_utils/tests/azure.py

@@ -139,6 +139,7 @@ async def azure_storage(azurite, azure_storage_settings: dict[str, Any]):
 
     storage = AzureStorage(
         account_url=storage_settings.azure_account_url,
+        kb_account_url=storage_settings.azure_kb_account_url or storage_settings.azure_account_url,
         connection_string=storage_settings.azure_connection_string,
     )
     await storage.initialize()

nucliadb_utils/utilities.py

@@ -124,6 +124,7 @@ async def _create_storage(gcs_scopes: Optional[List[str]] = None) -> Storage:
 
         azureutil = AzureStorage(
             account_url=storage_settings.azure_account_url,
+            kb_account_url=storage_settings.azure_kb_account_url or storage_settings.azure_account_url,
             connection_string=storage_settings.azure_connection_string,
             deadletter_bucket=extended_storage_settings.azure_deadletter_bucket,
             indexing_bucket=extended_storage_settings.azure_indexing_bucket,

{nucliadb_utils-6.8.1.post4988.dist-info → nucliadb_utils-6.8.1.post5003.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb_utils
-Version: 6.8.1.post4988
+Version: 6.8.1.post5003
 Summary: NucliaDB util library
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: AGPL-3.0-or-later
@@ -27,8 +27,8 @@ Requires-Dist: nats-py[nkeys]>=2.6.0
 Requires-Dist: PyNaCl
 Requires-Dist: pyjwt>=2.4.0
 Requires-Dist: mrflagly>=0.2.9
-Requires-Dist: nucliadb-protos>=6.8.1.post4988
-Requires-Dist: nucliadb-telemetry>=6.8.1.post4988
+Requires-Dist: nucliadb-protos>=6.8.1.post5003
+Requires-Dist: nucliadb-telemetry>=6.8.1.post5003
 Provides-Extra: cache
 Requires-Dist: redis>=4.3.4; extra == "cache"
 Requires-Dist: orjson>=3.6.7; extra == "cache"

{nucliadb_utils-6.8.1.post4988.dist-info → nucliadb_utils-6.8.1.post5003.dist-info}/RECORD

@@ -11,11 +11,11 @@ nucliadb_utils/nats.py,sha256=U21Cfg36_IHd3ZLXEC4eZ7nZ1Soh_ZNFFwjryNyd2-8,15248
 nucliadb_utils/partition.py,sha256=jBgy4Hu5Iwn4gjbPPcthSykwf-qNx-GcLAIwbzPd1d0,1157
 nucliadb_utils/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucliadb_utils/run.py,sha256=Es0_Bu5Yc-LWczvwL6gzWqSwC85RjDCk-0oFQAJi9g4,1827
-nucliadb_utils/settings.py,sha256=lZUCliwNKYfk_Tt0KiYeHsT4jRBG0gLAompuHWu9fBI,8233
+nucliadb_utils/settings.py,sha256=H9yKrHPR5emTxai-D4owg4CjE4_-E0qR0HyuHERQNH4,8493
 nucliadb_utils/signals.py,sha256=lo_Mk12NIX5Au--3H3WObvDOXq_OMurql2qiC2TnAao,2676
 nucliadb_utils/store.py,sha256=kQ35HemE0v4_Qg6xVqNIJi8vSFAYQtwI3rDtMsNy62Y,890
 nucliadb_utils/transaction.py,sha256=l3ZvrITYMnAs_fv1OOC-1nDZxWPG5qmbBhzvuC3DUzQ,8039
-nucliadb_utils/utilities.py,sha256=C_qSKlCeCpi8wIWttjDp0TiQjSUUhd_yS08X5NuPbAs,15940
+nucliadb_utils/utilities.py,sha256=Q5sJmoX7JSnAId1BC9Lr3H9IQ85YmFwUMtw9Lco_brQ,16044
 nucliadb_utils/aiopynecone/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb_utils/aiopynecone/client.py,sha256=MPyHnDXwhukJr7U3CJh7BpsekfSuOkyM4g5b9LLtzc8,22941
 nucliadb_utils/aiopynecone/exceptions.py,sha256=fUErx3ceKQK1MUbOnYcZhIzpNe8UVAptZE9JIRDLXDE,4000
@@ -39,7 +39,7 @@ nucliadb_utils/nuclia_usage/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn
 nucliadb_utils/nuclia_usage/utils/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb_utils/nuclia_usage/utils/kb_usage_report.py,sha256=6lLuxCCPQVn3dOuZNL5ThPjl2yws-1TJ_7duhQSWkPU,3934
 nucliadb_utils/storages/__init__.py,sha256=5Qc8AUWiJv9_JbGCBpAn88AIJhwDlm0OPQpg2ZdRL4U,872
-nucliadb_utils/storages/azure.py,sha256=SdZnz4GEFyBftsdXk36iiUvj-EZiXQ6PeDbZadSVkTk,17484
+nucliadb_utils/storages/azure.py,sha256=pu0IyKPCn32oT0wI3oJIG6iUxnPtwNgg1zu00C8wDjo,18057
 nucliadb_utils/storages/exceptions.py,sha256=6YhFLf8k0ABy5AVfxIJUo7w6AK0SJjktiyQTwF3gCdg,2344
 nucliadb_utils/storages/gcs.py,sha256=VyT72My34N4pEMmrQc5wdAMNLiuqpYl8OW3d50cJfSA,28222
 nucliadb_utils/storages/local.py,sha256=2aCHpZymORG_dUc1FDq0VFcgQulu0w2pZiUaj9dphFs,11686
@@ -51,13 +51,13 @@ nucliadb_utils/storages/storage.py,sha256=aOJnx6-WX8U3AAqPL_sWPCghIzlr8e3GKGi8z3
 nucliadb_utils/storages/utils.py,sha256=F4Iboa_0_bhDQr-JOKD9sGPld_-hKwJW5ptyZdn9Oag,1505
 nucliadb_utils/tests/__init__.py,sha256=Oo9CAE7B0eW5VHn8sHd6o30SQzOWUhktLPRXdlDOleA,1456
 nucliadb_utils/tests/asyncbenchmark.py,sha256=vrX_x9ifCXi18PfNShc23w9x_VUiB_Ph-2nuolh9z3Q,10707
-nucliadb_utils/tests/azure.py,sha256=rBRnS0XWqoh7Qa31MmHIl-XM20FxuQGJDxLazqa64-8,4939
+nucliadb_utils/tests/azure.py,sha256=rt1KRSYZW1EYhKy4Q0i7IEL9vdoOU6BYw2__S51YfGg,5039
 nucliadb_utils/tests/fixtures.py,sha256=4lzz-khYvbGzdbT18IG6KKg40f7CVex2q3ho88I-jL8,3799
 nucliadb_utils/tests/gcs.py,sha256=JNqp5ymeNNU9Ci8rNYTh7-VqP4fjybElhyB3ap7EV1c,4721
 nucliadb_utils/tests/local.py,sha256=z9E11_ol1mu7N8Y6PkjKl-WMPPMl7JqQbDj3uhVa1A0,1933
 nucliadb_utils/tests/nats.py,sha256=RWHjwqq5esuO7OFbP24yYX1cXnpPLcWJwDUdmwCpH28,1897
 nucliadb_utils/tests/s3.py,sha256=kz9ULxrAYLVslZ59I8dtweZ9DJz5R8Ioy2XYrveZzHw,3829
-nucliadb_utils-6.8.1.post4988.dist-info/METADATA,sha256=Q5PjGgMffZkRik2I7cFt87yEfcmCu6xsb5utKTRO4fE,2180
-nucliadb_utils-6.8.1.post4988.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nucliadb_utils-6.8.1.post4988.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
-nucliadb_utils-6.8.1.post4988.dist-info/RECORD,,
+nucliadb_utils-6.8.1.post5003.dist-info/METADATA,sha256=Oi5iEbnWxJ0O1LvUaI4n79YZ5KHB8FfaLgCqqQ6eOPM,2180
+nucliadb_utils-6.8.1.post5003.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nucliadb_utils-6.8.1.post5003.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
+nucliadb_utils-6.8.1.post5003.dist-info/RECORD,,