nidx-binding 6.6.1.post439__tar.gz → 6.6.1.post444__tar.gz

{nidx_binding-6.6.1.post439 → nidx_binding-6.6.1.post444}/PKG-INFO

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

{nidx_binding-6.6.1.post439 → nidx_binding-6.6.1.post444}/nidx_paragraph/src/reader.rs

@@ -90,7 +90,6 @@ impl ParagraphReaderService {
             termc: termc.get_termc(),
             text_service: self,
             query: &text,
-            page_number: 1,
             results_per_page: 10,
             searcher,
             min_score: 0.0,
@@ -122,7 +121,6 @@ impl ParagraphReaderService {
 
         let parser = QueryParser::for_index(&self.index, vec![self.schema.text]);
         let results = request.result_per_page as usize;
-        let offset = results * request.page_number as usize;
 
         let facets: Vec<_> = request
             .faceted
@@ -156,7 +154,6 @@ impl ParagraphReaderService {
         let searcher = Searcher {
             request,
             results,
-            offset,
             facets: &facets,
             text: &text,
             only_faceted: request.only_faceted,
@@ -282,7 +279,6 @@ impl Iterator for BatchProducer {
 struct Searcher<'a> {
     request: &'a ParagraphSearchRequest,
     results: usize,
-    offset: usize,
     facets: &'a [String],
     text: &'a str,
     only_faceted: bool,
@@ -292,7 +288,6 @@ impl Searcher<'_> {
         &self,
         order: OrderBy,
         limit: usize,
-        offset: usize,
     ) -> impl Collector<Fruit = Vec<(DateTime, DocAddress)>> {
         let order_field = match order.sort_by() {
             OrderField::Created => "created",
@@ -302,9 +297,7 @@ impl Searcher<'_> {
             OrderType::Desc => Order::Desc,
             OrderType::Asc => Order::Asc,
         };
-        TopDocs::with_limit(limit)
-            .and_offset(offset)
-            .order_by_fast_field(order_field, order_direction)
+        TopDocs::with_limit(limit).order_by_fast_field(order_field, order_direction)
     }
     fn do_search(
         &self,
@@ -334,7 +327,7 @@ impl Searcher<'_> {
             let extra_result = self.results + 1;
             match self.request.order.clone() {
                 Some(order) => {
-                    let custom_collector = self.custom_order_collector(order, extra_result, self.offset);
+                    let custom_collector = self.custom_order_collector(order, extra_result);
                     let collector = &(Count, custom_collector);
                     let (total, top_docs) = searcher.search(&query, collector)?;
                     Ok(ParagraphSearchResponse::from(SearchIntResponse {
@@ -345,13 +338,12 @@ impl Searcher<'_> {
                         termc: termc.get_termc(),
                         text_service: service,
                         query: self.text,
-                        page_number: self.request.page_number,
                         results_per_page: self.results as i32,
                         searcher,
                     }))
                 }
                 None => {
-                    let topdocs_collector = TopDocs::with_limit(extra_result).and_offset(self.offset);
+                    let topdocs_collector = TopDocs::with_limit(extra_result);
                     let collector = &(Count, topdocs_collector);
                     let (total, top_docs) = searcher.search(&query, collector)?;
                     Ok(ParagraphSearchResponse::from(SearchBm25Response {
@@ -362,7 +354,6 @@ impl Searcher<'_> {
                         termc: termc.get_termc(),
                         text_service: service,
                         query: self.text,
-                        page_number: self.request.page_number,
                         results_per_page: self.results as i32,
                         searcher,
                         min_score,
@@ -374,7 +365,7 @@ impl Searcher<'_> {
 
             match self.request.order.clone() {
                 Some(order) => {
-                    let custom_collector = self.custom_order_collector(order, extra_result, self.offset);
+                    let custom_collector = self.custom_order_collector(order, extra_result);
                     let collector = &(Count, facet_collector, custom_collector);
                     let (total, facets_count, top_docs) = searcher.search(&query, collector)?;
                     Ok(ParagraphSearchResponse::from(SearchIntResponse {
@@ -385,13 +376,12 @@ impl Searcher<'_> {
                         termc: termc.get_termc(),
                         text_service: service,
                         query: self.text,
-                        page_number: self.request.page_number,
                         results_per_page: self.results as i32,
                         searcher,
                     }))
                 }
                 None => {
-                    let topdocs_collector = TopDocs::with_limit(extra_result).and_offset(self.offset);
+                    let topdocs_collector = TopDocs::with_limit(extra_result);
                     let collector = &(Count, facet_collector, topdocs_collector);
                     let (total, facets_count, top_docs) = searcher.search(&query, collector)?;
                     Ok(ParagraphSearchResponse::from(SearchBm25Response {
@@ -402,7 +392,6 @@ impl Searcher<'_> {
                         termc: termc.get_termc(),
                         text_service: service,
                         query: self.text,
-                        page_number: self.request.page_number,
                         results_per_page: self.results as i32,
                         searcher,
                         min_score,

{nidx_binding-6.6.1.post439 → nidx_binding-6.6.1.post444}/nidx_paragraph/src/request_types.rs

@@ -27,7 +27,6 @@ pub struct ParagraphSearchRequest {
     pub body: String,
     pub order: Option<nidx_protos::OrderBy>,
     pub faceted: Option<nidx_protos::Faceted>,
-    pub page_number: i32,
     pub result_per_page: i32,
     pub with_duplicates: bool,
     pub only_faceted: bool,

{nidx_binding-6.6.1.post439 → nidx_binding-6.6.1.post444}/nidx_paragraph/src/search_response.rs

@@ -74,7 +74,6 @@ pub struct SearchBm25Response<'a> {
     pub facets_count: Option<FacetCounts>,
     pub facets: Vec<String>,
     pub top_docs: Vec<(f32, DocAddress)>,
-    pub page_number: i32,
     pub results_per_page: i32,
     pub termc: TermCollector,
     pub searcher: tantivy::Searcher,
@@ -88,7 +87,6 @@ pub struct SearchIntResponse<'a> {
     pub facets_count: Option<FacetCounts>,
     pub facets: Vec<String>,
     pub top_docs: Vec<(DateTime, DocAddress)>,
-    pub page_number: i32,
     pub results_per_page: i32,
     pub termc: TermCollector,
     pub searcher: tantivy::Searcher,
@@ -202,7 +200,6 @@ impl From<SearchIntResponse<'_>> for ParagraphSearchResponse {
             facets,
             total,
             fuzzy_distance: 0i32,
-            page_number: response.page_number,
             result_per_page: response.results_per_page,
             query: response.query.to_string(),
             next_page,
@@ -297,7 +294,6 @@ impl From<SearchBm25Response<'_>> for ParagraphSearchResponse {
             total,
             bm25: true,
             fuzzy_distance: 0i32,
-            page_number: response.page_number,
             result_per_page: response.results_per_page,
             query: response.query.to_string(),
             ematches: response.termc.eterms.into_iter().collect(),

{nidx_binding-6.6.1.post439 → nidx_binding-6.6.1.post444}/nidx_paragraph/tests/reader.rs

@@ -183,7 +183,6 @@ fn test_total_number_of_results() -> anyhow::Result<()> {
         body: "".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -198,7 +197,6 @@ fn test_total_number_of_results() -> anyhow::Result<()> {
         body: "".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 0,
         only_faceted: false,
         ..Default::default()
@@ -230,7 +228,6 @@ fn test_filtered_search() -> anyhow::Result<()> {
         body: "".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -295,7 +292,6 @@ fn test_new_paragraph() -> anyhow::Result<()> {
         body: "".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -310,7 +306,6 @@ fn test_new_paragraph() -> anyhow::Result<()> {
         body: "".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -325,7 +320,6 @@ fn test_new_paragraph() -> anyhow::Result<()> {
         body: "should enough".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         min_score: 30.0,
@@ -341,7 +335,6 @@ fn test_new_paragraph() -> anyhow::Result<()> {
         body: "shoupd enaugh".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -356,7 +349,6 @@ fn test_new_paragraph() -> anyhow::Result<()> {
         body: "\"should\" enaugh".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -371,7 +363,6 @@ fn test_new_paragraph() -> anyhow::Result<()> {
         body: "shoupd enaugh".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -386,7 +377,6 @@ fn test_new_paragraph() -> anyhow::Result<()> {
         body: "shoupd + enaugh\"".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -402,7 +392,6 @@ fn test_new_paragraph() -> anyhow::Result<()> {
         body: "shoupd + enaugh".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -418,7 +407,6 @@ fn test_new_paragraph() -> anyhow::Result<()> {
         body: "".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -433,7 +421,6 @@ fn test_new_paragraph() -> anyhow::Result<()> {
         body: "this is the".to_string(),
         faceted: Some(faceted.clone()),
         order: Some(order),
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -448,7 +435,6 @@ fn test_new_paragraph() -> anyhow::Result<()> {
         body: "\"shoupd\"".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()
@@ -492,7 +478,6 @@ fn test_query_parsing() -> anyhow::Result<()> {
         body: "".to_string(),
         faceted: None,
         order: None,
-        page_number: 0,
         result_per_page: 20,
         only_faceted: false,
         ..Default::default()

{nidx_binding-6.6.1.post439 → nidx_binding-6.6.1.post444}/nidx_protos/nodereader.proto

@@ -60,13 +60,14 @@ message DocumentResult {
 }
 
 message DocumentSearchResponse {
+    reserved 4;
+
     int32 total = 1;
 
     repeated DocumentResult results = 2;
 
     map<string, FacetResults> facets = 3;
 
-    int32 page_number = 4;
     int32 result_per_page = 5;
 
     // The text that lead to this results
@@ -95,6 +96,8 @@ message ParagraphResult {
 }
 
 message ParagraphSearchResponse {
+    reserved 4;
+
     int32 fuzzy_distance = 10;
     int32 total = 1;
     repeated ParagraphResult results = 2;
@@ -102,9 +105,6 @@ message ParagraphSearchResponse {
     // For each field what facets are.
     map<string, FacetResults> facets = 3;
 
-    // What page is the answer.
-    int32 page_number = 4;
-
     // How many results are in this page.
     int32 result_per_page = 5;
 
@@ -129,12 +129,11 @@ message DocumentScored {
 }
 
 message VectorSearchResponse {
+    reserved 4;
+
     // List of docs closer to the asked one.
     repeated DocumentScored documents = 1;
 
-    // What page is the answer.
-    int32 page_number = 4;
-
     // How many results are in this page.
     int32 result_per_page = 5;
 }
@@ -304,7 +303,7 @@ enum FilterOperator {
 }
 
 message SearchRequest {
-    reserved 20, 21;
+    reserved 7, 20, 21;
 
     string shard = 1;
 
@@ -315,7 +314,6 @@ message SearchRequest {
 
     Faceted faceted = 6;
 
-    int32 page_number = 7;
     int32 result_per_page = 8;
 
     repeated float vector = 10; // Embedded vector search.

{nidx_binding-6.6.1.post439 → nidx_binding-6.6.1.post444}/nidx_protos/pyproject.toml

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

{nidx_binding-6.6.1.post439 → nidx_binding-6.6.1.post444}/nidx_text/src/reader.rs

@@ -69,7 +69,6 @@ pub struct SearchResponse<'a, S> {
     pub facets_count: FacetCounts,
     pub facets: Vec<String>,
     pub top_docs: Vec<(S, DocAddress)>,
-    pub page_number: i32,
     pub results_per_page: i32,
     pub total: usize,
 }
@@ -236,31 +235,24 @@ impl TextReaderService {
 }
 
 impl TextReaderService {
-    fn custom_order_collector(
-        &self,
-        order: OrderBy,
-        limit: usize,
-        offset: usize,
-    ) -> impl Collector<Fruit = Vec<(i64, DocAddress)>> {
+    fn custom_order_collector(&self, order: OrderBy, limit: usize) -> impl Collector<Fruit = Vec<(i64, DocAddress)>> {
         use tantivy::{DocId, SegmentReader};
         let sorter = match order.r#type() {
             OrderType::Desc => |t: i64| t,
             OrderType::Asc => |t: i64| -t,
         };
-        TopDocs::with_limit(limit)
-            .and_offset(offset)
-            .custom_score(move |segment_reader: &SegmentReader| {
-                let reader = match order.sort_by() {
-                    OrderField::Created => segment_reader.fast_fields().date("created").unwrap(),
-                    OrderField::Modified => segment_reader.fast_fields().date("modified").unwrap(),
-                };
-                move |doc: DocId| sorter(reader.values_for_doc(doc).next().unwrap().into_timestamp_secs())
-            })
+        TopDocs::with_limit(limit).custom_score(move |segment_reader: &SegmentReader| {
+            let reader = match order.sort_by() {
+                OrderField::Created => segment_reader.fast_fields().date("created").unwrap(),
+                OrderField::Modified => segment_reader.fast_fields().date("modified").unwrap(),
+            };
+            move |doc: DocId| sorter(reader.values_for_doc(doc).next().unwrap().into_timestamp_secs())
+        })
     }
 
     fn convert_int_order(&self, response: SearchResponse<i64>, searcher: &Searcher) -> DocumentSearchResponse {
         let total = response.total as i32;
-        let retrieved_results = (response.page_number + 1) * response.results_per_page;
+        let retrieved_results = response.results_per_page;
         let next_page = total > retrieved_results;
         let results_per_page = response.results_per_page as usize;
         let result_stream = response.top_docs.into_iter().take(results_per_page).enumerate();
@@ -313,7 +305,6 @@ impl TextReaderService {
             total,
             results,
             facets,
-            page_number: response.page_number,
             result_per_page: response.results_per_page,
             query: response.query.to_string(),
             next_page,
@@ -328,7 +319,7 @@ impl TextReaderService {
         min_score: f32,
     ) -> DocumentSearchResponse {
         let total = response.total as i32;
-        let retrieved_results = (response.page_number + 1) * response.results_per_page;
+        let retrieved_results = response.results_per_page;
         let next_page = total > retrieved_results;
         let results_per_page = response.results_per_page as usize;
         let result_stream = response.top_docs.into_iter().take(results_per_page).enumerate();
@@ -383,7 +374,6 @@ impl TextReaderService {
             results,
             facets,
             total: response.total as i32,
-            page_number: response.page_number,
             result_per_page: response.results_per_page,
             query: response.query.to_string(),
             next_page,
@@ -424,7 +414,6 @@ impl TextReaderService {
 
         // Offset to search from
         let results = request.result_per_page as usize;
-        let offset = results * request.page_number as usize;
         let extra_result = results + 1;
         let maybe_order = request.order.clone();
         let valid_facet_iter = request
@@ -458,7 +447,7 @@ impl TextReaderService {
                 })
             }
             Some(order_by) => {
-                let topdocs_collector = self.custom_order_collector(order_by, extra_result, offset);
+                let topdocs_collector = self.custom_order_collector(order_by, extra_result);
                 let multicollector = &(facet_collector, topdocs_collector, Count);
                 let (facets_count, top_docs, total) = searcher.search(&query, multicollector)?;
                 let result = self.convert_int_order(
@@ -468,7 +457,6 @@ impl TextReaderService {
                         top_docs,
                         total,
                         query: &text,
-                        page_number: request.page_number,
                         results_per_page: results as i32,
                     },
                     &searcher,
@@ -476,7 +464,7 @@ impl TextReaderService {
                 Ok(result)
             }
             None => {
-                let topdocs_collector = TopDocs::with_limit(extra_result).and_offset(offset);
+                let topdocs_collector = TopDocs::with_limit(extra_result);
                 let multicollector = &(facet_collector, topdocs_collector, Count);
                 let (facets_count, top_docs, total) = searcher.search(&query, multicollector)?;
                 let result = self.convert_bm25_order(
@@ -486,7 +474,6 @@ impl TextReaderService {
                         top_docs,
                         total,
                         query: &text,
-                        page_number: request.page_number,
                         results_per_page: results as i32,
                     },
                     &searcher,

{nidx_binding-6.6.1.post439 → nidx_binding-6.6.1.post444}/nidx_text/src/request_types.rs

@@ -26,7 +26,6 @@ pub struct DocumentSearchRequest {
     pub body: String,
     pub order: Option<nidx_protos::OrderBy>,
     pub faceted: Option<nidx_protos::Faceted>,
-    pub page_number: i32,
     pub result_per_page: i32,
     pub only_faceted: bool,
     pub advanced_query: Option<String>,

{nidx_binding-6.6.1.post439 → nidx_binding-6.6.1.post444}/nidx_text/tests/test_search.rs

@@ -40,7 +40,6 @@ fn test_search_queries() {
         let request = DocumentSearchRequest {
             id: "shard".to_string(),
             body: query.clone(),
-            page_number: 0,
             result_per_page: 20,
             ..Default::default()
         };
@@ -195,7 +194,6 @@ fn test_filtered_search() {
         let request = DocumentSearchRequest {
             id: "shard".to_string(),
             body: query.clone(),
-            page_number: 0,
             result_per_page: 20,
             filter_expression: Some(expression),
             ..Default::default()
@@ -249,7 +247,6 @@ fn test_search_by_field() {
     let request = DocumentSearchRequest {
         id: "shard".to_string(),
         body: "".to_string(),
-        page_number: 0,
         result_per_page: 20,
         filter_expression: Some(FilterExpression {
             expr: Some(nidx_protos::filter_expression::Expr::Field(FieldFilter {
@@ -273,7 +270,6 @@ fn test_faceted_search() {
         let request = DocumentSearchRequest {
             id: "shard".to_string(),
             body: "".to_string(),
-            page_number: 0,
             result_per_page: 20,
             faceted: Some(facets.clone()),
             ..Default::default()
@@ -308,7 +304,6 @@ fn test_quote_fixing() {
         let request = DocumentSearchRequest {
             id: "shard".to_string(),
             body: query.into(),
-            page_number: 0,
             result_per_page: 20,
             ..Default::default()
         };
@@ -331,7 +326,6 @@ fn test_search_with_min_score() {
         let request = DocumentSearchRequest {
             id: "shard".to_string(),
             body: query.clone(),
-            page_number: 0,
             result_per_page: 20,
             min_score,
             ..Default::default()
@@ -356,7 +350,6 @@ fn test_int_order_pagination() {
     let request = DocumentSearchRequest {
         id: "shard".to_string(),
         body: "".to_string(),
-        page_number: 0,
         result_per_page: 1,
         order: Some(OrderBy {
             r#type: OrderType::Desc.into(),
@@ -390,7 +383,6 @@ fn test_timestamp_filtering() {
         let request = DocumentSearchRequest {
             id: "shard".to_string(),
             body: "".to_string(),
-            page_number: 0,
             result_per_page: 10,
             min_score: f32::MIN,
             filter_expression: Some(FilterExpression {
@@ -430,7 +422,6 @@ fn test_key_filtering() {
     let request = DocumentSearchRequest {
         id: "shard".to_string(),
         body: "".to_string(),
-        page_number: 0,
         result_per_page: 1,
         min_score: f32::MIN,
         ..Default::default()
@@ -442,7 +433,6 @@ fn test_key_filtering() {
         let request = DocumentSearchRequest {
             id: "shard".to_string(),
             body: "".to_string(),
-            page_number: 0,
             result_per_page: 10,
             min_score: f32::MIN,
             filter_expression: Some(FilterExpression {