phoenix/litellm-mirror
0
0
Fork 1
mirror of https://github.com/BerriAI/litellm.git synced 2025-04-25 02:34:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(openai.py): fix exception raising logic

Browse source
This commit is contained in:
Krrish Dholakia 2024-01-09 11:58:30 +05:30 • committed by ishaan-jaff
parent d03b886079
commit 4bd459aef2
2 changed files with 22 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

23
litellm/llms/azure.py
View file

@ -268,7 +268,10 @@ class AzureChatCompletion(BaseLLM):
exception_mapping_worked = True exception_mapping_worked = True
raise e raise e
except Exception as e: except Exception as e:
raise e if hasattr(e, "status_code"):
raise AzureOpenAIError(status_code=e.status_code, message=str(e))
else:
raise AzureOpenAIError(status_code=500, message=str(e))
async def acompletion( async def acompletion(
self, self,
@ -569,12 +572,10 @@ class AzureChatCompletion(BaseLLM):
exception_mapping_worked = True exception_mapping_worked = True
raise e raise e
except Exception as e: except Exception as e:
if exception_mapping_worked: if hasattr(e, "status_code"):
raise e raise AzureOpenAIError(status_code=e.status_code, message=str(e))
else: else:
import traceback raise AzureOpenAIError(status_code=500, message=str(e))
raise AzureOpenAIError(status_code=500, message=traceback.format_exc())
async def aimage_generation( async def aimage_generation(
self, self,
@ -702,14 +703,10 @@ class AzureChatCompletion(BaseLLM):
exception_mapping_worked = True exception_mapping_worked = True
raise e raise e
except Exception as e: except Exception as e:
if hasattr(e, "status_code"): if hasattr(e, "status_code"):
raise e raise AzureOpenAIError(status_code=e.status_code, message=str(e))
elif exception_mapping_worked:
raise e
else: else:
import traceback raise AzureOpenAIError(status_code=500, message=str(e))
raise AzureOpenAIError(status_code=500, message=traceback.format_exc())
async def ahealth_check( async def ahealth_check(
self, self,

25
litellm/llms/openai.py
View file

@ -346,7 +346,10 @@ class OpenAIChatCompletion(BaseLLM):
exception_mapping_worked = True exception_mapping_worked = True
raise e raise e
except Exception as e: except Exception as e:
raise e if hasattr(e, "status_code"):
raise OpenAIError(status_code=e.status_code, message=str(e))
else:
raise OpenAIError(status_code=500, message=str(e))
async def acompletion( async def acompletion(
self, self,
@ -500,6 +503,8 @@ class OpenAIChatCompletion(BaseLLM):
else: else:
if type(e).__name__ == "ReadTimeout": if type(e).__name__ == "ReadTimeout":
raise OpenAIError(status_code=408, message=f"{type(e).__name__}") raise OpenAIError(status_code=408, message=f"{type(e).__name__}")
elif hasattr(e, "status_code"):
raise OpenAIError(status_code=e.status_code, message=str(e))
else: else:
raise OpenAIError(status_code=500, message=f"{str(e)}") raise OpenAIError(status_code=500, message=f"{str(e)}")
@ -603,12 +608,10 @@ class OpenAIChatCompletion(BaseLLM):
exception_mapping_worked = True exception_mapping_worked = True
raise e raise e
except Exception as e: except Exception as e:
if exception_mapping_worked: if hasattr(e, "status_code"):
raise e raise OpenAIError(status_code=e.status_code, message=str(e))
else: else:
import traceback raise OpenAIError(status_code=500, message=str(e))
raise OpenAIError(status_code=500, message=traceback.format_exc())
async def aimage_generation( async def aimage_generation(
self, self,
@ -716,14 +719,10 @@ class OpenAIChatCompletion(BaseLLM):
exception_mapping_worked = True exception_mapping_worked = True
raise e raise e
except Exception as e: except Exception as e:
if hasattr(e, "status_code"): if hasattr(e, "status_code"):
raise e raise OpenAIError(status_code=e.status_code, message=str(e))
elif exception_mapping_worked:
raise e
else: else:
import traceback raise OpenAIError(status_code=500, message=str(e))
raise AzureOpenAIError(status_code=500, message=traceback.format_exc())
async def ahealth_check( async def ahealth_check(
self, self,