nucliadb-utils 5.0.1.post1105__py3-none-any.whl → 5.0.1.post1114__py3-none-any.whl

nucliadb_utils/nats.py

@@ -74,6 +74,7 @@ class MessageProgressUpdater:
         try:
             await self._task
         except asyncio.CancelledError:  # pragma: no cover
+            logger.info("MessageProgressUpdater cancelled")
             pass
         except Exception as exc:  # pragma: no cover
             capture_exception(exc)

nucliadb_utils/storages/gcs.py

@@ -34,7 +34,6 @@ import aiohttp.client_exceptions
 import backoff
 import google.auth.transport.requests  # type: ignore
 import yarl
-from google.auth.exceptions import DefaultCredentialsError  # type: ignore
 from google.oauth2 import service_account  # type: ignore
 
 from nucliadb_protos.resources_pb2 import CloudFile
@@ -459,25 +458,12 @@ class GCSStorage(Storage):
         url: str = "https://www.googleapis.com",
         scopes: Optional[List[str]] = None,
     ):
-        if account_credentials is None:
-            self._json_credentials = None
-        elif isinstance(account_credentials, str) and account_credentials.strip() == "":
-            self._json_credentials = None
-        else:
+        if account_credentials is not None:
             self._json_credentials = json.loads(base64.b64decode(account_credentials))
-
-        if self._json_credentials is not None:
             self._credentials = service_account.Credentials.from_service_account_info(
                 self._json_credentials,
                 scopes=DEFAULT_SCOPES if scopes is None else scopes,
             )
-        else:
-            try:
-                self._credentials, self._project = google.auth.default()
-            except DefaultCredentialsError:
-                logger.warning("Setting up without credentials as couldn't find workload identity")
-                self._credentials = None
-
         self.source = CloudFile.GCS
         self.deadletter_bucket = deadletter_bucket
         self.indexing_bucket = indexing_bucket
@@ -487,15 +473,16 @@ class GCSStorage(Storage):
         # https://cloud.google.com/storage/docs/bucket-locations
         self._bucket_labels = labels or {}
         self._executor = executor
+        self._creation_access_token = datetime.now()
         self._upload_url = url + "/upload/storage/v1/b/{bucket}/o?uploadType=resumable"  # noqa
         self.object_base_url = url + "/storage/v1/b"
         self._client = None
 
     def _get_access_token(self):
-        if self._credentials.expired or self._credentials.valid is False:
-            request = google.auth.transport.requests.Request()
-            self._credentials.refresh(request)
-
+        if self._credentials.valid is False:
+            req = google.auth.transport.requests.Request()
+            self._credentials.refresh(req)
+            self._creation_access_token = datetime.now()
         return self._credentials.token
 
     @storage_ops_observer.wrap({"type": "initialize"})
@@ -565,9 +552,7 @@ class GCSStorage(Storage):
             raise AttributeError()
 
         headers = await self.get_access_headers()
