Skip to content

fix(buzz-agent): honor OPENAI_BASE_URL as fallback for base URL #3705

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

Open
Chukwuebuka-2003 wants to merge 2 commits into
base: main
Choose a base branch
from
+78 −2
Open

fix(buzz-agent): honor OPENAI_BASE_URL as fallback for base URL #3705

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
e9e36d3
fix(buzz-agent): honor OPENAI_BASE_URL as fallback for base URL
Chukwuebuka-2003 Jul 29, 2026
f00fd08
fix(buzz-agent): fix OPENAI_BASE_URL fallback precedence
Chukwuebuka-2003 Jul 30, 2026
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
12 changes: 11 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions crates/buzz-agent/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,3 +55,4 @@ hex = { workspace = true }
serde = { workspace = true }
sha2 = { workspace = true }
tempfile = "3"
temp-env = "0.3"
67 changes: 66 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,9 @@ 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"),
env("OPENAI_COMPAT_BASE_URL")
.or_else(|| env("OPENAI_BASE_URL"))
.unwrap_or_else(|| "https://api.openai.com/v1".into()),
parse_openai_api(env("OPENAI_COMPAT_API").as_deref())?,
),
Provider::Databricks | Provider::DatabricksV2 => (
Expand Down Expand Up @@ -2751,4 +2753,67 @@ mod tests {
let err = resolve_provider(Some("openrouter"), None, None, None).unwrap_err();
assert!(err.contains("OPENROUTER_API_KEY"));
}

#[test]
fn base_url_prefers_compat_over_generic() {
temp_env::with_vars(
[
("BUZZ_AGENT_PROVIDER", Some("openai")),
("OPENAI_COMPAT_API_KEY", Some("sk-test")),
("OPENAI_COMPAT_MODEL", Some("gpt-4")),
("OPENAI_COMPAT_BASE_URL", Some("https://custom-openai.local/v1")),
("OPENAI_BASE_URL", Some("https://generic-openai.local/v1")),
],
|| {
let config = Config::from_env().unwrap();
assert_eq!(
config.base_url,
"https://custom-openai.local/v1",
"specific OPENAI_COMPAT_BASE_URL should win over generic OPENAI_BASE_URL"
);
},
);
}

#[test]
fn base_url_falls_back_to_generic_when_compat_unset() {
temp_env::with_vars(
[
("BUZZ_AGENT_PROVIDER", Some("openai")),
("OPENAI_COMPAT_API_KEY", Some("sk-test")),
("OPENAI_COMPAT_MODEL", Some("gpt-4")),
("OPENAI_COMPAT_BASE_URL", None),
("OPENAI_BASE_URL", Some("https://generic-openai.local/v1")),
],
|| {
let config = Config::from_env().unwrap();
assert_eq!(
config.base_url,
"https://generic-openai.local/v1",
"OPENAI_BASE_URL should be used when OPENAI_COMPAT_BASE_URL is unset"
);
},
);
}

#[test]
fn base_url_defaults_when_none_set() {
temp_env::with_vars(
[
("BUZZ_AGENT_PROVIDER", Some("openai")),
("OPENAI_COMPAT_API_KEY", Some("sk-test")),
("OPENAI_COMPAT_MODEL", Some("gpt-4")),
("OPENAI_COMPAT_BASE_URL", None),
("OPENAI_BASE_URL", None),
],
|| {
let config = Config::from_env().unwrap();
assert_eq!(
config.base_url,
"https://api.openai.com/v1",
"should default when neither env var is set"
);
},
);
}
}