Skip to content

fix(buzz-agent): OPENAI_BASE_URL fallback under OPENAI_COMPAT_BASE_URL #3773

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

Closed
Bartok9 wants to merge 1 commit into from
+57 −1
Closed

fix(buzz-agent): OPENAI_BASE_URL fallback under OPENAI_COMPAT_BASE_URL #3773

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 57 additions & 1 deletion crates/buzz-agent/src/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,10 @@ impl Config {
env("OPENAI_COMPAT_MODEL").as_deref(),
)
.ok_or_else(|| "config: OPENAI_COMPAT_MODEL required".to_string())?,
env_or("OPENAI_COMPAT_BASE_URL", "https://api.openai.com/v1"),
resolve_openai_compat_base_url(
env("OPENAI_COMPAT_BASE_URL").as_deref(),
env("OPENAI_BASE_URL").as_deref(),
),
parse_openai_api(env("OPENAI_COMPAT_API").as_deref())?,
),
Provider::Databricks | Provider::DatabricksV2 => (
Expand Down Expand Up @@ -984,6 +987,27 @@ impl Config {
}
}

/// OpenAI-compatible base URL for `Provider::OpenAi`.
///
/// Precedence (specific → generic → default):
/// 1. `OPENAI_COMPAT_BASE_URL` (Buzz-native)
/// 2. `OPENAI_BASE_URL` (common toolbox default; issue #3630)
/// 3. `https://api.openai.com/v1`
fn resolve_openai_compat_base_url(
compat_base_url: Option<&str>,
openai_base_url: Option<&str>,
) -> String {
for candidate in [compat_base_url, openai_base_url] {
if let Some(raw) = candidate {
let trimmed = raw.trim();
if !trimmed.is_empty() {
return trimmed.to_owned();
}
}
}
"https://api.openai.com/v1".to_owned()
}

fn env(k: &str) -> Option<String> {
std::env::var(k).ok()
}
Expand Down Expand Up @@ -1248,6 +1272,38 @@ mod tests {
assert!(err.contains("OPENAI_COMPAT_API=nope"), "{err}");
}

#[test]
fn resolve_openai_compat_base_url_precedence() {
assert_eq!(
resolve_openai_compat_base_url(None, None),
"https://api.openai.com/v1"
);
assert_eq!(
resolve_openai_compat_base_url(Some("https://compat.example/v1"), None),
"https://compat.example/v1"
);
assert_eq!(
resolve_openai_compat_base_url(None, Some("https://openai-base.example/v1")),
"https://openai-base.example/v1"
);
// Buzz-native compat wins over generic OPENAI_BASE_URL.
assert_eq!(
resolve_openai_compat_base_url(
Some("https://compat.example/v1"),
Some("https://openai-base.example/v1"),
),
"https://compat.example/v1"
);
assert_eq!(
resolve_openai_compat_base_url(Some(" "), Some("https://openai-base.example/v1")),
"https://openai-base.example/v1"
);
assert_eq!(
resolve_openai_compat_base_url(Some(" "), Some("")),
"https://api.openai.com/v1"
);
}

#[test]
fn resolve_provider_keeps_requested_provider_when_token_present() {
assert_eq!(
Expand Down