Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

agent: Support GEMINI_API_KEY environment variable (#34574)

Browse source 
Google Gemini Docs now recommend usage of `GEMINI_API_KEY` and the
legacy `GOOGLE_AI_API_KEY` variable is no longer supported in the modern
SDKs.

Zed will now accept either.

Release Notes:

- N/A
This commit is contained in:
Peter Tripp 2025-07-16 16:55:54 -04:00 • committed by GitHub
parent b4c2ae5196
commit f82ef1f76f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
crates/language_models/src/provider/google.rs
View file

@ -94,6 +94,7 @@ pub struct State {
_subscription: Subscription, _subscription: Subscription,
} }
const GEMINI_API_KEY_VAR: &str = "GEMINI_API_KEY";
const GOOGLE_AI_API_KEY_VAR: &str = "GOOGLE_AI_API_KEY"; const GOOGLE_AI_API_KEY_VAR: &str = "GOOGLE_AI_API_KEY";
impl State { impl State {
@ -151,6 +152,8 @@ impl State {
cx.spawn(async move |this, cx| { cx.spawn(async move |this, cx| {
let (api_key, from_env) = if let Ok(api_key) = std::env::var(GOOGLE_AI_API_KEY_VAR) { let (api_key, from_env) = if let Ok(api_key) = std::env::var(GOOGLE_AI_API_KEY_VAR) {
(api_key, true) (api_key, true)
} else if let Ok(api_key) = std::env::var(GEMINI_API_KEY_VAR) {
(api_key, true)
} else { } else {
let (_, api_key) = credentials_provider let (_, api_key) = credentials_provider
.read_credentials(&api_url, &cx) .read_credentials(&api_url, &cx)
@ -903,7 +906,7 @@ impl Render for ConfigurationView {
) )
.child( .child(
Label::new( Label::new(
format!("You can also assign the {GOOGLE_AI_API_KEY_VAR} environment variable and restart Zed."), format!("You can also assign the {GEMINI_API_KEY_VAR} environment variable and restart Zed."),
) )
.size(LabelSize::Small).color(Color::Muted), .size(LabelSize::Small).color(Color::Muted),
) )
@ -922,7 +925,7 @@ impl Render for ConfigurationView {
.gap_1() .gap_1()
.child(Icon::new(IconName::Check).color(Color::Success)) .child(Icon::new(IconName::Check).color(Color::Success))
.child(Label::new(if env_var_set { .child(Label::new(if env_var_set {
format!("API key set in {GOOGLE_AI_API_KEY_VAR} environment variable.") format!("API key set in {GEMINI_API_KEY_VAR} environment variable.")
} else { } else {
"API key configured.".to_string() "API key configured.".to_string()
})), })),
@ -935,7 +938,7 @@ impl Render for ConfigurationView {
.icon_position(IconPosition::Start) .icon_position(IconPosition::Start)
.disabled(env_var_set) .disabled(env_var_set)
.when(env_var_set, |this| { .when(env_var_set, |this| {
this.tooltip(Tooltip::text(format!("To reset your API key, unset the {GOOGLE_AI_API_KEY_VAR} environment variable."))) this.tooltip(Tooltip::text(format!("To reset your API key, make sure {GEMINI_API_KEY_VAR} and {GOOGLE_AI_API_KEY_VAR} environment variables are unset.")))
}) })
.on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx))), .on_click(cx.listener(|this, _, window, cx| this.reset_api_key(window, cx))),
) )

2
docs/src/ai/configuration.md
View file

@ -237,7 +237,7 @@ You can use Gemini models with the Zed agent by choosing it via the model dropdo
The Google AI API key will be saved in your keychain. The Google AI API key will be saved in your keychain.
Zed will also use the `GOOGLE_AI_API_KEY` environment variable if it's defined. Zed will also use the `GEMINI_API_KEY` environment variable if it's defined. See [Using Gemini API keys](Using Gemini API keys) in the Gemini docs for more.
#### Custom Models {#google-ai-custom-models} #### Custom Models {#google-ai-custom-models}