nucliadb 6.3.4.post3686__py3-none-any.whl → 6.3.4.post3694__py3-none-any.whl

nucliadb/backups/restore.py

@@ -282,7 +282,11 @@ async def restore_search_configurations(context: ApplicationContext, kbid: str,
         bucket=settings.backups_bucket,
         key=StorageKeys.SEARCH_CONFIGURATIONS.format(backup_id=backup_id),
     )
-    as_dict: dict[str, dict[str, Any]] = json.loads(raw.getvalue())
+    value = raw.getvalue()
+    if not value:
+        # No search configurations to restore
+        return
+    as_dict: dict[str, Any] = json.loads(value)
     search_configurations: dict[str, SearchConfiguration] = {}
     for name, data in as_dict.items():
         config: SearchConfiguration = TypeAdapter(SearchConfiguration).validate_python(data)

nucliadb/ingest/orm/brain.py

@@ -30,6 +30,7 @@ from nucliadb_models.metadata import ResourceProcessingStatus
 from nucliadb_protos import utils_pb2
 from nucliadb_protos.noderesources_pb2 import IndexParagraph as BrainParagraph
 from nucliadb_protos.noderesources_pb2 import (
+    IndexRelation,
     ParagraphMetadata,
     Representation,
     ResourceID,
@@ -232,15 +233,22 @@ class ResourceBrain:
             full_field_id = ids.FieldId(rid=self.rid, type=field_type, key=field_name).full()
             self.brain.paragraphs_to_delete.append(full_field_id)
 
+        field_relations = self.brain.field_relations[field_key].relations
         for relations in metadata.metadata.relations:
             for relation in relations.relations:
                 self.brain.relations.append(relation)
 
+                index_relation = IndexRelation(relation=relation)
+                if relation.metadata.HasField("data_augmentation_task_id"):
+                    index_relation.facets.append(f"/g/da/{relation.metadata.data_augmentation_task_id}")
+                field_relations.append(index_relation)
+
     def delete_field(self, field_key: str):
         ftype, fkey = field_key.split("/")
         full_field_id = ids.FieldId(rid=self.rid, type=ftype, key=fkey).full()
         self.brain.paragraphs_to_delete.append(full_field_id)
         self.brain.sentences_to_delete.append(full_field_id)
+        self.brain.relation_fields_to_delete.append(field_key)
 
     def apply_field_vectors(
         self,
@@ -408,12 +416,14 @@ class ResourceBrain:
             # origin contributors
             for contrib in origin.colaborators:
                 relationnodeuser = RelationNode(value=contrib, ntype=RelationNode.NodeType.USER)
-                self.brain.relations.append(
-                    Relation(
-                        relation=Relation.COLAB,
-                        source=relationnodedocument,
-                        to=relationnodeuser,
-                    )
+                relation = Relation(
+                    relation=Relation.COLAB,
+                    source=relationnodedocument,
+                    to=relationnodeuser,
+                )
+                self.brain.relations.append(relation)
+                self.brain.field_relations["a/metadata"].relations.append(
+                    IndexRelation(relation=relation)
                 )
 
         # labels
@@ -422,16 +432,22 @@ class ResourceBrain:
                 value=f"{classification.labelset}/{classification.label}",
                 ntype=RelationNode.NodeType.LABEL,
             )
-            self.brain.relations.append(
-                Relation(
-                    relation=Relation.ABOUT,
-                    source=relationnodedocument,
-                    to=relation_node_label,
-                )
+            relation = Relation(
+                relation=Relation.ABOUT,
+                source=relationnodedocument,
+                to=relation_node_label,
             )
+            self.brain.relations.append(relation)
+            self.brain.field_relations["a/metadata"].relations.append(IndexRelation(relation=relation))
 
         # relations
-        self.brain.relations.extend(user_relations.relations)
+        for relation in user_relations.relations:
+            self.brain.relations.append(relation)
+            self.brain.field_relations["a/metadata"].relations.append(
+                IndexRelation(relation=relation, facets=["/g/u"])
+            )
+
+        self.brain.relation_fields_to_delete.append("a/metadata")
 
     def _set_resource_labels(self, basic: Basic, origin: Optional[Origin]):
         if origin is not None:
@@ -507,6 +523,7 @@ class ResourceBrain:
                 relation.CopyFrom(base_classification_relation)
                 relation.to.value = label
                 self.brain.relations.append(relation)
+                self.brain.field_relations[field_key].relations.append(IndexRelation(relation=relation))
 
         # Data Augmentation + Processor entities
         base_entity_relation = Relation(
@@ -534,6 +551,7 @@ class ResourceBrain:
                 relation.to.value = entity_text
                 relation.to.subtype = entity_label
                 self.brain.relations.append(relation)
+                self.brain.field_relations[field_key].relations.append(IndexRelation(relation=relation))
 
         # Legacy processor entities
         # TODO: Remove once processor doesn't use this anymore and remove the positions and ner fields from the message
@@ -553,6 +571,7 @@ class ResourceBrain:
                 relation.to.value = entity
                 relation.to.subtype = klass
                 self.brain.relations.append(relation)
+                self.brain.field_relations[field_key].relations.append(IndexRelation(relation=relation))
 
     def apply_field_labels(
         self,
@@ -609,6 +628,7 @@ class ResourceBrain:
                         to=relation_node_entity,
                     )
                     self.brain.relations.append(rel)
+                    self.brain.field_relations[field_key].relations.append(IndexRelation(relation=rel))
             for paragraph_annotation in basic_user_fieldmetadata.paragraphs:
                 for classification in paragraph_annotation.classifications:
                     if not classification.cancelled_by_user:

nucliadb/search/search/merge.py

@@ -488,7 +488,7 @@ def _merge_relations_results(
         for relation in relation_response.subgraph.relations:
             origin = relation.source
             destination = relation.to
-            relation_type = RelationTypePbMap[relation.relation]
+            relation_type = RelationTypePbMap[relation.relation]  # type: ignore
             relation_label = relation.relation_label
             metadata = relation.metadata if relation.HasField("metadata") else None
             # If only_with_metadata is True, we check that metadata for the relation is not None

{nucliadb-6.3.4.post3686.dist-info → nucliadb-6.3.4.post3694.dist-info}/METADATA

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

{nucliadb-6.3.4.post3686.dist-info → nucliadb-6.3.4.post3694.dist-info}/RECORD

@@ -45,7 +45,7 @@ nucliadb/backups/const.py,sha256=AaIsBB04WerR-V6t8NoCUScxO1ojMYJzfHgdkF2qh4M,201
 nucliadb/backups/create.py,sha256=D0MEpIYu74AhbZXeybinQo8cm_A2-T9JxDGLrp5lavA,12507
 nucliadb/backups/delete.py,sha256=AAs-WP-ujejj6c1LJgiMn7Ht67N_j0a1sKQlUepHpEA,2659
 nucliadb/backups/models.py,sha256=-hITU4Mv6AxePu12toBu_fjpEv6vVGcwNVxV22O9jQA,1273
-nucliadb/backups/restore.py,sha256=KAly9iTXUP32mFFnW6neJm7qyNSZJ7fO5LGbC46vSAM,11416
+nucliadb/backups/restore.py,sha256=Jzp4mrJon3EEl8sqr0KZ5bhlhDXwIYnRD9RsBAFyEyc,11502
 nucliadb/backups/settings.py,sha256=SyzsInj1BRbBI0atg5IXWbMbOZ_eVg4eSQ3IcnUhCxQ,1357
 nucliadb/backups/tasks.py,sha256=WkL1LgdYBHbV_A5ilyYv5p3zmXwxH68TDudytN5f7zk,4225
 nucliadb/backups/utils.py,sha256=_Vogjqcru5oqNZM-bZ0q7Ju79Bv1PD-LVFEa7Z-Q13I,1261
@@ -138,7 +138,7 @@ 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=JwHRneyE2sAo6PwYJnnyUMXKiGBWXLv4JI_aemodB3U,28479
+nucliadb/ingest/orm/brain.py,sha256=lvO6bF0usfbZ5T7bDPoVALfocvxTFrCE3YhQrz-d1q8,29831
 nucliadb/ingest/orm/broker_message.py,sha256=XWaiZgDOz94NPOPT-hqbRr5ZkpVimUw6PjUJNftfoVw,7514
 nucliadb/ingest/orm/entities.py,sha256=3_n6lKhBy2GsdmNmkh0_mvxP8md20OZsbtTNEmfJ8Hg,14888
 nucliadb/ingest/orm/exceptions.py,sha256=k4Esv4NtL4TrGTcsQpwrSfDhPQpiYcRbB1SpYmBX5MY,1432
@@ -231,7 +231,7 @@ nucliadb/search/search/graph_merge.py,sha256=OiUNiXOWwrUVKqStuRcoUJwvDbDYamqIgiA
 nucliadb/search/search/graph_strategy.py,sha256=gisL2GpbSIa_SucyOwEt7TWdqURyAQqxvD_-PkXQct8,32339
 nucliadb/search/search/hydrator.py,sha256=-R37gCrGxkyaiHQalnTWHNG_FCx11Zucd7qA1vQCxuw,6985
 nucliadb/search/search/ingestion_agents.py,sha256=NeJr4EEX-bvFFMGvXOOwLv8uU7NuQ-ntJnnrhnKfMzY,3174
-nucliadb/search/search/merge.py,sha256=aUn6f5XnwWzUFhVC6uBqHE8NKdlfgw_xcTo57rS23U8,22950
+nucliadb/search/search/merge.py,sha256=aNjghwyQDuoIuddFt37_kHAUv4FDYgGtdP3dM1SBUWs,22966
 nucliadb/search/search/metrics.py,sha256=GGGtXHLhK79_ESV277xkBVjcaMURXHCxYG0EdGamUd8,2886
 nucliadb/search/search/paragraphs.py,sha256=pNAEiYqJGGUVcEf7xf-PFMVqz0PX4Qb-WNG-_zPGN2o,7799
 nucliadb/search/search/pgcatalog.py,sha256=s_J98fsX_RuFXwpejpkGqG-tD9ELuzz4YQ6U3ew5h2g,9313
@@ -353,8 +353,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.4.post3686.dist-info/METADATA,sha256=cSrjjD1x_Ca774OeHXlnYuqpXYq9WX3NdCCRGvCREzc,4291
-nucliadb-6.3.4.post3686.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
-nucliadb-6.3.4.post3686.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.3.4.post3686.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.3.4.post3686.dist-info/RECORD,,
+nucliadb-6.3.4.post3694.dist-info/METADATA,sha256=yo17tzuCOWQgea8j1Eqbz0bxeZQ92VwtVowbvZAI7jM,4291
+nucliadb-6.3.4.post3694.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+nucliadb-6.3.4.post3694.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.3.4.post3694.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.3.4.post3694.dist-info/RECORD,,