-        # Using object access url instead of bucket access to avoid
-        # giving admin permission to the SA, needed to GET a bucket
-        url = f"{self.object_base_url}/{bucket_name}/o"
+        url = f"{self.object_base_url}/{bucket_name}?project={self._project}"
         async with self.session.get(
             url,
             headers=headers,

{nucliadb_utils-5.0.1.post1105.dist-info → nucliadb_utils-5.0.1.post1114.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nucliadb_utils
-Version: 5.0.1.post1105
+Version: 5.0.1.post1114
 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>=5.0.1.post1105
-Requires-Dist: nucliadb-telemetry>=5.0.1.post1105
+Requires-Dist: nucliadb-protos>=5.0.1.post1114
+Requires-Dist: nucliadb-telemetry>=5.0.1.post1114
 Provides-Extra: cache
 Requires-Dist: redis>=4.3.4; extra == "cache"
 Requires-Dist: orjson>=3.6.7; extra == "cache"

{nucliadb_utils-5.0.1.post1105.dist-info → nucliadb_utils-5.0.1.post1114.dist-info}/RECORD

@@ -8,7 +8,7 @@ nucliadb_utils/featureflagging.py,sha256=0nN3vmtaEs6rB2uFQn0kI88It9568gcZ0GWWeWI
 nucliadb_utils/grpc.py,sha256=apu0uePnkGHCAT7GRQ9YZfRYyFj26kJ440i8jitbM3U,3314
 nucliadb_utils/helpers.py,sha256=nPw8yod3hP-pxq80VF8QC36s7ygSg0dBUdfI-LatvCs,1600
 nucliadb_utils/indexing.py,sha256=Luaqcar3CySpdYOFp6Q9Fyr8ZYwhYhaKRHQ_VGL78f8,2318
-nucliadb_utils/nats.py,sha256=b7_ZqBTtacnfTeErfeozXTLXbTL27JwqF1-SUEe9VmM,8370
+nucliadb_utils/nats.py,sha256=prs98dIrGh2-WchQcRBloc5wYhpjEnB0VtCERPnoReg,8430
 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
@@ -47,7 +47,7 @@ nucliadb_utils/nuclia_usage/utils/kb_usage_report.py,sha256=lTr9CMBpdk34KtkH5K8v
 nucliadb_utils/storages/__init__.py,sha256=5Qc8AUWiJv9_JbGCBpAn88AIJhwDlm0OPQpg2ZdRL4U,872
 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=TQlPpg9HzfHbOu_iCLPUo9KAql1IIjWxJ9mVJ9_CrV8,27658
+nucliadb_utils/storages/gcs.py,sha256=k1WXZDBQXSizO_3kEJef7EmyInnASJsAy5VTtEw8ly4,27020
 nucliadb_utils/storages/local.py,sha256=NxC_nMBd38NDsR266DSgoBLdQlvUwf0_sd50r-BLI0E,10288
 nucliadb_utils/storages/nuclia.py,sha256=vEv94xAT7QM2g80S25QyrOw2pzvP2BAX-ADgZLtuCVc,2097
 nucliadb_utils/storages/object_store.py,sha256=Tw10GmpYfM5TMqJ3Tk9pLQ9wLMBk1-snL_m6uasiZDQ,4257
@@ -64,8 +64,8 @@ nucliadb_utils/tests/indexing.py,sha256=YW2QhkhO9Q_8A4kKWJaWSvXvyQ_AiAwY1VylcfVQ
 nucliadb_utils/tests/local.py,sha256=7nuP8EFUAiA8ZH50R1iPV9EUXBySQxOanVm3Zht_e0g,1835
 nucliadb_utils/tests/nats.py,sha256=xqpww4jZjTKY9oPGlJdDJG67L3FIBQsa9qDHxILR8r8,7687
 nucliadb_utils/tests/s3.py,sha256=IdMxK_cNdSHLvO1u8BwsKFzD87Hk1MVPDZ57zx6h-rA,3656
-nucliadb_utils-5.0.1.post1105.dist-info/METADATA,sha256=y9QyvD9UC_-nFbonzN0VXqeBjILdE2Qv5oD99unablE,2071
-nucliadb_utils-5.0.1.post1105.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-nucliadb_utils-5.0.1.post1105.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
-nucliadb_utils-5.0.1.post1105.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nucliadb_utils-5.0.1.post1105.dist-info/RECORD,,
+nucliadb_utils-5.0.1.post1114.dist-info/METADATA,sha256=w9SzKmmFle6yh9jsS6evLbMQ_9i74tGlyriqpdok3hs,2071
+nucliadb_utils-5.0.1.post1114.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+nucliadb_utils-5.0.1.post1114.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
+nucliadb_utils-5.0.1.post1114.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+nucliadb_utils-5.0.1.post1114.dist-info/RECORD,,