From 5b06ea136c96d3e5492bf31e2dee453b8fdd8375 Mon Sep 17 00:00:00 2001
From: Krrish Dholakia <krrishdholakia@gmail.com>
Date: Tue, 27 Aug 2024 17:06:25 -0700
Subject: [PATCH] fix(openai.py): fix error re-raising

---
 litellm/llms/openai.py | 51 +++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 23 deletions(-)

diff --git a/litellm/llms/openai.py b/litellm/llms/openai.py
index 941b498437..e7a10c5cd8 100644
--- a/litellm/llms/openai.py
+++ b/litellm/llms/openai.py
@@ -789,14 +789,8 @@ class OpenAIChatCompletion(BaseLLM):
                 headers = {}
             response = raw_response.parse()
             return headers, response
-        except OpenAIError as e:
-            raise e
         except Exception as e:
-            status_code = getattr(e, "status_code", 500)
-            error_headers = getattr(e, "headers", None)
-            raise OpenAIError(
-                status_code=status_code, message=str(e), headers=error_headers
-            )
+            raise e
 
     def make_sync_openai_chat_completion_request(
         self,
@@ -820,14 +814,8 @@ class OpenAIChatCompletion(BaseLLM):
                 headers = {}
             response = raw_response.parse()
             return headers, response
-        except OpenAIError as e:
-            raise e
         except Exception as e:
-            status_code = getattr(e, "status_code", 500)
-            error_headers = getattr(e, "headers", None)
-            raise OpenAIError(
-                status_code=status_code, message=str(e), headers=error_headers
-            )
+            raise e
 
     def completion(
         self,
@@ -1046,13 +1034,14 @@ class OpenAIChatCompletion(BaseLLM):
                     else:
                         raise e
         except OpenAIError as e:
-            exception_mapping_worked = True
             raise e
         except Exception as e:
-            if hasattr(e, "status_code"):
-                raise OpenAIError(status_code=e.status_code, message=str(e))
-            else:
-                raise OpenAIError(status_code=500, message=traceback.format_exc())
+            status_code = getattr(e, "status_code", 500)
+            error_headers = getattr(e, "headers", None)
+            error_text = getattr(e, "text", str(e))
+            raise OpenAIError(
+                status_code=status_code, message=error_text, headers=error_headers
+            )
 
     async def acompletion(
         self,
@@ -1142,7 +1131,11 @@ class OpenAIChatCompletion(BaseLLM):
                     raise e
                 # e.message
             except Exception as e:
-                raise e
+                status_code = getattr(e, "status_code", 500)
+                error_headers = getattr(e, "headers", None)
+                raise OpenAIError(
+                    status_code=status_code, message=str(e), headers=error_headers
+                )
 
     def streaming(
         self,
@@ -1274,22 +1267,34 @@ class OpenAIChatCompletion(BaseLLM):
             except (
                 Exception
             ) as e:  # need to exception handle here. async exceptions don't get caught in sync functions.
+
                 if isinstance(e, OpenAIError):
                     raise e
+
+                error_headers = getattr(e, "headers", None)
                 if response is not None and hasattr(response, "text"):
                     raise OpenAIError(
                         status_code=500,
                         message=f"{str(e)}\n\nOriginal Response: {response.text}",
+                        headers=error_headers,
                     )
                 else:
                     if type(e).__name__ == "ReadTimeout":
                         raise OpenAIError(
-                            status_code=408, message=f"{type(e).__name__}"
+                            status_code=408,
+                            message=f"{type(e).__name__}",
+                            headers=error_headers,
                         )
                     elif hasattr(e, "status_code"):
-                        raise OpenAIError(status_code=e.status_code, message=str(e))
+                        raise OpenAIError(
+                            status_code=e.status_code,
+                            message=str(e),
+                            headers=error_headers,
+                        )
                     else:
-                        raise OpenAIError(status_code=500, message=f"{str(e)}")
+                        raise OpenAIError(
+                            status_code=500, message=f"{str(e)}", headers=error_headers
+                        )
 
     # Embedding
     async def make_openai_embedding_request(