nidx-binding 6.3.4.post104__tar.gz → 6.3.4.post123__tar.gz

{nidx_binding-6.3.4.post104 → nidx_binding-6.3.4.post123}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.3.4.post104
+Version: 6.3.4.post123
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.3.4.post104 → nidx_binding-6.3.4.post123}/nidx_protos/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "nidx_protos"
-version = "6.3.4.post104"
+version = "6.3.4.post123"
 license = { text = "AGPL" }
 description = "Protobuf definitions for nucliadb/nidx"
 authors = [ { name = "Nuclia", email = "nucliadb@nuclia.com" }]

{nidx_binding-6.3.4.post104 → nidx_binding-6.3.4.post123}/nidx_relation/src/graph_query_parser.rs

@@ -18,6 +18,7 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 use anyhow::anyhow;
+use nidx_protos::relation::RelationType;
 use nidx_protos::relation_node::NodeType;
 use nidx_types::query_language::{BooleanExpression, BooleanOperation, Operator};
 use tantivy::query::{AllQuery, BooleanQuery, FuzzyTermQuery, Occur, Query, TermQuery};
@@ -51,6 +52,7 @@ pub struct Node {
 #[derive(Default, Clone)]
 pub struct Relation {
     pub value: Option<String>,
+    pub relation_type: Option<RelationType>,
 }
 
 // Generic (simple) boolean expression for graph querying
@@ -393,16 +395,28 @@ impl GraphQueryParser {
         let mut subqueries = vec![];
 
         match expression {
-            Expression::Value(Relation { value: None }) => {}
-            Expression::Value(Relation { value: Some(value) }) if value.is_empty() => {}
-            Expression::Value(Relation { value: Some(value) }) => {
-                subqueries.push((Occur::Must, self.has_relation_label(value)));
+            Expression::Value(Relation { value, relation_type }) => {
+                value.as_ref().map(|value| {
+                    if !value.is_empty() {
+                        subqueries.push((Occur::Must, self.has_relation_label(value)));
+                    }
+                });
+
+                relation_type.map(|relation_type| {
+                    subqueries.push((Occur::Must, self.has_relation_type(relation_type)));
+                });
             }
 
-            Expression::Not(Relation { value: None }) => {}
-            Expression::Not(Relation { value: Some(value) }) if value.is_empty() => {}
-            Expression::Not(Relation { value: Some(value) }) => {
-                subqueries.push((Occur::MustNot, self.has_relation_label(value)));
+            Expression::Not(Relation { value, relation_type }) => {
+                value.as_ref().map(|value| {
+                    if !value.is_empty() {
+                        subqueries.push((Occur::MustNot, self.has_relation_label(value)));
+                    }
+                });
+
+                relation_type.map(|relation_type| {
+                    subqueries.push((Occur::MustNot, self.has_relation_type(relation_type)));
+                });
             }
 
             Expression::Or(relations) => {
@@ -487,6 +501,14 @@ impl GraphQueryParser {
             IndexRecordOption::Basic,
         ))
     }
+
+    fn has_relation_type(&self, relation_type: RelationType) -> Box<dyn Query> {
+        let relation_type = io_maps::relation_type_to_u64(relation_type);
+        Box::new(TermQuery::new(
+            tantivy::Term::from_field_u64(self.schema.relationship, relation_type),
+            IndexRecordOption::Basic,
+        ))
+    }
 }
 
 impl From<String> for Term {
@@ -663,7 +685,8 @@ impl TryFrom<&nidx_protos::graph_query::Relation> for Relation {
 
     fn try_from(relation_pb: &nidx_protos::graph_query::Relation) -> Result<Self, Self::Error> {
         let value = relation_pb.value.clone();
+        let relation_type = relation_pb.relation_type.map(RelationType::try_from).transpose()?;
 
-        Ok(Relation { value })
+        Ok(Relation { value, relation_type })
     }
 }

{nidx_binding-6.3.4.post104 → nidx_binding-6.3.4.post123}/nidx_relation/tests/test_graph_search.rs

@@ -19,6 +19,7 @@
 //
 mod common;
 
+use nidx_protos::relation::RelationType;
 use nidx_protos::relation_node::NodeType;
 use nidx_protos::{Resource, ResourceId};
 use nidx_relation::graph_query_parser::{
@@ -44,7 +45,7 @@ fn test_graph_node_query() -> anyhow::Result<()> {
             node_subtype: None,
             ..Default::default()
         }))))?;
-    assert_eq!(result.graph.len(), 16);
+    assert_eq!(result.graph.len(), 17);
 
     // (:PERSON)-[]->()
     let result = reader
@@ -202,21 +203,46 @@ fn test_graph_relation_query() -> anyhow::Result<()> {
         .reader
         .inner_graph_search(GraphQuery::RelationQuery(RelationQuery(Expression::Value(Relation {
             value: Some("LIVE_IN".to_string()),
+            ..Default::default()
         }))))?;
     let relations = friendly_parse(&result);
     assert_eq!(relations.len(), 2);
     assert!(relations.contains(&("Anna", "LIVE_IN", "New York")));
     assert!(relations.contains(&("Peter", "LIVE_IN", "New York")));
 
+    // ()-[:Synonym]->()
+    let result = reader
+        .reader
+        .inner_graph_search(GraphQuery::RelationQuery(RelationQuery(Expression::Value(Relation {
+            relation_type: Some(RelationType::Synonym),
+            ..Default::default()
+        }))))?;
+    let relations = friendly_parse(&result);
+    assert_eq!(relations.len(), 1);
+    assert!(relations.contains(&("Mr. P", "ALIAS", "Peter")));
+
+    // Synonym relations with nonexistent label
+    let result = reader
+        .reader
+        .inner_graph_search(GraphQuery::RelationQuery(RelationQuery(Expression::Value(Relation {
+            value: Some("FAKE".to_string()),
+            relation_type: Some(RelationType::Synonym),
+            ..Default::default()
+        }))))?;
+    let relations = friendly_parse(&result);
+    assert_eq!(relations.len(), 0);
+
     // ()-[:LIVE_IN | BORN_IN]->()
     let result = reader
         .reader
         .inner_graph_search(GraphQuery::RelationQuery(RelationQuery(Expression::Or(vec![
             Relation {
                 value: Some("BORN_IN".to_string()),
+                ..Default::default()
             },
             Relation {
                 value: Some("LIVE_IN".to_string()),
+                ..Default::default()
             },
         ]))))?;
     let relations = friendly_parse(&result);
@@ -225,14 +251,15 @@ fn test_graph_relation_query() -> anyhow::Result<()> {
     assert!(relations.contains(&("Erin", "BORN_IN", "UK")));
     assert!(relations.contains(&("Peter", "LIVE_IN", "New York")));
 
-    // // ()-[:!LIVE_IN]->()
+    // ()-[:!LIVE_IN]->()
     let result = reader
         .reader
         .inner_graph_search(GraphQuery::RelationQuery(RelationQuery(Expression::Not(Relation {
             value: Some("LIVE_IN".to_string()),
+            ..Default::default()
         }))))?;
     let relations = friendly_parse(&result);
-    assert_eq!(relations.len(), 14);
+    assert_eq!(relations.len(), 15);
 
     Ok(())
 }
@@ -250,7 +277,10 @@ fn test_graph_directed_path_query() -> anyhow::Result<()> {
                 node_type: Some(NodeType::Entity),
                 node_subtype: Some("PERSON".to_string()),
             }),
-            Expression::Value(Relation { value: None }),
+            Expression::Value(Relation {
+                value: None,
+                ..Default::default()
+            }),
             Expression::Value(Node {
                 value: Some("UK".into()),
                 node_type: Some(NodeType::Entity),
@@ -271,7 +301,10 @@ fn test_graph_directed_path_query() -> anyhow::Result<()> {
                 node_subtype: Some("PERSON".to_string()),
                 ..Default::default()
             }),
-            Expression::Value(Relation { value: None }),
+            Expression::Value(Relation {
+                value: None,
+                ..Default::default()
+            }),
             Expression::Value(Node {
                 value: None,
                 node_type: None,
@@ -298,6 +331,7 @@ fn test_graph_directed_path_query() -> anyhow::Result<()> {
             }),
             Expression::Value(Relation {
                 value: Some("LIVE_IN".to_string()),
+                ..Default::default()
             }),
             Expression::Value(Node {
                 value: None,
@@ -324,9 +358,11 @@ fn test_graph_directed_path_query() -> anyhow::Result<()> {
             Expression::Or(vec![
                 Relation {
                     value: Some("LIVE_IN".to_string()),
+                    ..Default::default()
                 },
                 Relation {
                     value: Some("LOVE".to_string()),
+                    ..Default::default()
                 },
             ]),
             Expression::Value(Node {
@@ -361,6 +397,7 @@ fn test_graph_undirected_path_query() -> anyhow::Result<()> {
             }),
             Expression::Value(Relation {
                 value: Some("IS_FRIEND".to_string()),
+                ..Default::default()
             }),
             Expression::Value(Node::default()),
         ))))?;
@@ -381,9 +418,11 @@ fn test_graph_response() -> anyhow::Result<()> {
         .inner_graph_search(GraphQuery::RelationQuery(RelationQuery(Expression::Or(vec![
             Relation {
                 value: Some("LIVE_IN".to_string()),
+                ..Default::default()
             },
             Relation {
                 value: Some("WORK_IN".to_string()),
+                ..Default::default()
             },
         ]))))?;
     friendly_print(&result);

{nidx_binding-6.3.4.post104 → nidx_binding-6.3.4.post123}/nidx_tests/src/graph.rs

@@ -78,6 +78,7 @@ pub fn knowledge_graph_as_relations() -> Vec<Relation> {
         ("Dimitri", "PERSON"),
         ("Erin", "PERSON"),
         ("Jerry", "ANIMAL"),
+        ("Mr. P", "AGENT"),
         ("Margaret", "PERSON"),
         ("Mouse", "ANIMAL"),
         ("New York", "PLACE"),
@@ -88,6 +89,19 @@ pub fn knowledge_graph_as_relations() -> Vec<Relation> {
         ("UK", "PLACE"),
     ]);
 
+    let relations = HashMap::from([
+        ("ALIAS", RelationType::Synonym),
+        ("BORN_IN", RelationType::Entity),
+        ("CHASE", RelationType::Entity),
+        ("DEVELOPED", RelationType::Entity),
+        ("FOLLOW", RelationType::Entity),
+        ("IS", RelationType::Entity),
+        ("IS_FRIEND", RelationType::Entity),
+        ("LIVE_IN", RelationType::Entity),
+        ("LOVE", RelationType::Entity),
+        ("WORK_IN", RelationType::Entity),
+    ]);
+
     let graph = vec![
         ("Anastasia", "IS_FRIEND", "Anna"),
         ("Anna", "FOLLOW", "Erin"),
@@ -102,20 +116,21 @@ pub fn knowledge_graph_as_relations() -> Vec<Relation> {
         ("Jerry", "IS", "Mouse"),
         ("Margaret", "DEVELOPED", "Apollo"),
         ("Margaret", "WORK_IN", "Computer science"),
+        ("Mr. P", "ALIAS", "Peter"),
         ("Peter", "LIVE_IN", "New York"),
         ("Tom", "CHASE", "Jerry"),
         ("Tom", "IS", "Cat"),
     ];
 
-    let mut relations = vec![];
+    let mut pb_relations = vec![];
     for (source, relation, target) in graph {
-        relations.push(Relation {
+        pb_relations.push(Relation {
             source: Some(RelationNode {
                 value: source.to_string(),
                 ntype: NodeType::Entity as i32,
                 subtype: entities.get(source).unwrap().to_string(),
             }),
-            relation: RelationType::Entity.into(),
+            relation: *relations.get(relation).unwrap() as i32,
             relation_label: relation.to_string(),
             to: Some(RelationNode {
                 value: target.to_string(),
@@ -127,5 +142,5 @@ pub fn knowledge_graph_as_relations() -> Vec<Relation> {
         })
     }
 
-    relations
+    pb_relations
 }

{nidx_binding-6.3.4.post104 → nidx_binding-6.3.4.post123}/pyproject.toml

@@ -13,7 +13,7 @@ classifiers = [
     "Programming Language :: Python :: Implementation :: CPython",
     "Programming Language :: Python :: Implementation :: PyPy",
 ]
-version = "6.3.4.post104"
+version = "6.3.4.post123"
 
 [project.urls]
 Homepage = "https://nuclia.com"

{nidx_binding-6.3.4.post104 → nidx_binding-6.3.4.post123}/tests/test_search_relations.rs

@@ -446,7 +446,7 @@ async fn test_graph_search_nodes(pool: PgPool) -> anyhow::Result<()> {
         .await?
         .into_inner();
     let nodes = &response.nodes;
-    assert_eq!(nodes.len(), 17);
+    assert_eq!(nodes.len(), 18);
 
     // Search all ANIMAL nodes
     let response = fixture
@@ -522,7 +522,7 @@ async fn test_graph_search__node_query(pool: PgPool) -> anyhow::Result<()> {
         .await?
         .into_inner();
     let relations = friendly_parse(&response);
-    assert_eq!(relations.len(), 16);
+    assert_eq!(relations.len(), 17);
 
     // (:PERSON)-[]->()
     let response = fixture
@@ -744,6 +744,7 @@ async fn test_graph_search_relations(pool: PgPool) -> anyhow::Result<()> {
                     query: Some(path_query::Query::Path(graph_query::Path {
                         relation: Some(graph_query::Relation {
                             value: Some("LIVE_IN".to_string()),
+                            ..Default::default()
                         }),
                         ..Default::default()
                     })),
@@ -770,6 +771,7 @@ async fn test_graph_search_relations(pool: PgPool) -> anyhow::Result<()> {
                     query: Some(path_query::Query::Path(graph_query::Path {
                         relation: Some(graph_query::Relation {
                             value: Some("PLAYED".to_string()),
+                            ..Default::default()
                         }),
                         ..Default::default()
                     })),
@@ -833,6 +835,7 @@ async fn test_graph_search__relation_query(pool: PgPool) -> anyhow::Result<()> {
                     query: Some(path_query::Query::Path(graph_query::Path {
                         relation: Some(graph_query::Relation {
                             value: Some("LIVE_IN".to_string()),
+                            ..Default::default()
                         }),
                         ..Default::default()
                     })),
@@ -859,6 +862,7 @@ async fn test_graph_search__relation_query(pool: PgPool) -> anyhow::Result<()> {
                     query: Some(path_query::Query::Path(graph_query::Path {
                         relation: Some(graph_query::Relation {
                             value: Some("LIVE_IN".to_string()),
+                            ..Default::default()
                         }),
                         ..Default::default()
                     })),
@@ -968,6 +972,7 @@ async fn test_graph_search__directed_path_query(pool: PgPool) -> anyhow::Result<
                         }),
                         relation: Some(graph_query::Relation {
                             value: Some("LIVE_IN".to_string()),
+                            ..Default::default()
                         }),
                         destination: Some(graph_query::Node {
                             node_subtype: Some("PLACE".to_string()),
@@ -1014,6 +1019,7 @@ async fn test_graph_search__undirected_path_query(pool: PgPool) -> anyhow::Resul
                         }),
                         relation: Some(graph_query::Relation {
                             value: Some("IS_FRIEND".to_string()),
+                            ..Default::default()
                         }),
                         destination: Some(graph_query::Node::default()),
                         undirected: true,