nucliadb 6.3.1.post3590__py3-none-any.whl → 6.3.1.post3593__py3-none-any.whl

nucliadb/backups/create.py

@@ -170,7 +170,7 @@ async def backup_resource_with_binaries(
         """
         nonlocal total_size
 
-        for cloud_file in get_cloud_files(bm):
+        for index, cloud_file in enumerate(get_cloud_files(bm)):
             if not await exists_cf(context, cloud_file):
                 logger.warning(
                     "Cloud file not found in storage, skipping",
@@ -184,13 +184,13 @@ async def backup_resource_with_binaries(
                 yield serialized_cf
 
             async for chunk in to_tar(
-                name=f"cloud-files/{cloud_file.uri}", size=len(serialized_cf), chunks=cf_iterator()
+                name=f"cloud-files/{index}", size=len(serialized_cf), chunks=cf_iterator()
             ):
                 yield chunk
                 total_size += len(chunk)
 
             async for chunk in to_tar(
-                name=f"binaries/{cloud_file.uri}",
+                name=f"binaries/{index}",
                 size=cloud_file.size,
                 chunks=download_binary(context, cloud_file),
             ):

nucliadb/backups/restore.py

@@ -69,11 +69,11 @@ async def restore_kb(context: ApplicationContext, kbid: str, backup_id: str):
     await restore_resources(context, kbid, backup_id)
     await restore_labels(context, kbid, backup_id)
     await restore_entities(context, kbid, backup_id)
-    await delete_last_restored_resource_key(context, kbid, backup_id)
+    await delete_last_restored(context, kbid, backup_id)
 
 
 async def restore_resources(context: ApplicationContext, kbid: str, backup_id: str):
-    last_restored = await get_last_restored_resource_key(context, kbid, backup_id)
+    last_restored = await get_last_restored(context, kbid, backup_id)
     tasks = []
     async for object_info in context.blob_storage.iterate_objects(
         bucket=settings.backups_bucket,
@@ -86,16 +86,14 @@ async def restore_resources(context: ApplicationContext, kbid: str, backup_id: s
         if len(tasks) > settings.restore_resources_concurrency:
             await asyncio.gather(*tasks)
             tasks = []
-            await set_last_restored_resource_key(context, kbid, backup_id, key)
+            await set_last_restored(context, kbid, backup_id, key)
     if len(tasks) > 0:
         await asyncio.gather(*tasks)
         tasks = []
-        await set_last_restored_resource_key(context, kbid, backup_id, key)
+        await set_last_restored(context, kbid, backup_id, key)
 
 
-async def get_last_restored_resource_key(
-    context: ApplicationContext, kbid: str, backup_id: str
-) -> Optional[str]:
+async def get_last_restored(context: ApplicationContext, kbid: str, backup_id: str) -> Optional[str]:
     key = MaindbKeys.LAST_RESTORED.format(kbid=kbid, backup_id=backup_id)
     async with context.kv_driver.transaction(read_only=True) as txn:
         raw = await txn.get(key)
@@ -104,16 +102,14 @@ async def get_last_restored_resource_key(
         return raw.decode()
 
 
-async def set_last_restored_resource_key(
-    context: ApplicationContext, kbid: str, backup_id: str, resource_id: str
-):
+async def set_last_restored(context: ApplicationContext, kbid: str, backup_id: str, resource_id: str):
     key = MaindbKeys.LAST_RESTORED.format(kbid=kbid, backup_id=backup_id)
     async with context.kv_driver.transaction() as txn:
         await txn.set(key, resource_id.encode())
         await txn.commit()
 
 
-async def delete_last_restored_resource_key(context: ApplicationContext, kbid: str, backup_id: str):
+async def delete_last_restored(context: ApplicationContext, kbid: str, backup_id: str):
     key = MaindbKeys.LAST_RESTORED.format(kbid=kbid, backup_id=backup_id)
     async with context.kv_driver.transaction() as txn:
         await txn.delete(key)
@@ -134,6 +130,7 @@ class ResourceBackupReader:
     def __init__(self, download_stream: AsyncIterator[bytes]):
         self.download_stream = download_stream
         self.buffer = b""
+        self.cloud_files: dict[int, CloudFile] = {}
 
     async def read(self, size: int) -> bytes:
         while len(self.buffer) < size:
@@ -194,15 +191,18 @@ class ResourceBackupReader:
             bm.ParseFromString(raw_bm)
             return bm
         elif tarinfo.name.startswith("cloud-files"):
+            cf_index = int(tarinfo.name.split("cloud-files/")[-1])
             raw_cf = await self.read_data(tarinfo)
             cf = CloudFile()
             cf.ParseFromString(raw_cf)
+            self.cloud_files[cf_index] = cf
             return cf
         elif tarinfo.name.startswith("binaries"):
-            uri = tarinfo.name.lstrip("binaries/")
+            bin_index = int(tarinfo.name.split("binaries/")[-1])
             size = tarinfo.size
             download_stream = functools.partial(self.iter_data, size)
-            return CloudFileBinary(uri, download_stream)
+            cf = self.cloud_files[bin_index]
+            return CloudFileBinary(cf.uri, download_stream)
         else:  # pragma: no cover
             raise ValueError(f"Unknown tar entry: {tarinfo.name}")
 

{nucliadb-6.3.1.post3590.dist-info → nucliadb-6.3.1.post3593.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nucliadb
-Version: 6.3.1.post3590
+Version: 6.3.1.post3593
 Summary: NucliaDB
 Author-email: Nuclia <nucliadb@nuclia.com>
 License: AGPL
@@ -20,11 +20,11 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: nucliadb-telemetry[all]>=6.3.1.post3590
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.1.post3590
-Requires-Dist: nucliadb-protos>=6.3.1.post3590
-Requires-Dist: nucliadb-models>=6.3.1.post3590
-Requires-Dist: nidx-protos>=6.3.1.post3590
+Requires-Dist: nucliadb-telemetry[all]>=6.3.1.post3593
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.1.post3593
+Requires-Dist: nucliadb-protos>=6.3.1.post3593
+Requires-Dist: nucliadb-models>=6.3.1.post3593
+Requires-Dist: nidx-protos>=6.3.1.post3593
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.24.2
 Requires-Dist: uvicorn

{nucliadb-6.3.1.post3590.dist-info → nucliadb-6.3.1.post3593.dist-info}/RECORD

@@ -41,10 +41,10 @@ nucliadb/openapi.py,sha256=wDiw0dVEvTpJvbatkJ0JZLkKm9RItZT5PWRHjqRfqTA,2272
 nucliadb/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nucliadb/backups/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/backups/const.py,sha256=9vPAhLxQO_gNAjSdPxWuv3V66s9WcdpjOQ89CZlfmuk,1894
-nucliadb/backups/create.py,sha256=w6KpjkTOpIoPVrtOZrxB99oMdWp6jYkyIJ1-qo_k4Mw,11230
+nucliadb/backups/create.py,sha256=x5Ezd1p8qqlcn-srbE_iFxTwEEjycKWhTezUIkXL-oo,11230
 nucliadb/backups/delete.py,sha256=1rnBhVUGYYZJXSZUrrgYMDZ5NyswEWkIA-G-crRCyHk,2404
 nucliadb/backups/models.py,sha256=-hITU4Mv6AxePu12toBu_fjpEv6vVGcwNVxV22O9jQA,1273
-nucliadb/backups/restore.py,sha256=wepEgv4vBN5yeiZU-f17PbuFV4xT4_SVKplNr8xSJrE,10001
+nucliadb/backups/restore.py,sha256=BIsJPXDKIsobO0C2mX6g9WUysKAKpJ9RX-DrxqqZSnY,10123
 nucliadb/backups/settings.py,sha256=SyzsInj1BRbBI0atg5IXWbMbOZ_eVg4eSQ3IcnUhCxQ,1357
 nucliadb/backups/tasks.py,sha256=4_kOVJ2yCwMvDEpzJgTuTt75TNlpq5woyw9sTAcaSkw,4194
 nucliadb/backups/utils.py,sha256=_Vogjqcru5oqNZM-bZ0q7Ju79Bv1PD-LVFEa7Z-Q13I,1261
@@ -351,8 +351,8 @@ nucliadb/writer/tus/local.py,sha256=7jYa_w9b-N90jWgN2sQKkNcomqn6JMVBOVeDOVYJHto,
 nucliadb/writer/tus/s3.py,sha256=vF0NkFTXiXhXq3bCVXXVV-ED38ECVoUeeYViP8uMqcU,8357
 nucliadb/writer/tus/storage.py,sha256=ToqwjoYnjI4oIcwzkhha_MPxi-k4Jk3Lt55zRwaC1SM,2903
 nucliadb/writer/tus/utils.py,sha256=MSdVbRsRSZVdkaum69_0wku7X3p5wlZf4nr6E0GMKbw,2556
-nucliadb-6.3.1.post3590.dist-info/METADATA,sha256=cnyGLiXObJPzQkmY-I7Ilyq2TvPG9l48K1TrnPhqreQ,4291
-nucliadb-6.3.1.post3590.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-nucliadb-6.3.1.post3590.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.3.1.post3590.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.3.1.post3590.dist-info/RECORD,,
+nucliadb-6.3.1.post3593.dist-info/METADATA,sha256=jU-nHJGJbWgLgYiZlT1k8GatmOMazY89YO66_nL_N_k,4291
+nucliadb-6.3.1.post3593.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+nucliadb-6.3.1.post3593.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.3.1.post3593.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.3.1.post3593.dist-info/RECORD,,