diff --git a/crates/meilisearch/src/routes/mod.rs b/crates/meilisearch/src/routes/mod.rs index 74b3215ac..87a98fd24 100644 --- a/crates/meilisearch/src/routes/mod.rs +++ b/crates/meilisearch/src/routes/mod.rs @@ -42,10 +42,10 @@ use crate::routes::multi_search::SearchResults; use crate::routes::network::{Network, Remote}; use crate::routes::swap_indexes::SwapIndexesPayload; use crate::routes::webhooks::{WebhookResults, WebhookSettings, WebhookWithMetadata}; -use crate::search::INCLUDE_METADATA_HEADER; use crate::search::{ FederatedSearch, FederatedSearchResult, Federation, FederationOptions, MergeFacets, SearchQueryWithIndex, SearchResultWithIndex, SimilarQuery, SimilarResult, + INCLUDE_METADATA_HEADER, }; use crate::search_queue::SearchQueue; use crate::Opt; diff --git a/crates/meilisearch/src/search/federated/mod.rs b/crates/meilisearch/src/search/federated/mod.rs index c2a795c3f..40204c591 100644 --- a/crates/meilisearch/src/search/federated/mod.rs +++ b/crates/meilisearch/src/search/federated/mod.rs @@ -4,7 +4,7 @@ mod types; mod weighted_scores; pub use perform::perform_federated_search; -pub use proxy::{INCLUDE_METADATA_HEADER, PROXY_SEARCH_HEADER, PROXY_SEARCH_HEADER_VALUE}; +pub use proxy::{PROXY_SEARCH_HEADER, PROXY_SEARCH_HEADER_VALUE}; pub use types::{ FederatedSearch, FederatedSearchResult, Federation, FederationOptions, MergeFacets, }; diff --git a/crates/meilisearch/src/search/federated/proxy.rs b/crates/meilisearch/src/search/federated/proxy.rs index b5a0d4b19..37ff2012a 100644 --- a/crates/meilisearch/src/search/federated/proxy.rs +++ b/crates/meilisearch/src/search/federated/proxy.rs @@ -7,11 +7,10 @@ use serde::de::DeserializeOwned; use serde_json::Value; use super::types::{FederatedSearch, FederatedSearchResult, Federation}; -use crate::search::SearchQueryWithIndex; +use crate::search::{SearchQueryWithIndex, INCLUDE_METADATA_HEADER}; pub const PROXY_SEARCH_HEADER: &str = "Meili-Proxy-Search"; pub const PROXY_SEARCH_HEADER_VALUE: &str = "true"; -pub const INCLUDE_METADATA_HEADER: &str = "Meili-Include-Metadata"; mod error { use meilisearch_types::error::ResponseError; diff --git a/crates/meilisearch/src/search/mod.rs b/crates/meilisearch/src/search/mod.rs index 85cd9d678..4a09df8fa 100644 --- a/crates/meilisearch/src/search/mod.rs +++ b/crates/meilisearch/src/search/mod.rs @@ -43,8 +43,7 @@ use crate::error::MeilisearchHttpError; mod federated; pub use federated::{ perform_federated_search, FederatedSearch, FederatedSearchResult, Federation, - FederationOptions, MergeFacets, INCLUDE_METADATA_HEADER, PROXY_SEARCH_HEADER, - PROXY_SEARCH_HEADER_VALUE, + FederationOptions, MergeFacets, PROXY_SEARCH_HEADER, PROXY_SEARCH_HEADER_VALUE, }; mod ranking_rules; @@ -58,6 +57,7 @@ pub const DEFAULT_CROP_MARKER: fn() -> String = || "…".to_string(); pub const DEFAULT_HIGHLIGHT_PRE_TAG: fn() -> String = || "".to_string(); pub const DEFAULT_HIGHLIGHT_POST_TAG: fn() -> String = || "".to_string(); pub const DEFAULT_SEMANTIC_RATIO: fn() -> SemanticRatio = || SemanticRatio(0.5); +pub const INCLUDE_METADATA_HEADER: &str = "Meili-Include-Metadata"; #[derive(Clone, Default, PartialEq, Deserr, ToSchema)] #[deserr(error = DeserrJsonError, rename_all = camelCase, deny_unknown_fields)]