refactor: simplify internal error handling (#968)

openai · Dec 12, 2023 · d187f6b · d187f6b
1 parent 5c138f4
commit d187f6b
Show file tree

Hide file tree

Showing 2 changed files with 124 additions and 246 deletions.
diff --git a/src/openai/_base_client.py b/src/openai/_base_client.py
@@ -873,66 +873,61 @@ def _request(
         request = self._build_request(options)
         self._prepare_request(request)
 
-        response = None
-
         try:
             response = self._client.send(
                 request,
                 auth=self.custom_auth,
                 stream=stream or self._should_stream_response_body(request=request),
             )
-            log.debug(
-                'HTTP Request: %s %s "%i %s"', request.method, request.url, response.status_code, response.reason_phrase
-            )
-            response.raise_for_status()
-        except httpx.HTTPStatusError as err:  # thrown on 4xx and 5xx status code
-            if retries > 0 and self._should_retry(err.response):
-                err.response.close()
+        except httpx.TimeoutException as err:
+            if retries > 0:
                 return self._retry_request(
                     options,
                     cast_to,
                     retries,
-                    err.response.headers,
                     stream=stream,
                     stream_cls=stream_cls,
+                    response_headers=None,
                 )
 
-            # If the response is streamed then we need to explicitly read the response
-            # to completion before attempting to access the response text.
-            if not err.response.is_closed:
-                err.response.read()
-
-            raise self._make_status_error_from_response(err.response) from None
-        except httpx.TimeoutException as err:
-            if response is not None:
-                response.close()
-
+            raise APITimeoutError(request=request) from err
+        except Exception as err:
             if retries > 0:
                 return self._retry_request(
                     options,
                     cast_to,
                     retries,
                     stream=stream,
                     stream_cls=stream_cls,
-                    response_headers=response.headers if response is not None else None,
+                    response_headers=None,
                 )
 
-            raise APITimeoutError(request=request) from err
-        except Exception as err:
-            if response is not None:
-                response.close()
+            raise APIConnectionError(request=request) from err
 
-            if retries > 0:
+        log.debug(
+            'HTTP Request: %s %s "%i %s"', request.method, request.url, response.status_code, response.reason_phrase
+        )
+
+        try:
+            response.raise_for_status()
+        except httpx.HTTPStatusError as err:  # thrown on 4xx and 5xx status code
+            if retries > 0 and self._should_retry(err.response):
+                err.response.close()
                 return self._retry_request(
                     options,
                     cast_to,
                     retries,
+                    err.response.headers,
                     stream=stream,
                     stream_cls=stream_cls,
-                    response_headers=response.headers if response is not None else None,
                 )
 
-            raise APIConnectionError(request=request) from err
+            # If the response is streamed then we need to explicitly read the response
+            # to completion before attempting to access the response text.
+            if not err.response.is_closed:
+                err.response.read()
+
+            raise self._make_status_error_from_response(err.response) from None
 
         return self._process_response(
             cast_to=cast_to,
@@ -1340,66 +1335,61 @@ async def _request(
         request = self._build_request(options)
         await self._prepare_request(request)
 
-        response = None
-
         try:
             response = await self._client.send(
                 request,
                 auth=self.custom_auth,
                 stream=stream or self._should_stream_response_body(request=request),
             )
-            log.debug(
-                'HTTP Request: %s %s "%i %s"', request.method, request.url, response.status_code, response.reason_phrase
-            )
-            response.raise_for_status()
-        except httpx.HTTPStatusError as err:  # thrown on 4xx and 5xx status code
-            if retries > 0 and self._should_retry(err.response):
-                await err.response.aclose()
+        except httpx.TimeoutException as err:
+            if retries > 0:
                 return await self._retry_request(
                     options,
                     cast_to,
                     retries,
-                    err.response.headers,
                     stream=stream,
                     stream_cls=stream_cls,
+                    response_headers=None,
                 )
 
-            # If the response is streamed then we need to explicitly read the response
-            # to completion before attempting to access the response text.
-            if not err.response.is_closed:
-                await err.response.aread()
-
-            raise self._make_status_error_from_response(err.response) from None
-        except httpx.TimeoutException as err:
-            if response is not None:
-                await response.aclose()
-
+            raise APITimeoutError(request=request) from err
+        except Exception as err:
             if retries > 0:
                 return await self._retry_request(
                     options,
                     cast_to,
                     retries,
                     stream=stream,
                     stream_cls=stream_cls,
-                    response_headers=response.headers if response is not None else None,
+                    response_headers=None,
                 )
 
-            raise APITimeoutError(request=request) from err
-        except Exception as err:
-            if response is not None:
-                await response.aclose()
+            raise APIConnectionError(request=request) from err
 
-            if retries > 0:
+        log.debug(
+            'HTTP Request: %s %s "%i %s"', request.method, request.url, response.status_code, response.reason_phrase
+        )
+
+        try:
+            response.raise_for_status()
+        except httpx.HTTPStatusError as err:  # thrown on 4xx and 5xx status code
+            if retries > 0 and self._should_retry(err.response):
+                await err.response.aclose()
                 return await self._retry_request(
                     options,
                     cast_to,
                     retries,
+                    err.response.headers,
                     stream=stream,
                     stream_cls=stream_cls,
-                    response_headers=response.headers if response is not None else None,
                 )
 
-            raise APIConnectionError(request=request) from err
+            # If the response is streamed then we need to explicitly read the response
+            # to completion before attempting to access the response text.
+            if not err.response.is_closed:
+                await err.response.aread()
+
+            raise self._make_status_error_from_response(err.response) from None
 
         return self._process_response(
             cast_to=cast_to,