nidx-binding 6.8.1.post515__tar.gz → 6.8.1.post521__tar.gz

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nidx_binding
-Version: 6.8.1.post515
+Version: 6.8.1.post521
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Programming Language :: Python :: Implementation :: PyPy

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_paragraph/src/query_parser/tokenizer.rs

@@ -72,7 +72,7 @@ pub fn tokenize_query_infallible(input: &str) -> Vec<Token<'_>> {
     }
 }
 
-fn nidx_grammar_tokenize(input: &str) -> IResult<&str, Vec<Token>, nom::error::Error<&str>> {
+fn nidx_grammar_tokenize(input: &str) -> IResult<&str, Vec<Token<'_>>, nom::error::Error<&str>> {
     let is_literal_char = |c: char| -> bool {
         c.is_alphanumeric()
             || (

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_protos/pyproject.toml

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

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_relation/src/graph_query_parser.rs

@@ -410,10 +410,10 @@ impl<'a> GraphQueryParser<'a> {
             subqueries.push(self.has_node_type(node_type, fields.node_type));
         }
 
-        if let Some(ref node_subtype) = node.node_subtype {
-            if !node_subtype.is_empty() {
-                subqueries.push(self.has_node_subtype(node_subtype, fields.node_subtype));
-            }
+        if let Some(ref node_subtype) = node.node_subtype
+            && !node_subtype.is_empty()
+        {
+            subqueries.push(self.has_node_subtype(node_subtype, fields.node_subtype));
         }
 
         subqueries
@@ -425,10 +425,10 @@ impl<'a> GraphQueryParser<'a> {
 
         match expression {
             Expression::Value(Relation { value, relation_type }) => {
-                if let Some(value) = value {
-                    if !value.is_empty() {
-                        subqueries.push((Occur::Must, self.has_relation_label(value)));
-                    }
+                if let Some(value) = value
+                    && !value.is_empty()
+                {
+                    subqueries.push((Occur::Must, self.has_relation_label(value)));
                 };
 
                 relation_type.map(|relation_type| {
@@ -437,10 +437,10 @@ impl<'a> GraphQueryParser<'a> {
             }
 
             Expression::Not(Relation { value, relation_type }) => {
-                if let Some(value) = value {
-                    if !value.is_empty() {
-                        subqueries.push((Occur::MustNot, self.has_relation_label(value)));
-                    }
+                if let Some(value) = value
+                    && !value.is_empty()
+                {
+                    subqueries.push((Occur::MustNot, self.has_relation_label(value)));
                 };
 
                 relation_type.map(|relation_type| {

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_tantivy/src/index_reader.rs

@@ -52,7 +52,7 @@ pub fn open_index_with_deletions(
     for segment in index.searchable_segments()? {
         let segment_deletions = open_index
             .deletions()
-            .filter(|&(_, del_seq)| (Seq::from(segment.meta().delete_opstamp().unwrap() as i64) < del_seq))
+            .filter(|&(_, del_seq)| Seq::from(segment.meta().delete_opstamp().unwrap() as i64) < del_seq)
             .map(|(key, _)| key);
         let segment_reader = SegmentReader::open(&segment)?;
         let mut bitset = BitSet::with_max_value_and_full(segment.meta().max_doc());

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/data_store/v1/node.rs

@@ -87,7 +87,7 @@ impl<'a> Node<'a> {
 
         // Pointer computations
         let vector_start = HEADER_LEN + metadata_len;
-        let vector_pad = if vector_start % alignment > 0 {
+        let vector_pad = if !vector_start.is_multiple_of(alignment) {
             alignment - (vector_start % alignment)
         } else {
             0

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/data_store/v1/store.rs

@@ -71,7 +71,7 @@ pub fn stored_elements(x: &[u8]) -> usize {
 }
 
 // O(1)
-pub fn get_value(src: &[u8], id: usize) -> Node {
+pub fn get_value(src: &[u8], id: usize) -> Node<'_> {
     let pointer = get_pointer(src, id);
     Node::new(&src[pointer..])
 }
@@ -128,7 +128,7 @@ pub fn create_key_value<D: IntoBuffer>(
     for slot in slots {
         // slot serialization
         let mut slot_address = recipient_buffer.seek(SeekFrom::End(0))?;
-        if slot_address as usize % alignment > 0 {
+        if !(slot_address as usize).is_multiple_of(alignment) {
             let pad = alignment - (slot_address as usize % alignment);
             recipient_buffer.seek(SeekFrom::Current(pad as i64))?;
             slot_address += pad as u64;
@@ -185,7 +185,7 @@ pub fn merge(
             // Moving to the end of the file to write the current element.
             let exact_element = Node::new(element_slice);
             let mut element_pointer = recipient_buffer.seek(SeekFrom::End(0))?;
-            if element_pointer as usize % alignment > 0 {
+            if !(element_pointer as usize).is_multiple_of(alignment) {
                 let pad = alignment - (element_pointer as usize % alignment);
                 recipient_buffer.seek(SeekFrom::Current(pad as i64))?;
                 element_pointer += pad as u64;

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/data_store/v1.rs

@@ -54,7 +54,7 @@ impl DataStore for DataStoreV1 {
         self.stored_paragraph_count()
     }
 
-    fn get_vector(&self, VectorAddr(id): VectorAddr) -> VectorRef {
+    fn get_vector(&self, VectorAddr(id): VectorAddr) -> VectorRef<'_> {
         VectorRef {
             vector: store::get_value(&self.nodes, id as usize).vector(),
             paragraph_addr: ParagraphAddr(id),
@@ -68,7 +68,7 @@ impl DataStore for DataStoreV1 {
         self
     }
 
-    fn get_paragraph(&self, ParagraphAddr(id): ParagraphAddr) -> ParagraphRef {
+    fn get_paragraph(&self, ParagraphAddr(id): ParagraphAddr) -> ParagraphRef<'_> {
         ParagraphRef::V1(store::get_value(&self.nodes, id as usize))
     }
 }

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/data_store/v2/paragraph_store.rs

@@ -94,7 +94,7 @@ impl ParagraphStore {
         Ok(Self { pos, data })
     }
 
-    pub fn get_paragraph(&self, ParagraphAddr(addr): ParagraphAddr) -> ParagraphRef {
+    pub fn get_paragraph(&self, ParagraphAddr(addr): ParagraphAddr) -> ParagraphRef<'_> {
         let start_bytes = &self.pos[addr as usize * U32_LEN..addr as usize * U32_LEN + U32_LEN];
         let start = u32::from_le_bytes(start_bytes.try_into().unwrap()) as usize;
         let (paragraph, _) =

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/data_store/v2/vector_store.rs

@@ -73,7 +73,7 @@ impl VectorStore {
         })
     }
 
-    pub fn get_vector(&self, addr: VectorAddr) -> VectorRef {
+    pub fn get_vector(&self, addr: VectorAddr) -> VectorRef<'_> {
         let start = self.record_start(addr);
         let vector = &self.data[start..start + self.vector_len_bytes];
         let paragraph_bytes = &self.data[start + self.vector_len_bytes..start + self.vector_len_bytes + U32_LEN];

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/data_store/v2.rs

@@ -99,11 +99,11 @@ impl DataStore for DataStoreV2 {
         self.vectors.stored_elements()
     }
 
-    fn get_paragraph(&self, id: ParagraphAddr) -> super::ParagraphRef {
+    fn get_paragraph(&self, id: ParagraphAddr) -> super::ParagraphRef<'_> {
         self.paragraphs.get_paragraph(id)
     }
 
-    fn get_vector(&self, id: VectorAddr) -> super::VectorRef {
+    fn get_vector(&self, id: VectorAddr) -> super::VectorRef<'_> {
         self.vectors.get_vector(id)
     }
 

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/data_store.rs

@@ -92,8 +92,8 @@ pub trait DataStore: Sync + Send {
     fn size_bytes(&self) -> usize;
     fn stored_paragraph_count(&self) -> u32;
     fn stored_vector_count(&self) -> u32;
-    fn get_paragraph(&self, id: ParagraphAddr) -> ParagraphRef;
-    fn get_vector(&self, id: VectorAddr) -> VectorRef;
+    fn get_paragraph(&self, id: ParagraphAddr) -> ParagraphRef<'_>;
+    fn get_vector(&self, id: VectorAddr) -> VectorRef<'_>;
     fn will_need(&self, id: VectorAddr);
     fn as_any(&self) -> &dyn Any;
 }

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/hnsw/disk_hnsw.rs

@@ -143,7 +143,7 @@ impl DiskHnsw {
     }
 
     // node must be serialized using DiskNode, may have trailing bytes at the start.
-    fn get_out_edges(node: &[u8], layer: usize) -> EdgeIter {
+    fn get_out_edges(node: &[u8], layer: usize) -> EdgeIter<'_> {
         // layer + 1 since the layers are stored in reverse order.
         // [l3, l2, l1, l0, end] Since we have the position of end, the layer i is
         // i + 1 positions to its left.

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/hnsw/ram_hnsw.rs

@@ -100,7 +100,7 @@ impl RAMHnsw {
             .layers
             .iter()
             .enumerate()
-            .last()
+            .next_back()
             .and_then(|(index, l)| l.first().map(|node| (node, index)))
             .map(|(node, layer)| EntryPoint { node, layer });
         self

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/indexer.rs

@@ -66,7 +66,7 @@ impl<'a> ResourceWrapper<'a> {
         &self.resource.labels
     }
 
-    pub fn fields(&self) -> impl Iterator<Item = (&String, impl Iterator<Item = ParagraphVectors>)> {
+    pub fn fields(&self) -> impl Iterator<Item = (&String, impl Iterator<Item = ParagraphVectors<'_>>)> {
         self.resource.paragraphs.iter().map(|(field_id, paragraphs_wrapper)| {
             let sentences_iterator = paragraphs_wrapper
                 .paragraphs

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/inverted_index.rs

@@ -90,7 +90,7 @@ fn field_id_key(paragraph_key: &str) -> Option<Vec<u8>> {
 
 /// The key for the labels, ending with a separator to allow for easy prefix search
 fn labels_key(label: &str) -> Vec<u8> {
-    [label[1..].as_bytes(), "/".as_bytes()].concat()
+    [&label.as_bytes()[1..], "/".as_bytes()].concat()
 }
 
 /// Helper to build indexes when the input is not sorted by key

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/multivector.rs

@@ -21,7 +21,7 @@ use crate::{VectorErr, VectorR, config::VectorType};
 
 pub fn extract_multi_vectors(vector: &[f32], vector_type: &VectorType) -> VectorR<Vec<Vec<f32>>> {
     let dimension = vector_type.dimension();
-    if vector.len() % dimension != 0 {
+    if !vector.len().is_multiple_of(dimension) {
         return Err(VectorErr::InconsistentDimensions {
             index_config: dimension,
             vector: vector.len(),

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/searcher.rs

@@ -236,7 +236,7 @@ impl Searcher {
         &self,
         request: &SearchRequest,
         segment_filter: &Option<BooleanExpression<String>>,
-    ) -> VectorR<Vec<ScoredParagraph>> {
+    ) -> VectorR<Vec<ScoredParagraph<'_>>> {
         let normalized_query;
         let query = if self.config.normalize_vectors {
             normalized_query = utils::normalize_vector(request.get_query());
@@ -342,7 +342,7 @@ impl Searcher {
         })
     }
 
-    fn search_multi_vector(&self, search: &SearchRequest) -> VectorR<Vec<ScoredParagraph>> {
+    fn search_multi_vector(&self, search: &SearchRequest) -> VectorR<Vec<ScoredParagraph<'_>>> {
         let search_vectors = extract_multi_vectors(&search.request.vector, &self.config.vector_type)?;
         let encoded_query = search_vectors
             .iter()

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/nidx_vector/src/segment.rs

@@ -396,7 +396,7 @@ pub struct ScoredVector<'a> {
 }
 
 impl ScoredVector<'_> {
-    fn new(addr: VectorAddr, data_store: &dyn DataStore, score: f32) -> ScoredVector {
+    fn new(addr: VectorAddr, data_store: &dyn DataStore, score: f32) -> ScoredVector<'_> {
         let node = data_store.get_vector(addr);
         ScoredVector { score, vector: node }
     }
@@ -450,11 +450,11 @@ impl OpenSegment {
         self.data_store.size_bytes() + self.index.len() + self.inverted_indexes.space_usage()
     }
 
-    pub fn get_paragraph(&self, id: ParagraphAddr) -> ParagraphRef {
+    pub fn get_paragraph(&self, id: ParagraphAddr) -> ParagraphRef<'_> {
         self.data_store.get_paragraph(id)
     }
 
-    pub fn get_vector(&self, id: VectorAddr) -> VectorRef {
+    pub fn get_vector(&self, id: VectorAddr) -> VectorRef<'_> {
         self.data_store.get_vector(id)
     }
 
@@ -466,7 +466,7 @@ impl OpenSegment {
         results: usize,
         config: &VectorConfig,
         min_score: f32,
-    ) -> Box<dyn Iterator<Item = ScoredVector> + '_> {
+    ) -> Box<dyn Iterator<Item = ScoredVector<'_>> + '_> {
         if let Some(v1) = self.data_store.as_any().downcast_ref::<DataStoreV1>() {
             self._search(v1, query, filter, with_duplicates, results, config, min_score)
         } else if let Some(v2) = self.data_store.as_any().downcast_ref::<DataStoreV2>() {
@@ -486,7 +486,7 @@ impl OpenSegment {
         results: usize,
         config: &VectorConfig,
         min_score: f32,
-    ) -> Box<dyn Iterator<Item = ScoredVector> + '_> {
+    ) -> Box<dyn Iterator<Item = ScoredVector<'_>> + '_> {
         let encoded_query = config.vector_type.encode(query);
         let retriever = Retriever::new(&encoded_query, data_store, config, min_score);
         let query_address = VectorAddr(self.metadata.records as u32);
@@ -537,7 +537,7 @@ impl OpenSegment {
         Box::new(
             neighbours
                 .into_iter()
-                .map(|(address, dist)| (ScoredVector::new(address, self.data_store.as_ref(), dist)))
+                .map(|(address, dist)| ScoredVector::new(address, self.data_store.as_ref(), dist))
                 .take(results),
         )
     }

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/pyproject.toml

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

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/src/control.rs

@@ -173,10 +173,9 @@ pub fn control_client(settings: &EnvSettings, request: ControlRequest) -> anyhow
         nats_connected,
         ..
     } = response
+        && !(alive.all_ok() && searcher_initally_synced.unwrap_or(true) && nats_connected.unwrap_or(true))
     {
-        if !(alive.all_ok() && searcher_initally_synced.unwrap_or(true) && nats_connected.unwrap_or(true)) {
-            return Err(anyhow!("Not ready"));
-        }
+        return Err(anyhow!("Not ready"));
     }
 
     Ok(())

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/src/indexer.rs

@@ -279,7 +279,7 @@ pub async fn delete_resource(meta: &NidxMetadata, shard_id: &str, resource: Stri
 
     let mut tx = meta.transaction().await?;
     for index in indexes {
-        Deletion::create(&mut *tx, index.id, seq, &[resource.clone()]).await?;
+        Deletion::create(&mut *tx, index.id, seq, std::slice::from_ref(&resource)).await?;
         Index::updated(&mut *tx, &index.id).await?;
     }
     tx.commit().await?;

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/src/metadata.rs

@@ -64,7 +64,7 @@ impl NidxMetadata {
         Ok(NidxMetadata { pool })
     }
 
-    pub async fn transaction(&self) -> sqlx::Result<sqlx::Transaction<sqlx::Postgres>> {
+    pub async fn transaction(&self) -> sqlx::Result<sqlx::Transaction<'_, sqlx::Postgres>> {
         self.pool.begin().await
     }
 

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/src/searcher/shard_selector.rs

@@ -129,10 +129,10 @@ impl KubernetesCluster {
             return false;
         }
         // Any condition exists and says it's not ready
-        if let Some(conds) = &p.status.as_ref().unwrap().conditions {
-            if conds.iter().any(|c| c.type_ == "Ready" && c.status == "False") {
-                return false;
-            }
+        if let Some(conds) = &p.status.as_ref().unwrap().conditions
+            && conds.iter().any(|c| c.type_ == "Ready" && c.status == "False")
+        {
+            return false;
         }
 
         true

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/src/searcher/sync.rs

@@ -190,11 +190,10 @@ pub async fn run_sync(
             }
 
             // We do not marked as synced until initial sync has fully finished without error
-            if !initial_sync {
-                if let Some(ref sync_status) = sync_status {
+            if !initial_sync
+                && let Some(ref sync_status) = sync_status {
                     let _ = sync_status.send(SyncStatus::Synced);
                 }
-            }
 
             // If we didn't sync anything, wait for a bit
             if no_updates {
@@ -588,7 +587,7 @@ impl GuardedIndexMetadata {
         Self { guard, index_id }
     }
 
-    pub async fn get(&self) -> Option<RwLockReadGuard<IndexMetadata>> {
+    pub async fn get(&self) -> Option<RwLockReadGuard<'_, IndexMetadata>> {
         let m = self.guard.get(&self.index_id)?;
         Some(m.read().await)
     }

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/src/telemetry/log_format.rs

@@ -98,14 +98,14 @@ where
                 .parent()
                 .and_then(|id| ctx.span(id))
                 .or_else(|| ctx.lookup_current());
-            if let Some(span) = span {
-                if let Some(otel_data) = span.extensions().get::<OtelData>() {
-                    let trace_id = match otel_data.builder.trace_id {
-                        Some(trace_id) => trace_id,
-                        None => otel_data.parent_cx.span().span_context().trace_id(),
-                    };
-                    serializer.serialize_entry("trace_id", &trace_id.to_string())?;
-                }
+            if let Some(span) = span
+                && let Some(otel_data) = span.extensions().get::<OtelData>()
+            {
+                let trace_id = match otel_data.builder.trace_id {
+                    Some(trace_id) => trace_id,
+                    None => otel_data.parent_cx.span().span_context().trace_id(),
+                };
+                serializer.serialize_entry("trace_id", &trace_id.to_string())?;
             }
 
             serializer.end()
@@ -130,9 +130,7 @@ impl std::io::Write for WriteAdaptor<'_> {
     fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
         let s = std::str::from_utf8(buf).map_err(|e| std::io::Error::new(std::io::ErrorKind::InvalidData, e))?;
 
-        self.fmt_write
-            .write_str(s)
-            .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+        self.fmt_write.write_str(s).map_err(std::io::Error::other)?;
 
         Ok(s.len())
     }

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/src/telemetry/middleware.rs

@@ -115,6 +115,7 @@ impl Extractor for HeaderMapWrapper<'_> {
     }
 }
 
+#[allow(clippy::result_large_err)]
 pub fn add_telemetry_headers(mut req: tonic::Request<()>) -> tonic::Result<tonic::Request<()>> {
     opentelemetry::global::get_text_map_propagator(|propagator| {
         propagator.inject(&mut MetadataMapWrapper {

{nidx_binding-6.8.1.post515 → nidx_binding-6.8.1.post521}/tests/test_search_filtering.rs

@@ -205,7 +205,7 @@ fn build_resource_with_field(shard_id: String, field_id: String) -> noderesource
         nanos: 0,
     };
 
-    let label = field_id.split('/').last().unwrap();
+    let label = field_id.split('/').next_back().unwrap();
     let mut texts = HashMap::new();
     texts.insert(
         field_id.clone(),