mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-05 02:41:56 +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>
82 lines
2.4 KiB
Rust
82 lines
2.4 KiB
Rust
#![allow(dead_code)]
|
|
|
|
use std::{
|
|
collections::HashMap,
|
|
sync::{Arc, Mutex},
|
|
};
|
|
|
|
use litellm_auth_aws::AwsAuthConfig;
|
|
use litellm_cache::JsonCodec;
|
|
use litellm_cache_s3::{S3Cache, S3CacheConfig, S3Endpoint};
|
|
use serde_json::Value;
|
|
use tokio::runtime::Handle;
|
|
use wiremock::{Mock, MockServer, Request, Respond, ResponseTemplate, http::Method, matchers::any};
|
|
|
|
pub type JsonS3Cache = S3Cache<JsonCodec<Value>>;
|
|
|
|
pub fn config(endpoint: &str) -> S3CacheConfig {
|
|
S3CacheConfig {
|
|
bucket: "cache-bucket".to_string(),
|
|
key_prefix: "team/".to_string(),
|
|
region: "us-east-1".to_string(),
|
|
endpoint: Some(S3Endpoint {
|
|
url: endpoint.to_string(),
|
|
}),
|
|
auth: AwsAuthConfig {
|
|
access_key_id: Some("key".to_string()),
|
|
secret_access_key: Some("secret".to_string()),
|
|
region_name: Some("us-east-1".to_string()),
|
|
..Default::default()
|
|
},
|
|
}
|
|
}
|
|
|
|
pub fn cache_with(config: S3CacheConfig, runtime: Handle) -> JsonS3Cache {
|
|
S3Cache::new(
|
|
config,
|
|
litellm_http::Client::plain_for_test(),
|
|
JsonCodec::new(),
|
|
runtime,
|
|
)
|
|
}
|
|
|
|
pub fn cache(endpoint: &str) -> JsonS3Cache {
|
|
cache_with(config(endpoint), Handle::current())
|
|
}
|
|
|
|
/// An in-memory bucket: PUT stores the body under the request path, GET serves it or answers
|
|
/// `NoSuchKey`.
|
|
#[derive(Clone, Default)]
|
|
pub struct FakeBucket {
|
|
objects: Arc<Mutex<HashMap<String, Vec<u8>>>>,
|
|
}
|
|
|
|
impl FakeBucket {
|
|
pub async fn serve() -> MockServer {
|
|
let server = MockServer::start().await;
|
|
Mock::given(any())
|
|
.respond_with(Self::default())
|
|
.mount(&server)
|
|
.await;
|
|
server
|
|
}
|
|
}
|
|
|
|
impl Respond for FakeBucket {
|
|
fn respond(&self, request: &Request) -> ResponseTemplate {
|
|
let path = request.url.path().to_string();
|
|
let mut objects = self.objects.lock().unwrap();
|
|
match request.method {
|
|
Method::PUT => {
|
|
objects.insert(path, request.body.clone());
|
|
ResponseTemplate::new(200).insert_header("etag", "\"etag\"")
|
|
}
|
|
Method::GET => match objects.get(&path) {
|
|
Some(body) => ResponseTemplate::new(200).set_body_bytes(body.clone()),
|
|
None => ResponseTemplate::new(404)
|
|
.set_body_string("<Error><Code>NoSuchKey</Code></Error>"),
|
|
},
|
|
_ => ResponseTemplate::new(405),
|
|
}
|
|
}
|
|
}
|