mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-21 00:21:49 +00:00
b4bfd92a2a
Every legacy callback call from callbacks-legacy now goes through one typed Python shim, litellm.rust_bridge.legacy_callbacks, the only Python module the crate reaches. Before, the crate called Logging methods, litellm.utils hooks, the logging worker, the executor and several litellm globals directly, and its tests retyped those signatures by hand, so an outdated fake could accept a call the real code rejects. python_contract.json lists each shim function's parameters: a Python test pins it to the real signatures and a Rust test pins it to the Rust enum. The lifecycle contract changes to match the Python @client wrapper: - the driver emits CallEvent::Started before begin, so every host sees one start time - RequestContext carries the route-resolved api_key, so legacy pre_call and post_call receive it, and post_call's additional_args match the Python OCR path - Passthrough and its re-aliasing are gone - async deployment hooks always run, and the "no callbacks" shortcut that skipped the logging payload is removed, as in the Python path The OCR api_key is a SecretValue from the wire request onward, so Debug output upstream of the callback contract cannot leak it. host-python's RouteHost now classifies native failures once through classify, and host ops return HostOpError. The OCR route host keeps main's public errors by sending both through the existing Python map_failure.
51 lines
1.7 KiB
Rust
51 lines
1.7 KiB
Rust
use pyo3::{prelude::*, types::PyDict};
|
|
|
|
/// The caller's own object for a public argument: the keyword if given, even an explicit
|
|
/// `None`, else the bound request's attribute. Every reader of a public Python call uses
|
|
/// this rule, so the callbacks and the provider see one object per argument.
|
|
pub fn lookup<'py>(
|
|
kwargs: &Bound<'py, PyDict>,
|
|
request: &Bound<'py, PyAny>,
|
|
name: &str,
|
|
) -> PyResult<Option<Bound<'py, PyAny>>> {
|
|
if let Some(value) = kwargs.get_item(name)? {
|
|
return Ok(Some(value));
|
|
}
|
|
request.getattr_opt(name)
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn lookup_prefers_the_keyword_even_when_none_and_falls_back_to_the_request() {
|
|
crate::initialize_python();
|
|
Python::attach(|py| {
|
|
let locals = PyDict::new(py);
|
|
py.run(
|
|
c"
|
|
key = object()
|
|
document = {'type': 'document_url'}
|
|
class Request:
|
|
api_key = 'from-request'
|
|
api_base = 'from-request'
|
|
document = document
|
|
request = Request()
|
|
kwargs = {'api_key': key, 'api_base': None}
|
|
",
|
|
Some(&locals),
|
|
Some(&locals),
|
|
)
|
|
.unwrap();
|
|
let item = |name: &str| locals.get_item(name).unwrap().unwrap();
|
|
let kwargs = item("kwargs").cast_into::<PyDict>().unwrap();
|
|
let request = item("request");
|
|
let find = |name: &str| lookup(&kwargs, &request, name).unwrap();
|
|
assert!(find("api_key").unwrap().is(item("key")));
|
|
assert!(find("api_base").unwrap().is_none());
|
|
assert!(find("document").unwrap().is(item("document")));
|
|
assert!(find("model").is_none());
|
|
});
|
|
}
|
|
}
|