nucliadb 6.3.1.post3560__py3-none-any.whl → 6.3.1.post3570__py3-none-any.whl

nucliadb/ingest/orm/brain.py

@@ -45,6 +45,7 @@ from nucliadb_protos.resources_pb2 import (
     Metadata,
     Origin,
     Paragraph,
+    Relations,
     UserFieldMetadata,
     UserMetadata,
 )
@@ -375,10 +376,10 @@ class ResourceBrain:
             return "EMPTY"
         return METADATA_STATUS_PB_TYPE_TO_NAME_MAP[metadata.status]
 
-    def set_resource_metadata(self, basic: Basic, origin: Optional[Origin]):
+    def set_resource_metadata(self, basic: Basic, origin: Optional[Origin], user_relations: Relations):
         self._set_resource_dates(basic, origin)
         self._set_resource_labels(basic, origin)
-        self._set_resource_relations(basic, origin)
+        self._set_resource_relations(basic, origin, user_relations)
 
     def _set_resource_dates(self, basic: Basic, origin: Optional[Origin]):
         if basic.created.seconds > 0:
@@ -401,7 +402,7 @@ class ResourceBrain:
             if origin.HasField("modified") and origin.modified.seconds > 0:
                 self.brain.metadata.modified.CopyFrom(origin.modified)
 
-    def _set_resource_relations(self, basic: Basic, origin: Optional[Origin]):
+    def _set_resource_relations(self, basic: Basic, origin: Optional[Origin], user_relations: Relations):
         relationnodedocument = RelationNode(value=self.rid, ntype=RelationNode.NodeType.RESOURCE)
         if origin is not None:
             # origin contributors
@@ -430,7 +431,7 @@ class ResourceBrain:
             )
 
         # relations
-        self.brain.relations.extend(basic.usermetadata.relations)
+        self.brain.relations.extend(user_relations.relations)
 
     def _set_resource_labels(self, basic: Basic, origin: Optional[Origin]):
         if origin is not None:

nucliadb/ingest/orm/processor/processor.py

@@ -577,6 +577,9 @@ class Processor:
         if message.HasField("security"):
             await resource.set_security(message.security)
 
+        if message.HasField("user_relations"):
+            await resource.set_user_relations(message.user_relations)
+
         await resource.apply_fields(message)
         await resource.apply_extracted(message)
 

nucliadb/ingest/orm/resource.py

@@ -129,6 +129,7 @@ class Resource:
         self.basic = basic
         self.disable_vectors = disable_vectors
         self._previous_status: Optional[Metadata.Status.ValueType] = None
+        self.user_relations: Optional[PBRelations] = None
 
     @property
     def indexer(self) -> ResourceBrain:
@@ -301,6 +302,23 @@ class Resource:
         self.modified = True
         self.relations = relations
 
+    async def get_user_relations(self) -> PBRelations:
+        if self.user_relations is None:
+            sf = self.storage.user_relations(self.kb.kbid, self.uuid)
+            relations = await self.storage.download_pb(sf, PBRelations)
+            if relations is None:
+                # Key not found = no relations
+                self.user_relations = PBRelations()
+            else:
+                self.user_relations = relations
+        return self.user_relations
+
+    async def set_user_relations(self, payload: PBRelations):
+        sf = self.storage.user_relations(self.kb.kbid, self.uuid)
+        await self.storage.upload_pb(sf, payload)
+        self.modified = True
+        self.user_relations = payload
+
     @processor_observer.wrap({"type": "generate_index_message"})
     async def generate_index_message(self, reindex: bool = False) -> ResourceBrain:
         brain = ResourceBrain(rid=self.uuid)
@@ -930,11 +948,12 @@ class Resource:
     async def compute_global_tags(self, brain: ResourceBrain):
         origin = await self.get_origin()
         basic = await self.get_basic()
+        user_relations = await self.get_user_relations()
         if basic is None:
             raise KeyError("Resource not found")
 
         brain.set_processing_status(basic=basic, previous_status=self._previous_status)
-        brain.set_resource_metadata(basic=basic, origin=origin)
+        brain.set_resource_metadata(basic=basic, origin=origin, user_relations=user_relations)
         for type, field in await self.get_fields_ids(force=True):
             fieldobj = await self.get_field(field, type, load=False)
             fieldid = FieldID(field_type=type, field=field)

