mirror of
https://github.com/BerriAI/litellm.git
synced 2025-04-24 18:24:20 +00:00
fix(openai.py): fix exception raising logic
This commit is contained in:
parent
d03b886079
commit
4bd459aef2
2 changed files with 22 additions and 26 deletions
|
@ -268,7 +268,10 @@ class AzureChatCompletion(BaseLLM):
|
|||
exception_mapping_worked = True
|
||||
raise 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(
|
||||
self,
|
||||
|
@ -569,12 +572,10 @@ class AzureChatCompletion(BaseLLM):
|
|||
exception_mapping_worked = True
|
||||
raise e
|
||||
except Exception as e:
|
||||
if exception_mapping_worked:
|
||||
raise e
|
||||
if hasattr(e, "status_code"):
|
||||
raise AzureOpenAIError(status_code=e.status_code, message=str(e))
|
||||
else:
|
||||
import traceback
|
||||
|
||||
raise AzureOpenAIError(status_code=500, message=traceback.format_exc())
|
||||
raise AzureOpenAIError(status_code=500, message=str(e))
|
||||
|
||||
async def aimage_generation(
|
||||
self,
|
||||
|
@ -702,14 +703,10 @@ class AzureChatCompletion(BaseLLM):
|
|||
exception_mapping_worked = True
|
||||
raise e
|
||||
except Exception as e:
|
||||
if hasattr(e, "status_code"):
|
||||
raise e
|
||||
elif exception_mapping_worked:
|
||||
raise e
|
||||
if hasattr(e, "status_code"):
|
||||
raise AzureOpenAIError(status_code=e.status_code, message=str(e))
|
||||
else:
|
||||
import traceback
|
||||
|
||||
raise AzureOpenAIError(status_code=500, message=traceback.format_exc())
|
||||
raise AzureOpenAIError(status_code=500, message=str(e))
|
||||
|
||||
async def ahealth_check(
|
||||
self,
|
||||
|
|
|
@ -346,7 +346,10 @@ class OpenAIChatCompletion(BaseLLM):
|
|||
exception_mapping_worked = True
|
||||
raise 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(
|
||||
self,
|
||||
|
@ -500,6 +503,8 @@ class OpenAIChatCompletion(BaseLLM):
|
|||
else:
|
||||
if type(e).__name__ == "ReadTimeout":
|
||||
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:
|
||||
raise OpenAIError(status_code=500, message=f"{str(e)}")
|
||||
|
||||
|
@ -603,12 +608,10 @@ class OpenAIChatCompletion(BaseLLM):
|
|||
exception_mapping_worked = True
|
||||
raise e
|
||||
except Exception as e:
|
||||
if exception_mapping_worked:
|
||||
raise e
|
||||
if hasattr(e, "status_code"):
|
||||
raise OpenAIError(status_code=e.status_code, message=str(e))
|
||||
else:
|
||||
import traceback
|
||||
|
||||
raise OpenAIError(status_code=500, message=traceback.format_exc())
|
||||
raise OpenAIError(status_code=500, message=str(e))
|
||||
|
||||
async def aimage_generation(
|
||||
self,
|
||||
|
@ -716,14 +719,10 @@ class OpenAIChatCompletion(BaseLLM):
|
|||
exception_mapping_worked = True
|
||||
raise e
|
||||
except Exception as e:
|
||||
if hasattr(e, "status_code"):
|
||||
raise e
|
||||
elif exception_mapping_worked:
|
||||
raise e
|
||||
if hasattr(e, "status_code"):
|
||||
raise OpenAIError(status_code=e.status_code, message=str(e))
|
||||
else:
|
||||
import traceback
|
||||
|
||||
raise AzureOpenAIError(status_code=500, message=traceback.format_exc())
|
||||
raise OpenAIError(status_code=500, message=str(e))
|
||||
|
||||
async def ahealth_check(
|
||||
self,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue