Merge branch 'main' into vector-search-embedder

.code-samples.meilisearch.yaml

@@ -1048,7 +1048,7 @@ primary_field_guide_add_document_primary_key: |-
 getting_started_add_documents_md: |-
   ```toml
     [dependencies]
-    meilisearch-sdk = "0.26.1"
+    meilisearch-sdk = "0.27.0"
     # futures: because we want to block on futures
     futures = "0.3"
     # serde: required if you are going to use documents
@@ -1704,3 +1704,38 @@ create_snapshot_1: |-
     .create_snapshot()
     .await
     .unwrap();
+search_parameter_reference_distinct_1: |-
+  let res = client
+    .index("INDEX_NAME")
+    .search()
+    .with_query("QUERY TERMS")
+    .with_distinct("ATTRIBUTE_A")
+    .execute()
+    .await
+    .unwrap();
+distinct_attribute_guide_filterable_1: |-
+  let task: TaskInfo = client
+    .index("products")
+    .settings()
+    .set_filterable_attributes(["product_id", "sku", "url"])
+    .execute()
+    .await
+    .unwrap();
+distinct_attribute_guide_distinct_parameter_1: |-
+  let res = client
+    .index("products")
+    .search()
+    .with_query("white shirt")
+    .with_distinct("sku")
+    .execute()
+    .await
+    .unwrap();
+search_parameter_reference_ranking_score_threshold_1: |-
+  let res = client
+    .index("INDEX_NAME")
+    .search()
+    .with_query("badman")
+    .with_ranking_score_threshold(0.2)
+    .execute()
+    .await
+    .unwrap();

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "meilisearch-sdk"
-version = "0.26.1"
+version = "0.27.0"
 authors = ["Mubelotix <[email protected]>"]
 edition = "2018"
 description = "Rust wrapper for the Meilisearch API. Meilisearch is a powerful, fast, open-source, easy to use and deploy search engine."
@@ -21,7 +21,7 @@ time = { version = "0.3.7", features = ["serde-well-known", "formatting", "parsi
 yaup = "0.3.1"
 either = { version = "1.8.0", features = ["serde"] }
 thiserror = "1.0.37"
-meilisearch-index-setting-macro = { path = "meilisearch-index-setting-macro", version = "0.26.1" }
+meilisearch-index-setting-macro = { path = "meilisearch-index-setting-macro", version = "0.27.0" }
 pin-project-lite = { version = "0.2.13", optional = true }
 reqwest = { version = "0.12.3", optional = true, default-features = false, features = ["rustls-tls", "http2", "stream"] }
 bytes = { version = "1.6", optional = true }

README.md

@@ -58,7 +58,7 @@ To use `meilisearch-sdk`, add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-meilisearch-sdk = "0.26.1"
+meilisearch-sdk = "0.27.0"
 ```
 
 The following optional dependencies may also be useful:

README.tpl

@@ -58,7 +58,7 @@ To use `meilisearch-sdk`, add this to your `Cargo.toml`:
 
 ```toml
 [dependencies]
-meilisearch-sdk = "0.26.1"
+meilisearch-sdk = "0.27.0"
 ```
 
 The following optional dependencies may also be useful:

meilisearch-index-setting-macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "meilisearch-index-setting-macro"
-version = "0.26.1"
+version = "0.27.0"
 description = "Helper tool to generate settings of a Meilisearch index"
 edition = "2021"
 license = "MIT"

src/search.rs

@@ -352,6 +352,14 @@ pub struct SearchQuery<'a, Http: HttpClient> {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub matching_strategy: Option<MatchingStrategies>,
 
+    ///Defines one attribute in the filterableAttributes list as a distinct attribute.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub distinct: Option<&'a str>,
+
+    ///Excludes results below the specified ranking score.
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub ranking_score_threshold: Option<f64>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub(crate) index_uid: Option<&'a str>,
 
@@ -404,6 +412,8 @@ impl<'a, Http: HttpClient> SearchQuery<'a, Http> {
             hybrid: None,
             vector: None,
             retrieve_vectors: None,
+            distinct: None,
+            ranking_score_threshold: None,
         }
     }
     pub fn with_query<'b>(&'b mut self, query: &'a str) -> &'b mut SearchQuery<'a, Http> {
@@ -622,8 +632,18 @@ impl<'a, Http: HttpClient> SearchQuery<'a, Http> {
         self.vector = Some(vector);
         self
     }
-
     #[must_use]
+    pub fn with_distinct<'b>(&'b mut self, distinct: &'a str) -> &'b mut SearchQuery<'a, Http> {
+        self.distinct = Some(distinct);
+        self
+    }
+    pub fn with_ranking_score_threshold<'b>(
+        &'b mut self,
+        ranking_score_threshold: f64,
+    ) -> &'b mut SearchQuery<'a, Http> {
+        self.ranking_score_threshold = Some(ranking_score_threshold);
+        self
+    }
     pub fn build(&mut self) -> SearchQuery<'a, Http> {
         self.clone()
     }
@@ -1218,6 +1238,21 @@ mod tests {
         Ok(())
     }
 
+    #[meilisearch_test]
+    async fn test_query_show_ranking_score_threshold(
+        client: Client,
+        index: Index,
+    ) -> Result<(), Error> {
+        setup_test_index(&client, &index).await?;
+
+        let mut query = SearchQuery::new(&index);
+        query.with_query("dolor text");
+        query.with_ranking_score_threshold(1.0);
+        let results: SearchResults<Document> = index.execute_query(&query).await.unwrap();
+        assert!(results.hits.is_empty());
+        Ok(())
+    }
+
     #[meilisearch_test]
     async fn test_phrase_search(client: Client, index: Index) -> Result<(), Error> {
         setup_test_index(&client, &index).await?;
@@ -1275,6 +1310,20 @@ mod tests {
         Ok(())
     }
 
+    #[meilisearch_test]
+    async fn test_distinct(client: Client, index: Index) -> Result<(), Error> {
+        setup_test_index(&client, &index).await?;
+
+        let results = SearchQuery::new(&index)
+            .with_distinct("kind")
+            .execute::<Document>()
+            .await
+            .unwrap();
+
+        assert_eq!(results.hits.len(), 2);
+        Ok(())
+    }
+
     #[meilisearch_test]
     async fn test_generate_tenant_token_from_client(
         client: Client,