nucliadb/ingest/serialize.py

@@ -227,6 +227,12 @@ async def managed_serialize(
             )
             resource.queue = QueueType[orm_resource.basic.QueueType.Name(orm_resource.basic.queue)]
 
+            if ResourceProperties.RELATIONS in show:
+                relations = await orm_resource.get_user_relations()
+                resource.usermetadata.relations = [
+                    from_proto.relation(rel) for rel in relations.relations
+                ]
+
     if ResourceProperties.RELATIONS in show:
         await orm_resource.get_relations()
         if orm_resource.relations is not None:

nucliadb/writer/resource/basic.py

@@ -195,8 +195,8 @@ def parse_basic_modify(bm: BrokerMessage, item: ComingResourcePayload, toprocess
 
         # protobuferrs repeated fields don't support assignment so
         # in order to replace relations, we need to clear them first
-        bm.basic.usermetadata.ClearField("relations")
-        bm.basic.usermetadata.relations.extend(relations)
+        bm.user_relations.ClearField("relations")
+        bm.user_relations.relations.extend(relations)
 
     if item.security is not None:
         unique_groups = list(set(item.security.access_groups))

{nucliadb-6.3.1.post3560.dist-info → nucliadb-6.3.1.post3570.dist-info}/METADATA

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

{nucliadb-6.3.1.post3560.dist-info → nucliadb-6.3.1.post3570.dist-info}/RECORD

@@ -115,7 +115,7 @@ nucliadb/ingest/app.py,sha256=rX1KE5vsAzG9hlArBk8WE2SOlvdYylcb-jNkMQNPJdQ,7407
 nucliadb/ingest/partitions.py,sha256=2NIhMYbNT0TNBL6bX1UMSi7vxFGICstCKEqsB0TXHOE,2410
 nucliadb/ingest/processing.py,sha256=8OggvuxNzktTTKDTUwsIuazhDParEWhn46CBZaMYAy8,20659
 nucliadb/ingest/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nucliadb/ingest/serialize.py,sha256=pTXpfoADsKax2gF5Xw5XAmn0ygRGxSC9vETv9y8xVH0,16147
+nucliadb/ingest/serialize.py,sha256=42zNKu-O6g9EmLnQOXwhfagD76FSmWD6xRf69LrJxfA,16415
 nucliadb/ingest/settings.py,sha256=0B-wQNa8FLqtNcQgRzh-fuIuGptM816XHcbH1NQKfmE,3050
 nucliadb/ingest/utils.py,sha256=l1myURu3r8oA11dx3GpHw-gNTUc1AFX8xdPm9Lgl2rA,2275
 nucliadb/ingest/consumer/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
@@ -136,19 +136,19 @@ nucliadb/ingest/fields/generic.py,sha256=elgtqv15aJUq3zY7X_g0bli_2BpcwPArVvzhe54
 nucliadb/ingest/fields/link.py,sha256=kN_gjRUEEj5cy8K_BwPijYg3TiWhedc24apXYlTbRJs,4172
 nucliadb/ingest/fields/text.py,sha256=tFvSQJAe0W7ePpp2_WDfLiE2yglR1OTU0Zht9acvOFw,1594
 nucliadb/ingest/orm/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
-nucliadb/ingest/orm/brain.py,sha256=UND5EsNUdd7XdjScYqRqg4r_xCx3l-My8alGw5M9CWg,28398
+nucliadb/ingest/orm/brain.py,sha256=JwHRneyE2sAo6PwYJnnyUMXKiGBWXLv4JI_aemodB3U,28479
 nucliadb/ingest/orm/broker_message.py,sha256=ZEMueoGuuRKO4tHgzc0P0AM1Ls1TTYey_4UvRQf0BpY,6915
 nucliadb/ingest/orm/entities.py,sha256=3_n6lKhBy2GsdmNmkh0_mvxP8md20OZsbtTNEmfJ8Hg,14888
 nucliadb/ingest/orm/exceptions.py,sha256=k4Esv4NtL4TrGTcsQpwrSfDhPQpiYcRbB1SpYmBX5MY,1432
 nucliadb/ingest/orm/knowledgebox.py,sha256=IGOPvBR1qXqDxE5DeiOdYCLdPgjzOVVpsASJ2zYvWwQ,23651
 nucliadb/ingest/orm/metrics.py,sha256=OkwMSPKLZcKba0ZTwtTiIxwBgaLMX5ydhGieKvi2y7E,1096
-nucliadb/ingest/orm/resource.py,sha256=t2raRJpkJb5O8K4UhQdfyHx2e4JagcHS0eZqHV-a0io,44625
+nucliadb/ingest/orm/resource.py,sha256=waSV2GWJ_o9gzBObY8JNCR5mVJmWCJ1oQOGUsY1AVTQ,45489
 nucliadb/ingest/orm/utils.py,sha256=vCe_9UxHu26JDFGLwQ0wH-XyzJIpQCTK-Ow9dtZR5Vg,2716
 nucliadb/ingest/orm/processor/__init__.py,sha256=Aqd9wCNTvggkMkCY3WvoI8spdr94Jnqk-0iq9XpLs18,922
 nucliadb/ingest/orm/processor/auditing.py,sha256=TeYhXGJRyQ7ROytbb2u8R0fIh_FYi3HgTu3S1ribY3U,4623
 nucliadb/ingest/orm/processor/data_augmentation.py,sha256=HpSU9olDHcTfECDYCsmm4yA-Hu0mBrd_zTtx50XDGFE,5164
 nucliadb/ingest/orm/processor/pgcatalog.py,sha256=f32PIEXWktWzGDws6Ffife37OAfrseP5IOti_Cb4ir8,3012
-nucliadb/ingest/orm/processor/processor.py,sha256=oaiZ9HUszhUbvNMCmDq5Xj_jtXiCDjMEyw2GqqQxFdY,31550
+nucliadb/ingest/orm/processor/processor.py,sha256=wjZmfJumypdGoKVB0BEJ51ha3xNRs1CzDZbFGj7z4_8,31668
 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
@@ -335,7 +335,7 @@ nucliadb/writer/api/v1/upload.py,sha256=VOeqNTrZx1_z8iaKjM7p8fVlVcIYMtnQNK1dm72c
 nucliadb/writer/api/v1/vectorsets.py,sha256=mESaXkkI9f-jWWMW61ZZgv7E5YWXKemyc6vwT0lFXns,6747
 nucliadb/writer/resource/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/writer/resource/audit.py,sha256=FvxMZPzrNHtd31HgpZEvxzwAkbxJTZRhPLqRYYJi3tA,1426
-nucliadb/writer/resource/basic.py,sha256=wo5VDyp9VBekoJaQAbhE7uPFkpB5auAoRnsdrh3Ny3s,11222
+nucliadb/writer/resource/basic.py,sha256=cHhh5hQRHFIoKd-6fEteHuGWW6fGN56ornIWPBuSpHg,11214
 nucliadb/writer/resource/field.py,sha256=HsOERELyAsb9e0dx2IkSQ9lk0SThALFRcDKCVBw8ifU,15478
 nucliadb/writer/resource/origin.py,sha256=pvhUDdU0mlWPUcpoQi4LDUJaRtfjzVVrA8XcGVI_N8k,2021
 nucliadb/writer/tus/__init__.py,sha256=huWpKnDnjsrKlBBJk30ta5vamlA-4x0TbPs_2Up8hyM,5443
@@ -347,8 +347,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.post3560.dist-info/METADATA,sha256=xRmPeYhCFeFqvdPnWCIqn232dIiuJleIE7T6YZqbTPE,4291
-nucliadb-6.3.1.post3560.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-nucliadb-6.3.1.post3560.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.3.1.post3560.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.3.1.post3560.dist-info/RECORD,,
+nucliadb-6.3.1.post3570.dist-info/METADATA,sha256=a5FFqexlq9oEflkrfSYCAW8j3sV62OJnY1LCgPtpbJg,4291
+nucliadb-6.3.1.post3570.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
+nucliadb-6.3.1.post3570.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.3.1.post3570.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.3.1.post3570.dist-info/RECORD,,

{nucliadb-6.3.1.post3560.dist-info → nucliadb-6.3.1.post3570.dist-info}/WHEEL

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