backup proto renaming kb id (#2948)

nucliadb/src/nucliadb/backups/create.py

@@ -46,7 +46,7 @@
 
 
 async def backup_kb_task(context: ApplicationContext, msg: CreateBackupRequest):
-    kbid = msg.kbid
+    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/src/nucliadb/backups/models.py

@@ -23,12 +23,12 @@
 
 
 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/src/nucliadb/backups/restore.py

@@ -41,7 +41,7 @@
 
 
 async def restore_kb_task(context: ApplicationContext, msg: RestoreBackupRequest):
-    kbid = msg.kbid
+    kbid = msg.kb_id
     backup_id = msg.backup_id
 
     retry_handler = TaskRetryHandler(

nucliadb/src/nucliadb/backups/tasks.py

@@ -52,7 +52,7 @@ async def create(kbid: str, backup_id: str) -> None:
         msg_type=CreateBackupRequest,
     )
     msg = CreateBackupRequest(
-        kbid=kbid,
+        kb_id=kbid,
         backup_id=backup_id,
     )
     await producer.send(msg)
@@ -80,7 +80,7 @@ async def restore(kbid: str, backup_id: str) -> None:
         msg_type=RestoreBackupRequest,
     )
     msg = RestoreBackupRequest(
-        kbid=kbid,
+        kb_id=kbid,
         backup_id=backup_id,
     )
     await producer.send(msg)

nucliadb/src/nucliadb/ingest/service/writer.py

@@ -473,11 +473,11 @@ async def ReIndex(self, request: IndexResource, context=None) -> IndexStatus:  #
     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,15 +493,15 @@ async def DeleteBackup(
     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
             )
         if not await backup_utils.exists_backup(self.storage, request.backup_id):
             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/tests/nucliadb/integration/test_backups.py

@@ -189,7 +189,7 @@ async def test_backup_resumed(
 
     # Set the metadata as if the backup was interrupted right after exporting the first resource
     metadata = BackupMetadata(
-        kbid=src_kb, requested_at=datetime.now(), total_resources=len(rids), missing_resources=rids[1:]
+        kb_id=src_kb, requested_at=datetime.now(), total_resources=len(rids), missing_resources=rids[1:]
     )
     await set_metadata(context, src_kb, backup_id, metadata)
 

nucliadb_protos/backups.proto

@@ -8,7 +8,7 @@ import "google/protobuf/timestamp.proto";
 
 message CreateBackupRequest {
     string backup_id = 1;
-    string kbid = 2;
+    string kb_id = 2;
 }
 
 
@@ -24,7 +24,7 @@ message CreateBackupResponse {
 
 message DeleteBackupRequest {
     string backup_id = 1;
-    string kbid = 2;
+    string kb_id = 2;
 }
 
 
@@ -38,7 +38,7 @@ message DeleteBackupResponse {
 
 message RestoreBackupRequest {
     string backup_id = 1;
-    string kbid = 2;
+    string kb_id = 2;
 }
 
 
@@ -57,5 +57,5 @@ message BackupCreatedNotification {
     string backup_id = 2;
     string kb_id = 3;
     uint64 size = 4;
-    uint64 resources = 5;
+    uint32 resources = 5;
 }

nucliadb_protos/python/src/nucliadb_protos/backups_pb2.pyi

@@ -23,16 +23,16 @@ class CreateBackupRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     BACKUP_ID_FIELD_NUMBER: builtins.int
-    KBID_FIELD_NUMBER: builtins.int
+    KB_ID_FIELD_NUMBER: builtins.int
     backup_id: builtins.str
-    kbid: builtins.str
+    kb_id: builtins.str
     def __init__(
         self,
         *,
         backup_id: builtins.str = ...,
-        kbid: builtins.str = ...,
+        kb_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["backup_id", b"backup_id", "kbid", b"kbid"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["backup_id", b"backup_id", "kb_id", b"kb_id"]) -> None: ...
 
 global___CreateBackupRequest = CreateBackupRequest
 
@@ -71,16 +71,16 @@ class DeleteBackupRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     BACKUP_ID_FIELD_NUMBER: builtins.int
-    KBID_FIELD_NUMBER: builtins.int
+    KB_ID_FIELD_NUMBER: builtins.int
     backup_id: builtins.str
-    kbid: builtins.str
+    kb_id: builtins.str
     def __init__(
         self,
         *,
         backup_id: builtins.str = ...,
-        kbid: builtins.str = ...,
+        kb_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["backup_id", b"backup_id", "kbid", b"kbid"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["backup_id", b"backup_id", "kb_id", b"kb_id"]) -> None: ...
 
 global___DeleteBackupRequest = DeleteBackupRequest
 
@@ -117,16 +117,16 @@ class RestoreBackupRequest(google.protobuf.message.Message):
     DESCRIPTOR: google.protobuf.descriptor.Descriptor
 
     BACKUP_ID_FIELD_NUMBER: builtins.int
-    KBID_FIELD_NUMBER: builtins.int
+    KB_ID_FIELD_NUMBER: builtins.int
     backup_id: builtins.str
-    kbid: builtins.str
+    kb_id: builtins.str
     def __init__(
         self,
         *,
         backup_id: builtins.str = ...,
-        kbid: builtins.str = ...,
+        kb_id: builtins.str = ...,
     ) -> None: ...
-    def ClearField(self, field_name: typing.Literal["backup_id", b"backup_id", "kbid", b"kbid"]) -> None: ...
+    def ClearField(self, field_name: typing.Literal["backup_id", b"backup_id", "kb_id", b"kb_id"]) -> None: ...
 
 global___RestoreBackupRequest = RestoreBackupRequest