mirror of
https://github.com/BerriAI/litellm.git
synced 2026-10-03 02:22:24 +00:00
* ci: drop the ocr_testing job now that tests/ocr_tests is gone Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(ocr): restore the live OCR matrix and the ocr_testing job The public litellm.ocr / aocr / Router interface is unchanged by the Rust migration, so the live provider matrix still applies. Drops the stale VCR skip list for the deleted test_rust_bridge.py. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * test(messages): show streamed upstream headers never reach the native stream The Python handler puts the upstream response headers on the stream's _hidden_params before the first chunk so the proxy can forward them as llm_provider-* headers. The native route drops them, and this test fails on the Rust path while passing on Python. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * feat(messages): hand upstream response headers to the native stream before its first chunk The Messages route fills MessagesStreamHead from the upstream response and yields it on Open. The Python driver converts it through the protocol host and hands it to Stream and SyncStream as their _hidden_params, so a streamed native call carries additional_headers the same way the Python handler does and the proxy can forward them as llm_provider-* headers. The relay contract lives in the core crate test, the hand-off in the host-python driver test, and the header projection in the route host test, so the recording-server test that showed the gap is dropped. Co-Authored-By: Claude Fable 5.1 <noreply@anthropic.com> * wip --------- Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
152 lines
4.9 KiB
Rust
152 lines
4.9 KiB
Rust
use std::panic::{AssertUnwindSafe, catch_unwind};
|
|
|
|
use crate::panic_to_pyerr;
|
|
use pyo3::exceptions::{PyBaseException, PyRuntimeError};
|
|
use pyo3::gc::{PyTraverseError, PyVisit};
|
|
use pyo3::prelude::*;
|
|
|
|
pub enum ExecutionStep {
|
|
Return(Py<PyAny>),
|
|
Await(Py<PyAny>),
|
|
/// The call streams: the caller gets a stream over this execution carrying this head,
|
|
/// and the execution stays suspended until the stream asks for a chunk.
|
|
Open(Py<PyAny>),
|
|
Yield(Py<PyAny>),
|
|
}
|
|
|
|
pub trait ExecutionBody: Send + Sync {
|
|
fn resume(&mut self, result: Option<PyResult<Py<PyAny>>>) -> PyResult<ExecutionStep>;
|
|
fn traverse(&self, visit: &PyVisit<'_>) -> Result<(), PyTraverseError>;
|
|
}
|
|
|
|
enum ExecutionState {
|
|
Created(Box<dyn ExecutionBody>),
|
|
Running,
|
|
Suspended(Box<dyn ExecutionBody>),
|
|
Closed,
|
|
}
|
|
|
|
#[pyclass]
|
|
pub struct Execution {
|
|
state: ExecutionState,
|
|
}
|
|
|
|
impl Execution {
|
|
pub fn new(body: impl ExecutionBody + 'static) -> Self {
|
|
Self {
|
|
state: ExecutionState::Created(Box::new(body)),
|
|
}
|
|
}
|
|
|
|
/// An execution already started elsewhere and now waiting for its next input.
|
|
pub fn suspended(body: impl ExecutionBody + 'static) -> Self {
|
|
Self {
|
|
state: ExecutionState::Suspended(Box::new(body)),
|
|
}
|
|
}
|
|
|
|
fn advance(
|
|
slf: &Bound<'_, Self>,
|
|
py: Python<'_>,
|
|
result: Option<PyResult<Py<PyAny>>>,
|
|
) -> PyResult<Py<PyAny>> {
|
|
let mut body = {
|
|
let mut execution = slf.borrow_mut();
|
|
match (&execution.state, result.is_some()) {
|
|
(ExecutionState::Created(_), false) | (ExecutionState::Suspended(_), true) => {}
|
|
(ExecutionState::Running, _) => {
|
|
return Err(PyRuntimeError::new_err("execution is already running"));
|
|
}
|
|
(ExecutionState::Closed, _) => {
|
|
return Err(PyRuntimeError::new_err("execution is closed"));
|
|
}
|
|
_ => {
|
|
return Err(PyRuntimeError::new_err(
|
|
"execution requires start before resume and can only start once",
|
|
));
|
|
}
|
|
}
|
|
match std::mem::replace(&mut execution.state, ExecutionState::Running) {
|
|
ExecutionState::Created(body) | ExecutionState::Suspended(body) => body,
|
|
_ => unreachable!(),
|
|
}
|
|
};
|
|
let outcome = catch_unwind(AssertUnwindSafe(|| {
|
|
let step = body.resume(result)?;
|
|
let (tag, value, suspended) = match step {
|
|
ExecutionStep::Await(value) => ("Await", value, true),
|
|
ExecutionStep::Open(head) => ("Open", head, true),
|
|
ExecutionStep::Yield(value) => ("Yield", value, true),
|
|
ExecutionStep::Return(value) => ("Complete", value, false),
|
|
};
|
|
let step = py
|
|
.import("litellm.rust_bridge.lifecycle")?
|
|
.getattr(tag)?
|
|
.call1((value,))?
|
|
.unbind();
|
|
Ok((step, suspended))
|
|
}))
|
|
.map_err(panic_to_pyerr)
|
|
.and_then(|result| result);
|
|
match outcome {
|
|
Ok((step, true)) if matches!(slf.borrow().state, ExecutionState::Running) => {
|
|
slf.borrow_mut().state = ExecutionState::Suspended(body);
|
|
Ok(step)
|
|
}
|
|
outcome => {
|
|
slf.borrow_mut().state = ExecutionState::Closed;
|
|
drop(body);
|
|
outcome.and_then(|(step, suspended)| {
|
|
if suspended {
|
|
Err(PyRuntimeError::new_err(
|
|
"execution was closed while running",
|
|
))
|
|
} else {
|
|
Ok(step)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
#[pymethods]
|
|
impl Execution {
|
|
fn start(slf: &Bound<'_, Self>, py: Python<'_>) -> PyResult<Py<PyAny>> {
|
|
Self::advance(slf, py, None)
|
|
}
|
|
|
|
fn resume_value(
|
|
slf: &Bound<'_, Self>,
|
|
py: Python<'_>,
|
|
value: Py<PyAny>,
|
|
) -> PyResult<Py<PyAny>> {
|
|
Self::advance(slf, py, Some(Ok(value)))
|
|
}
|
|
|
|
fn resume_error(
|
|
slf: &Bound<'_, Self>,
|
|
py: Python<'_>,
|
|
error: Bound<'_, PyBaseException>,
|
|
) -> PyResult<Py<PyAny>> {
|
|
Self::advance(slf, py, Some(Err(PyErr::from_value(error.into_any()))))
|
|
}
|
|
|
|
fn close(slf: &Bound<'_, Self>) {
|
|
let state = std::mem::replace(&mut slf.borrow_mut().state, ExecutionState::Closed);
|
|
drop(state);
|
|
}
|
|
|
|
fn __traverse__(&self, visit: PyVisit<'_>) -> Result<(), PyTraverseError> {
|
|
match &self.state {
|
|
ExecutionState::Created(body) | ExecutionState::Suspended(body) => {
|
|
body.traverse(&visit)
|
|
}
|
|
_ => Ok(()),
|
|
}
|
|
}
|
|
|
|
fn __clear__(slf: &Bound<'_, Self>) {
|
|
Self::close(slf);
|
|
}
|
|
}
|