nidx-binding 6.6.1.post454__tar.gz → 6.6.1.post456__tar.gz

{nidx_binding-6.6.1.post454 → nidx_binding-6.6.1.post456}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.6.1.post454
+Version: 6.6.1.post456
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.6.1.post454 → nidx_binding-6.6.1.post456}/nidx_protos/pyproject.toml

@@ -10,7 +10,7 @@ build-backend = "pdm.backend"
 
 [project]
 name = "nidx_protos"
-version = "6.6.1.post454"
+version = "6.6.1.post456"
 license = "AGPL-3.0-or-later"
 description = "Protobuf definitions for nucliadb/nidx"
 authors = [{ name = "Nuclia", email = "nucliadb@nuclia.com" }]

{nidx_binding-6.6.1.post454 → nidx_binding-6.6.1.post456}/nidx_relation/src/reader.rs

@@ -80,7 +80,7 @@ impl<'a, I: Iterator<Item = &'a FieldId>> Iterator for AddMetadataFieldIterator<
         }
         let next = self.iter.next()?;
 
-        let term = tantivy::Term::from_field_bytes(self.field, &encode_field_id(next.resource_id, &next.field_id));
+        let term = tantivy::Term::from_field_bytes(self.field, &encode_field_id(next.resource_id, &next.field_id[1..]));
         if self.prev != next.resource_id {
             // New resource, emit the metadata field (and save the actual field for next iteration)
             self.buffer = Some(term);

{nidx_binding-6.6.1.post454 → nidx_binding-6.6.1.post456}/nidx_relation/tests/test_graph_search.rs

@@ -854,7 +854,7 @@ fn test_prefilter() -> anyhow::Result<()> {
         Query::Path(Path::default()),
         PrefilterResult::Some(vec![FieldId {
             resource_id: Uuid::nil(),
-            field_id: "f/fake".to_string(),
+            field_id: "/f/fake".to_string(),
         }]),
     )?;
     assert_eq!(result.graph.len(), 0);
@@ -865,7 +865,7 @@ fn test_prefilter() -> anyhow::Result<()> {
         Query::Path(Path::default()),
         PrefilterResult::Some(vec![FieldId {
             resource_id: Uuid::parse_str("0123456789abcdef0123456789abcdef").unwrap(),
-            field_id: "a/metadata".to_string(),
+            field_id: "/a/metadata".to_string(),
         }]),
     )?;
     assert_eq!(result.graph.len(), 17);
@@ -876,7 +876,45 @@ fn test_prefilter() -> anyhow::Result<()> {
         Query::Path(Path::default()),
         PrefilterResult::Some(vec![FieldId {
             resource_id: Uuid::parse_str("0123456789abcdef0123456789abcdef").unwrap(),
-            field_id: "f/fake".to_string(),
+            field_id: "/f/fake".to_string(),
+        }]),
+    )?;
+    assert_eq!(result.graph.len(), 17);
+
+    Ok(())
+}
+
+#[test]
+fn test_prefilter_file_field() -> anyhow::Result<()> {
+    // Basic prefilter tests, other tests are done at upper levels with access to the text index
+    let reader = create_reader_file_field()?;
+
+    // All
+    let result = search_with_prefilter(&reader, Query::Path(Path::default()), PrefilterResult::All)?;
+    assert_eq!(result.graph.len(), 17);
+
+    // None
+    let result = search_with_prefilter(&reader, Query::Path(Path::default()), PrefilterResult::None)?;
+    assert_eq!(result.graph.len(), 0);
+
+    // Some excludes our result
+    let result = search_with_prefilter(
+        &reader,
+        Query::Path(Path::default()),
+        PrefilterResult::Some(vec![FieldId {
+            resource_id: Uuid::parse_str("0123456789abcdef0123456789abcdef").unwrap(),
+            field_id: "/f/fake".to_string(),
+        }]),
+    )?;
+    assert_eq!(result.graph.len(), 0);
+
+    // Some includes our result
+    let result = search_with_prefilter(
+        &reader,
+        Query::Path(Path::default()),
+        PrefilterResult::Some(vec![FieldId {
+            resource_id: Uuid::parse_str("0123456789abcdef0123456789abcdef").unwrap(),
+            field_id: "/f/my_file".to_string(),
         }]),
     )?;
     assert_eq!(result.graph.len(), 17);
@@ -1048,3 +1086,27 @@ fn create_reader() -> anyhow::Result<RelationSearcher> {
         TestOpener::new(vec![(segment_meta, 1i64.into())], vec![]),
     )
 }
+
+fn create_reader_file_field() -> anyhow::Result<RelationSearcher> {
+    let dir = TempDir::new().unwrap();
+
+    let relations = nidx_tests::graph::knowledge_graph_as_relations();
+    let field_relations = HashMap::from([("f/my_file".to_string(), IndexRelations { relations })]);
+    let resource = Resource {
+        resource: Some(ResourceId {
+            uuid: "0123456789abcdef0123456789abcdef".to_string(),
+            shard_id: "shard_id".to_string(),
+        }),
+        field_relations,
+        ..Default::default()
+    };
+
+    let segment_meta = RelationIndexer
+        .index_resource(dir.path(), &RelationConfig::default(), &resource)
+        .unwrap()
+        .unwrap();
+    RelationSearcher::open(
+        RelationConfig::default(),
+        TestOpener::new(vec![(segment_meta, 1i64.into())], vec![]),
+    )
+}

{nidx_binding-6.6.1.post454 → nidx_binding-6.6.1.post456}/pyproject.toml

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