nidx-binding 6.9.7.post701__tar.gz → 6.9.7.post704__tar.gz

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.9.7.post701
+Version: 6.9.7.post704
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/nidx_paragraph/src/reader.rs

@@ -272,7 +272,7 @@ impl Searcher<'_> {
         } else if self.facets.is_empty() {
             // Only query no facets
             let extra_result = self.results + 1;
-            match self.request.order.clone() {
+            match self.request.order {
                 Some(order) => {
                     let sort_field = order.sort_by();
                     let custom_collector = self.custom_order_collector(order, extra_result);
@@ -312,7 +312,7 @@ impl Searcher<'_> {
         } else {
             let extra_result = self.results + 1;
 
-            match self.request.order.clone() {
+            match self.request.order {
                 Some(order) => {
                     let sort_field = order.sort_by();
                     let custom_collector = self.custom_order_collector(order, extra_result);

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/nidx_paragraph/tests/reader.rs

@@ -383,7 +383,6 @@ fn test_order_by() -> anyhow::Result<()> {
     let order = OrderBy {
         sort_by: OrderField::Created as i32,
         r#type: 0,
-        ..Default::default()
     };
 
     // TODO: we need two resources to test any order (creation/modification dates)

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/nidx_protos/nodereader.proto

@@ -24,6 +24,8 @@ message Faceted {
 
 
 message OrderBy {
+    reserved 1;
+
     enum OrderType {
       DESC = 0;
       ASC = 1;
@@ -32,7 +34,7 @@ message OrderBy {
         CREATED = 0;
         MODIFIED = 1;
     }
-    string field = 1 [deprecated = true];
+
     OrderType type = 2;
     OrderField sort_by = 3;
 }

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/nidx_protos/noderesources.proto

@@ -138,6 +138,8 @@ message IndexParagraphs {
 }
 
 message Resource {
+    reserved 12, 13;
+
     ResourceID resource = 1;
 
     IndexMetadata metadata = 2;
@@ -179,9 +181,6 @@ message Resource {
 
     string shard_id = 11;
 
-    map<string, utils.UserVectors> vectors = 12 [deprecated = true]; // vectorset is the key
-    map<string, utils.UserVectorsList> vectors_to_delete = 13 [deprecated = true];  // Vectorset prefix vector id
-
     optional utils.Security security = 14;
 
     // Boleans to indicate if the indexing needs to be done
@@ -190,8 +189,9 @@ message Resource {
 }
 
 message ShardMetadata {
+    reserved 2;
+
     string kbid = 1;
-    utils.ReleaseChannel release_channel = 2;
 }
 
 message StringList {

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/nidx_protos/nodewriter.proto

@@ -6,6 +6,8 @@ import public "nidx_protos/noderesources.proto";
 
 
 message OpStatus {
+    reserved 3, 4, 5, 6;
+
     enum Status {
         OK = 0;
         WARNING = 1;
@@ -13,11 +15,6 @@ message OpStatus {
     }
     Status status = 1;
     string detail = 2;
-
-    uint64 field_count = 3 [deprecated = true];
-    uint64 paragraph_count = 5 [deprecated = true];
-    uint64 sentence_count = 6 [deprecated = true];
-    string shard_id = 4 [deprecated = true];
 }
 
 // Implemented at nucliadb_object_storage
@@ -57,10 +54,9 @@ message VectorIndexConfig {
 }
 
 message NewShardRequest {
-    reserved 4, 5;
-    utils.VectorSimilarity similarity = 1 [deprecated = true];
+    reserved 1, 3, 4, 5;
+
     string kbid = 2;
-    utils.ReleaseChannel release_channel = 3;
 
     map<string, VectorIndexConfig> vectorsets_configs = 6;
     bool prewarm_enabled = 7;
@@ -68,8 +64,8 @@ message NewShardRequest {
 }
 
 message NewVectorSetRequest {
+    reserved 2, 3;
+
     noderesources.VectorSetID id = 1;
-    utils.VectorSimilarity similarity = 2 [deprecated = true];
-    bool normalize_vectors = 3 [deprecated = true];
     VectorIndexConfig config = 4;
 }

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/nidx_protos/pyproject.toml

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

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/nidx_relation/tests/test_writer.rs

@@ -27,6 +27,8 @@ use nidx_protos::{
 use nidx_relation::{RelationConfig, RelationIndexer};
 use tempfile::TempDir;
 
+use crate::common::TestOpener;
+
 #[test]
 fn test_index_docs() -> anyhow::Result<()> {
     let dir = TempDir::new().unwrap();
@@ -82,3 +84,91 @@ fn test_index_docs() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+#[test]
+fn test_merge() -> anyhow::Result<()> {
+    let dir1 = TempDir::new().unwrap();
+
+    let resource = Resource {
+        resource: Some(ResourceId {
+            uuid: "01808bbd8e784552967a4fb0d8b6e584".to_string(),
+            shard_id: "shard_id".to_string(),
+        }),
+        field_relations: HashMap::from([(
+            "a/metadata".to_string(),
+            IndexRelations {
+                relations: vec![common::create_relation(
+                    "01808bbd8e784552967a4fb0d8b6e584".to_string(),
+                    NodeType::Resource,
+                    "".to_string(),
+                    "dog".to_string(),
+                    NodeType::Entity,
+                    "ANIMALS".to_string(),
+                    RelationType::Entity,
+                    "IS".to_string(),
+                )],
+            },
+        )]),
+        ..Default::default()
+    };
+
+    let meta1 = RelationIndexer
+        .index_resource(dir1.path(), &RelationConfig::default(), &resource)?
+        .unwrap();
+
+    assert_eq!(meta1.records, 1);
+
+    let dir2 = TempDir::new().unwrap();
+
+    let resource = Resource {
+        resource: Some(ResourceId {
+            uuid: "81808bbd8e784552967a4fb0d8b6e584".to_string(),
+            shard_id: "shard_id".to_string(),
+        }),
+        field_relations: HashMap::from([(
+            "a/metadata".to_string(),
+            IndexRelations {
+                relations: vec![common::create_relation(
+                    "81808bbd8e784552967a4fb0d8b6e584".to_string(),
+                    NodeType::Resource,
+                    "".to_string(),
+                    "cat".to_string(),
+                    NodeType::Entity,
+                    "ANIMALS".to_string(),
+                    RelationType::Entity,
+                    "IS".to_string(),
+                )],
+            },
+        )]),
+        ..Default::default()
+    };
+
+    let meta2 = RelationIndexer
+        .index_resource(dir2.path(), &RelationConfig::default(), &resource)?
+        .unwrap();
+
+    assert_eq!(meta2.records, 1);
+
+    let dir_merge = TempDir::new().unwrap();
+    let merged_meta = RelationIndexer.merge(
+        dir_merge.path(),
+        RelationConfig::default(),
+        TestOpener::new(vec![(meta1.clone(), 1u64.into()), (meta2.clone(), 2u64.into())], vec![]),
+    )?;
+
+    assert_eq!(merged_meta.records, 2);
+
+    let dir_merge2 = TempDir::new().unwrap();
+    let merged_meta2 = RelationIndexer.merge(
+        dir_merge2.path(),
+        RelationConfig::default(),
+        TestOpener::new(
+            vec![(meta1, 1u64.into()), (meta2, 2u64.into())],
+            vec![("01808bbd8e784552967a4fb0d8b6e584".to_string(), 3u64.into())],
+        ),
+    )?;
+
+    assert_eq!(merged_meta2.records, 1);
+
+    Ok(())
+}

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/nidx_text/src/reader.rs

@@ -413,7 +413,7 @@ impl TextReaderService {
         // Offset to search from
         let results = request.result_per_page as usize;
         let extra_result = results + 1;
-        let maybe_order = request.order.clone();
+        let maybe_order = request.order;
         let valid_facet_iter = request
             .faceted
             .iter()

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/nidx_text/tests/common/mod.rs

@@ -110,8 +110,6 @@ pub fn create_resource(shard_id: String) -> Resource {
         labels: vec![],
         paragraphs: HashMap::new(),
         paragraphs_to_delete: vec![],
-        vectors: HashMap::default(),
-        vectors_to_delete: HashMap::default(),
         shard_id,
         ..Default::default()
     }

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/nidx_text/tests/test_search.rs

@@ -347,7 +347,6 @@ fn test_int_order_pagination() {
         order: Some(OrderBy {
             r#type: OrderType::Desc.into(),
             sort_by: OrderField::Created.into(),
-            ..Default::default()
         }),
         min_score: f32::MIN,
         ..Default::default()

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/pyproject.toml

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

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/src/api/grpc.rs

@@ -89,7 +89,6 @@ impl NidxApi for ApiServer {
         Ok(Response::new(noderesources::Shard {
             metadata: Some(ShardMetadata {
                 kbid: shard.kbid.to_string(),
-                release_channel: 0,
             }),
             shard_id: shard_id.to_string(),
             fields: index_stats.get(&IndexKind::Text).map(|s| s.records).unwrap_or(0) as u64,
@@ -167,7 +166,6 @@ impl NidxApi for ApiServer {
         Ok(Response::new(OpStatus {
             status: op_status::Status::Ok.into(),
             detail: "Vectorset successfully created".to_string(),
-            ..Default::default()
         }))
     }
 
@@ -186,7 +184,6 @@ impl NidxApi for ApiServer {
         Ok(Response::new(OpStatus {
             status: op_status::Status::Ok.into(),
             detail: "Vectorset successfully deleted".to_string(),
-            ..Default::default()
         }))
     }
 

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/src/searcher/query_planner.rs

@@ -106,7 +106,7 @@ fn compute_paragraphs_request(search_request: &SearchRequest) -> anyhow::Result<
     Ok(Some(ParagraphSearchRequest {
         uuid: "".to_string(),
         body: search_request.body.clone(),
-        order: search_request.order.clone(),
+        order: search_request.order,
         faceted: search_request.faceted.clone(),
         result_per_page: search_request.result_per_page,
         with_duplicates: search_request.with_duplicates,
@@ -130,7 +130,7 @@ fn compute_texts_request(search_request: &SearchRequest) -> Option<DocumentSearc
 
     Some(DocumentSearchRequest {
         body: search_request.body.clone(),
-        order: search_request.order.clone(),
+        order: search_request.order,
         faceted: search_request.faceted.clone(),
         result_per_page: search_request.result_per_page,
         only_faceted: search_request.only_faceted,

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/tests/integration/search_sorting.rs

@@ -108,7 +108,7 @@ async fn test_search_sorting(pool: PgPool) -> Result<(), Box<dyn std::error::Err
             .searcher_client
             .search(SearchRequest {
                 shard: shard_id.clone(),
-                order: order.clone(),
+                order,
                 document: true,
                 vectorset: "english".to_string(),
                 result_per_page: page_size,
@@ -130,7 +130,6 @@ async fn test_search_sorting(pool: PgPool) -> Result<(), Box<dyn std::error::Err
     let order = Some(nidx_protos::OrderBy {
         sort_by: nidx_protos::order_by::OrderField::Created.into(),
         r#type: nidx_protos::order_by::OrderType::Asc.into(),
-        ..Default::default()
     });
     let fields = do_search(&mut fixture, shard_id.clone(), order, 5).await;
     let mut sorted_fields = fields.clone();
@@ -144,7 +143,6 @@ async fn test_search_sorting(pool: PgPool) -> Result<(), Box<dyn std::error::Err
     let order = Some(nidx_protos::OrderBy {
         sort_by: nidx_protos::order_by::OrderField::Modified.into(),
         r#type: nidx_protos::order_by::OrderType::Asc.into(),
-        ..Default::default()
     });
     let fields = do_search(&mut fixture, shard_id.clone(), order, 5).await;
 
@@ -159,7 +157,6 @@ async fn test_search_sorting(pool: PgPool) -> Result<(), Box<dyn std::error::Err
     let order = Some(nidx_protos::OrderBy {
         sort_by: nidx_protos::order_by::OrderField::Created.into(),
         r#type: nidx_protos::order_by::OrderType::Desc.into(),
-        ..Default::default()
     });
     let fields = do_search(&mut fixture, shard_id.clone(), order, 5).await;
 
@@ -175,7 +172,6 @@ async fn test_search_sorting(pool: PgPool) -> Result<(), Box<dyn std::error::Err
     let order = Some(nidx_protos::OrderBy {
         sort_by: nidx_protos::order_by::OrderField::Modified.into(),
         r#type: nidx_protos::order_by::OrderType::Desc.into(),
-        ..Default::default()
     });
     let fields = do_search(&mut fixture, shard_id.clone(), order, 5).await;
 

{nidx_binding-6.9.7.post701 → nidx_binding-6.9.7.post704}/tests/integration/vectorsets.rs

@@ -141,7 +141,6 @@ async fn test_add_vectorset_to_shard(pool: PgPool) -> anyhow::Result<()> {
                 vector_dimension: Some(3),
                 ..Default::default()
             }),
-            ..Default::default()
         }))
         .await?;