nucliadb-utils 6.1.0.post2569__py3-none-any.whl → 6.1.0.post2574__py3-none-any.whl

nucliadb_utils/utilities.py

@@ -105,6 +105,13 @@ async def get_storage(
     if Utility.STORAGE in MAIN:
         return MAIN[Utility.STORAGE]
 
+    storage = await _create_storage(gcs_scopes=gcs_scopes)
+    set_utility(Utility.STORAGE, storage)
+
+    return MAIN[Utility.STORAGE]
+
+
+async def _create_storage(gcs_scopes: Optional[List[str]] = None) -> Storage:
     if storage_settings.file_backend == FileBackendConfig.AZURE:
         from nucliadb_utils.storages.azure import AzureStorage
 
@@ -118,7 +125,7 @@ async def get_storage(
 
         logger.info("Configuring Azure Storage")
         await azureutil.initialize()
-        set_utility(Utility.STORAGE, azureutil)
+        return azureutil
 
     elif storage_settings.file_backend == FileBackendConfig.S3:
         from nucliadb_utils.storages.s3 import S3Storage
@@ -136,9 +143,9 @@ async def get_storage(
             bucket=storage_settings.s3_bucket,
             bucket_tags=storage_settings.s3_bucket_tags,
         )
-        set_utility(Utility.STORAGE, s3util)
-        await s3util.initialize()
         logger.info("Configuring S3 Storage")
+        await s3util.initialize()
+        return s3util
 
     elif storage_settings.file_backend == FileBackendConfig.GCS:
         from nucliadb_utils.storages.gcs import GCSStorage
@@ -155,9 +162,9 @@ async def get_storage(
             labels=storage_settings.gcs_bucket_labels,
             scopes=gcs_scopes,
         )
-        set_utility(Utility.STORAGE, gcsutil)
-        await gcsutil.initialize()
         logger.info("Configuring GCS Storage")
+        await gcsutil.initialize()
+        return gcsutil
 
     elif storage_settings.file_backend == FileBackendConfig.LOCAL:
         if storage_settings.local_files is None:
@@ -168,14 +175,12 @@ async def get_storage(
             local_testing_files=storage_settings.local_files,
             indexing_bucket=storage_settings.local_indexing_bucket,
         )
-        set_utility(Utility.STORAGE, localutil)
-        await localutil.initialize()
         logger.info("Configuring Local Storage")
+        await localutil.initialize()
+        return localutil
     else:
         raise ConfigurationError("Invalid storage settings, please configure FILE_BACKEND")
 
-    return MAIN[Utility.STORAGE]
-
 
 async def teardown_storage():
     storage: Optional[Storage] = get_utility(Utility.STORAGE)

{nucliadb_utils-6.1.0.post2569.dist-info → nucliadb_utils-6.1.0.post2574.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nucliadb_utils
-Version: 6.1.0.post2569
+Version: 6.1.0.post2574
 Home-page: https://nuclia.com
 License: BSD
 Classifier: Development Status :: 4 - Beta
@@ -24,8 +24,8 @@ Requires-Dist: PyNaCl
 Requires-Dist: pyjwt>=2.4.0
 Requires-Dist: memorylru>=1.1.2
 Requires-Dist: mrflagly>=0.2.9
-Requires-Dist: nucliadb-protos>=6.1.0.post2569
-Requires-Dist: nucliadb-telemetry>=6.1.0.post2569
+Requires-Dist: nucliadb-protos>=6.1.0.post2574
+Requires-Dist: nucliadb-telemetry>=6.1.0.post2574
 Provides-Extra: cache
 Requires-Dist: redis>=4.3.4; extra == "cache"
 Requires-Dist: orjson>=3.6.7; extra == "cache"

{nucliadb_utils-6.1.0.post2569.dist-info → nucliadb_utils-6.1.0.post2574.dist-info}/RECORD

@@ -16,7 +16,7 @@ nucliadb_utils/settings.py,sha256=BOuYTh08cJe7UgBgU9ALHCJm6eDezbdPsdAXM4HGEgo,81
 nucliadb_utils/signals.py,sha256=JRNv2y9zLtBjOANBf7krGfDGfOc9qcoXZ6N1nKWS2FE,2674
 nucliadb_utils/store.py,sha256=kQ35HemE0v4_Qg6xVqNIJi8vSFAYQtwI3rDtMsNy62Y,890
 nucliadb_utils/transaction.py,sha256=GjM754TU9940pfQY3vxAQAYlQdBpqfwrO-_gYkSjWrI,7979
-nucliadb_utils/utilities.py,sha256=1C5o6WcOupoTfBRn6dgHc-XTZ2bsG397JVQCKy6swBo,15832
+nucliadb_utils/utilities.py,sha256=vO6NUQxFpljTo7y6TemoOewMsXLgKTJmVPTtCWnjsDk,15921
 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
@@ -59,8 +59,8 @@ nucliadb_utils/tests/indexing.py,sha256=YW2QhkhO9Q_8A4kKWJaWSvXvyQ_AiAwY1VylcfVQ
 nucliadb_utils/tests/local.py,sha256=fXIBasrvdaFJM-sw2wk1_oiFzBcm9O10iCyC-OiXwY8,1914
 nucliadb_utils/tests/nats.py,sha256=xqpww4jZjTKY9oPGlJdDJG67L3FIBQsa9qDHxILR8r8,7687
 nucliadb_utils/tests/s3.py,sha256=pl-RJFjA4MH6iXkqhsh5g8gDuEhrYu1nPZ-laxlrMlE,3704
-nucliadb_utils-6.1.0.post2569.dist-info/METADATA,sha256=T1xbEoRg1HejRErLhiNADWFkcmKImEwp3-W4S8RWDCY,2055
-nucliadb_utils-6.1.0.post2569.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-nucliadb_utils-6.1.0.post2569.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
-nucliadb_utils-6.1.0.post2569.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nucliadb_utils-6.1.0.post2569.dist-info/RECORD,,
+nucliadb_utils-6.1.0.post2574.dist-info/METADATA,sha256=zMBg9P6lJzmDHZkDXp5GuZnthmHfi-hqCHfIYfIKQ3k,2055
+nucliadb_utils-6.1.0.post2574.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+nucliadb_utils-6.1.0.post2574.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
+nucliadb_utils-6.1.0.post2574.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+nucliadb_utils-6.1.0.post2574.dist-info/RECORD,,