mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-21 00:21:49 +00:00
custom_httpx mirrored a Python module that mixes transport plumbing with OCR orchestration. The transport half (media fetcher, transport errors, request and header helpers) now lives in litellm-http next to the pool, TLS, proxies and settings, and the OCR request handler moves to base_llm/ocr/handler.rs. Drops the unused deserialize_optional_param and stale dead_code allows. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
355 lines
12 KiB
Rust
355 lines
12 KiB
Rust
use std::{
|
|
collections::HashSet,
|
|
path::{Path, PathBuf},
|
|
sync::{Arc, LazyLock, Mutex, PoisonError},
|
|
};
|
|
|
|
use litellm_core_utils::settings::ProcessEnvironment;
|
|
use litellm_http::{
|
|
HttpClientConfig, HttpClientPool, HttpSettings, HttpSettingsLayer, Resolution, SslVerify,
|
|
Unsupported,
|
|
media::{PublicDnsResolver, UrlPolicy},
|
|
};
|
|
use pyo3::{prelude::*, types::PyDict};
|
|
|
|
use crate::{errors::RustBridgeDeclined, python_settings::PythonSettings};
|
|
|
|
static POOL: LazyLock<HttpClientPool> =
|
|
LazyLock::new(|| HttpClientPool::new(Arc::new(PublicDnsResolver)));
|
|
|
|
static REPORTED_UNSUPPORTED: LazyLock<Mutex<HashSet<Unsupported>>> = LazyLock::new(Mutex::default);
|
|
|
|
pub(crate) fn pool() -> &'static HttpClientPool {
|
|
&POOL
|
|
}
|
|
|
|
pub(crate) fn call_config(
|
|
py: Python<'_>,
|
|
kwargs: &Bound<'_, PyDict>,
|
|
asynchronous: bool,
|
|
) -> PyResult<HttpClientConfig> {
|
|
let settings = HttpSettings::from_layers([
|
|
for_call(call_ssl_verify(kwargs)?, asynchronous),
|
|
HttpSettingsLayer::from_environment(&ProcessEnvironment),
|
|
configured(&PythonSettings::Http.read(py)?)?,
|
|
])
|
|
.without_missing_files(&|path: &Path| path.exists());
|
|
let resolution = Resolution::from(&settings);
|
|
for unsupported in unreported(&REPORTED_UNSUPPORTED, resolution.unsupported) {
|
|
PythonSettings::warn(py, &unsupported.to_string())?;
|
|
}
|
|
Ok(resolution.config)
|
|
}
|
|
|
|
fn unreported(
|
|
reported: &Mutex<HashSet<Unsupported>>,
|
|
unsupported: Vec<Unsupported>,
|
|
) -> Vec<Unsupported> {
|
|
let mut reported = reported.lock().unwrap_or_else(PoisonError::into_inner);
|
|
unsupported
|
|
.into_iter()
|
|
.filter(|unsupported| reported.insert(unsupported.clone()))
|
|
.collect()
|
|
}
|
|
|
|
pub(crate) fn url_policy(py: Python<'_>) -> PyResult<UrlPolicy> {
|
|
let policy: PythonUrlPolicy =
|
|
PythonSettings::UrlPolicy
|
|
.read(py)?
|
|
.extract()
|
|
.map_err(|error: PyErr| {
|
|
RustBridgeDeclined::new_err(format!(
|
|
"litellm URL policy cannot be used by the Rust route: {error}"
|
|
))
|
|
})?;
|
|
Ok(UrlPolicy {
|
|
validate: policy.user_url_validation,
|
|
allowed_hosts: policy.user_url_allowed_hosts,
|
|
})
|
|
}
|
|
|
|
fn call_ssl_verify(kwargs: &Bound<'_, PyDict>) -> PyResult<Option<SslVerify>> {
|
|
Ok(kwargs
|
|
.get_item("ssl_verify")?
|
|
.and_then(|value| ssl_verify(&value)))
|
|
}
|
|
|
|
fn for_call(call_ssl_verify: Option<SslVerify>, asynchronous: bool) -> HttpSettingsLayer {
|
|
HttpSettingsLayer {
|
|
ssl_verify: call_ssl_verify,
|
|
disable_aiohttp_transport: (!asynchronous).then_some(true),
|
|
..HttpSettingsLayer::default()
|
|
}
|
|
}
|
|
|
|
#[derive(FromPyObject)]
|
|
struct PythonUrlPolicy {
|
|
user_url_validation: bool,
|
|
user_url_allowed_hosts: Vec<String>,
|
|
}
|
|
|
|
#[derive(FromPyObject)]
|
|
struct PythonHttpSettings<'py> {
|
|
ssl_verify: Bound<'py, PyAny>,
|
|
ssl_certificate: Option<String>,
|
|
ssl_security_level: Option<String>,
|
|
ssl_ecdh_curve: Option<String>,
|
|
force_ipv4: bool,
|
|
http2: bool,
|
|
aiohttp_trust_env: bool,
|
|
disable_aiohttp_trust_env: bool,
|
|
disable_aiohttp_transport: bool,
|
|
user_agent: String,
|
|
}
|
|
|
|
fn configured(value: &Bound<'_, PyAny>) -> PyResult<HttpSettingsLayer> {
|
|
let python: PythonHttpSettings = value.extract().map_err(|error: PyErr| {
|
|
RustBridgeDeclined::new_err(format!(
|
|
"litellm HTTP settings cannot be used by the Rust route: {error}"
|
|
))
|
|
})?;
|
|
Ok(HttpSettingsLayer {
|
|
ssl_verify: ssl_verify(&python.ssl_verify),
|
|
ssl_certificate: python.ssl_certificate.map(PathBuf::from),
|
|
ssl_security_level: python.ssl_security_level,
|
|
ssl_ecdh_curve: python.ssl_ecdh_curve,
|
|
force_ipv4: Some(python.force_ipv4),
|
|
http2: Some(python.http2),
|
|
aiohttp_trust_env: Some(python.aiohttp_trust_env),
|
|
disable_aiohttp_trust_env: Some(python.disable_aiohttp_trust_env),
|
|
disable_aiohttp_transport: Some(python.disable_aiohttp_transport),
|
|
user_agent: Some(python.user_agent),
|
|
..HttpSettingsLayer::default()
|
|
})
|
|
}
|
|
|
|
fn ssl_verify(value: &Bound<'_, PyAny>) -> Option<SslVerify> {
|
|
if let Ok(enabled) = value.extract::<bool>() {
|
|
return Some(if enabled {
|
|
SslVerify::Enabled
|
|
} else {
|
|
SslVerify::Disabled
|
|
});
|
|
}
|
|
value
|
|
.extract::<String>()
|
|
.ok()
|
|
.map(|path| SslVerify::parse(&path))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use litellm_http::Verify;
|
|
use rstest::rstest;
|
|
|
|
use super::*;
|
|
use crate::python_settings::CONTRACT;
|
|
|
|
fn python_settings<'py>(py: Python<'py>, overrides: &str) -> Bound<'py, PyAny> {
|
|
let source = format!(
|
|
"
|
|
import json
|
|
import types
|
|
defaults = dict(
|
|
ssl_verify=True,
|
|
ssl_certificate=None,
|
|
ssl_security_level=None,
|
|
ssl_ecdh_curve=None,
|
|
force_ipv4=False,
|
|
http2=False,
|
|
aiohttp_trust_env=False,
|
|
disable_aiohttp_trust_env=False,
|
|
disable_aiohttp_transport=False,
|
|
user_agent='litellm/test',
|
|
)
|
|
defaults.update(dict({overrides}))
|
|
settings = types.SimpleNamespace(**{{name: defaults[name] for name in json.loads(contract)['http_settings']}})
|
|
"
|
|
);
|
|
let locals = PyDict::new(py);
|
|
locals.set_item("contract", CONTRACT).unwrap();
|
|
let source = std::ffi::CString::new(source).unwrap();
|
|
py.run(&source, Some(&locals), Some(&locals)).unwrap();
|
|
locals.get_item("settings").unwrap().unwrap()
|
|
}
|
|
|
|
#[test]
|
|
fn default_python_settings_resolve_to_default_settings_with_verification_on() {
|
|
Python::initialize();
|
|
Python::attach(|py| {
|
|
let layer = configured(&python_settings(py, "")).unwrap();
|
|
assert_eq!(
|
|
HttpSettings::from_layers([layer]),
|
|
HttpSettings {
|
|
ssl_verify: Some(SslVerify::Enabled),
|
|
user_agent: Some("litellm/test".into()),
|
|
..HttpSettings::default()
|
|
}
|
|
);
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn python_settings_flow_into_the_configured_layer() {
|
|
Python::initialize();
|
|
Python::attach(|py| {
|
|
let layer = configured(&python_settings(
|
|
py,
|
|
"
|
|
ssl_verify='/etc/ssl/corp.pem',
|
|
ssl_certificate='/etc/ssl/client.pem',
|
|
ssl_security_level='2',
|
|
ssl_ecdh_curve='X25519',
|
|
force_ipv4=True,
|
|
http2=True,
|
|
aiohttp_trust_env=True,
|
|
disable_aiohttp_trust_env=True,
|
|
disable_aiohttp_transport=True,
|
|
user_agent='litellm/9.9.9',
|
|
",
|
|
))
|
|
.unwrap();
|
|
assert_eq!(
|
|
layer,
|
|
HttpSettingsLayer {
|
|
ssl_verify: Some(SslVerify::CaBundle("/etc/ssl/corp.pem".into())),
|
|
ssl_certificate: Some("/etc/ssl/client.pem".into()),
|
|
ssl_security_level: Some("2".into()),
|
|
ssl_ecdh_curve: Some("X25519".into()),
|
|
force_ipv4: Some(true),
|
|
http2: Some(true),
|
|
aiohttp_trust_env: Some(true),
|
|
disable_aiohttp_trust_env: Some(true),
|
|
disable_aiohttp_transport: Some(true),
|
|
user_agent: Some("litellm/9.9.9".into()),
|
|
..HttpSettingsLayer::default()
|
|
}
|
|
);
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn user_agent_environment_variable_beats_the_python_default() {
|
|
Python::initialize();
|
|
Python::attach(|py| {
|
|
let settings = HttpSettings::from_layers([
|
|
HttpSettingsLayer::from_environment(&|name: &str| {
|
|
(name == "LITELLM_USER_AGENT").then(|| "operator/1".to_string())
|
|
}),
|
|
configured(&python_settings(py, "")).unwrap(),
|
|
]);
|
|
assert_eq!(settings.user_agent.as_deref(), Some("operator/1"));
|
|
});
|
|
}
|
|
|
|
#[rstest]
|
|
#[case::disabled("ssl_verify=False", Verify::Disabled)]
|
|
#[case::disabled_string("ssl_verify='False'", Verify::Disabled)]
|
|
#[case::enabled_string("ssl_verify='true'", Verify::BuiltInRoots)]
|
|
#[case::bundle("ssl_verify='/tmp/ca.pem'", Verify::CaBundle("/tmp/ca.pem".into()))]
|
|
fn ssl_verify_global_resolves_like_get_ssl_verify(
|
|
#[case] overrides: &str,
|
|
#[case] expected: Verify,
|
|
) {
|
|
Python::initialize();
|
|
Python::attach(|py| {
|
|
let layer = configured(&python_settings(py, overrides)).unwrap();
|
|
let config = Resolution::from(&HttpSettings::from_layers([layer])).config;
|
|
assert_eq!(config.verify, expected);
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn ssl_context_global_is_ignored_so_environment_and_defaults_apply() {
|
|
Python::initialize();
|
|
Python::attach(|py| {
|
|
let layer = configured(&python_settings(py, "ssl_verify=object()")).unwrap();
|
|
assert_eq!(layer.ssl_verify, None);
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn unsupported_settings_are_reported_once_per_process() {
|
|
let reported = Mutex::default();
|
|
let curve = Unsupported::EcdhCurve("secp521r1".into());
|
|
let level = Unsupported::SecurityLevel("@SECLEVEL=1".into());
|
|
assert_eq!(
|
|
unreported(&reported, vec![curve.clone(), level.clone()]),
|
|
[curve.clone(), level]
|
|
);
|
|
assert_eq!(unreported(&reported, vec![curve]), []);
|
|
}
|
|
|
|
#[test]
|
|
fn mistyped_python_settings_decline_instead_of_raising() {
|
|
Python::initialize();
|
|
Python::attach(|py| {
|
|
let error = configured(&python_settings(py, "force_ipv4='yes'")).unwrap_err();
|
|
assert!(error.is_instance_of::<RustBridgeDeclined>(py));
|
|
});
|
|
}
|
|
|
|
fn configured_ssl_verify(ssl_verify: SslVerify) -> HttpSettingsLayer {
|
|
HttpSettingsLayer {
|
|
ssl_verify: Some(ssl_verify),
|
|
..HttpSettingsLayer::default()
|
|
}
|
|
}
|
|
|
|
#[test]
|
|
fn call_ssl_verify_beats_the_configured_value() {
|
|
Python::initialize();
|
|
Python::attach(|py| {
|
|
let kwargs = PyDict::new(py);
|
|
kwargs.set_item("ssl_verify", false).unwrap();
|
|
let call = for_call(call_ssl_verify(&kwargs).unwrap(), true);
|
|
let settings =
|
|
HttpSettings::from_layers([call, configured_ssl_verify(SslVerify::Enabled)]);
|
|
assert_eq!(settings.ssl_verify, Some(SslVerify::Disabled));
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn absent_call_ssl_verify_keeps_the_configured_value() {
|
|
Python::initialize();
|
|
Python::attach(|py| {
|
|
let kwargs = PyDict::new(py);
|
|
kwargs.set_item("ssl_verify", py.None()).unwrap();
|
|
let call = for_call(call_ssl_verify(&kwargs).unwrap(), true);
|
|
let settings =
|
|
HttpSettings::from_layers([call, configured_ssl_verify(SslVerify::Disabled)]);
|
|
assert_eq!(settings.ssl_verify, Some(SslVerify::Disabled));
|
|
});
|
|
}
|
|
|
|
#[test]
|
|
fn live_ssl_context_argument_is_ignored_so_the_configured_value_applies() {
|
|
Python::initialize();
|
|
Python::attach(|py| {
|
|
let kwargs = PyDict::new(py);
|
|
kwargs
|
|
.set_item("ssl_verify", py.eval(c"object()", None, None).unwrap())
|
|
.unwrap();
|
|
let call = for_call(call_ssl_verify(&kwargs).unwrap(), true);
|
|
let settings =
|
|
HttpSettings::from_layers([call, configured_ssl_verify(SslVerify::Disabled)]);
|
|
assert_eq!(settings.ssl_verify, Some(SslVerify::Disabled));
|
|
});
|
|
}
|
|
|
|
#[rstest]
|
|
#[case::asynchronous(true, false)]
|
|
#[case::synchronous(false, true)]
|
|
fn synchronous_calls_honor_environment_proxies_even_when_aiohttp_opts_out(
|
|
#[case] asynchronous: bool,
|
|
#[case] expected: bool,
|
|
) {
|
|
let opted_out = HttpSettingsLayer {
|
|
disable_aiohttp_trust_env: Some(true),
|
|
disable_aiohttp_transport: Some(false),
|
|
..HttpSettingsLayer::default()
|
|
};
|
|
let settings = HttpSettings::from_layers([for_call(None, asynchronous), opted_out]);
|
|
assert_eq!(settings.trust_proxy_env, expected);
|
|
}
|
|
}
|