nucliadb 6.3.4.post3769__py3-none-any.whl → 6.3.4.post3785__py3-none-any.whl

nucliadb/ingest/orm/brain.py

@@ -236,8 +236,6 @@ class ResourceBrain:
         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}")
@@ -421,7 +419,6 @@ class ResourceBrain:
                     source=relationnodedocument,
                     to=relationnodeuser,
                 )
-                self.brain.relations.append(relation)
                 self.brain.field_relations["a/metadata"].relations.append(
                     IndexRelation(relation=relation)
                 )
@@ -437,12 +434,10 @@ class ResourceBrain:
                 source=relationnodedocument,
                 to=relation_node_label,
             )
-            self.brain.relations.append(relation)
             self.brain.field_relations["a/metadata"].relations.append(IndexRelation(relation=relation))
 
         # 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"])
             )
@@ -522,7 +517,6 @@ class ResourceBrain:
                 relation = Relation()
                 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
@@ -550,7 +544,6 @@ class ResourceBrain:
                 relation.CopyFrom(base_entity_relation)
                 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
@@ -570,7 +563,6 @@ class ResourceBrain:
                 relation.CopyFrom(base_entity_relation)
                 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(
@@ -627,7 +619,6 @@ class ResourceBrain:
                         source=relation_node_resource,
                         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:

nucliadb/search/search/find.py

@@ -153,9 +153,10 @@ async def _index_node_retrieval(
     search_results.shards = queried_shards
     search_results.autofilters = autofilters
 
+    ndb_time = metrics.elapsed("node_query") + metrics.elapsed("results_merge")
     if metrics.elapsed("node_query") > settings.slow_node_query_log_threshold:
         logger.warning(
-            "Slow node query",
+            "Slow nidx query",
             extra={
                 "kbid": kbid,
                 "user": x_nucliadb_user,
@@ -166,7 +167,7 @@ async def _index_node_retrieval(
                 "durations": metrics.steps(),
             },
         )
-    elif search_time > settings.slow_find_log_threshold:
+    elif ndb_time > settings.slow_find_log_threshold:
         logger.info(
             "Slow find query",
             extra={

nucliadb/search/search/merge.py

@@ -485,12 +485,17 @@ def _merge_relations_results(
         relations.entities[entry_point.value] = EntitySubgraph(related_to=[])
 
     for relation_response in relations_responses:
-        for relation in relation_response.subgraph.relations:
+        for index_relation in relation_response.subgraph.relations:
+            relation = index_relation.relation
             origin = relation.source
             destination = relation.to
             relation_type = RelationTypePbMap[relation.relation]  # type: ignore
             relation_label = relation.relation_label
             metadata = relation.metadata if relation.HasField("metadata") else None
+
+            if index_relation.resource_field_id is not None:
+                resource_id = index_relation.resource_field_id.split("/")[0]
+
             # If only_with_metadata is True, we check that metadata for the relation is not None
             # If only_agentic is True, we check that metadata for the relation is not None and that it has a data_augmentation_task_id
             # TODO: This is suboptimal, we should be able to filter this in the query to the index,
@@ -513,7 +518,7 @@ def _merge_relations_results(
                         relation_label=relation_label,
                         direction=RelationDirection.OUT,
                         metadata=from_proto.relation_metadata(metadata) if metadata else None,
-                        resource_id=relation.resource_id,
+                        resource_id=resource_id,
                     )
                 )
             elif destination.value in relations.entities:
@@ -526,7 +531,7 @@ def _merge_relations_results(
                         relation_label=relation_label,
                         direction=RelationDirection.IN,
                         metadata=from_proto.relation_metadata(metadata) if metadata else None,
-                        resource_id=relation.resource_id,
+                        resource_id=resource_id,
                     )
                 )
 

nucliadb/search/search/query_parser/parsers/graph.py

@@ -148,6 +148,9 @@ def _parse_path_query(expr: graph_requests.GraphPathQuery) -> nodereader_pb2.Gra
     elif isinstance(expr, graph_requests.Relation):
         _set_relation_to_pb(expr, pb.path.relation)
 
+    elif isinstance(expr, graph_requests.Generated):
+        _set_generated_to_pb(expr, pb)
+
     else:  # pragma: nocover
         # This is a trick so mypy generates an error if this branch can be reached,
         # that is, if we are missing some ifs
@@ -174,6 +177,9 @@ def _parse_node_query(expr: graph_requests.GraphNodesQuery) -> nodereader_pb2.Gr
         _set_node_to_pb(expr, pb.path.source)
         pb.path.undirected = True
 
+    elif isinstance(expr, graph_requests.Generated):
+        _set_generated_to_pb(expr, pb)
+
     else:  # pragma: nocover
         # This is a trick so mypy generates an error if this branch can be reached,
         # that is, if we are missing some ifs
@@ -201,6 +207,9 @@ def _parse_relation_query(
     elif isinstance(expr, graph_requests.Relation):
         _set_relation_to_pb(expr, pb.path.relation)
 
+    elif isinstance(expr, graph_requests.Generated):
+        _set_generated_to_pb(expr, pb)
+
     else:  # pragma: nocover
         # This is a trick so mypy generates an error if this branch can be reached,
         # that is, if we are missing some ifs
@@ -235,3 +244,23 @@ def _set_relation_to_pb(relation: graph_requests.GraphRelation, pb: nodereader_p
         pb.value = relation.label
     if relation.type is not None:
         pb.relation_type = RelationTypeMap[relation.type]
+
+
+def _set_generated_to_pb(generated: graph_requests.Generated, pb: nodereader_pb2.GraphQuery.PathQuery):
+    if generated.by == graph_requests.Generator.USER:
+        pb.facet.facet = "/g/u"
+
+    elif generated.by == graph_requests.Generator.PROCESSOR:
+        pb.bool_not.facet.facet = "/g"
+
+    elif generated.by == graph_requests.Generator.DATA_AUGMENTATION:
+        facet = "/g/da"
+        if generated.da_task is not None:
+            facet += f"/{generated.da_task}"
+
+        pb.facet.facet = facet
+
+    else:  # pragma: nocover
+        # This is a trick so mypy generates an error if this branch can be reached,
+        # that is, if we are missing some ifs
+        _a: int = "a"

nucliadb/writer/api/v1/services.py

@@ -180,9 +180,15 @@ async def set_labelset_endpoint(request: Request, kbid: str, labelset: str, item
 
     try:
         labelsets = await datamanagers.atomic.labelset.get_all(kbid=kbid)
-        labelset_titles = [ls.title.lower() for (k, ls) in labelsets.labelset.items() if k != labelset]
+        labelset_titles = {
+            ls.title.lower(): k for (k, ls) in labelsets.labelset.items() if k != labelset
+        }
         if item.title.lower() in labelset_titles:
-            raise HTTPException(status_code=422, detail="Duplicated labelset titles are not allowed")
+            conflict = labelset_titles[item.title.lower()]
+            raise HTTPException(
+                status_code=422,
+                detail=f"Duplicated labelset titles are not allowed. Labelset {conflict} has the same title",
+            )
 
         await set_labelset(kbid, labelset, item)
     except KnowledgeBoxNotFound:

{nucliadb-6.3.4.post3769.dist-info → nucliadb-6.3.4.post3785.dist-info}/METADATA

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

{nucliadb-6.3.4.post3769.dist-info → nucliadb-6.3.4.post3785.dist-info}/RECORD

@@ -139,7 +139,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=lvO6bF0usfbZ5T7bDPoVALfocvxTFrCE3YhQrz-d1q8,29831
+nucliadb/ingest/orm/brain.py,sha256=A8H1J7Bo95sNzDgYr0_UNoemQhWOFEFz9UlYfs6ug-8,29407
 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
@@ -226,13 +226,13 @@ nucliadb/search/search/cut.py,sha256=ytY0_GY7ocNjfxTb4aosxEp4ZfhQNDP--JkhEMGD298
 nucliadb/search/search/exceptions.py,sha256=klGLgAGGrXcSGix_W6418ZBMqDchAIGjN77ofkOScEI,1039
 nucliadb/search/search/fetch.py,sha256=XJHIFnZmXM_8Kb37lb4lg1GYG7cZ1plT-qAIb_QziX4,6184
 nucliadb/search/search/filters.py,sha256=1MkHlJjAQqoRCj7e5cEzK2HvBxGLE17I_omsjiklbtw,6476
-nucliadb/search/search/find.py,sha256=p7Odx3hjPwTsHEhQrVYsR_ufq0meMmCnQV0YihfOmlg,10237
+nucliadb/search/search/find.py,sha256=pjc-i55j_p_F1H0La4qc9slZSl_gICoFzl3fy6FLYTM,10314
 nucliadb/search/search/find_merge.py,sha256=3FnzKFEnVemg6FO_6zveulbAU7klvsiPEBvLrpBBMg8,17450
 nucliadb/search/search/graph_merge.py,sha256=OiUNiXOWwrUVKqStuRcoUJwvDbDYamqIgiAy_FwPdMI,3405
 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=aNjghwyQDuoIuddFt37_kHAUv4FDYgGtdP3dM1SBUWs,22966
+nucliadb/search/search/merge.py,sha256=bPO51Kc3Ec69UuCbF5ulokd02gWZhp7zlJSuMjGDo9Y,23141
 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
@@ -258,7 +258,7 @@ nucliadb/search/search/query_parser/old_filters.py,sha256=-zbfN-RsXoj_DRjh3Lfp-w
 nucliadb/search/search/query_parser/parsers/__init__.py,sha256=ySCNSdbesLXGZyR88919njulA6UE10_3PhqMG_Yj1o4,1034
 nucliadb/search/search/query_parser/parsers/catalog.py,sha256=XdBiTweGTQkj8m_V_i2xbwp7P5pPO8K1Tud692XKhMw,7149
 nucliadb/search/search/query_parser/parsers/find.py,sha256=q3wH_i0DGceeKckYEH3c5MqM5EvRiMCL7r-6nCAId9Q,4666
-nucliadb/search/search/query_parser/parsers/graph.py,sha256=SfbMV-H-oCqZraQIwD8n5Hqi9dwOlvqzh_I3aZAKatg,8369
+nucliadb/search/search/query_parser/parsers/graph.py,sha256=DlYZGqywJThx12Bm0NNhE3pahst3ZoOWj7lklbFDCgk,9336
 nucliadb/standalone/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/standalone/api_router.py,sha256=hgq9FXpihzgjHkwcVGfGCSwyXy67fqXTfLFHuINzIi0,5567
 nucliadb/standalone/app.py,sha256=mAApNK_iVsQgJyd-mtwCeZq5csSimwnXmlQGH9a70pE,5586
@@ -335,7 +335,7 @@ nucliadb/writer/api/v1/knowledgebox.py,sha256=MLeIuym4jPrJgfy1NTcN9CpUGwuBiqDHMc
 nucliadb/writer/api/v1/learning_config.py,sha256=CKBjqcbewkfPwGUPLDWzZSpro6XkmCaVppe5Qtpu5Go,3117
 nucliadb/writer/api/v1/resource.py,sha256=jV9HM-ID1PPYypfy4Sl4_9aSPF87v7gSJZUSzHjHcQ4,19740
 nucliadb/writer/api/v1/router.py,sha256=RjuoWLpZer6Kl2BW_wznpNo6XL3BOpdTGqXZCn3QrrQ,1034
-nucliadb/writer/api/v1/services.py,sha256=HLQW18AEC5zQp5azpeAtRi7ZTzQSwG6SbmkHlmjTIFA,13165
+nucliadb/writer/api/v1/services.py,sha256=3AUjk-SmvqJx76v7y89DZx6oyasojPliGYeniRQjpcU,13337
 nucliadb/writer/api/v1/slug.py,sha256=xlVBDBpRi9bNulpBHZwhyftVvulfE0zFm1XZIWl-AKY,2389
 nucliadb/writer/api/v1/transaction.py,sha256=d2Vbgnkk_-FLGSTt3vfldwiJIUf0XoyD0wP1jQNz_DY,2430
 nucliadb/writer/api/v1/upload.py,sha256=hLMHXSaqEOE-vjKjhIupgdx8klJc3mVQp_oMwx5N-7o,33800
@@ -354,8 +354,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.post3769.dist-info/METADATA,sha256=3yi784IVKCq1hDA5dt7jxVLfDJ6P8kCcGxL38k64JZ4,4291
-nucliadb-6.3.4.post3769.dist-info/WHEEL,sha256=L0N565qmK-3nM2eBoMNFszYJ_MTx03_tQ0CQu1bHLYo,91
-nucliadb-6.3.4.post3769.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.3.4.post3769.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.3.4.post3769.dist-info/RECORD,,
+nucliadb-6.3.4.post3785.dist-info/METADATA,sha256=4HSRfhdLXMRNJ7A-J_jKPIAamg8m_D6lFFhoOOdRDQc,4291
+nucliadb-6.3.4.post3785.dist-info/WHEEL,sha256=DK49LOLCYiurdXXOXwGJm6U4DkHkg4lcxjhqwRa0CP4,91
+nucliadb-6.3.4.post3785.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.3.4.post3785.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.3.4.post3785.dist-info/RECORD,,

{nucliadb-6.3.4.post3769.dist-info → nucliadb-6.3.4.post3785.dist-info}/WHEEL

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