mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-07 07:58:09 +00:00
Adds the litellm-router-core crate, its step-driven PyO3 bridge (RouterCoreHandle / RouterCall) and RustCore (litellm/router_rust/), served behind LITELLM_RUST through the ROUTER route rule. The host call-out is the only boundary: every attempt goes through Host::invoke, there is no native executor path, and RustCore never builds, wraps or forwards to PythonCore, so router_python_core.py stays deletable. Attempt preparation lives in litellm/router_attempt.py so it outlives router_python_core.py. RustCore matches PythonCore's behavior, including its known bugs (fixed in follow-up PRs). Routing decisions (strategy picks, routing groups, PTU, pre-routing, pre-call checks, fallback walk, health routing, access groups, weights, cooldowns, allowed fails, usage) live in the crate; work that needs live Python objects (request shaping, endpoints, streaming, model info facts, callbacks, alerting, prompt management) lives in the host-side litellm/router_rust/ package (steps/, invoke/, surface/) driven by Rust steps. The crate owns the registry. It runs the deployment build loop (secret references, ids, organization fan-out, install order) and asks the host for what needs Python, one deployment at a time so errors surface where Python raised them: secrets, validate, provider and added steps. It holds the model list, the index maps and the pattern routers with the Python core's history rules (host_index.rs), and answers the registry lookups (lookup.rs). The Python views of that state in litellm/router_rust/surface/ (model_list, index(), names(), patterns()) read the handle, and every write to them becomes a changeset. Model info, deployment model info, configured limits and model group info are merged in the crate (model_info.rs, group_info.rs) from catalog rows and facts the host answers on a model_info step asked at query time, so price reloads and register_model stay visible. The usage cache key format is defined once, in the crate. The crate records each attempt's outcome itself rather than through litellm callbacks. A streamed attempt is deferred: it counts its request when the stream opens, and the host's stream wrappers report the success with the final usage, or a failure after the first chunk, when the stream ends, as the Python core's callbacks do. tests/unit/test_router/core characterizes PythonCore's public behavior and runs every test on both cores, with nothing pending; only the names of the Python core's own outcome callbacks are asserted on Python alone. litellm.Router is now final: subclassing it raises TypeError at the class statement, and the machinery that kept subclass overrides working is gone. The Rust core never honoured subclass overrides, so they would have silently stopped running there. Custom routing goes through register_plugin(), settings through apply() and outcomes through observe(). This is a breaking change for anyone subclassing Router. Fuzz parity fixes on top of the rebase: the Rust core keeps num_retries, max_fallbacks, allowed_fails, retry_after, timeout, the tag settings, routing_strategy_args and the fallback lists as given (the crate reads them as numbers, update_settings casts as Python does); a deprecated `model_list = [...]` write reaches the Rust core; a failed set_model_list is all or nothing on both cores (the deployments served before the call are put back and the error raised); config_deployments() is a generator and `del` of a plain attribute works on the Rust core. Least-busy pick reservations from main now work on the Rust core: its selectors share one reservation store, routed calls reserve and free their unstarted picks, and select() and batch cancel do not reserve. On the Python core a dropped upsert takes its name back off deployment_names, and get_deployment_order reads every numeric spelling as one int so mixed orders no longer raise TypeError. Rulings on the remaining differences, the Python core changed where it was the odd one out: sync picks and picks by deployment id apply the team filter as async picks do, so another team's deployment is refused; the fallback lists and default_litellm_params in RouterSettings are copies, so an in-place edit is ignored and settings change only through apply(); one health record with an unreadable timestamp drops out alone; an empty fallback entry is skipped; a bool cooldown_time is refused at construction, a bool or string cooldown_time on a deployment or a call falls back to the router default, and a failure status that no HTTP status can be is recorded as 500; an infinite or NaN cost and a whole number wider than 64 bits (ptu_shares) are refused on both cores with the same error (litellm/router_utils/deployment_numbers.py); and a /v1/messages stream whose provider iterator raises cools the deployment and retries like a non-stream call, with the Rust core waiting for that cooldown before its retry picks. Differences the proxy parity fuzz and its regression tests found on the Rust core: a file upload or a batch on an uploaded file falls back only within its own model group, as on the Python core, since the file lives with one provider (the host sends same_group_fallbacks_only and the walk skips targets in other groups); Decisions calls drop deployments whose provider has no Decisions config, and deployments that refuse the audio or videos a call carries, unless that would leave none, as the Python core does, while the retry count still reads the whole group; a file upload that fails on one order level is created on the next level's deployments rather than the first level again; and a response that cannot be converted (a text_completion body without a message) reports only its own traceback, so a rate limit handled by the attempt before it no longer turns the error into a 429, and both cores return 500.
195 lines
7.1 KiB
Python
195 lines
7.1 KiB
Python
from typing import Final, NoReturn
|
|
|
|
import pytest
|
|
|
|
from litellm import Router
|
|
from litellm.proxy._types import LiteLLM_ObjectPermissionTable, UserAPIKeyAuth
|
|
from litellm.proxy.auth.fallback_model_access import (
|
|
RouterFallbackAccessCheck,
|
|
is_model_authorized_for_token,
|
|
router_fallback_access_check,
|
|
)
|
|
from litellm.search import asearch
|
|
|
|
|
|
def _router() -> Router:
|
|
return Router(
|
|
model_list=[
|
|
{
|
|
"model_name": "open-model",
|
|
"litellm_params": {"model": "openai/open", "api_key": "k"},
|
|
"model_info": {"access_groups": ["open-group"]},
|
|
},
|
|
{
|
|
"model_name": "secret-model",
|
|
"litellm_params": {"model": "openai/secret", "api_key": "k"},
|
|
"model_info": {"access_groups": ["secret-group"]},
|
|
},
|
|
]
|
|
)
|
|
|
|
|
|
def _key_limited_to(access_group: str) -> UserAPIKeyAuth:
|
|
return UserAPIKeyAuth(api_key="hashed", models=[access_group])
|
|
|
|
|
|
def _request_with_key(metadata_field: str = "metadata") -> dict:
|
|
return {metadata_field: {"user_api_key_auth": _key_limited_to("open-group")}}
|
|
|
|
|
|
ENFORCED = RouterFallbackAccessCheck(is_enforced=lambda: True)
|
|
NOT_ENFORCED = RouterFallbackAccessCheck(is_enforced=lambda: False)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_is_model_authorized_for_token_follows_the_key_access_groups():
|
|
router = _router()
|
|
token = _key_limited_to("open-group")
|
|
|
|
assert await is_model_authorized_for_token(model="open-model", valid_token=token, llm_router=router) is True
|
|
assert await is_model_authorized_for_token(model="secret-model", valid_token=token, llm_router=router) is False
|
|
|
|
|
|
def _broken_access_group_lookup(*args: object, **kwargs: object) -> NoReturn:
|
|
raise RuntimeError("access group store unavailable")
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.usefixtures("python_router_core") # the Rust core keeps this lookup on its host registry
|
|
async def test_is_model_authorized_for_token_fails_closed_when_the_lookup_breaks(monkeypatch: pytest.MonkeyPatch):
|
|
router = _router()
|
|
monkeypatch.setattr(router, "_core_get_model_access_groups", _broken_access_group_lookup)
|
|
|
|
assert (
|
|
await is_model_authorized_for_token(
|
|
model="open-model", valid_token=_key_limited_to("open-group"), llm_router=router
|
|
)
|
|
is False
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize("metadata_field", ["metadata", "litellm_metadata"])
|
|
async def test_enforced_check_authorizes_the_key_carried_in_request_metadata(metadata_field: str):
|
|
router = _router()
|
|
request_kwargs = _request_with_key(metadata_field)
|
|
|
|
assert await ENFORCED(model="open-model", request_kwargs=request_kwargs, ctx=router._core_ctx)
|
|
assert not await ENFORCED(model="secret-model", request_kwargs=request_kwargs, ctx=router._core_ctx)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_enforced_check_does_not_restrict_requests_without_a_key():
|
|
assert await ENFORCED(model="secret-model", request_kwargs={"metadata": {}}, ctx=_router()._core_ctx)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
async def test_check_allows_every_fallback_while_not_enforced():
|
|
assert await NOT_ENFORCED(model="secret-model", request_kwargs=_request_with_key(), ctx=_router()._core_ctx)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize(
|
|
("general_settings", "expected"),
|
|
[
|
|
({}, False),
|
|
({"enforce_fallback_model_access": False}, True),
|
|
({"enforce_fallback_model_access": "false"}, True),
|
|
({"enforce_fallback_model_access": True}, False),
|
|
({"enforce_fallback_model_access": "true"}, False),
|
|
],
|
|
)
|
|
async def test_proxy_check_reads_enforce_fallback_model_access_from_general_settings(
|
|
monkeypatch: pytest.MonkeyPatch, general_settings: dict, expected: bool
|
|
):
|
|
monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", general_settings)
|
|
|
|
assert await router_fallback_access_check(
|
|
model="open-model", request_kwargs=_request_with_key(), ctx=_router()._core_ctx
|
|
)
|
|
assert (
|
|
await router_fallback_access_check(
|
|
model="secret-model", request_kwargs=_request_with_key(), ctx=_router()._core_ctx
|
|
)
|
|
is expected
|
|
)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize("check", [ENFORCED, NOT_ENFORCED], ids=["enforced", "not-enforced"])
|
|
async def test_search_tool_fallback_target_follows_the_key_search_tool_grant(
|
|
monkeypatch: pytest.MonkeyPatch, check: RouterFallbackAccessCheck
|
|
):
|
|
monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {})
|
|
router = Router(
|
|
model_list=[],
|
|
search_tools=[
|
|
{"search_tool_name": name, "litellm_params": {"search_provider": "tavily", "api_key": "k"}}
|
|
for name in ("search-a", "search-b")
|
|
],
|
|
)
|
|
request_kwargs = {
|
|
"original_generic_function": asearch,
|
|
"litellm_metadata": {
|
|
"user_api_key_auth": UserAPIKeyAuth(
|
|
api_key="hashed",
|
|
object_permission_id="op-key",
|
|
object_permission=LiteLLM_ObjectPermissionTable(
|
|
object_permission_id="op-key", search_tools=["search-a"]
|
|
),
|
|
)
|
|
},
|
|
}
|
|
|
|
assert await check(model="search-a", request_kwargs=request_kwargs, ctx=router._core_ctx)
|
|
assert not await check(model="search-b", request_kwargs=request_kwargs, ctx=router._core_ctx)
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize(
|
|
"request_kwargs, expected",
|
|
[
|
|
({"original_generic_function": asearch}, True),
|
|
({}, False),
|
|
],
|
|
ids=["search-request", "completion-request"],
|
|
)
|
|
async def test_fallback_named_like_both_a_model_and_a_search_tool_follows_the_request_kind(
|
|
request_kwargs: dict, expected: bool
|
|
):
|
|
router = Router(
|
|
model_list=[
|
|
{"model_name": "shared-name", "litellm_params": {"model": "openai/secret", "api_key": "k"}},
|
|
],
|
|
search_tools=[
|
|
{"search_tool_name": "shared-name", "litellm_params": {"search_provider": "tavily", "api_key": "k"}},
|
|
],
|
|
)
|
|
key = UserAPIKeyAuth(
|
|
api_key="hashed",
|
|
models=["open-model"],
|
|
object_permission_id="op-key",
|
|
object_permission=LiteLLM_ObjectPermissionTable(object_permission_id="op-key", search_tools=["shared-name"]),
|
|
)
|
|
|
|
allowed = await ENFORCED(
|
|
model="shared-name",
|
|
request_kwargs={**request_kwargs, "metadata": {"user_api_key_auth": key}},
|
|
ctx=router._core_ctx,
|
|
)
|
|
|
|
assert allowed is expected
|
|
|
|
|
|
@pytest.mark.asyncio
|
|
@pytest.mark.parametrize("metadata_field", ["metadata", "litellm_metadata"])
|
|
async def test_default_check_enforces_team_models_for_a_key_without_model_restrictions(
|
|
monkeypatch: pytest.MonkeyPatch, metadata_field: str
|
|
) -> None:
|
|
monkeypatch.setattr("litellm.proxy.proxy_server.general_settings", {})
|
|
router: Final = _router()
|
|
token: Final = UserAPIKeyAuth(api_key="hashed", models=[], team_id="qa-team", team_models=["open-model"])
|
|
request_kwargs: Final = {metadata_field: {"user_api_key_auth": token}}
|
|
|
|
assert await router_fallback_access_check(model="open-model", request_kwargs=request_kwargs, ctx=router._core_ctx)
|
|
assert not await router_fallback_access_check(model="secret-model", request_kwargs=request_kwargs, ctx=router._core_ctx)
|