feat: raise ResendError on custom client error

Author: drish

resend/http_client_requests.py

@@ -6,6 +6,10 @@
 
 
 class RequestsClient(HTTPClient):
+    """
+    This is the default HTTP client implementation using the requests library.
+    """
+
     def __init__(self, timeout: int = 30):
         self._timeout = timeout
 
@@ -26,4 +30,6 @@ def request(
             )
             return resp.content, resp.status_code, resp.headers
         except requests.RequestException as e:
+            # This gets caught by the request.perform() method
+            # and raises a ResendError with the error type "HttpClientError"
             raise RuntimeError(f"Request failed: {e}") from e

resend/request.py

@@ -4,7 +4,8 @@
 from typing_extensions import Literal, TypeVar
 
 import resend
-from resend.exceptions import NoContentError, raise_for_code_and_type
+from resend.exceptions import (NoContentError, ResendError,
+                               raise_for_code_and_type)
 from resend.version import get_version
 
 RequestVerb = Literal["get", "post", "put", "patch", "delete"]
@@ -69,12 +70,22 @@ def make_request(self, url: str) -> Union[Dict[str, Any], List[Any]]:
         else:
             json_params = None
 
-        content, _status_code, resp_headers = resend.default_http_client.request(
-            method=self.verb,
-            url=url,
-            headers=headers,
-            json=json_params,
-        )
+        try:
+            content, _status_code, resp_headers = resend.default_http_client.request(
+                method=self.verb,
+                url=url,
+                headers=headers,
+                json=json_params,
+            )
+
+        # Safety net around the HTTP Client
+        except Exception as e:
+            raise ResendError(
+                code=500,
+                message=str(e),
+                error_type="HttpClientError",
+                suggested_action="Request failed, please try again.",
+            )
 
         content_type = {k.lower(): v for k, v in resp_headers.items()}.get(
             "content-type", ""

tests/default_http_client_test.py

@@ -1,8 +1,11 @@
-from typing import cast
+from typing import Any, Dict, Mapping, Tuple, cast
 from unittest import TestCase
 from unittest.mock import create_autospec
 
+import pytest
+
 import resend
+import resend.exceptions
 from resend.http_client import HTTPClient
 
 
@@ -40,3 +43,22 @@ def test_default_http_client_called_with_correct_payload(self) -> None:
         assert kwargs["method"] == "post"
         assert "/emails" in kwargs["url"]
         assert kwargs["json"]["subject"] == "Hi!"
+
+    def test_perform_raises_resend_error_on_runtime_error(self) -> None:
+        class RaisesClient(resend.http_client.HTTPClient):
+            def request(
+                self, *args: object, **kwargs: object
+            ) -> Tuple[bytes, int, Mapping[str, str]]:
+                raise RuntimeError("Connection broken")
+
+        resend.default_http_client = RaisesClient()
+
+        request: resend.Request[Dict[str, Any]] = resend.Request(
+            path="/emails", params={}, verb="post"
+        )
+
+        with pytest.raises(resend.exceptions.ResendError) as exc:
+            request.perform()
+
+        assert "Connection broken" in str(exc.value)
+        assert exc.value.error_type == "HttpClientError"