Michael Sloan
98edf1bf0b
Three motivations for this: * Changing provider URL could cause credentials for the prior URL to be sent to the new URL. * The UI is in a misleading state after URL change - it shows a configured API key, but on restart it will show no API key. * #34110 will add support for both URL and key configuration for Ollama. This is the first provider to have UI for setting the URL, and this makes these issues show up more directly as odd UI interactions. #37610 implemented something similar for the OpenAI and OpenAI compatible providers. This extracts out some shared code, uses it in all relevant providers, and adds more safety around key use. I haven't tested all providers, but the per-provider changes were pretty mechanical, so hopefully work properly. Release Notes: - Fixed handling of changes to LLM provider URL in settings to also load the associated API key.
45 lines
1.3 KiB
Rust
45 lines
1.3 KiB
Rust
use gpui::SharedString;
|
|
use std::sync::LazyLock;
|
|
|
|
/// Whether Zed is running in stateless mode.
|
|
/// When true, Zed will use in-memory databases instead of persistent storage.
|
|
pub static ZED_STATELESS: LazyLock<bool> = bool_env_var!("ZED_STATELESS");
|
|
|
|
pub struct EnvVar {
|
|
pub name: SharedString,
|
|
/// Value of the environment variable. Also `None` when set to an empty string.
|
|
pub value: Option<String>,
|
|
}
|
|
|
|
impl EnvVar {
|
|
pub fn new(name: SharedString) -> Self {
|
|
let value = std::env::var(name.as_str()).ok();
|
|
if value.as_ref().is_some_and(|v| v.is_empty()) {
|
|
Self { name, value: None }
|
|
} else {
|
|
Self { name, value }
|
|
}
|
|
}
|
|
|
|
pub fn or(self, other: EnvVar) -> EnvVar {
|
|
if self.value.is_some() { self } else { other }
|
|
}
|
|
}
|
|
|
|
/// Creates a `LazyLock<EnvVar>` expression for use in a `static` declaration.
|
|
#[macro_export]
|
|
macro_rules! env_var {
|
|
($name:expr) => {
|
|
LazyLock::new(|| $crate::EnvVar::new(($name).into()))
|
|
};
|
|
}
|
|
|
|
/// Generates a `LazyLock<bool>` expression for use in a `static` declaration. Checks if the
|
|
/// environment variable exists and is non-empty.
|
|
#[macro_export]
|
|
macro_rules! bool_env_var {
|
|
($name:expr) => {
|
|
LazyLock::new(|| $crate::EnvVar::new(($name).into()).value.is_some())
|
|
};
|
|
}
|