diff --git a/crates/dump/src/lib.rs b/crates/dump/src/lib.rs index b374131f5..a2b72e0e5 100644 --- a/crates/dump/src/lib.rs +++ b/crates/dump/src/lib.rs @@ -253,13 +253,13 @@ pub(crate) mod test { use big_s::S; use maplit::{btreemap, btreeset}; use meilisearch_types::batches::{Batch, BatchEnqueuedAt, BatchStats}; + use meilisearch_types::enterprise_edition::network::{Network, Remote}; use meilisearch_types::facet_values_sort::FacetValuesSort; use meilisearch_types::features::RuntimeTogglableFeatures; use meilisearch_types::index_uid_pattern::IndexUidPattern; use meilisearch_types::keys::{Action, Key}; use meilisearch_types::milli::update::Setting; use meilisearch_types::milli::{self, FilterableAttributesRule}; - use meilisearch_types::network::{Network, Remote}; use meilisearch_types::settings::{Checked, FacetingSettings, Settings}; use meilisearch_types::task_view::DetailsView; use meilisearch_types::tasks::{BatchStopReason, Details, Kind, Status}; diff --git a/crates/dump/src/reader/v6/mod.rs b/crates/dump/src/reader/v6/mod.rs index d361ab0b1..75ff2ebe6 100644 --- a/crates/dump/src/reader/v6/mod.rs +++ b/crates/dump/src/reader/v6/mod.rs @@ -24,7 +24,7 @@ pub type Batch = meilisearch_types::batches::Batch; pub type Key = meilisearch_types::keys::Key; pub type ChatCompletionSettings = meilisearch_types::features::ChatCompletionSettings; pub type RuntimeTogglableFeatures = meilisearch_types::features::RuntimeTogglableFeatures; -pub type Network = meilisearch_types::network::Network; +pub type Network = meilisearch_types::enterprise_edition::network::Network; pub type Webhooks = meilisearch_types::webhooks::WebhooksDumpView; // ===== Other types to clarify the code of the compat module diff --git a/crates/dump/src/writer.rs b/crates/dump/src/writer.rs index ad6d1651b..1f8000a50 100644 --- a/crates/dump/src/writer.rs +++ b/crates/dump/src/writer.rs @@ -5,9 +5,9 @@ use std::path::PathBuf; use flate2::write::GzEncoder; use flate2::Compression; use meilisearch_types::batches::Batch; +use meilisearch_types::enterprise_edition::network::Network; use meilisearch_types::features::{ChatCompletionSettings, RuntimeTogglableFeatures}; use meilisearch_types::keys::Key; -use meilisearch_types::network::Network; use meilisearch_types::settings::{Checked, Settings}; use meilisearch_types::webhooks::WebhooksDumpView; use serde_json::{Map, Value}; diff --git a/crates/index-scheduler/src/features.rs b/crates/index-scheduler/src/features.rs index c9a4af9af..1b01f89de 100644 --- a/crates/index-scheduler/src/features.rs +++ b/crates/index-scheduler/src/features.rs @@ -1,9 +1,9 @@ use std::sync::{Arc, RwLock}; +use meilisearch_types::enterprise_edition::network::Network; use meilisearch_types::features::{InstanceTogglableFeatures, RuntimeTogglableFeatures}; use meilisearch_types::heed::types::{SerdeJson, Str}; use meilisearch_types::heed::{Database, Env, RwTxn, WithoutTls}; -use meilisearch_types::network::Network; use crate::error::FeatureNotEnabledError; use crate::Result; diff --git a/crates/index-scheduler/src/lib.rs b/crates/index-scheduler/src/lib.rs index ef02d9c3b..d6c150dbb 100644 --- a/crates/index-scheduler/src/lib.rs +++ b/crates/index-scheduler/src/lib.rs @@ -51,6 +51,7 @@ pub use features::RoFeatures; use flate2::bufread::GzEncoder; use flate2::Compression; use meilisearch_types::batches::Batch; +use meilisearch_types::enterprise_edition::network::Network; use meilisearch_types::features::{ ChatCompletionSettings, InstanceTogglableFeatures, RuntimeTogglableFeatures, }; @@ -63,7 +64,6 @@ use meilisearch_types::milli::vector::{ Embedder, EmbedderOptions, RuntimeEmbedder, RuntimeEmbedders, RuntimeFragment, }; use meilisearch_types::milli::{self, Index}; -use meilisearch_types::network::Network; use meilisearch_types::task_view::TaskView; use meilisearch_types::tasks::{KindWithContent, Task, TaskNetwork}; use meilisearch_types::webhooks::{Webhook, WebhooksDumpView, WebhooksView}; diff --git a/crates/meilisearch-types/src/enterprise_edition/mod.rs b/crates/meilisearch-types/src/enterprise_edition/mod.rs new file mode 100644 index 000000000..47047de48 --- /dev/null +++ b/crates/meilisearch-types/src/enterprise_edition/mod.rs @@ -0,0 +1,6 @@ +// Copyright © 2025 Meilisearch Some Rights Reserved +// This file is part of Meilisearch Enterprise Edition (EE). +// Use of this source code is governed by the Business Source License 1.1, +// as found in the LICENSE-EE file or at + +pub mod network; diff --git a/crates/meilisearch-types/src/network.rs b/crates/meilisearch-types/src/enterprise_edition/network.rs similarity index 95% rename from crates/meilisearch-types/src/network.rs rename to crates/meilisearch-types/src/enterprise_edition/network.rs index 79b3b3808..9d5c51e25 100644 --- a/crates/meilisearch-types/src/network.rs +++ b/crates/meilisearch-types/src/enterprise_edition/network.rs @@ -5,7 +5,7 @@ use std::collections::BTreeMap; -use milli::update::new::indexer::sharding::Shards; +use milli::update::new::indexer::enterprise_edition::sharding::Shards; use serde::{Deserialize, Serialize}; #[derive(Serialize, Deserialize, Debug, Clone, PartialEq, Eq, Default)] diff --git a/crates/meilisearch-types/src/lib.rs b/crates/meilisearch-types/src/lib.rs index 0cb647b0a..6c013f3bb 100644 --- a/crates/meilisearch-types/src/lib.rs +++ b/crates/meilisearch-types/src/lib.rs @@ -3,6 +3,7 @@ pub mod batches; pub mod compression; pub mod deserr; pub mod document_formats; +pub mod enterprise_edition; pub mod error; pub mod facet_values_sort; pub mod features; @@ -10,7 +11,6 @@ pub mod index_uid; pub mod index_uid_pattern; pub mod keys; pub mod locales; -pub mod network; pub mod settings; pub mod star_or; pub mod task_view; diff --git a/crates/meilisearch/src/routes/indexes/documents.rs b/crates/meilisearch/src/routes/indexes/documents.rs index d188a9867..d445153ad 100644 --- a/crates/meilisearch/src/routes/indexes/documents.rs +++ b/crates/meilisearch/src/routes/indexes/documents.rs @@ -45,7 +45,7 @@ use crate::extractors::authentication::policies::*; use crate::extractors::authentication::GuardedData; use crate::extractors::payload::Payload; use crate::extractors::sequential_extractor::SeqHandler; -use crate::routes::indexes::proxy::{proxy, Body}; +use crate::routes::indexes::enterprise_edition::proxy::{proxy, Body}; use crate::routes::indexes::search::fix_sort_query_parameters; use crate::routes::{ get_task_id, is_dry_run, PaginationView, SummarizedTaskView, PAGINATION_DEFAULT_LIMIT, diff --git a/crates/meilisearch/src/routes/indexes/enterprise_edition/mod.rs b/crates/meilisearch/src/routes/indexes/enterprise_edition/mod.rs new file mode 100644 index 000000000..a3ca7350c --- /dev/null +++ b/crates/meilisearch/src/routes/indexes/enterprise_edition/mod.rs @@ -0,0 +1,6 @@ +// Copyright © 2025 Meilisearch Some Rights Reserved +// This file is part of Meilisearch Enterprise Edition (EE). +// Use of this source code is governed by the Business Source License 1.1, +// as found in the LICENSE-EE file or at + +pub mod proxy; diff --git a/crates/meilisearch/src/routes/indexes/proxy.rs b/crates/meilisearch/src/routes/indexes/enterprise_edition/proxy.rs similarity index 98% rename from crates/meilisearch/src/routes/indexes/proxy.rs rename to crates/meilisearch/src/routes/indexes/enterprise_edition/proxy.rs index a1106b974..7cb3eb8cc 100644 --- a/crates/meilisearch/src/routes/indexes/proxy.rs +++ b/crates/meilisearch/src/routes/indexes/enterprise_edition/proxy.rs @@ -17,7 +17,9 @@ use serde::de::DeserializeOwned; use serde_json::Value; use crate::error::MeilisearchHttpError; -use crate::routes::indexes::proxy::error::{ProxyDocumentChangeError, ReqwestErrorWithoutUrl}; +use crate::routes::indexes::enterprise_edition::proxy::error::{ + ProxyDocumentChangeError, ReqwestErrorWithoutUrl, +}; use crate::routes::SummarizedTaskView; pub enum Body { @@ -50,7 +52,7 @@ pub async fn proxy( index_scheduler: &IndexScheduler, index_uid: &str, req: &HttpRequest, - network: meilisearch_types::network::Network, + network: meilisearch_types::enterprise_edition::network::Network, body: Body, task: &meilisearch_types::tasks::Task, ) -> Result<(), MeilisearchHttpError> { diff --git a/crates/meilisearch/src/routes/indexes/mod.rs b/crates/meilisearch/src/routes/indexes/mod.rs index d1946215f..8e994bb43 100644 --- a/crates/meilisearch/src/routes/indexes/mod.rs +++ b/crates/meilisearch/src/routes/indexes/mod.rs @@ -29,8 +29,8 @@ use crate::routes::is_dry_run; use crate::Opt; pub mod documents; +mod enterprise_edition; pub mod facet_search; -mod proxy; pub mod search; mod search_analytics; #[cfg(test)] @@ -40,7 +40,7 @@ mod settings_analytics; pub mod similar; mod similar_analytics; -pub use proxy::{PROXY_ORIGIN_REMOTE_HEADER, PROXY_ORIGIN_TASK_UID_HEADER}; +pub use enterprise_edition::proxy::{PROXY_ORIGIN_REMOTE_HEADER, PROXY_ORIGIN_TASK_UID_HEADER}; #[derive(OpenApi)] #[openapi( diff --git a/crates/meilisearch/src/routes/network.rs b/crates/meilisearch/src/routes/network.rs index f4119b0ad..b7fa2980c 100644 --- a/crates/meilisearch/src/routes/network.rs +++ b/crates/meilisearch/src/routes/network.rs @@ -7,6 +7,7 @@ use deserr::Deserr; use index_scheduler::IndexScheduler; use itertools::{EitherOrBoth, Itertools}; use meilisearch_types::deserr::DeserrJsonError; +use meilisearch_types::enterprise_edition::network::{Network as DbNetwork, Remote as DbRemote}; use meilisearch_types::error::deserr_codes::{ InvalidNetworkRemotes, InvalidNetworkSearchApiKey, InvalidNetworkSelf, InvalidNetworkSharding, InvalidNetworkUrl, InvalidNetworkWriteApiKey, @@ -14,7 +15,6 @@ use meilisearch_types::error::deserr_codes::{ use meilisearch_types::error::ResponseError; use meilisearch_types::keys::actions; use meilisearch_types::milli::update::Setting; -use meilisearch_types::network::{Network as DbNetwork, Remote as DbRemote}; use serde::Serialize; use tracing::debug; use utoipa::{OpenApi, ToSchema}; diff --git a/crates/meilisearch/src/search/federated/perform.rs b/crates/meilisearch/src/search/federated/perform.rs index 6fb8bcd43..4988dc07d 100644 --- a/crates/meilisearch/src/search/federated/perform.rs +++ b/crates/meilisearch/src/search/federated/perform.rs @@ -9,12 +9,12 @@ use std::vec::{IntoIter, Vec}; use actix_http::StatusCode; use index_scheduler::{IndexScheduler, RoFeatures}; use itertools::Itertools; +use meilisearch_types::enterprise_edition::network::{Network, Remote}; use meilisearch_types::error::ResponseError; use meilisearch_types::milli::order_by_map::OrderByMap; use meilisearch_types::milli::score_details::{ScoreDetails, WeightedScoreValue}; use meilisearch_types::milli::vector::Embedding; use meilisearch_types::milli::{self, DocumentId, OrderBy, TimeBudget, DEFAULT_VALUES_PER_FACET}; -use meilisearch_types::network::{Network, Remote}; use roaring::RoaringBitmap; use tokio::task::JoinHandle; diff --git a/crates/meilisearch/src/search/federated/proxy.rs b/crates/meilisearch/src/search/federated/proxy.rs index 6da92ca9e..ac8cd2491 100644 --- a/crates/meilisearch/src/search/federated/proxy.rs +++ b/crates/meilisearch/src/search/federated/proxy.rs @@ -1,6 +1,6 @@ pub use error::ProxySearchError; use error::ReqwestErrorWithoutUrl; -use meilisearch_types::network::Remote; +use meilisearch_types::enterprise_edition::network::Remote; use rand::Rng as _; use reqwest::{Client, Response, StatusCode}; use serde::de::DeserializeOwned; diff --git a/crates/milli/src/update/new/indexer/document_operation.rs b/crates/milli/src/update/new/indexer/document_operation.rs index 50364c07c..4e3725c6e 100644 --- a/crates/milli/src/update/new/indexer/document_operation.rs +++ b/crates/milli/src/update/new/indexer/document_operation.rs @@ -17,7 +17,7 @@ use super::guess_primary_key::retrieve_or_guess_primary_key; use crate::documents::PrimaryKey; use crate::progress::{AtomicPayloadStep, Progress}; use crate::update::new::document::{DocumentContext, Versions}; -use crate::update::new::indexer::sharding::Shards; +use crate::update::new::indexer::enterprise_edition::sharding::Shards; use crate::update::new::steps::IndexingStep; use crate::update::new::thread_local::MostlySend; use crate::update::new::{DocumentIdentifiers, Insertion, Update}; diff --git a/crates/milli/src/update/new/indexer/enterprise_edition/mod.rs b/crates/milli/src/update/new/indexer/enterprise_edition/mod.rs new file mode 100644 index 000000000..9f89e8e31 --- /dev/null +++ b/crates/milli/src/update/new/indexer/enterprise_edition/mod.rs @@ -0,0 +1,6 @@ +// Copyright © 2025 Meilisearch Some Rights Reserved +// This file is part of Meilisearch Enterprise Edition (EE). +// Use of this source code is governed by the Business Source License 1.1, +// as found in the LICENSE-EE file or at + +pub mod sharding; diff --git a/crates/milli/src/update/new/indexer/sharding.rs b/crates/milli/src/update/new/indexer/enterprise_edition/sharding.rs similarity index 100% rename from crates/milli/src/update/new/indexer/sharding.rs rename to crates/milli/src/update/new/indexer/enterprise_edition/sharding.rs diff --git a/crates/milli/src/update/new/indexer/mod.rs b/crates/milli/src/update/new/indexer/mod.rs index b24081c02..e18337623 100644 --- a/crates/milli/src/update/new/indexer/mod.rs +++ b/crates/milli/src/update/new/indexer/mod.rs @@ -31,12 +31,12 @@ pub(crate) mod de; pub mod document_changes; mod document_deletion; mod document_operation; +pub mod enterprise_edition; mod extract; mod guess_primary_key; mod partial_dump; mod post_processing; pub mod settings_changes; -pub mod sharding; mod update_by_function; mod write;