nucliadb-utils 6.3.0.post3402__py3-none-any.whl → 6.3.0.post3415__py3-none-any.whl

nucliadb_utils/storages/storage.py

@@ -441,23 +441,9 @@ class Storage(abc.ABC, metaclass=abc.ABCMeta):
         return result
 
     async def downloadbytescf(self, cf: CloudFile) -> BytesIO:  # pragma: no cover
-        # this is covered by other tests
         result = BytesIO()
-        if cf.source == self.source:
-            async for data in self.download(cf.bucket_name, cf.uri):
-                if data is not None:
-                    result.write(data)
-        elif cf.source == CloudFile.FLAPS:
-            flaps_storage = await get_nuclia_storage()
-            async for data in flaps_storage.download(cf):
-                if data is not None:
-                    result.write(data)
-        elif cf.source == CloudFile.LOCAL:
-            local_storage = get_local_storage()
-            async for data in local_storage.download(cf.bucket_name, cf.uri):
-                if data is not None:
-                    result.write(data)
-
+        async for data in self.downloadbytescf_iterator(cf):
+            result.write(data)
         result.seek(0)
         return result
 
@@ -499,6 +485,16 @@ class Storage(abc.ABC, metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def get_bucket_name(self, kbid: str) -> str: ...
 
+    def get_bucket_name_from_cf(self, cf: CloudFile) -> str:
+        """
+        We need this because some CloudFile objects have the `bucket_name` attribute pointing to old/incorrect bucket names.
+        Doing a migration is not feasible, so we need to dynamically get the bucket name from the uri.
+        We assume that all uris have the following prefix:
+            kbs/{kbid}/...
+        """
+        kbid = cf.uri.split("/")[1]
+        return self.get_bucket_name(kbid)
+
     @abc.abstractmethod
     async def initialize(self) -> None: ...
 

{nucliadb_utils-6.3.0.post3402.dist-info → nucliadb_utils-6.3.0.post3415.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nucliadb_utils
-Version: 6.3.0.post3402
+Version: 6.3.0.post3415
 Summary: NucliaDB util library
 Author-email: Nuclia <nucliadb@nuclia.com>
 License: AGPL
@@ -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.3.0.post3402
-Requires-Dist: nucliadb-telemetry>=6.3.0.post3402
+Requires-Dist: nucliadb-protos>=6.3.0.post3415
+Requires-Dist: nucliadb-telemetry>=6.3.0.post3415
 Provides-Extra: cache
 Requires-Dist: redis>=4.3.4; extra == "cache"
 Requires-Dist: orjson>=3.6.7; extra == "cache"

{nucliadb_utils-6.3.0.post3402.dist-info → nucliadb_utils-6.3.0.post3415.dist-info}/RECORD

@@ -47,7 +47,7 @@ nucliadb_utils/storages/nuclia.py,sha256=vEv94xAT7QM2g80S25QyrOw2pzvP2BAX-ADgZLt
 nucliadb_utils/storages/object_store.py,sha256=HtKjIKhErSBvuqx1SuCOnL0SkiHqgfyekNMP8o2piZU,4492
 nucliadb_utils/storages/s3.py,sha256=pgakBqBLfDAFbdjwwX6u19QTv7gQYZ82Pjw67Yi6ob8,20895
 nucliadb_utils/storages/settings.py,sha256=ugCPy1zxBOmA2KosT-4tsjpvP002kg5iQyi42yCGCJA,1285
-nucliadb_utils/storages/storage.py,sha256=15AqJKnFbDVrPAStJNJtRmqc0jpANvDUS2R83Hifuxk,21266
+nucliadb_utils/storages/storage.py,sha256=1LSaZKQ4xSoBP85OVATh7zBZdBQ369Wl1uYBymZPfPw,21135
 nucliadb_utils/storages/utils.py,sha256=8g2rIwJeYIumQLOB47Yw1rx3twlhRB_cJxer65QfZmk,1479
 nucliadb_utils/tests/__init__.py,sha256=Oo9CAE7B0eW5VHn8sHd6o30SQzOWUhktLPRXdlDOleA,1456
 nucliadb_utils/tests/asyncbenchmark.py,sha256=vrX_x9ifCXi18PfNShc23w9x_VUiB_Ph-2nuolh9z3Q,10707
@@ -57,7 +57,7 @@ nucliadb_utils/tests/gcs.py,sha256=KW_DLet1WRlssSW55eI-IQ-0d94Jo2Oh7Di4xGv4JCc,4
 nucliadb_utils/tests/local.py,sha256=fXIBasrvdaFJM-sw2wk1_oiFzBcm9O10iCyC-OiXwY8,1914
 nucliadb_utils/tests/nats.py,sha256=RWHjwqq5esuO7OFbP24yYX1cXnpPLcWJwDUdmwCpH28,1897
 nucliadb_utils/tests/s3.py,sha256=pl-RJFjA4MH6iXkqhsh5g8gDuEhrYu1nPZ-laxlrMlE,3704
-nucliadb_utils-6.3.0.post3402.dist-info/METADATA,sha256=xXMgXcXJ7FeNzxl2_j49Lny3N4F1xYOvtk8Sl5rlJ_g,2209
-nucliadb_utils-6.3.0.post3402.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-nucliadb_utils-6.3.0.post3402.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
-nucliadb_utils-6.3.0.post3402.dist-info/RECORD,,
+nucliadb_utils-6.3.0.post3415.dist-info/METADATA,sha256=_90TfyuJMzVekA2bHqXUB_RmBzCO7f8m6D7NpL95e_E,2209
+nucliadb_utils-6.3.0.post3415.dist-info/WHEEL,sha256=nn6H5-ilmfVryoAQl3ZQ2l8SH5imPWFpm1A5FgEuFV4,91
+nucliadb_utils-6.3.0.post3415.dist-info/top_level.txt,sha256=fE3vJtALTfgh7bcAWcNhcfXkNPp_eVVpbKK-2IYua3E,15
+nucliadb_utils-6.3.0.post3415.dist-info/RECORD,,

{nucliadb_utils-6.3.0.post3402.dist-info → nucliadb_utils-6.3.0.post3415.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (75.8.1)
 Root-Is-Purelib: true
 Tag: py3-none-any