Better handling for TimeoutExceptions (#9)

* Increasing timeout and better error messaging

* Better handling for TimeoutExceptions

Author: Ben-Chapman

src/libs/http.py

@@ -3,6 +3,7 @@
 
 import httpx
 from src.libs.libs import async_timeit
+from src.libs.responses import error_response
 from src.routers.logger import send_error_to_gcp
 
 
@@ -150,25 +151,27 @@ async def fetch_api_data(
         Returns:
             ResponseObject: The HTTP response from the requested URL.
         """
+        error_message = "An error occurred obtaining vehicle inventory for this search."
+
         try:
             resp = await self.client.get(uri, headers=headers, params=params)
             resp.raise_for_status()
 
-        except httpx.TimeoutException as e:
-            error_message = f"The request to {e.request.url!r} timed out. {e}."
+        except (httpx.TimeoutException, httpx.ReadTimeout) as e:
+            error_data = f"The request to {e.request.url!r} timed out."
             send_error_to_gcp(
                 error_message,
                 http_context={
                     "method": e.request.method,
                     "url": str(e.request.url),
-                    "user_agent": headers.get("User-Agent"),
+                    "user_agent": headers.get("User-Agent") if headers else "",
                     "status_code": "504",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         except httpx.NetworkError as e:
-            error_message = f"A network error occurred for {e.request.url!r}. {e}."
+            error_data = f"A network error occurred for {e.request.url!r}. {e}."
             send_error_to_gcp(
                 error_message,
                 http_context={
@@ -178,10 +181,10 @@ async def fetch_api_data(
                     "status_code": "503",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         except httpx.DecodingError as e:
-            error_message = f"""Decoding of the response to {e.request.url!r} failed,
+            error_data = f"""Decoding of the response to {e.request.url!r} failed,
                 due to a malformed encoding. {e}."""
             send_error_to_gcp(
                 error_message,
@@ -192,10 +195,10 @@ async def fetch_api_data(
                     "status_code": "400",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         except httpx.TooManyRedirects as e:
-            error_message = f"Too many redirects for {e.request.url!r} failed. {e}."
+            error_data = f"Too many redirects for {e.request.url!r} failed. {e}."
             send_error_to_gcp(
                 error_message,
                 http_context={
@@ -205,10 +208,10 @@ async def fetch_api_data(
                     "status_code": "429",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         except httpx.RemoteProtocolError as e:
-            error_message = f"An error occurred while requesting {e.request.url!r}. {e}"
+            error_data = f"An error occurred while requesting {e.request.url!r}. {e}"
             send_error_to_gcp(
                 error_message,
                 http_context={
@@ -218,11 +221,11 @@ async def fetch_api_data(
                     "status_code": "400",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         # Base exceptions to catch all remaining errors
         except httpx.HTTPStatusError as e:
-            error_message = f"""Error response {e.response.status_code} while requesting
+            error_data = f"""Error response {e.response.status_code} while requesting
             {e.request.url!r}."""
             send_error_to_gcp(
                 error_message,
@@ -233,10 +236,10 @@ async def fetch_api_data(
                     "status_code": "500",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         except httpx.RequestError as e:
-            error_message = f"An error occurred while requesting {e.request.url!r}. {e}"
+            error_data = f"An error occurred while requesting {e.request.url!r}. {e}"
             send_error_to_gcp(
                 error_message,
                 http_context={
@@ -246,19 +249,20 @@ async def fetch_api_data(
                     "status_code": "400",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         else:
             return resp
 
     @async_timeit
     async def post(self, uri: str, headers: dict, post_data: dict):
+        error_message = "An error occurred obtaining vehicle inventory for this search."
         try:
             resp = await self.client.post(uri, headers=headers, json=post_data)
             resp.raise_for_status()
 
-        except httpx.TimeoutException as e:
-            error_message = f"The request to {e.request.url!r} timed out. {e}."
+        except (httpx.TimeoutException, httpx.ReadTimeout) as e:
+            error_data = f"The request to {e.request.url!r} timed out."
             send_error_to_gcp(
                 error_message,
                 http_context={
@@ -268,10 +272,10 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "status_code": "504",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         except httpx.NetworkError as e:
-            error_message = f"A network error occurred for {e.request.url!r}. {e}."
+            error_data = f"A network error occurred for {e.request.url!r}. {e}."
             send_error_to_gcp(
                 error_message,
                 http_context={
@@ -281,10 +285,10 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "status_code": "503",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         except httpx.DecodingError as e:
-            error_message = f"""Decoding of the response to {e.request.url!r} failed,
+            error_data = f"""Decoding of the response to {e.request.url!r} failed,
                 due to a malformed encoding. {e}."""
             send_error_to_gcp(
                 error_message,
@@ -295,10 +299,10 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "status_code": "400",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         except httpx.TooManyRedirects as e:
-            error_message = f"Too many redirects for {e.request.url!r} failed. {e}."
+            error_data = f"Too many redirects for {e.request.url!r} failed. {e}."
             send_error_to_gcp(
                 error_message,
                 http_context={
@@ -308,11 +312,11 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "status_code": "429",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         # Base exceptions to catch all remaining errors
         except httpx.HTTPStatusError as e:
-            error_message = f"""Error response {e.response.status_code} while requesting
+            error_data = f"""Error response {e.response.status_code} while requesting
             {e.request.url!r}."""
             send_error_to_gcp(
                 error_message,
@@ -323,10 +327,10 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "status_code": "500",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         except httpx.RequestError as e:
-            error_message = f"An error occurred while requesting {e.request.url!r}. {e}"
+            error_data = f"An error occurred while requesting {e.request.url!r}. {e}"
             send_error_to_gcp(
                 error_message,
                 http_context={
@@ -336,7 +340,7 @@ async def post(self, uri: str, headers: dict, post_data: dict):
                     "status_code": "400",
                 },
             )
-            return error_message
+            return error_response(error_message=error_message, error_data=error_data)
 
         else:
             return resp

src/routers/audi.py

@@ -46,15 +46,15 @@ async def get_audi_inventory(
     }
 
     async with AsyncHTTPClient(
-        base_url=audi_base_url, timeout_value=30.0, verify=verify_ssl
+        base_url=audi_base_url, timeout_value=60.0, verify=verify_ssl
     ) as http:
         g = await http.post(uri="/", headers=headers, post_data=inventory_post_data)
 
     try:
         data = g.json()
     except ValueError:
         return error_response(
-            error_message=f"An error occurred with the Audi API: {g.text}"
+            error_message=f"An error occurred with the Audi inventory service: {g.text}"
         )
     try:
         # If the inventory request was successful, even if 0 vehicles are returned
@@ -66,7 +66,7 @@ async def get_audi_inventory(
         )
     except KeyError:
         print(data)
-        error_message = "An error occurred with the Audi API"
+        error_message = "An error occurred with the Audi inventory service"
         return error_response(error_message=error_message, error_data=data)
 
 
@@ -102,5 +102,5 @@ async def get_audi_vin_detail(req: Request) -> dict:
         data["data"]["getVehicleInfoForWormwood"]
         return send_response(response_data=data, cache_control_age=3600)
     except KeyError:
-        error_message = "An error occurred with the Audi API"
+        error_message = "An error occurred with the Audi inventory service"
         return error_response(error_message=error_message, error_data=data)

src/routers/hyundai.py

@@ -55,7 +55,7 @@ async def get_hyundai_inventory(
     else:
         return error_response(
             error_message="Received invalid data from the Hyundai API",
-            error_data=inventory,
+            error_data=inventory.text,
             status_code=400,
         )
 

src/routers/logger.py

@@ -49,7 +49,10 @@ def send_error_to_gcp(error, http_context=None):
             user_agent=http_context["user_agent"],
             response_status_code=http_context["status_code"],
         )
-        error_client.report(message=error, http_context=context)
+        try:
+            error_client.report(message=error, http_context=context)
+        except Exception:
+            pass
     else:
         # Setup error logging to GCP Error Reporting
         error_client = error_reporting.Client(version=error.appVersion)
@@ -60,7 +63,10 @@ def send_error_to_gcp(error, http_context=None):
             user_agent=error.userAgent,
             referrer=error.appVersion,
         )
-        error_client.report(
-            message=f"{error.errorMessage}",
-            http_context=http_context,
-        )
+        try:
+            error_client.report(
+                message=f"{error.errorMessage}",
+                http_context=http_context,
+            )
+        except Exception:
+            pass