mirror of
https://github.com/BerriAI/litellm.git
synced 2026-09-26 01:12:21 +00:00
* refactor(ocr): remove the Python OCR execution path and require the Rust route Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * fmt * refactor(ocr): tidy the native OCR passthrough binding Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * style(ocr): ruff format the azure passthrough transformation Co-Authored-By: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> * refactor(ocr): resolve passthrough OCR costing in one Rust call Replace passthrough_url/passthrough_transform with passthrough_response, which matches the relayed endpoint against each Azure config's path segments instead of building a fake request to call get_complete_url. The binding drops the unused headers, status and api_base arguments. Catch the ValueError/RuntimeError the binding raises so a relayed body that is not OCR-shaped falls back to the passthrough object instead of failing logging, and cover the relay against the real binding. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(ocr): drop the unused LlmProviders import from health check helpers Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * 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(ocr): import Final in the health check helper tests Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Yujong Lee <yujong@berri.ai> Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
319 lines
11 KiB
Python
319 lines
11 KiB
Python
from collections.abc import Awaitable, Callable, Mapping
|
|
from typing import Final, cast # noqa: TID251 # narrows legacy callable signatures for inspect
|
|
|
|
import httpx
|
|
import pytest
|
|
|
|
import litellm
|
|
from litellm.llms.base_llm.ocr.transformation import OCRResponse
|
|
from litellm.ocr.dispatch import (
|
|
_ADISPATCH, # pyright: ignore[reportPrivateUsage] # tests configured dispatch
|
|
_DISPATCH, # pyright: ignore[reportPrivateUsage] # tests configured dispatch
|
|
)
|
|
from litellm.rust_bridge import catalog, runtime
|
|
from litellm.rust_bridge.bindings import NativeBinding
|
|
from litellm.rust_bridge.catalog import Route, RouteRule, Rules
|
|
from litellm.rust_bridge.configuration import Rollout
|
|
from litellm.rust_bridge.ocr.entrypoints import (
|
|
NATIVE_AOCR,
|
|
NATIVE_OCR,
|
|
LiteLLMOcrRequest,
|
|
NativeAocr,
|
|
NativeOcr,
|
|
)
|
|
|
|
RUST_RULES: Final[Rules] = (RouteRule(Route.OCR, Rollout.RUST_REQUIRED),)
|
|
|
|
|
|
def ocr_binding(native: NativeOcr | None) -> NativeBinding[NativeOcr]:
|
|
binding: Final[NativeBinding[NativeOcr]] = NativeBinding("ocr", validate=lambda _: None)
|
|
binding.override(native)
|
|
return binding
|
|
|
|
|
|
def aocr_binding(native: NativeAocr | None) -> NativeBinding[NativeAocr]:
|
|
binding: Final[NativeBinding[NativeAocr]] = NativeBinding("aocr", validate=lambda _: None)
|
|
binding.override(native)
|
|
return binding
|
|
|
|
|
|
def response(model: str = "mistral/mistral-ocr-latest") -> OCRResponse:
|
|
return OCRResponse(pages=[], model=model)
|
|
|
|
|
|
def test_native_receives_normalized_positional_request_and_original_call_shape() -> None:
|
|
document: Final[Mapping[str, object]] = {"type": "file", "file": b"pdf"}
|
|
timeout: Final = httpx.Timeout(30)
|
|
extra_headers: Final[dict[str, object]] = {"x-test": "1"}
|
|
pages: Final = [0, 2]
|
|
args: Final[tuple[object, ...]] = ("mistral/mistral-ocr-latest", document)
|
|
kwargs: Final[Mapping[str, object]] = {
|
|
"api_key": "test-key",
|
|
"api_base": "https://example.invalid",
|
|
"timeout": timeout,
|
|
"custom_llm_provider": "mistral",
|
|
"extra_headers": extra_headers,
|
|
"pages": pages,
|
|
}
|
|
captured: Final[list[tuple[LiteLLMOcrRequest, tuple[object, ...], Mapping[str, object]]]] = []
|
|
expected: Final = response()
|
|
|
|
def native(
|
|
request: LiteLLMOcrRequest,
|
|
args: tuple[object, ...],
|
|
kwargs: Mapping[str, object],
|
|
) -> OCRResponse:
|
|
captured.append((request, args, kwargs))
|
|
return expected
|
|
|
|
result: Final = _DISPATCH.run(
|
|
args,
|
|
kwargs,
|
|
python=runtime.NO_PYTHON,
|
|
binding=ocr_binding(native),
|
|
native=lambda hook, request, call_args, call_kwargs: hook(request, call_args, call_kwargs),
|
|
rules=RUST_RULES,
|
|
)
|
|
|
|
request, call_args, call_kwargs = captured[0]
|
|
assert result is expected
|
|
assert request.model == "mistral/mistral-ocr-latest"
|
|
assert request.document is document
|
|
assert request.api_key == "test-key"
|
|
assert request.api_base == "https://example.invalid"
|
|
assert request.timeout is timeout
|
|
assert request.custom_llm_provider == "mistral"
|
|
assert request.extra_headers is extra_headers
|
|
assert request.kwargs == {"pages": pages}
|
|
assert request.kwargs["pages"] is pages
|
|
assert call_args is args
|
|
assert call_kwargs is kwargs
|
|
|
|
|
|
def test_native_preserves_keyword_model_and_document_in_original_call_shape() -> None:
|
|
document: Final[Mapping[str, object]] = {
|
|
"type": "document_url",
|
|
"document_url": "https://example.invalid/document.pdf",
|
|
}
|
|
pages: Final = [1]
|
|
args: Final[tuple[object, ...]] = ()
|
|
kwargs: Final[Mapping[str, object]] = {
|
|
"model": "mistral/mistral-ocr-latest",
|
|
"document": document,
|
|
"pages": pages,
|
|
}
|
|
captured: Final[list[tuple[LiteLLMOcrRequest, tuple[object, ...], Mapping[str, object]]]] = []
|
|
expected: Final = response()
|
|
|
|
def native(
|
|
request: LiteLLMOcrRequest,
|
|
args: tuple[object, ...],
|
|
kwargs: Mapping[str, object],
|
|
) -> OCRResponse:
|
|
captured.append((request, args, kwargs))
|
|
return expected
|
|
|
|
result: Final = _DISPATCH.run(
|
|
args,
|
|
kwargs,
|
|
python=runtime.NO_PYTHON,
|
|
binding=ocr_binding(native),
|
|
native=lambda hook, request, call_args, call_kwargs: hook(request, call_args, call_kwargs),
|
|
rules=RUST_RULES,
|
|
)
|
|
|
|
request, call_args, call_kwargs = captured[0]
|
|
assert result is expected
|
|
assert request.model == "mistral/mistral-ocr-latest"
|
|
assert request.document is document
|
|
assert request.kwargs == {"pages": pages}
|
|
assert call_args is args
|
|
assert call_kwargs is kwargs
|
|
assert call_kwargs["model"] == "mistral/mistral-ocr-latest"
|
|
assert call_kwargs["document"] is document
|
|
|
|
|
|
def test_aocr_marker_cannot_be_served_without_python() -> None:
|
|
document: Final[Mapping[str, object]] = {"type": "file", "file": b"pdf"}
|
|
args: Final[tuple[object, ...]] = ("mistral/mistral-ocr-latest", document)
|
|
kwargs: Final[Mapping[str, object]] = {"aocr": True}
|
|
|
|
def native(
|
|
request: LiteLLMOcrRequest,
|
|
args: tuple[object, ...],
|
|
kwargs: Mapping[str, object],
|
|
) -> OCRResponse:
|
|
pytest.fail("the aocr bypass marker must not reach native")
|
|
|
|
with pytest.raises(runtime.NoPythonImplementationError, match="bypass"):
|
|
_DISPATCH.run(
|
|
args,
|
|
kwargs,
|
|
python=runtime.NO_PYTHON,
|
|
binding=ocr_binding(native),
|
|
native=lambda hook, request, call_args, call_kwargs: hook(request, call_args, call_kwargs),
|
|
rules=RUST_RULES,
|
|
)
|
|
|
|
|
|
def test_missing_native_binding_is_a_required_rust_error() -> None:
|
|
args: Final[tuple[object, ...]] = ("mistral/mistral-ocr-latest", {"type": "file", "file": b"pdf"})
|
|
|
|
with pytest.raises(RuntimeError, match="Rust ocr bridge"):
|
|
_DISPATCH.run(
|
|
args,
|
|
{},
|
|
python=runtime.NO_PYTHON,
|
|
binding=ocr_binding(None),
|
|
native=lambda hook, request, call_args, call_kwargs: hook(request, call_args, call_kwargs),
|
|
rules=RUST_RULES,
|
|
)
|
|
|
|
|
|
def test_non_required_rule_cannot_be_served_without_python() -> None:
|
|
args: Final[tuple[object, ...]] = ("mistral/mistral-ocr-latest", {"type": "file", "file": b"pdf"})
|
|
|
|
def native(
|
|
request: LiteLLMOcrRequest,
|
|
args: tuple[object, ...],
|
|
kwargs: Mapping[str, object],
|
|
) -> OCRResponse:
|
|
return response()
|
|
|
|
with pytest.raises(runtime.NoPythonImplementationError, match="RUST_REQUIRED"):
|
|
_DISPATCH.run(
|
|
args,
|
|
{},
|
|
python=runtime.NO_PYTHON,
|
|
binding=ocr_binding(native),
|
|
native=lambda hook, request, call_args, call_kwargs: hook(request, call_args, call_kwargs),
|
|
rules=(RouteRule(Route.OCR, Rollout.PYTHON_ONLY),),
|
|
)
|
|
|
|
|
|
@pytest.mark.parametrize(
|
|
("args", "kwargs", "message"),
|
|
(
|
|
(
|
|
("mistral/mistral-ocr-latest", {"type": "file", "file": b"pdf"}),
|
|
{"model": "duplicate"},
|
|
r"ocr\(\) got multiple values for argument 'model'",
|
|
),
|
|
(
|
|
("mistral/mistral-ocr-latest",),
|
|
{},
|
|
r"ocr\(\) missing 1 required positional argument: 'document'",
|
|
),
|
|
),
|
|
)
|
|
def test_ocr_parser_errors_before_native(
|
|
args: tuple[object, ...], kwargs: Mapping[str, object], message: str
|
|
) -> None:
|
|
def native(
|
|
request: LiteLLMOcrRequest,
|
|
args: tuple[object, ...],
|
|
kwargs: Mapping[str, object],
|
|
) -> OCRResponse:
|
|
pytest.fail("OCR parser failures must not call native")
|
|
|
|
with pytest.raises(TypeError, match=message):
|
|
_DISPATCH.run(
|
|
args,
|
|
kwargs,
|
|
python=runtime.NO_PYTHON,
|
|
binding=ocr_binding(native),
|
|
native=lambda hook, request, call_args, call_kwargs: hook(request, call_args, call_kwargs),
|
|
rules=RUST_RULES,
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize(
|
|
("args", "kwargs", "message"),
|
|
(
|
|
(
|
|
("mistral/mistral-ocr-latest", {"type": "file", "file": b"pdf"}),
|
|
{"model": "duplicate"},
|
|
r"aocr\(\) got multiple values for argument 'model'",
|
|
),
|
|
(
|
|
("mistral/mistral-ocr-latest",),
|
|
{},
|
|
r"aocr\(\) missing 1 required positional argument: 'document'",
|
|
),
|
|
),
|
|
)
|
|
async def test_aocr_parser_errors_before_native(
|
|
args: tuple[object, ...], kwargs: Mapping[str, object], message: str
|
|
) -> None:
|
|
async def native(
|
|
request: LiteLLMOcrRequest,
|
|
args: tuple[object, ...],
|
|
kwargs: Mapping[str, object],
|
|
) -> OCRResponse:
|
|
pytest.fail("OCR parser failures must not call native")
|
|
|
|
with pytest.raises(TypeError, match=message):
|
|
await _ADISPATCH.arun(
|
|
args,
|
|
kwargs,
|
|
python=runtime.NO_PYTHON,
|
|
binding=aocr_binding(native),
|
|
native=lambda hook, request, call_args, call_kwargs: hook(request, call_args, call_kwargs),
|
|
rules=RUST_RULES,
|
|
)
|
|
|
|
|
|
def test_public_ocr_routes_through_dispatch(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
document: Final[Mapping[str, object]] = {
|
|
"type": "document_url",
|
|
"document_url": "https://example.invalid/document.pdf",
|
|
}
|
|
captured: Final[list[LiteLLMOcrRequest]] = []
|
|
expected: Final = response()
|
|
|
|
def native(
|
|
request: LiteLLMOcrRequest,
|
|
args: tuple[object, ...],
|
|
kwargs: Mapping[str, object],
|
|
) -> OCRResponse:
|
|
captured.append(request)
|
|
return expected
|
|
|
|
NATIVE_OCR.override(native)
|
|
monkeypatch.setattr(catalog, "RULES", RUST_RULES)
|
|
public_ocr: Final = cast(Callable[..., OCRResponse], litellm.ocr)
|
|
try:
|
|
result: Final = public_ocr(model="mistral/mistral-ocr-latest", document=document)
|
|
finally:
|
|
NATIVE_OCR.reset()
|
|
assert result is expected
|
|
assert [request.model for request in captured] == ["mistral/mistral-ocr-latest"]
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_public_aocr_routes_through_dispatch(monkeypatch: pytest.MonkeyPatch) -> None:
|
|
document: Final[Mapping[str, object]] = {
|
|
"type": "document_url",
|
|
"document_url": "https://example.invalid/document.pdf",
|
|
}
|
|
captured: Final[list[LiteLLMOcrRequest]] = []
|
|
expected: Final = response()
|
|
|
|
async def native(
|
|
request: LiteLLMOcrRequest,
|
|
args: tuple[object, ...],
|
|
kwargs: Mapping[str, object],
|
|
) -> OCRResponse:
|
|
captured.append(request)
|
|
return expected
|
|
|
|
NATIVE_AOCR.override(native)
|
|
monkeypatch.setattr(catalog, "RULES", RUST_RULES)
|
|
public_aocr: Final = cast(Callable[..., Awaitable[OCRResponse]], litellm.aocr)
|
|
try:
|
|
result: Final = await public_aocr(model="mistral/mistral-ocr-latest", document=document)
|
|
finally:
|
|
NATIVE_AOCR.reset()
|
|
assert result is expected
|
|
assert [request.model for request in captured] == ["mistral/mistral-ocr-latest"]
|