nidx-binding 6.4.0.post367__tar.gz → 6.4.0.post375__tar.gz

{nidx_binding-6.4.0.post367 → nidx_binding-6.4.0.post375}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.4.0.post367
+Version: 6.4.0.post375
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.4.0.post367 → nidx_binding-6.4.0.post375}/nidx_protos/pyproject.toml

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

{nidx_binding-6.4.0.post367 → nidx_binding-6.4.0.post375}/nidx_text/src/query_io.rs

@@ -32,7 +32,13 @@ pub fn translate_keyword_to_text_query(literal: &str, schema: &TextSchema) -> Bo
         terms.push(Term::from_field_text(schema.text, &token.text));
     }
     // Create a query using the tokenized terms
-    if terms.len() == 1 {
+    if terms.len() == 0 {
+        // This can happen for empty or non-alphanumeric keywords, fallback to avoid panic'ing
+        Box::new(TermQuery::new(
+            Term::from_field_text(schema.text, literal),
+            IndexRecordOption::Basic,
+        ))
+    } else if terms.len() == 1 {
         Box::new(TermQuery::new(terms[0].clone(), IndexRecordOption::Basic))
     } else {
         Box::new(PhraseQuery::new(terms))

{nidx_binding-6.4.0.post367 → nidx_binding-6.4.0.post375}/nidx_text/tests/test_search.rs

@@ -173,6 +173,19 @@ fn test_keywords_prefilter_search() {
         panic!("Response is not on the right variant");
     };
     assert_eq!(fields.len(), 1);
+
+    let request = PreFilterRequest {
+        security: None,
+        filter_expression: Some(FilterExpression {
+            expr: Some(nidx_protos::filter_expression::Expr::Keyword(KeywordFilter {
+                keyword: "%".into(),
+            })),
+        }),
+    };
+    let response = reader.prefilter(&request).unwrap();
+    let PrefilterResult::None = response else {
+        panic!("Response is not on the right variant");
+    };
 }
 
 #[test]

{nidx_binding-6.4.0.post367 → nidx_binding-6.4.0.post375}/pyproject.toml

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

{nidx_binding-6.4.0.post367 → nidx_binding-6.4.0.post375}/src/indexer.rs

@@ -130,6 +130,8 @@ pub async fn run_nats(settings: Settings, shutdown: CancellationToken) -> anyhow
     let nats_client = async_nats::connect(&indexer_settings.nats_server.as_ref().unwrap()).await?;
     let jetstream = async_nats::jetstream::new(nats_client);
     let consumer: PullConsumer = jetstream.get_consumer_from_stream("nidx", "nidx").await?;
+    let message_ttl = consumer.cached_info().config.ack_wait;
+    let in_progress_interval = message_ttl.mul_f32(0.8);
     let mut subscription = consumer.stream().max_messages_per_batch(1).messages().await?;
 
     let work_path = match &settings.work_path {
@@ -185,6 +187,23 @@ pub async fn run_nats(settings: Settings, shutdown: CancellationToken) -> anyhow
             }
         };
 
+        // Start keepalive task to mark progress
+        let (ack, mut ack_rx) = tokio::sync::oneshot::channel::<()>();
+        let keepalive = tokio::spawn(async move {
+            loop {
+                tokio::select! {
+                    _ = tokio::time::sleep(in_progress_interval) => {
+                        if let Err(e) = acker.ack_with(async_nats::jetstream::AckKind::Progress).await {
+                            warn!("Error acking message as in progress: {e:?}");
+                        }
+                    },
+                    _ = &mut ack_rx => {
+                        return acker;
+                    }
+                }
+            }
+        });
+
         if let Err(e) = process_index_message(
             &meta,
             indexer_storage.clone(),
@@ -202,6 +221,12 @@ pub async fn run_nats(settings: Settings, shutdown: CancellationToken) -> anyhow
         }
         INDEXING_COUNTER.get_or_create(&OperationStatusLabels::success()).inc();
 
+        // Stop keepalive task and send final ACK
+        if let Err(e) = ack.send(()) {
+            error!("Cannot stop keepalive task: {e:?}");
+            continue;
+        };
+        let acker = keepalive.await?;
         if let Err(e) = acker.double_ack().await {
             warn!("Error acking index message: {e:?}");
             continue;