From b9716ec346cf64a7cb09c5a9c746576fbf149e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Renault?= Date: Thu, 15 May 2025 18:28:02 +0200 Subject: [PATCH] Support base_api in the settings --- crates/meilisearch/src/routes/chat.rs | 14 ++++++-------- crates/meilisearch/src/routes/settings/chat.rs | 4 ++-- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/crates/meilisearch/src/routes/chat.rs b/crates/meilisearch/src/routes/chat.rs index 82ee4b435..8d07342c8 100644 --- a/crates/meilisearch/src/routes/chat.rs +++ b/crates/meilisearch/src/routes/chat.rs @@ -186,10 +186,9 @@ async fn non_streamed_chat( if let Some(api_key) = chat_settings.api_key.as_ref() { config = config.with_api_key(api_key); } - // We cannot change the endpoint - // if let Some(endpoint) = chat_settings.endpoint.as_ref() { - // config.with_api_base(&endpoint); - // } + if let Some(base_api) = chat_settings.base_api.as_ref() { + config = config.with_api_base(base_api); + } let client = Client::with_config(config); setup_search_tool(&mut chat_completion, &chat_settings.prompts); @@ -257,10 +256,9 @@ async fn streamed_chat( if let Some(api_key) = chat_settings.api_key.as_ref() { config = config.with_api_key(api_key); } - // We cannot change the endpoint - // if let Some(endpoint) = chat_settings.endpoint.as_ref() { - // config.with_api_base(&endpoint); - // } + if let Some(base_api) = chat_settings.base_api.as_ref() { + config = config.with_api_base(base_api); + } setup_search_tool(&mut chat_completion, &chat_settings.prompts); diff --git a/crates/meilisearch/src/routes/settings/chat.rs b/crates/meilisearch/src/routes/settings/chat.rs index 9708e1409..d8be27ab3 100644 --- a/crates/meilisearch/src/routes/settings/chat.rs +++ b/crates/meilisearch/src/routes/settings/chat.rs @@ -48,7 +48,7 @@ async fn patch_settings( #[serde(deny_unknown_fields, rename_all = "camelCase")] pub struct ChatSettings { pub source: String, - pub endpoint: Option, + pub base_api: Option, pub api_key: Option, pub prompts: ChatPrompts, pub indexes: BTreeMap, @@ -95,7 +95,7 @@ impl Default for ChatSettings { fn default() -> Self { ChatSettings { source: "openai".to_string(), - endpoint: None, + base_api: None, api_key: None, prompts: ChatPrompts { system: DEFAULT_SYSTEM_MESSAGE.to_string(),