Merge pull request #4973 from BerriAI/litellm_return_code_as_str

[Fix-Proxy] ProxyException code as str - Make OpenAI Compatible
This commit is contained in:
Ishaan Jaff 2024-07-30 13:27:33 -07:00 committed by GitHub
commit e0d0d45e87
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 14 additions and 3 deletions

View file

@ -1661,13 +1661,17 @@ class ProxyException(Exception):
message: str,
type: str,
param: Optional[str],
code: Optional[int],
code: Optional[Union[int, str]] = None,
headers: Optional[Dict[str, str]] = None,
):
self.message = message
self.type = type
self.param = param
self.code = code
# If we look on official python OpenAI lib, the code should be a string:
# https://github.com/openai/openai-python/blob/195c05a64d39c87b2dfdf1eca2d339597f1fce03/src/openai/types/shared/error_object.py#L11
# Related LiteLLM issue: https://github.com/BerriAI/litellm/discussions/4834
self.code = str(code)
if headers is not None:
for k, v in headers.items():
if not isinstance(v, str):
@ -1681,7 +1685,7 @@ class ProxyException(Exception):
"No healthy deployment available" in self.message
or "No deployments available" in self.message
):
self.code = 429
self.code = "429"
def to_dict(self) -> dict:
"""Converts the ProxyException instance to a dictionary."""

View file

@ -79,6 +79,13 @@ def test_chat_completion_exception(client):
in json_response["error"]["message"]
)
code_in_error = json_response["error"]["code"]
# OpenAI SDK required code to be STR, https://github.com/BerriAI/litellm/issues/4970
# If we look on official python OpenAI lib, the code should be a string:
# https://github.com/openai/openai-python/blob/195c05a64d39c87b2dfdf1eca2d339597f1fce03/src/openai/types/shared/error_object.py#L11
# Related LiteLLM issue: https://github.com/BerriAI/litellm/discussions/4834
assert type(code_in_error) == str
# make an openai client to call _make_status_error_from_response
openai_client = openai.OpenAI(api_key="anything")
openai_exception = openai_client._make_status_error_from_response(