nucliadb 6.3.1.post3531__py3-none-any.whl → 6.3.1.post3546__py3-none-any.whl

nucliadb/backups/const.py

@@ -39,3 +39,11 @@ class StorageKeys:
 class BackupFinishedStream:
     name = "backups"
     subject = "backups.creation_finished"
+
+
+class BackupsNatsStream:
+    name = "ndb-backups"
+    stream_subjects = ["ndb-backups.>"]
+    create_subject = "ndb-backups.create"
+    delete_subject = "ndb-backups.delete"
+    restore_subject = "ndb-backups.restore"

nucliadb/backups/create.py

@@ -45,8 +45,8 @@ from nucliadb_utils.storages.storage import StorageField
 from nucliadb_utils.utilities import get_audit
 
 
-async def backup_kb_retried(context: ApplicationContext, msg: CreateBackupRequest):
-    kbid = msg.kbid
+async def backup_kb_task(context: ApplicationContext, msg: CreateBackupRequest):
+    kbid = msg.kb_id
     backup_id = msg.backup_id
 
     retry_handler = TaskRetryHandler(
@@ -79,7 +79,7 @@ async def backup_resources(context: ApplicationContext, kbid: str, backup_id: st
     metadata = await get_metadata(context, kbid, backup_id)
     if metadata is None:
         metadata = BackupMetadata(
-            kbid=kbid,
+            kb_id=kbid,
             requested_at=datetime.now(tz=timezone.utc),
         )
         async for rid in datamanagers.resources.iterate_resource_ids(kbid=kbid):

nucliadb/backups/delete.py

@@ -27,11 +27,14 @@ from nucliadb.backups.settings import settings
 from nucliadb.common.context import ApplicationContext
 
 
-async def delete_backup(context: ApplicationContext, msg: DeleteBackupRequest):
+async def delete_backup_task(context: ApplicationContext, msg: DeleteBackupRequest):
     """
     Deletes the backup files from the cloud storage.
     """
-    backup_id = msg.backup_id
+    await delete_backup(context, msg.backup_id)
+
+
+async def delete_backup(context: ApplicationContext, backup_id: str):
     while True:
         deleted = await delete_n(context, backup_id, n=1000)
         if deleted == 0:

nucliadb/backups/models.py

@@ -23,12 +23,12 @@ from pydantic import BaseModel
 
 
 class CreateBackupRequest(BaseModel):
-    kbid: str
+    kb_id: str
     backup_id: str
 
 
 class RestoreBackupRequest(BaseModel):
-    kbid: str
+    kb_id: str
     backup_id: str
 
 
@@ -37,7 +37,7 @@ class DeleteBackupRequest(BaseModel):
 
 
 class BackupMetadata(BaseModel):
-    kbid: str
+    kb_id: str
     requested_at: datetime
     total_resources: int = 0
     missing_resources: list[str] = []

nucliadb/backups/restore.py

@@ -40,8 +40,8 @@ from nucliadb_protos.resources_pb2 import CloudFile
 from nucliadb_protos.writer_pb2 import BrokerMessage
 
 
-async def restore_kb_retried(context: ApplicationContext, msg: RestoreBackupRequest):
-    kbid = msg.kbid
+async def restore_kb_task(context: ApplicationContext, msg: RestoreBackupRequest):
+    kbid = msg.kb_id
     backup_id = msg.backup_id
 
     retry_handler = TaskRetryHandler(
@@ -135,6 +135,8 @@ class ResourceBackupReader:
     async def read(self, size: int) -> bytes:
         while len(self.buffer) < size:
             chunk = await self.download_stream.__anext__()
+            if not chunk:
+                continue
             self.buffer += chunk
         result = self.buffer[:size]
         self.buffer = self.buffer[size:]

nucliadb/backups/tasks.py

@@ -19,10 +19,11 @@
 #
 from typing import Awaitable, Callable
 
-from nucliadb.backups.create import backup_kb_retried
+from nucliadb.backups.const import BackupsNatsStream
+from nucliadb.backups.create import backup_kb_task
 from nucliadb.backups.delete import delete_backup
 from nucliadb.backups.models import CreateBackupRequest, DeleteBackupRequest, RestoreBackupRequest
-from nucliadb.backups.restore import restore_kb_retried
+from nucliadb.backups.restore import restore_kb_task
 from nucliadb.common.context import ApplicationContext
 from nucliadb.tasks import create_consumer, create_producer
 from nucliadb.tasks.consumer import NatsTaskConsumer
@@ -32,10 +33,10 @@ from nucliadb.tasks.producer import NatsTaskProducer
 def creator_consumer() -> NatsTaskConsumer[CreateBackupRequest]:
     consumer: NatsTaskConsumer = create_consumer(
         name="backup_creator",
-        stream="backups",
-        stream_subjects=["backups.>"],
-        consumer_subject="backups.create",
-        callback=backup_kb_retried,
+        stream=BackupsNatsStream.name,
+        stream_subjects=BackupsNatsStream.stream_subjects,
+        consumer_subject=BackupsNatsStream.create_subject,
+        callback=backup_kb_task,
         msg_type=CreateBackupRequest,
         max_concurrent_messages=10,
     )
@@ -45,13 +46,13 @@ def creator_consumer() -> NatsTaskConsumer[CreateBackupRequest]:
 async def create(kbid: str, backup_id: str) -> None:
     producer: NatsTaskProducer[CreateBackupRequest] = create_producer(
         name="backup_creator",
-        stream="backups",
-        stream_subjects=["backups.>"],
-        producer_subject="backups.create",
+        stream=BackupsNatsStream.name,
+        stream_subjects=BackupsNatsStream.stream_subjects,
+        producer_subject=BackupsNatsStream.create_subject,
         msg_type=CreateBackupRequest,
     )
     msg = CreateBackupRequest(
-        kbid=kbid,
+        kb_id=kbid,
         backup_id=backup_id,
     )
     await producer.send(msg)
@@ -60,10 +61,10 @@ async def create(kbid: str, backup_id: str) -> None:
 def restorer_consumer() -> NatsTaskConsumer[RestoreBackupRequest]:
     consumer: NatsTaskConsumer = create_consumer(
         name="backup_restorer",
-        stream="backups",
-        stream_subjects=["backups.>"],
-        consumer_subject="backups.restore",
-        callback=restore_kb_retried,
+        stream=BackupsNatsStream.name,
+        stream_subjects=BackupsNatsStream.stream_subjects,
+        consumer_subject=BackupsNatsStream.restore_subject,
+        callback=restore_kb_task,
         msg_type=RestoreBackupRequest,
         max_concurrent_messages=10,
     )
@@ -73,13 +74,13 @@ def restorer_consumer() -> NatsTaskConsumer[RestoreBackupRequest]:
 async def restore(kbid: str, backup_id: str) -> None:
     producer: NatsTaskProducer[RestoreBackupRequest] = create_producer(
         name="backup_restorer",
-        stream="backups",
-        stream_subjects=["backups.>"],
-        producer_subject="backups.restore",
+        stream=BackupsNatsStream.name,
+        stream_subjects=BackupsNatsStream.stream_subjects,
+        producer_subject=BackupsNatsStream.restore_subject,
         msg_type=RestoreBackupRequest,
     )
     msg = RestoreBackupRequest(
-        kbid=kbid,
+        kb_id=kbid,
         backup_id=backup_id,
     )
     await producer.send(msg)
@@ -88,9 +89,9 @@ async def restore(kbid: str, backup_id: str) -> None:
 def deleter_consumer() -> NatsTaskConsumer[DeleteBackupRequest]:
     consumer: NatsTaskConsumer = create_consumer(
         name="backup_deleter",
-        stream="backups",
-        stream_subjects=["backups.>"],
-        consumer_subject="backups.delete",
+        stream=BackupsNatsStream.name,
+        stream_subjects=BackupsNatsStream.stream_subjects,
+        consumer_subject=BackupsNatsStream.delete_subject,
         callback=delete_backup,
         msg_type=DeleteBackupRequest,
         max_concurrent_messages=2,
@@ -101,9 +102,9 @@ def deleter_consumer() -> NatsTaskConsumer[DeleteBackupRequest]:
 async def delete(backup_id: str) -> None:
     producer: NatsTaskProducer[DeleteBackupRequest] = create_producer(
         name="backup_deleter",
-        stream="backups",
-        stream_subjects=["backups.>"],
-        producer_subject="backups.delete",
+        stream=BackupsNatsStream.name,
+        stream_subjects=BackupsNatsStream.stream_subjects,
+        producer_subject=BackupsNatsStream.delete_subject,
         msg_type=DeleteBackupRequest,
     )
     msg = DeleteBackupRequest(

nucliadb/ingest/service/writer.py

@@ -473,11 +473,11 @@ class WriterServicer(writer_pb2_grpc.WriterServicer):
     async def CreateBackup(
         self, request: backups_pb2.CreateBackupRequest, context=None
     ) -> backups_pb2.CreateBackupResponse:
-        if not await exists_kb(request.kbid):
+        if not await exists_kb(request.kb_id):
             return backups_pb2.CreateBackupResponse(
                 status=backups_pb2.CreateBackupResponse.Status.KB_NOT_FOUND
             )
-        await backup_tasks.create(request.kbid, request.backup_id)
+        await backup_tasks.create(request.kb_id, request.backup_id)
         return backups_pb2.CreateBackupResponse(status=backups_pb2.CreateBackupResponse.Status.OK)
 
     async def DeleteBackup(
@@ -493,7 +493,7 @@ class WriterServicer(writer_pb2_grpc.WriterServicer):
     async def RestoreBackup(
         self, request: backups_pb2.RestoreBackupRequest, context=None
     ) -> backups_pb2.RestoreBackupResponse:
-        if not await exists_kb(request.kbid):
+        if not await exists_kb(request.kb_id):
             return backups_pb2.RestoreBackupResponse(
                 status=backups_pb2.RestoreBackupResponse.Status.NOT_FOUND
             )
@@ -501,7 +501,7 @@ class WriterServicer(writer_pb2_grpc.WriterServicer):
             return backups_pb2.RestoreBackupResponse(
                 status=backups_pb2.RestoreBackupResponse.Status.NOT_FOUND
             )
-        await backup_tasks.restore(request.kbid, request.backup_id)
+        await backup_tasks.restore(request.kb_id, request.backup_id)
         return backups_pb2.RestoreBackupResponse(status=backups_pb2.RestoreBackupResponse.Status.OK)
 
 

{nucliadb-6.3.1.post3531.dist-info → nucliadb-6.3.1.post3546.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nucliadb
-Version: 6.3.1.post3531
+Version: 6.3.1.post3546
 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.post3531
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.1.post3531
-Requires-Dist: nucliadb-protos>=6.3.1.post3531
-Requires-Dist: nucliadb-models>=6.3.1.post3531
-Requires-Dist: nidx-protos>=6.3.1.post3531
+Requires-Dist: nucliadb-telemetry[all]>=6.3.1.post3546
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.1.post3546
+Requires-Dist: nucliadb-protos>=6.3.1.post3546
+Requires-Dist: nucliadb-models>=6.3.1.post3546
+Requires-Dist: nidx-protos>=6.3.1.post3546
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.24.2
 Requires-Dist: uvicorn

{nucliadb-6.3.1.post3531.dist-info → nucliadb-6.3.1.post3546.dist-info}/RECORD

@@ -40,13 +40,13 @@ nucliadb/metrics_exporter.py,sha256=6u0geEYFxgE5I2Fhl_sxsvGN-ZkaFZNGutSXwrzrsVs,
 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=obLwfu8V8YMDGl_80g_NmUJBpuYoBdvoUmeaMjZOW7U,1453
-nucliadb/backups/create.py,sha256=-keBfqaijp3D_SMTAyeKJnydX3ALP9gL0084tskJPjY,10443
-nucliadb/backups/delete.py,sha256=YMVH2msbr4N28mXWeSpX9wqDsbIxUz0no4XiCsrKSLA,2309
-nucliadb/backups/models.py,sha256=13-Z4p-Ypjdtg5NuDE2m-09CTdFYHh-W6U9FyWSEhPA,1270
-nucliadb/backups/restore.py,sha256=6sFYsotfD7MJbpNF7mwJ2bWnD12E_rcfu9s0eAc7-n4,9654
+nucliadb/backups/const.py,sha256=llb5TaC53Ce6BMmlPKPUrVhVGl7uQrqv_Vle-P4GET4,1673
+nucliadb/backups/create.py,sha256=AM_nC7TgHOX0EFGaTXClS28jBSK28fHrKNZi14z2wek,10442
+nucliadb/backups/delete.py,sha256=1rnBhVUGYYZJXSZUrrgYMDZ5NyswEWkIA-G-crRCyHk,2404
+nucliadb/backups/models.py,sha256=-hITU4Mv6AxePu12toBu_fjpEv6vVGcwNVxV22O9jQA,1273
+nucliadb/backups/restore.py,sha256=xhslVvTf4H8VmDucZpjrEFpKj6csPIWBadCPMVJYKQ8,9703
 nucliadb/backups/settings.py,sha256=SyzsInj1BRbBI0atg5IXWbMbOZ_eVg4eSQ3IcnUhCxQ,1357
-nucliadb/backups/tasks.py,sha256=JR_CClBEv8v5U26iEysV1OpwH22B9e45cBK4F1jFATk,4193
+nucliadb/backups/tasks.py,sha256=QgGDBBWsTpD-jLcrRP-C897Zo1qvc_ux1b4L-SlCnd8,4530
 nucliadb/backups/utils.py,sha256=ayDaxfWP5cPnAkQH-tF4M6cnowsPQgU2ljYz_iL1CbE,1249
 nucliadb/common/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/common/constants.py,sha256=QpigxJh_CtD85Evy0PtV5cVq6x0U_f9xfIcXz1ymkUg,869
@@ -154,7 +154,7 @@ nucliadb/ingest/orm/processor/processor.py,sha256=oaiZ9HUszhUbvNMCmDq5Xj_jtXiCDj
 nucliadb/ingest/orm/processor/sequence_manager.py,sha256=uqEphtI1Ir_yk9jRl2gPf7BlzzXWovbARY5MNZSBI_8,1704
 nucliadb/ingest/service/__init__.py,sha256=MME_G_ERxzJR6JW_hfE2qcfXpmpH1kdG-S0a-M0qRm8,2043
 nucliadb/ingest/service/exceptions.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
-nucliadb/ingest/service/writer.py,sha256=XISw3m5joj30gKe9CfpyybXMwgWOueAcgfiHRnX4Cqc,22311
+nucliadb/ingest/service/writer.py,sha256=8oHJru1Yc8e05MXKmdQMbcNOzLHFFbWmHlJXIMjJcnY,22315
 nucliadb/middleware/__init__.py,sha256=A8NBlBuEkunCFMKpR9gnfNELsVn0Plc55BIQMbWDM8Q,2202
 nucliadb/migrator/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/migrator/command.py,sha256=dKbJ1tAmP6X4lMVRSSlz351euaqs2wBPpOczLjATUes,2089
@@ -349,8 +349,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.post3531.dist-info/METADATA,sha256=zY1NCVHHOfsUDSbz6fhhBl5EaDh3maWjwJbUYQtOh1g,4291
-nucliadb-6.3.1.post3531.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-nucliadb-6.3.1.post3531.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.3.1.post3531.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.3.1.post3531.dist-info/RECORD,,
+nucliadb-6.3.1.post3546.dist-info/METADATA,sha256=DNgc6YIrIj8zGIewzwiHRTsrQL_kYcQVR8VddQdzKLw,4291
+nucliadb-6.3.1.post3546.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+nucliadb-6.3.1.post3546.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.3.1.post3546.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.3.1.post3546.dist-info/RECORD,,