searchengines-web/MeiliSearch
searchengines-web/MeiliSearch
1
0
Fork 0
mirror of https://github.com/meilisearch/MeiliSearch synced 2025-07-04 20:37:15 +02:00
Code Issues Releases Wiki Activity

Merge fe7245af20 into fef089c7b6

Browse source
This commit is contained in:
Martin Grigorov 2025-07-03 17:27:01 +01:00 • committed by GitHub
commit 7c2898c946
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
6 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

1
crates/meilisearch/src/analytics/segment_analytics.rs
View file

@ -281,6 +281,7 @@ impl Infos {
indexer_options,
config_file_path,
no_analytics: _,
experimental_chat_completions: _,
} = options;
let schedule_snapshot = match schedule_snapshot {

22
crates/meilisearch/src/option.rs
View file

@ -68,6 +68,7 @@ const MEILI_EXPERIMENTAL_LIMIT_BATCHED_TASKS_TOTAL_SIZE: &str =
const MEILI_EXPERIMENTAL_EMBEDDING_CACHE_ENTRIES: &str =
"MEILI_EXPERIMENTAL_EMBEDDING_CACHE_ENTRIES";
const MEILI_EXPERIMENTAL_NO_SNAPSHOT_COMPACTION: &str = "MEILI_EXPERIMENTAL_NO_SNAPSHOT_COMPACTION";
const MEILI_EXPERIMENTAL_CHAT_COMPLETIONS: &str = "MEILI_EXPERIMENTAL_CHAT_COMPLETIONS";
const DEFAULT_CONFIG_FILE_PATH: &str = "./config.toml";
const DEFAULT_DB_PATH: &str = "./data.ms";
const DEFAULT_HTTP_ADDR: &str = "localhost:7700";
@ -475,6 +476,11 @@ pub struct Opt {
/// Format must be TOML.
#[clap(long)]
pub config_file_path: Option<PathBuf>,
/// Enables the chat completions functionality.
#[serde(default)]
#[clap(long, env = MEILI_EXPERIMENTAL_CHAT_COMPLETIONS, default_value_t = false)]
pub experimental_chat_completions: bool,
}
impl Opt {
@ -500,25 +506,21 @@ impl Opt {
Ok(config) => {
// If the file is successfully read, we deserialize it with `toml`.
let opt_from_config = toml::from_str::<Opt>(&config)?;
// Return an error if config file contains 'config_file_path'
// Return an error if the config file contains 'config_file_path'
// Using that key in the config file doesn't make sense bc it creates a logical loop (config file referencing itself)
if opt_from_config.config_file_path.is_some() {
anyhow::bail!("`config_file_path` is not supported in the configuration file")
}
// We inject the values from the toml in the corresponding env vars if needs be. Doing so, we respect the priority toml < env vars < cli args.
opt_from_config.export_to_env();
// Once injected we parse the cli args once again to take the new env vars into scope.
// Once injected, we parse the cli args once again to take the new env vars into scope.
opts = Opt::parse();
config_read_from = Some(config_file_path);
}
Err(e) => {
if let Some(path) = user_specified_config_file_path {
// If we have an error while reading the file defined by the user.
anyhow::bail!(
"unable to open or read the {:?} configuration file: {}.",
path,
e,
)
anyhow::bail!("unable to open or read the {path:?} configuration file: {e}.")
}
}
}
@ -572,6 +574,7 @@ impl Opt {
experimental_limit_batched_tasks_total_size,
experimental_embedding_cache_entries,
experimental_no_snapshot_compaction,
experimental_chat_completions,
} = self;
export_to_env_if_not_present(MEILI_DB_PATH, db_path);
export_to_env_if_not_present(MEILI_HTTP_ADDR, http_addr);
@ -672,6 +675,10 @@ impl Opt {
MEILI_EXPERIMENTAL_NO_SNAPSHOT_COMPACTION,
experimental_no_snapshot_compaction.to_string(),
);
export_to_env_if_not_present(
MEILI_EXPERIMENTAL_CHAT_COMPLETIONS,
experimental_chat_completions.to_string(),
);
indexer_options.export_to_env();
}
@ -724,6 +731,7 @@ impl Opt {
metrics: self.experimental_enable_metrics,
logs_route: self.experimental_enable_logs_route,
contains_filter: self.experimental_contains_filter,
chat_completions: self.experimental_chat_completions,
}
}
}