mirror of
https://github.com/BerriAI/litellm.git
synced 2026-11-16 09:22:22 +00:00
Merge d4469a5c02 into c5da69cd13
This commit is contained in:
commit
6d424be5f9
4 changed files with 147 additions and 5 deletions
|
|
@ -320,6 +320,29 @@ def _upstream_reply(response: httpx.Response | None) -> httpx.Response | None:
|
|||
return response if response is not None and (response.headers or response.content) else None
|
||||
|
||||
|
||||
def _permission_denied_error(
|
||||
*,
|
||||
model: str,
|
||||
message: str,
|
||||
custom_llm_provider: str,
|
||||
exception_provider: str,
|
||||
response: httpx.Response | None,
|
||||
extra_information: str,
|
||||
) -> PermissionDeniedError:
|
||||
"""OpenAI-compatible 403 replies, matching openai.PermissionDeniedError (#49936)
|
||||
|
||||
The fallback response uses a neutral request so upstream credentials, query and body never leak into it
|
||||
"""
|
||||
request: Final = httpx.Request("POST", "https://litellm.ai")
|
||||
return PermissionDeniedError(
|
||||
message=f"PermissionDeniedError: {exception_provider} - {message}",
|
||||
llm_provider=custom_llm_provider,
|
||||
model=model,
|
||||
response=response if response is not None else httpx.Response(status_code=403, request=request),
|
||||
litellm_debug_info=extra_information,
|
||||
)
|
||||
|
||||
|
||||
def _map_openai_exception(
|
||||
*,
|
||||
model: str,
|
||||
|
|
@ -439,6 +462,15 @@ def _map_openai_exception(
|
|||
litellm_debug_info=extra_information,
|
||||
body=getattr(original_exception, "body", None),
|
||||
)
|
||||
if invalid_request_status == 403:
|
||||
raise _permission_denied_error(
|
||||
model=model,
|
||||
message=message,
|
||||
custom_llm_provider=custom_llm_provider,
|
||||
exception_provider=exception_provider,
|
||||
response=response,
|
||||
extra_information=extra_information,
|
||||
)
|
||||
if invalid_request_status == 404:
|
||||
raise NotFoundError(
|
||||
message=f"{exception_provider} - {message}",
|
||||
|
|
@ -516,6 +548,15 @@ def _map_openai_exception(
|
|||
response=response,
|
||||
litellm_debug_info=extra_information,
|
||||
)
|
||||
elif original_exception.status_code == 403:
|
||||
raise _permission_denied_error(
|
||||
model=model,
|
||||
message=message,
|
||||
custom_llm_provider=custom_llm_provider,
|
||||
exception_provider=exception_provider,
|
||||
response=response,
|
||||
extra_information=extra_information,
|
||||
)
|
||||
elif original_exception.status_code == 404:
|
||||
raise NotFoundError(
|
||||
message=f"NotFoundError: {exception_provider} - {message}",
|
||||
|
|
@ -1657,6 +1698,15 @@ def _map_huggingface_exception(
|
|||
model=model,
|
||||
response=getattr(original_exception, "response", None),
|
||||
)
|
||||
elif original_exception.status_code == 403:
|
||||
raise _permission_denied_error(
|
||||
model=model,
|
||||
message=original_exception.message,
|
||||
custom_llm_provider="huggingface",
|
||||
exception_provider="HuggingfaceException",
|
||||
response=getattr(original_exception, "response", None),
|
||||
extra_information=extra_information,
|
||||
)
|
||||
elif original_exception.status_code == 400:
|
||||
raise BadRequestError(
|
||||
message=f"HuggingfaceException - {original_exception.message}",
|
||||
|
|
@ -2202,6 +2252,15 @@ def _map_azure_exception(
|
|||
litellm_debug_info=extra_information,
|
||||
response=response,
|
||||
)
|
||||
elif original_exception.status_code == 403:
|
||||
raise _permission_denied_error(
|
||||
model=model,
|
||||
message=message,
|
||||
custom_llm_provider=custom_llm_provider,
|
||||
exception_provider=exception_provider,
|
||||
response=response,
|
||||
extra_information=extra_information,
|
||||
)
|
||||
elif original_exception.status_code == 404:
|
||||
raise NotFoundError(
|
||||
message=f"AzureException NotFoundError - {message}",
|
||||
|
|
@ -2310,6 +2369,15 @@ def _map_openrouter_exception(
|
|||
response=getattr(original_exception, "response", None),
|
||||
litellm_debug_info=extra_information,
|
||||
)
|
||||
elif original_exception.status_code == 403:
|
||||
raise _permission_denied_error(
|
||||
model=model,
|
||||
message=error_str,
|
||||
custom_llm_provider=custom_llm_provider,
|
||||
exception_provider=exception_provider,
|
||||
response=getattr(original_exception, "response", None),
|
||||
extra_information=extra_information,
|
||||
)
|
||||
elif original_exception.status_code == 404:
|
||||
raise NotFoundError(
|
||||
message=f"NotFoundError: {exception_provider} - {error_str}",
|
||||
|
|
|
|||
|
|
@ -1141,8 +1141,8 @@ def test_openai_invalid_request_error_without_a_status_code_maps_to_bad_request(
|
|||
|
||||
|
||||
@pytest.mark.parametrize("provider", ["openai", "groq", "deepseek"])
|
||||
@pytest.mark.parametrize("status_code", [403, 409, 422, 429, 500, 503])
|
||||
def test_openai_invalid_request_error_keeps_bad_request_for_statuses_other_than_401_and_404(
|
||||
@pytest.mark.parametrize("status_code", [409, 422, 429, 500, 503])
|
||||
def test_openai_invalid_request_error_keeps_bad_request_for_statuses_other_than_401_403_and_404(
|
||||
provider: str, status_code: int
|
||||
) -> None:
|
||||
message: Final = "Cannot cancel a batch that is already completed."
|
||||
|
|
@ -1244,7 +1244,7 @@ OPENAI_SHAPED = {
|
|||
400: (litellm.BadRequestError, 400),
|
||||
401: (litellm.AuthenticationError, 401),
|
||||
402: (litellm.PaymentRequiredError, 402),
|
||||
403: (litellm.APIError, 403),
|
||||
403: (litellm.PermissionDeniedError, 403),
|
||||
404: (litellm.NotFoundError, 404),
|
||||
408: (litellm.Timeout, 408),
|
||||
422: (litellm.BadRequestError, 422),
|
||||
|
|
@ -3209,3 +3209,57 @@ def test_openai_error_matched_by_its_message_keeps_the_upstream_body(
|
|||
assert error_response.headers["x-request-id"] == "req-openai"
|
||||
assert "sk-openai-secret" not in str(error_response.request.headers)
|
||||
assert error_response.request.content == b""
|
||||
|
||||
|
||||
@pytest.mark.parametrize("provider", ["openai", "groq", "deepseek"])
|
||||
@pytest.mark.parametrize("error_type", ["request_forbidden", "invalid_request_error"])
|
||||
def test_openai_403_maps_to_permission_denied(provider: str, error_type: str) -> None:
|
||||
"""Regression for #49936, a 403 must raise PermissionDeniedError like the openai SDK does"""
|
||||
message: Final = "Country, region, or territory not supported"
|
||||
error_message: Final = json.dumps(
|
||||
{
|
||||
"error": {
|
||||
"message": message,
|
||||
"type": error_type,
|
||||
"param": None,
|
||||
"code": "unsupported_country_region_territory",
|
||||
}
|
||||
}
|
||||
)
|
||||
original_exception: Final = OpenAIError(status_code=403, message=error_message, headers={})
|
||||
|
||||
with pytest.raises(openai.APIError) as excinfo:
|
||||
exception_type(
|
||||
model="gpt-4o",
|
||||
original_exception=original_exception,
|
||||
custom_llm_provider=provider,
|
||||
)
|
||||
|
||||
assert type(excinfo.value) is litellm.PermissionDeniedError
|
||||
assert isinstance(excinfo.value, openai.PermissionDeniedError)
|
||||
assert excinfo.value.status_code == 403
|
||||
assert message in excinfo.value.message
|
||||
|
||||
|
||||
@pytest.mark.parametrize("provider", ["openrouter", "huggingface"])
|
||||
def test_fallback_403_response_does_not_carry_the_upstream_request(provider: str) -> None:
|
||||
"""The stub response on a 403 must not reuse the upstream request and its credentials"""
|
||||
|
||||
class _Upstream403(Exception):
|
||||
status_code = 403
|
||||
message = "forbidden"
|
||||
response = None
|
||||
request = httpx.Request(
|
||||
"POST",
|
||||
"https://upstream.example/v1/chat?key=query-secret",
|
||||
headers={"Authorization": "Bearer sk-upstream-secret"},
|
||||
content=b'{"api_key": "body-secret"}',
|
||||
)
|
||||
|
||||
with pytest.raises(litellm.PermissionDeniedError) as excinfo:
|
||||
exception_type(model="some-model", original_exception=_Upstream403("forbidden"), custom_llm_provider=provider)
|
||||
|
||||
stub_request: Final = excinfo.value.response.request
|
||||
assert str(stub_request.url) == "https://litellm.ai"
|
||||
assert "authorization" not in stub_request.headers
|
||||
assert b"body-secret" not in stub_request.content
|
||||
|
|
|
|||
|
|
@ -85,6 +85,26 @@ async def test_azure_content_policy_stream_ends_with_one_finish_reason(monkeypat
|
|||
class TestAzureExceptionMapping:
|
||||
"""Test Azure OpenAI exception mapping with provider-specific fields"""
|
||||
|
||||
def test_azure_403_content_filter_stays_content_policy_violation(self) -> None:
|
||||
"""A 403 content_filter reply must stay ContentPolicyViolationError, not PermissionDeniedError (#49936)"""
|
||||
mock_exception = Exception(
|
||||
"The response was filtered due to the prompt triggering Azure OpenAI's content management policy"
|
||||
)
|
||||
mock_exception.status_code = 403
|
||||
mock_exception.body = {"code": "content_filter", "message": "filtered"}
|
||||
mock_response = MagicMock()
|
||||
mock_response.status_code = 403
|
||||
mock_exception.response = mock_response
|
||||
|
||||
with pytest.raises(ContentPolicyViolationError) as exc_info:
|
||||
exception_type(
|
||||
model="azure/gpt-4",
|
||||
original_exception=mock_exception,
|
||||
custom_llm_provider="azure",
|
||||
)
|
||||
|
||||
assert not isinstance(exc_info.value, litellm.PermissionDeniedError)
|
||||
|
||||
def test_azure_content_policy_violation_innererror_access(self):
|
||||
"""Test that Azure content policy violation exceptions provide access to innererror details"""
|
||||
|
||||
|
|
@ -738,7 +758,7 @@ async def _azure_atext_completion_stream() -> None:
|
|||
(
|
||||
(400, _AZURE_REFUSAL_BODY, BadRequestError),
|
||||
(400, _AZURE_CONTENT_FILTER_BODY, BadRequestError),
|
||||
(403, _AZURE_REFUSAL_BODY, litellm.APIError),
|
||||
(403, _AZURE_REFUSAL_BODY, litellm.PermissionDeniedError),
|
||||
(404, _AZURE_DEPLOYMENT_NOT_FOUND_BODY, litellm.NotFoundError),
|
||||
(500, _AZURE_INTERNAL_ERROR_BODY, openai.APIError),
|
||||
(502, _AZURE_REFUSAL_BODY, litellm.BadGatewayError),
|
||||
|
|
|
|||
|
|
@ -878,7 +878,7 @@ _QUERY_SECRET: Final = "query-secret"
|
|||
("status_code", "mapped_error", "body"),
|
||||
(
|
||||
(400, litellm.BadRequestError, _REFUSAL_BODY),
|
||||
(403, litellm.APIError, _REFUSAL_BODY),
|
||||
(403, litellm.PermissionDeniedError, _REFUSAL_BODY),
|
||||
(408, litellm.Timeout, _REFUSAL_BODY),
|
||||
(408, litellm.Timeout, _GATEWAY_TIMEOUT_BODY),
|
||||
(409, litellm.APIError, _REFUSAL_BODY),
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue