scriptoriumadmin/litellm
1
0
Fork 0
mirror of https://github.com/BerriAI/litellm.git synced 2026-10-11 03:38:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 83

fix(router): fix ttft_timeout or-chain and content-policy bypass

Browse source 
_get_ttft_timeout used or-chaining which would skip a caller-supplied
ttft_timeout=0.0 as falsy. Replaced with explicit is not None iteration.

The ttft_timeout streaming path bypassed the content-policy violation
check that runs for native non-streaming responses. The reconstructed
ModelResponse now goes through _should_raise_content_policy_error
before being returned, matching the existing non-streaming behavior.
This commit is contained in:
Nathan Price 2026-06-12 21:37:02 -05:00
parent ee2fda07d9
commit 999d44279d
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
litellm/router.py
View file

@ -3061,11 +3061,20 @@ class Router:
if isinstance(response, CustomStreamWrapper):
if _forced_stream_for_ttft and _ttft_timeout is not None:
return await self._collect_stream_with_ttft_timeout(
reconstructed = await self._collect_stream_with_ttft_timeout(
response=response,
messages=messages,
ttft_timeout=_ttft_timeout,
)
if self._should_raise_content_policy_error(
model=model, response=reconstructed, kwargs=kwargs
):
raise litellm.ContentPolicyViolationError(
message="Response output was blocked.",
model=model,
llm_provider="",
)
return reconstructed
return await self._acompletion_streaming_iterator(
model_response=response,
messages=messages,
@ -3378,12 +3387,15 @@ class Router:
return timeout
def _get_ttft_timeout(self, kwargs: dict, data: dict) -> Optional[float]:
return (
kwargs.get("ttft_timeout", None)
or data.get("ttft_timeout", None)
or self.ttft_timeout
or self.default_litellm_params.get("ttft_timeout", None)
)
for source in (
kwargs.get("ttft_timeout"),
data.get("ttft_timeout"),
self.ttft_timeout,
self.default_litellm_params.get("ttft_timeout"),
):
if source is not None:
return source
return None
def _get_timeout(self, kwargs: dict, data: dict) -> Optional[Union[float, int]]:
"""Helper to get timeout from kwargs or deployment params"""