nidx-binding 6.4.2.post385__tar.gz → 6.4.2.post402__tar.gz

{nidx_binding-6.4.2.post385 → nidx_binding-6.4.2.post402}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.4.2.post385
+Version: 6.4.2.post402
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.4.2.post385 → nidx_binding-6.4.2.post402}/nidx_protos/nodereader.proto

@@ -405,4 +405,5 @@ message DocumentItem {
 message StreamRequest {
     noderesources.ShardId shard_id = 3;
     StreamFilter filter = 4;
+    optional FilterExpression filter_expression = 5;
 }

{nidx_binding-6.4.2.post385 → nidx_binding-6.4.2.post402}/nidx_protos/pyproject.toml

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

{nidx_binding-6.4.2.post385 → nidx_binding-6.4.2.post402}/nidx_text/src/search_query.rs

@@ -59,8 +59,9 @@ pub fn create_streaming_query(schema: &TextSchema, request: &StreamRequest) -> B
 
     if let Some(ref filter) = request.filter {
         queries.extend(create_stream_filter_queries(schema, filter))
+    } else if let Some(ref filter_expression) = request.filter_expression {
+        queries.push((Occur::Must, filter_to_query(schema, filter_expression)))
     }
-
     Box::new(BooleanQuery::new(queries))
 }
 

{nidx_binding-6.4.2.post385 → nidx_binding-6.4.2.post402}/nidx_text/tests/test_streaming.rs

@@ -18,18 +18,49 @@
 // along with this program. If not, see <http://www.gnu.org/licenses/>.
 //
 
+use nidx_protos::FilterExpression;
 use nidx_protos::StreamRequest;
-
+use nidx_protos::filter_expression::FacetFilter;
 mod common;
 
 #[test]
 fn test_stream_request_iterator() {
     let reader = common::test_reader();
+
+    // There are two fields in total
     let request = StreamRequest {
         shard_id: None,
-        filter: None,
+        ..Default::default()
     };
     let iter = reader.iterator(&request).unwrap();
     let count = iter.count();
     assert_eq!(count, 2);
+
+    // Filtering on a non-existing label should not yield any result
+    let request = StreamRequest {
+        shard_id: None,
+        filter_expression: Some(FilterExpression {
+            expr: Some(nidx_protos::filter_expression::Expr::Facet(FacetFilter {
+                facet: "/l/non-existing-label".into(),
+            })),
+        }),
+        ..Default::default()
+    };
+    let iter = reader.iterator(&request).unwrap();
+    let count = iter.count();
+    assert_eq!(count, 0);
+
+    // The label /l/mylabel should match the title field
+    let request = StreamRequest {
+        shard_id: None,
+        filter_expression: Some(FilterExpression {
+            expr: Some(nidx_protos::filter_expression::Expr::Facet(FacetFilter {
+                facet: "/l/mylabel".into(),
+            })),
+        }),
+        ..Default::default()
+    };
+    let iter = reader.iterator(&request).unwrap();
+    let count = iter.count();
+    assert_eq!(count, 1);
 }

{nidx_binding-6.4.2.post385 → nidx_binding-6.4.2.post402}/pyproject.toml

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