Skip to content

feat: Add support for custom OpenAI API base URLs. #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 23, 2023
Merged

feat: Add support for custom OpenAI API base URLs. #112

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07046c3
feat: Add support for custom OpenAI API base URLs.
ferstar Mar 22, 2023
70c29d6
lint: code style fix
ferstar Mar 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions src/llms/openai.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ impl OpenAIClient {

let mut client = Client::new().with_api_key(&api_key);

let api_base = settings.api_base.unwrap_or_default();
if !api_base.is_empty() {
client = client.with_api_base(&api_base);
}

if settings.retries.unwrap_or_default() > 0 {
let backoff = backoff::ExponentialBackoffBuilder::new()
.with_max_elapsed_time(Some(std::time::Duration::from_secs(60)))
Expand Down
12 changes: 12 additions & 0 deletions src/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ impl<'de> serde::Deserialize<'de> for ModelProvider {

#[derive(Debug, Default, Serialize, Deserialize, Clone)]
pub(crate) struct OpenAISettings {
pub api_base: Option<String>,
pub api_key: Option<String>,
pub model: Option<String>,
pub retries: Option<u16>,
Expand All @@ -80,6 +81,10 @@ pub(crate) struct OpenAISettings {
impl From<OpenAISettings> for config::ValueKind {
fn from(settings: OpenAISettings) -> Self {
let mut properties = HashMap::new();
properties.insert(
"api_base".to_string(),
config::Value::from(settings.api_base),
);
properties.insert("api_key".to_string(), config::Value::from(settings.api_key));
properties.insert("model".to_string(), config::Value::from(settings.model));
properties.insert("retries".to_string(), config::Value::from(settings.retries));
Expand Down Expand Up @@ -218,6 +223,7 @@ impl Settings {
.set_default(
"openai",
Some(OpenAISettings {
api_base: None,
api_key: None,
model: Some(DEFAULT_OPENAI_MODEL.to_string()),
retries: Some(2),
Expand Down Expand Up @@ -281,6 +287,12 @@ impl Settings {
settings = settings.add_source(app_env);

// add custom override
if let Ok(openai_api_base) = std::env::var("OPENAI_API_BASE") {
if !openai_api_base.is_empty() {
debug!("Applying OPENAI_API_BASE envvar: {}", openai_api_base);
settings = settings.set_override("openai.api_base", Some(openai_api_base))?;
}
}
if let Ok(openai_api_key) = std::env::var("OPENAI_API_KEY") {
if !openai_api_key.is_empty() {
debug!("Applying OPENAI_API_KEY envvar: {}", openai_api_key);
Expand Down