mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-28 01:32:17 +00:00
* refactor(messages): take the provider client from the injected HTTP pool The messages route kept its own process-wide reqwest client, so it ignored ssl_verify, CA bundles, client certs, proxies and every other setting that litellm-http resolves. The machine now takes the HttpClientPool and the call's HttpClientConfig, as OCR does, and the bridge passes its shared pool. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(http): hand out an owned Client and move chat, audio and OIDC onto the pool HttpClientPool now returns litellm_http::Client, a newtype only crates/http can build, so every provider client carries the resolved TLS, proxy and timeout settings. Chat completions and audio transcription drop their process-wide reqwest clients and take the pool and call config like messages; their 600s ceiling moves to the request. OidcResolver takes its client instead of building one, and the bridge hands it the pooled one. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * refactor(secrets): build Google, Azure and CyberArk manager clients from the pool The native secret managers built bare reqwest clients, so they ignored the host's TLS and proxy settings. load_native_manager now takes the pool and the host config and hands each manager a pooled client. CyberArk's CYBERARK_SSL_VERIFY and CYBERARK_CLIENT_CERT/KEY become an override on the host config instead of a hand-built client. To express a certificate and key in separate files, HttpClientConfig::client_certificate is now a ClientIdentity that is either one PEM or a split pair. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * chore(clippy): only crates/http may build a reqwest client Fence reqwest::Client, ClientBuilder and the TLS builder methods with disallowed-types and disallowed-methods so new code takes a litellm_http::Client from the pool. crates/http is exempt as the one place clients are built, and testkit as a dev-only installer. Tests move to litellm_http::Client::plain_for_test or a pooled client. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(secrets-cyberark): keep verifying certificates when the host disables it Python hands CyberArk its own ssl_verify, which wins over the global setting, so CYBERARK_SSL_VERIFY unset or true still verifies even when the host sets ssl_verify false. The pooled client copied the host's Disabled and would send the API key unverified; fall back to the built-in roots instead. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(python-bridge): treat a missing litellm package as no host HTTP settings Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> --------- Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
62 lines
2.1 KiB
Rust
62 lines
2.1 KiB
Rust
#[cfg(test)]
|
|
mod tests {
|
|
use rstest::rstest;
|
|
|
|
use litellm_secrets::source::{EnvironmentSecrets, SecretSource};
|
|
|
|
#[rstest]
|
|
#[case::lowercase_true("LITELLM_ENVIRONMENT_SECRETS_TRUE", "true", None)]
|
|
#[case::padded_false("LITELLM_ENVIRONMENT_SECRETS_FALSE", " FALSE ", None)]
|
|
#[case::text("LITELLM_ENVIRONMENT_SECRETS_TEXT", "secret", Some("secret"))]
|
|
#[tokio::test]
|
|
async fn python_environment_values_are_absent_like_get_secret_str(
|
|
#[case] name: &'static str,
|
|
#[case] value: &str,
|
|
#[case] expected: Option<&str>,
|
|
) {
|
|
unsafe { std::env::set_var(name, value) };
|
|
let secret = EnvironmentSecrets::python_compatible(litellm_http::Client::plain_for_test())
|
|
.resolve(&[name])
|
|
.await
|
|
.unwrap()
|
|
.get(name);
|
|
unsafe { std::env::remove_var(name) };
|
|
assert_eq!(secret.as_deref(), expected);
|
|
}
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn dynamic_names_use_the_same_resolver_and_snapshots_never_do_fresh_lookups() {
|
|
use litellm_secrets::source::SecretSource;
|
|
use litellm_secrets::{OidcResolver, SecretManagerState, SecretResolver};
|
|
use std::sync::{
|
|
Arc,
|
|
atomic::{AtomicUsize, Ordering},
|
|
};
|
|
|
|
let calls = Arc::new(AtomicUsize::new(0));
|
|
let reads = calls.clone();
|
|
let source = SecretResolver::new(
|
|
Arc::new(SecretManagerState::default()),
|
|
Arc::new(move |name: &str| {
|
|
reads.fetch_add(1, Ordering::SeqCst);
|
|
(name != "missing").then(|| name.to_owned())
|
|
}),
|
|
OidcResolver::new(litellm_http::Client::plain_for_test()),
|
|
);
|
|
let snapshot = source.resolve(&["declared", "missing"]).await.unwrap();
|
|
let name = format!("runtime-{}", "key");
|
|
assert_eq!(snapshot.get("declared").as_deref(), Some("declared"));
|
|
assert_eq!(snapshot.get("missing"), None);
|
|
assert_eq!(snapshot.get(&name), None);
|
|
assert_eq!(calls.load(Ordering::SeqCst), 2);
|
|
assert_eq!(
|
|
SecretSource::get_secret_str(&source, &name)
|
|
.await
|
|
.unwrap()
|
|
.unwrap()
|
|
.expose(),
|
|
name
|
|
);
|
|
assert_eq!(calls.load(Ordering::SeqCst), 3);
|
|
}
|