nidx-binding 6.9.0.post580__tar.gz → 6.9.0.post585__tar.gz

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.9.0.post580
+Version: 6.9.0.post585
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_paragraph/src/reader.rs

@@ -113,16 +113,11 @@ impl ParagraphReaderService {
     ) -> anyhow::Result<ParagraphSearchResponse> {
         let mut time_tracker = TimeTracker::start();
 
-        let shard_id = &request.id;
         let text = &request.body;
         let results = request.result_per_page as usize;
         let (keyword_query, termc, fuzzy_query) = search_query(request, prefilter, &self.index, &self.schema);
         let facets = request.facets();
-        trace!(
-            shard_id,
-            "Query parsing took {}µs",
-            time_tracker.checkpoint().as_micros()
-        );
+        debug!("Query parsing took {}µs", time_tracker.checkpoint().as_micros());
 
         let searcher = Searcher {
             request,
@@ -133,22 +128,14 @@ impl ParagraphReaderService {
         };
         // println!("Regular search with query: {:#?}", keyword_query);
         let mut response = searcher.do_search(termc.clone(), keyword_query, self, request.min_score)?;
-        trace!(
-            shard_id,
-            "Keyword search took {}µs",
-            time_tracker.checkpoint().as_micros()
-        );
+        debug!("Keyword search took {}µs", time_tracker.checkpoint().as_micros());
 
         if response.results.is_empty() && request.result_per_page > 0 && request.min_score == 0 as f32 {
             // println!("Fuzzy search with query: {:#?}", fuzzy_query);
             let fuzzied = searcher.do_search(termc, fuzzy_query, self, request.min_score)?;
             response = fuzzied;
             response.fuzzy_distance = FUZZY_DISTANCE as i32;
-            trace!(
-                shard_id,
-                "Fallback fuzzy query took {}µs",
-                time_tracker.checkpoint().as_micros()
-            );
+            debug!("Fallback fuzzy query took {}µs", time_tracker.checkpoint().as_micros());
         }
 
         let total = response.results.len() as f32;
@@ -175,16 +162,8 @@ impl ParagraphReaderService {
             response.next_page = false;
         }
 
-        trace!(
-            shard_id,
-            "Result processing took {}µs",
-            time_tracker.checkpoint().as_micros()
-        );
-        trace!(
-            shard_id,
-            "Paragraph search took {}µs",
-            time_tracker.elapsed().as_micros()
-        );
+        debug!("Result processing took {}µs", time_tracker.checkpoint().as_micros());
+        debug!("Paragraph search took {}µs", time_tracker.elapsed().as_micros());
 
         Ok(response)
     }

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_paragraph/src/request_types.rs

@@ -23,7 +23,6 @@ use tantivy::schema::Facet;
 
 #[derive(Clone, Default)]
 pub struct ParagraphSearchRequest {
-    pub id: String,
     pub uuid: String,
     pub body: String,
     pub order: Option<nidx_protos::OrderBy>,

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_paragraph/tests/reader.rs

@@ -175,7 +175,6 @@ fn test_total_number_of_results() -> anyhow::Result<()> {
     let paragraph_reader_service = test_reader(&resource);
 
     let mut request = ParagraphSearchRequest {
-        id: shard_id,
         uuid: rid,
         ..Default::default()
     };
@@ -205,7 +204,6 @@ fn test_filtering_formula() -> anyhow::Result<()> {
 
     // Only one paragraph matches
     let mut request = ParagraphSearchRequest {
-        id: shard_id,
         uuid: rid,
         body: "".to_string(),
         faceted: None,
@@ -259,7 +257,6 @@ fn test_keyword_and_fuzzy_queries() -> anyhow::Result<()> {
 
     let paragraph_search = |query: &str| {
         let request = ParagraphSearchRequest {
-            id: shard_id.clone(),
             uuid: rid.clone(),
             body: query.to_string(),
             faceted: None,
@@ -327,7 +324,6 @@ fn test_min_score_filter() -> anyhow::Result<()> {
     let paragraph_reader_service = test_reader(&resource);
 
     let mut request = ParagraphSearchRequest {
-        id: shard_id,
         uuid: rid,
         result_per_page: 20,
         ..Default::default()
@@ -361,7 +357,6 @@ fn test_faceted_search() -> anyhow::Result<()> {
 
     // Filter with facets and order
     let request = ParagraphSearchRequest {
-        id: shard_id,
         uuid: rid,
         faceted: Some(faceted.clone()),
         result_per_page: 20,
@@ -395,7 +390,6 @@ fn test_order_by() -> anyhow::Result<()> {
 
     // Use a sort order
     let request = ParagraphSearchRequest {
-        id: "shard1".to_string(),
         uuid: "".to_string(),
         body: "this is the".to_string(),
         order: Some(order),
@@ -440,7 +434,6 @@ fn test_query_parsing() -> anyhow::Result<()> {
 
     // Only one paragraph  matches
     let mut search = ParagraphSearchRequest {
-        id: shard_id,
         uuid: rid,
         body: "".to_string(),
         faceted: None,
@@ -468,7 +461,6 @@ fn test_query_parsing_weird_stuff() -> anyhow::Result<()> {
     let paragraph_reader_service = test_reader(&resource);
 
     let mut search = ParagraphSearchRequest {
-        id: shard_id,
         uuid: rid,
         body: "".to_string(),
         faceted: None,

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_protos/pyproject.toml

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

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_text/src/reader.rs

@@ -219,12 +219,11 @@ impl TextReaderService {
     }
 
     fn count(&self) -> anyhow::Result<usize> {
-        let id: Option<String> = None;
         let time = Instant::now();
         let searcher = self.reader.searcher();
         let count = searcher.search(&AllQuery, &Count)?;
         let v = time.elapsed().as_millis();
-        debug!("{id:?} - Ending at: {v} ms");
+        debug!("Ending at: {v} ms");
 
         Ok(count)
     }
@@ -393,11 +392,10 @@ impl TextReaderService {
 
     fn do_search(&self, request: &DocumentSearchRequest) -> anyhow::Result<DocumentSearchResponse> {
         use crate::search_query::create_query;
-        let id = Some(&request.id);
         let time = Instant::now();
 
         let v = time.elapsed().as_millis();
-        debug!("{id:?} - Creating query: starts at {v} ms");
+        debug!("Creating query: starts at {v} ms");
 
         let query_parser = {
             let mut query_parser = QueryParser::for_index(&self.index, vec![self.schema.text]);
@@ -428,14 +426,14 @@ impl TextReaderService {
             facet_collector.add_facet(Facet::from(facet));
         }
         let v = time.elapsed().as_millis();
-        debug!("{id:?} - Creating query: ends at {v} ms");
+        debug!("Creating query: ends at {v} ms");
 
         let v = time.elapsed().as_millis();
-        debug!("{id:?} - Searching: starts at {v} ms");
+        debug!("Searching: starts at {v} ms");
 
         let searcher = self.reader.searcher();
         let v = time.elapsed().as_millis();
-        debug!("{id:?} - Searching: ends at {v} ms");
+        debug!("Searching: ends at {v} ms");
 
         match maybe_order {
             _ if request.only_faceted => {

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_text/src/request_types.rs

@@ -22,7 +22,6 @@ use nidx_protos::FilterExpression;
 
 #[derive(Clone, Default)]
 pub struct DocumentSearchRequest {
-    pub id: String,
     pub body: String,
     pub order: Option<nidx_protos::OrderBy>,
     pub faceted: Option<nidx_protos::Faceted>,

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_text/tests/test_search.rs

@@ -38,7 +38,6 @@ fn test_search_queries() {
     fn query(reader: &TextSearcher, query: impl Into<String>, expected: i32) {
         let query = query.into();
         let request = DocumentSearchRequest {
-            id: "shard".to_string(),
             body: query.clone(),
             result_per_page: 20,
             ..Default::default()
@@ -192,7 +191,6 @@ fn test_filtered_search() {
     fn query(reader: &TextSearcher, query: impl Into<String>, expression: FilterExpression, expected: i32) {
         let query = query.into();
         let request = DocumentSearchRequest {
-            id: "shard".to_string(),
             body: query.clone(),
             result_per_page: 20,
             filter_expression: Some(expression),
@@ -245,7 +243,6 @@ fn test_search_by_field() {
     let reader = common::test_reader();
 
     let request = DocumentSearchRequest {
-        id: "shard".to_string(),
         body: "".to_string(),
         result_per_page: 20,
         filter_expression: Some(FilterExpression {
@@ -268,7 +265,6 @@ fn test_faceted_search() {
     fn query(reader: &TextSearcher, query: impl Into<String>, facets: Faceted, expected: i32) {
         let query = query.into();
         let request = DocumentSearchRequest {
-            id: "shard".to_string(),
             body: "".to_string(),
             result_per_page: 20,
             faceted: Some(facets.clone()),
@@ -302,7 +298,6 @@ fn test_faceted_search() {
 fn test_quote_fixing() {
     fn query(reader: &TextSearcher, query: impl Into<String>) {
         let request = DocumentSearchRequest {
-            id: "shard".to_string(),
             body: query.into(),
             result_per_page: 20,
             ..Default::default()
@@ -324,7 +319,6 @@ fn test_search_with_min_score() {
     fn query(reader: &TextSearcher, query: impl Into<String>, min_score: f32, expected: i32) {
         let query = query.into();
         let request = DocumentSearchRequest {
-            id: "shard".to_string(),
             body: query.clone(),
             result_per_page: 20,
             min_score,
@@ -348,7 +342,6 @@ fn test_int_order_pagination() {
     let reader = common::test_reader();
 
     let request = DocumentSearchRequest {
-        id: "shard".to_string(),
         body: "".to_string(),
         result_per_page: 1,
         order: Some(OrderBy {
@@ -381,7 +374,6 @@ fn test_timestamp_filtering() {
 
     let search = |date_range| {
         let request = DocumentSearchRequest {
-            id: "shard".to_string(),
             body: "".to_string(),
             result_per_page: 10,
             min_score: f32::MIN,
@@ -420,7 +412,6 @@ fn test_key_filtering() {
     let reader = common::test_reader();
 
     let request = DocumentSearchRequest {
-        id: "shard".to_string(),
         body: "".to_string(),
         result_per_page: 1,
         min_score: f32::MIN,
@@ -431,7 +422,6 @@ fn test_key_filtering() {
 
     let search = |resource| {
         let request = DocumentSearchRequest {
-            id: "shard".to_string(),
             body: "".to_string(),
             result_per_page: 10,
             min_score: f32::MIN,

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_vector/src/hnsw/ops_hnsw.rs

@@ -26,6 +26,8 @@ use rand::rngs::SmallRng;
 use rustc_hash::FxHashSet;
 use std::cmp::{Ordering, Reverse};
 use std::collections::{BinaryHeap, HashMap, HashSet, VecDeque};
+use std::time::Instant;
+use tracing::trace;
 
 use crate::inverted_index::FilterBitSet;
 use crate::vector_types::rabitq;
@@ -421,12 +423,15 @@ impl<'a, DR: DataRetriever> HnswOps<'a, DR> {
         let mut entry_points = vec![entry_point.node];
 
         // Traverse upper layer finding the best match on each one
+        let t = Instant::now();
         while crnt_layer != 0 {
             let layer = hnsw.get_layer(crnt_layer);
             let layer_res = self.layer_search(query, layer, 1, &entry_points);
             entry_points = layer_res.map(|(addr, _)| addr).collect();
             crnt_layer -= 1;
         }
+        let time = t.elapsed();
+        trace!(?time, "HNSW search: upper layers");
 
         // If using RabitQ, request more vectors to rerank later
         let original_query = if let SearchVector::RabitQ(rq) = query {
@@ -441,15 +446,22 @@ impl<'a, DR: DataRetriever> HnswOps<'a, DR> {
         };
 
         // Find the best k nodes in the last layer
+        let t = Instant::now();
         let layer = hnsw.get_layer(crnt_layer);
         let neighbours = self.layer_search(query, layer, last_layer_k, &entry_points);
+        let time = t.elapsed();
+        trace!(?time, "HNSW search: last layer");
 
         let entry_points = if let Some(query) = original_query {
             // If using RabitQ, rerank using the original vectors
-            rabitq::rerank_top(neighbours.collect(), k_neighbours, self.retriever, query)
+            let t = Instant::now();
+            let reranked = rabitq::rerank_top(neighbours.collect(), k_neighbours, self.retriever, query)
                 .into_iter()
                 .map(|Reverse(Cnx(addr, _))| addr)
-                .collect()
+                .collect();
+            let time = t.elapsed();
+            trace!(?time, "HNSW search: reranking");
+            reranked
         } else {
             neighbours.map(|(addr, _)| addr).collect()
         };
@@ -463,6 +475,7 @@ impl<'a, DR: DataRetriever> HnswOps<'a, DR> {
         let layer_zero = hnsw.get_layer(0);
 
         // Find k nodes that match the filter in the last layer
+        let t = Instant::now();
         let mut filtered_result = self.closest_up_nodes(
             entry_points,
             original_query.unwrap_or(query),
@@ -470,6 +483,8 @@ impl<'a, DR: DataRetriever> HnswOps<'a, DR> {
             k_neighbours,
             filter,
         );
+        let time = t.elapsed();
+        trace!(?time, "HNSW search: closest nodes");
 
         // order may be lost
         filtered_result.sort_by(|a, b| b.1.total_cmp(&a.1));

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_vector/src/indexer.rs

@@ -58,10 +58,6 @@ impl<'a> ResourceWrapper<'a> {
         }
     }
 
-    pub fn id(&self) -> &String {
-        &self.resource.shard_id
-    }
-
     pub fn labels(&self) -> &[String] {
         &self.resource.labels
     }
@@ -108,10 +104,9 @@ pub fn index_resource(
 ) -> anyhow::Result<Option<VectorSegmentMetadata>> {
     let time = Instant::now();
 
-    let id = resource.id();
-    debug!("{id:?} - Updating main index");
+    debug!("Updating main index");
     let v = time.elapsed().as_millis();
-    debug!("{id:?} - Creating elements for the main index: starts {v} ms");
+    debug!("Creating elements for the main index: starts {v} ms");
 
     let mut elems = Vec::new();
     let normalize_vectors = config.normalize_vectors;
@@ -142,10 +137,10 @@ pub fn index_resource(
         }
     }
     let v = time.elapsed().as_millis();
-    debug!("{id:?} - Creating elements for the main index: ends {v} ms");
+    debug!("Creating elements for the main index: ends {v} ms");
 
     let v = time.elapsed().as_millis();
-    debug!("{id:?} - Main index set resource: starts {v} ms");
+    debug!("Main index set resource: starts {v} ms");
 
     if elems.is_empty() {
         return Ok(None);
@@ -160,7 +155,7 @@ pub fn index_resource(
     let segment = segment::create(output_path, elems, config, tags)?;
 
     let v = time.elapsed().as_millis();
-    debug!("{id:?} - Main index set resource: ends {v} ms");
+    debug!("Main index set resource: ends {v} ms");
 
     Ok(Some(segment.into_metadata()))
 }

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_vector/src/request_types.rs

@@ -22,8 +22,6 @@ use nidx_types::query_language::BooleanExpression;
 
 #[derive(Clone, Default)]
 pub struct VectorSearchRequest {
-    /// Shard ID
-    pub id: String,
     /// Embedded vector search.
     pub vector: Vec<f32>,
     /// How many results are in this page.

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_vector/src/searcher.rs

@@ -290,8 +290,6 @@ impl Searcher {
     ) -> anyhow::Result<VectorSearchResponse> {
         let time = Instant::now();
 
-        let id = Some(&request.id);
-
         let mut formula = Formula::new();
 
         if let PrefilterResult::Some(valid_fields) = prefilter {
@@ -313,7 +311,7 @@ impl Searcher {
         }
 
         let v = time.elapsed().as_millis();
-        debug!("{id:?} - Searching: starts at {v} ms");
+        debug!("Searching: starts at {v} ms");
         let search_request = &SearchRequest { request, formula };
         let result = match self.config.vector_cardinality {
             VectorCardinality::Single => self._search(search_request, &request.segment_filtering_formula)?,
@@ -321,9 +319,9 @@ impl Searcher {
         };
 
         let v = time.elapsed().as_millis();
-        debug!("{id:?} - Searching: ends at {v} ms");
+        debug!("Searching: ends at {v} ms");
 
-        debug!("{id:?} - Creating results: starts at {v} ms");
+        debug!("Creating results: starts at {v} ms");
 
         let documents = result
             .into_iter()
@@ -331,10 +329,10 @@ impl Searcher {
             .collect::<Vec<_>>();
         let v = time.elapsed().as_millis();
 
-        debug!("{id:?} - Creating results: ends at {v} ms");
+        debug!("Creating results: ends at {v} ms");
 
         let took = time.elapsed().as_secs_f64();
-        debug!("{id:?} - Ending at {took} ms");
+        debug!("Ending at {took} ms");
 
         Ok(VectorSearchResponse {
             documents,
@@ -479,7 +477,6 @@ mod tests {
 
         let searcher = Searcher::open(vec![segment::open(segment, &vsc)?], vsc).unwrap();
         let request = VectorSearchRequest {
-            id: "".to_string(),
             vector_set: "".to_string(),
             vector: vec![4.0, 6.0, 7.0],
             result_per_page: 20,
@@ -575,7 +572,6 @@ mod tests {
 
         let searcher = Searcher::open(vec![segment::open(segment, &vsc)?], vsc).unwrap();
         let request = VectorSearchRequest {
-            id: "".to_string(),
             vector_set: "".to_string(),
             vector: vec![4.0, 6.0, 7.0],
             result_per_page: 20,
@@ -586,7 +582,6 @@ mod tests {
         assert_eq!(result.documents.len(), 4);
 
         let request = VectorSearchRequest {
-            id: "".to_string(),
             vector_set: "".to_string(),
             vector: vec![4.0, 6.0, 7.0],
             result_per_page: 20,
@@ -598,7 +593,6 @@ mod tests {
 
         // Check that min_score works
         let request = VectorSearchRequest {
-            id: "".to_string(),
             vector_set: "".to_string(),
             vector: vec![4.0, 6.0, 7.0],
             result_per_page: 20,
@@ -610,7 +604,6 @@ mod tests {
         assert_eq!(result.documents.len(), 0);
 
         let bad_request = VectorSearchRequest {
-            id: "".to_string(),
             vector_set: "".to_string(),
             vector: vec![4.0, 6.0],
             result_per_page: 20,
@@ -685,7 +678,6 @@ mod tests {
 
         let searcher = Searcher::open(vec![segment::open(segment, &vsc)?], vsc).unwrap();
         let request = VectorSearchRequest {
-            id: "".to_string(),
             vector_set: "".to_string(),
             vector: vec![4.0, 6.0, 7.0],
             result_per_page: 20,
@@ -696,7 +688,6 @@ mod tests {
         assert_eq!(result.documents.len(), 2);
 
         let request = VectorSearchRequest {
-            id: "".to_string(),
             vector_set: "".to_string(),
             vector: vec![4.0, 6.0, 7.0],
             result_per_page: 20,

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_vector/src/segment.rs

@@ -37,6 +37,8 @@ use std::fs::File;
 use std::io;
 use std::iter::empty;
 use std::path::Path;
+use std::time::Instant;
+use tracing::{debug, trace};
 
 /// How much expensive is to find a node via HNSW compared to a simple brute force scan
 const HNSW_COST_FACTOR: usize = 100;
@@ -498,7 +500,7 @@ impl OpenSegment {
         query: &[f32],
         filter: &Formula,
         with_duplicates: bool,
-        results: usize,
+        top_k: usize,
         config: &VectorConfig,
         min_score: f32,
     ) -> Box<dyn Iterator<Item = ScoredVector<'a>> + '_> {
@@ -519,35 +521,48 @@ impl OpenSegment {
         // If we have no filters, just the deletions
         let bitset = filter_bitset.as_ref().unwrap_or(&self.alive_bitset);
 
-        let count = bitset.iter().count();
-        if count == 0 {
+        let matching = bitset.iter().count();
+        if matching == 0 {
             return Box::new(empty());
         }
-        let expected_traversal_scan = results * self.metadata.records / count;
+        let expected_traversal_scan = top_k * self.metadata.records / matching;
 
-        if count < expected_traversal_scan * HNSW_COST_FACTOR {
-            self.brute_force_search(bitset, results, retriever, encoded_query, &raw_query)
+        let t = Instant::now();
+        let method;
+        let results = if matching < expected_traversal_scan * HNSW_COST_FACTOR {
+            method = "brute force";
+            self.brute_force_search(bitset, top_k, retriever, encoded_query, &raw_query)
         } else {
+            method = "hnsw";
             let ops = HnswOps::new(&retriever, true);
-            let neighbours = ops.search(encoded_query, self.index.as_ref(), results, bitset, with_duplicates);
+            let neighbours = ops.search(encoded_query, self.index.as_ref(), top_k, bitset, with_duplicates);
             Box::new(
                 neighbours
                     .into_iter()
                     .map(|(address, dist)| ScoredVector::new(address, self.data_store.as_ref(), dist))
-                    .take(results),
+                    .take(top_k),
             )
-        }
+        };
+
+        let time = t.elapsed();
+        let segment_path = &self.metadata.path;
+        let records = self.metadata.records;
+        debug!(?time, ?segment_path, records, matching, "Segment search using {method}");
+
+        results
     }
 
     fn brute_force_search<'a, DS: DataStore>(
         &'a self,
         bitset: &FilterBitSet,
-        results: usize,
+        top_k: usize,
         retriever: Retriever<'a, DS>,
         encoded_query: &SearchVector,
         raw_query: &SearchVector,
     ) -> Box<dyn Iterator<Item = ScoredVector<'a>> + '_> {
         let mut scored_results = Vec::new();
+
+        let t = Instant::now();
         for paragraph_addr in bitset.iter() {
             let paragraph = retriever.data_store.get_paragraph(paragraph_addr);
 
@@ -565,11 +580,14 @@ impl OpenSegment {
                 scored_results.push(best_vector_score);
             }
         }
+        let time = t.elapsed();
+        trace!(?time, "Brute force search: retrieve");
 
-        if matches!(encoded_query, SearchVector::RabitQ(_)) {
+        let t = Instant::now();
+        let results: Box<dyn Iterator<Item = _>> = if matches!(encoded_query, SearchVector::RabitQ(_)) {
             // If using RabitQ, rerank top results using the raw vectors
             Box::new(
-                rabitq::rerank_top(scored_results, results, &retriever, raw_query)
+                rabitq::rerank_top(scored_results, top_k, &retriever, raw_query)
                     .into_iter()
                     .map(|Reverse(Cnx(addr, score))| ScoredVector::new(addr, self.data_store.as_ref(), score)),
             )
@@ -580,9 +598,13 @@ impl OpenSegment {
                 scored_results
                     .into_iter()
                     .map(|a| ScoredVector::new(a.0, self.data_store.as_ref(), a.1.score))
-                    .take(results),
+                    .take(top_k),
             )
-        }
+        };
+        let time = t.elapsed();
+        trace!(?time, "Brute force search: rerank");
+
+        results
     }
 }
 

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/nidx_vector/src/vector_types/rabitq.rs

@@ -229,7 +229,7 @@ pub fn rerank_top(
     top_k: usize,
     retriever: &impl DataRetriever,
     query: &SearchVector,
-) -> BinaryHeap<Reverse<Cnx>> {
+) -> Vec<Reverse<Cnx>> {
     let mut best = BinaryHeap::new();
     let mut best_k = 0.0;
     for (addr, EstimatedScore { upper_bound, .. }) in candidates {
@@ -245,7 +245,7 @@ pub fn rerank_top(
             }
         }
     }
-    best
+    best.into_sorted_vec()
 }
 
 #[cfg(test)]

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/pyproject.toml

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

{nidx_binding-6.9.0.post580 → nidx_binding-6.9.0.post585}/src/searcher/query_planner.rs

@@ -112,7 +112,6 @@ fn compute_paragraphs_request(search_request: &SearchRequest) -> anyhow::Result<
         with_duplicates: search_request.with_duplicates,
         only_faceted: search_request.only_faceted,
         advanced_query: search_request.advanced_query.clone(),
-        id: String::default(),
         min_score: search_request.min_score_bm25,
         security: search_request.security.clone(),
         filtering_formula: search_request
@@ -130,7 +129,6 @@ fn compute_texts_request(search_request: &SearchRequest) -> Option<DocumentSearc
     }
 
     Some(DocumentSearchRequest {
-        id: search_request.shard.clone(),
         body: search_request.body.clone(),
         order: search_request.order.clone(),
         faceted: search_request.faceted.clone(),
@@ -153,7 +151,6 @@ fn compute_vectors_request(search_request: &SearchRequest) -> anyhow::Result<Opt
         .and_then(|f| extract_label_filters(f, SEGMENT_TAGS));
 
     Ok(Some(VectorSearchRequest {
-        id: search_request.shard.clone(),
         vector_set: search_request.vectorset.clone(),
         vector: search_request.vector.clone(),
         result_per_page: search_request.result_per_page,