diff --git a/litellm/llms/azure.py b/litellm/llms/azure.py index 9c3d04bf14..716b65dbbe 100644 --- a/litellm/llms/azure.py +++ b/litellm/llms/azure.py @@ -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, diff --git a/litellm/llms/openai.py b/litellm/llms/openai.py index ce4cfa596f..0ae5633d50 100644 --- a/litellm/llms/openai.py +++ b/litellm/llms/openai.py @@ -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,