chore: merge main into async-support

Author: drish

examples/receiving_email.py

@@ -38,12 +38,25 @@
 print(f"BCC: {received_email.get('bcc', [])}")
 print(f"Reply-To: {received_email.get('reply_to', [])}")
 
-print("\n--- Headers ---")
+print("\n--- Email MIME Headers ---")
+# received_email["headers"] contains the MIME headers of the inbound email
+# (e.g. X-Mailer, DKIM-Signature). These come from the API response body
+# and are part of the email itself, not the HTTP response.
 if received_email.get("headers"):
     for header_name, header_value in received_email["headers"].items():
         print(f"{header_name}: {header_value}")
 else:
-    print("No custom headers")
+    print("No email headers")
+
+print("\n--- HTTP Response Headers ---")
+# received_email["http_headers"] contains HTTP-level metadata from the Resend API
+# (e.g. x-request-id, x-ratelimit-remaining). Injected by the SDK, never part
+# of the email content.
+if received_email.get("http_headers"):
+    print(f"Rate limit: {received_email['http_headers'].get('ratelimit-limit')}")
+    print(
+        f"Rate limit remaining: {received_email['http_headers'].get('ratelimit-remaining')}"
+    )
 
 print("\n--- Attachments ---")
 if received_email["attachments"]:

examples/with_headers.py

@@ -1,44 +1,80 @@
 """
-Example demonstrating how to access response headers.
+Example demonstrating the three different types of headers in the Resend Python SDK:
 
-Response headers include useful information like rate limits, request IDs, etc.
+1. Email headers (SendParams["headers"]): Custom MIME headers added to the outgoing
+   email itself, visible to the recipient's mail client (e.g. X-Entity-Ref-ID).
+
+2. HTTP response headers (response["http_headers"]): HTTP-level metadata returned
+   by the Resend API, such as rate limit info and request IDs. These are injected
+   by the SDK and are never part of the email content.
+
+3. Inbound email MIME headers (email["headers"]): MIME headers present on a received
+   email, returned as part of the API response body (e.g. X-Mailer, DKIM-Signature).
 """
 
 import os
 
 import resend
 
-if not os.environ["RESEND_API_KEY"]:
-    raise EnvironmentError("RESEND_API_KEY is missing")
+resend.api_key = os.environ["RESEND_API_KEY"]
+
+# --- Example 1: Custom email headers (part of the outgoing email itself) ---
 
 params: resend.Emails.SendParams = {
     "from": "onboarding@resend.dev",
     "to": ["delivered@resend.dev"],
     "subject": "Hello from Resend",
     "html": "<strong>Hello, world!</strong>",
+    "headers": {
+        "X-Entity-Ref-ID": "123456789",
+    },
 }
 
 resp: resend.Emails.SendResponse = resend.Emails.send(params)
 print(f"Email sent! ID: {resp['id']}")
 
-if "headers" in resp:
-    print(f"Request ID: {resp['headers'].get('x-request-id')}")
-    print(f"Rate limit: {resp['headers'].get('x-ratelimit-limit')}")
-    print(f"Rate limit remaining: {resp['headers'].get('x-ratelimit-remaining')}")
-    print(f"Rate limit reset: {resp['headers'].get('x-ratelimit-reset')}")
+# --- Example 2: HTTP response headers (SDK metadata, not part of the email) ---
+
+if "http_headers" in resp:
+    print(f"Rate limit: {resp['http_headers'].get('ratelimit-limit')}")
+    print(f"Rate limit remaining: {resp['http_headers'].get('ratelimit-remaining')}")
+    print(f"Rate limit reset: {resp['http_headers'].get('ratelimit-reset')}")
+
+# --- Example 3: Inbound email MIME headers (from a received email response body) ---
+
+# Replace with a real received email ID
+received_email_id = os.environ.get("RECEIVED_EMAIL_ID", "")
+
+if received_email_id:
+    received: resend.ReceivedEmail = resend.Emails.Receiving.get(
+        email_id=received_email_id
+    )
+
+    # email["headers"] — MIME headers of the inbound email, part of the API response body.
+    # Completely separate from http_headers injected by the SDK.
+    if received.get("headers"):
+        print("Inbound email MIME headers:")
+        for name, value in received["headers"].items():
+            print(f"  {name}: {value}")
+
+    # http_headers are also available on received email responses
+    if received.get("http_headers"):
+        print(
+            f"Rate limit remaining: {received['http_headers'].get('ratelimit-remaining')}"
+        )
+else:
+    print("Set RECEIVED_EMAIL_ID env var to run the inbound email headers example.")
 
-print("\n")
-print("Example 3: Rate limit tracking")
+# --- Example 4: Rate limit tracking via HTTP response headers ---
 
 
 def send_with_rate_limit_check(params: resend.Emails.SendParams) -> str:
     """Example function showing how to track rate limits."""
     response = resend.Emails.send(params)
 
-    # Access headers via dict key
-    headers = response.get("headers", {})
-    remaining = headers.get("x-ratelimit-remaining")
-    limit = headers.get("x-ratelimit-limit")
+    http_headers = response.get("http_headers", {})
+    remaining = http_headers.get("ratelimit-remaining")
+    limit = http_headers.get("ratelimit-limit")
 
     if remaining and limit:
         print(f"Rate limit usage: {int(limit) - int(remaining)}/{limit}")

resend/_base_response.py

@@ -9,8 +9,8 @@ class BaseResponse(TypedDict):
     """Base response type that all API responses inherit from.
 
     Attributes:
-        headers: HTTP response headers including rate limit info, request IDs, etc.
-                 Optional field that may not be present in all responses.
+        http_headers: HTTP response headers including rate limit info, request IDs, etc.
+                      Optional field that may not be present in all responses.
     """
 
-    headers: NotRequired[Dict[str, str]]
+    http_headers: NotRequired[Dict[str, str]]

resend/api_keys/_api_key.py

@@ -1,3 +1,5 @@
+from typing import Optional
+
 from typing_extensions import TypedDict
 
 
@@ -14,3 +16,7 @@ class ApiKey(TypedDict):
     """
     The API key creation date
     """
+    last_used_at: Optional[str]
+    """
+    The date and time the API key was last used, or None if never used
+    """

resend/emails/_emails.py

@@ -207,7 +207,7 @@ class SendResponse(BaseResponse):
 
         Attributes:
             id (str): The ID of the sent email
-            headers (NotRequired[Dict[str, str]]): HTTP response headers (inherited from BaseResponse)
+            http_headers (NotRequired[Dict[str, str]]): HTTP response headers (inherited from BaseResponse)
         """
 
         id: str
@@ -246,7 +246,7 @@ class ListResponse(BaseResponse):
             object (str): The object type: "list"
             data (List[Email]): The list of email objects.
             has_more (bool): Whether there are more emails available for pagination.
-            headers (NotRequired[Dict[str, str]]): HTTP response headers (inherited from BaseResponse)
+            http_headers (NotRequired[Dict[str, str]]): HTTP response headers (inherited from BaseResponse)
         """
 
         object: str

resend/emails/_received_email.py

@@ -2,6 +2,8 @@
 
 from typing_extensions import NotRequired, TypedDict
 
+from resend._base_response import BaseResponse
+
 
 class EmailAttachment(TypedDict):
     """
@@ -109,7 +111,7 @@ class EmailAttachmentDetails(TypedDict):
 )
 
 
-class _ReceivedEmailDefaultAttrs(_ReceivedEmailFromParam):
+class _ReceivedEmailDefaultAttrs(_ReceivedEmailFromParam, BaseResponse):
     object: str
     """
     The object type.

resend/request.py

@@ -119,7 +119,7 @@ def make_request(self, url: str) -> Union[Dict[str, Any], List[Any]]:
             parsed_data = cast(Union[Dict[str, Any], List[Any]], json.loads(content))
             # Inject headers into dict responses
             if isinstance(parsed_data, dict):
-                parsed_data["headers"] = dict(self._response_headers)
+                parsed_data["http_headers"] = dict(self._response_headers)
             # For list responses, return as-is (lists can't have headers key)
             return parsed_data
         except json.JSONDecodeError:

tests/api_keys_test.py

@@ -38,6 +38,7 @@ def test_api_keys_list(self) -> None:
                         "id": "91f3200a-df72-4654-b0cd-f202395f5354",
                         "name": "Production",
                         "created_at": "2023-04-08T00:11:13.110779+00:00",
+                        "last_used_at": "2023-04-08T12:00:00.000000+00:00",
                     }
                 ],
             }
@@ -50,6 +51,26 @@ def test_api_keys_list(self) -> None:
             assert key["id"] == "91f3200a-df72-4654-b0cd-f202395f5354"
             assert key["name"] == "Production"
             assert key["created_at"] == "2023-04-08T00:11:13.110779+00:00"
+            assert key["last_used_at"] == "2023-04-08T12:00:00.000000+00:00"
+
+    def test_api_keys_list_last_used_at_none(self) -> None:
+        self.set_mock_json(
+            {
+                "object": "list",
+                "has_more": False,
+                "data": [
+                    {
+                        "id": "91f3200a-df72-4654-b0cd-f202395f5354",
+                        "name": "Production",
+                        "created_at": "2023-04-08T00:11:13.110779+00:00",
+                        "last_used_at": None,
+                    }
+                ],
+            }
+        )
+
+        keys: resend.ApiKeys.ListResponse = resend.ApiKeys.list()
+        assert keys["data"][0]["last_used_at"] is None
 
     def test_should_list_api_key_raise_exception_when_no_content(self) -> None:
         self.set_mock_json(None)

tests/emails_test.py

@@ -1,4 +1,4 @@
-from unittest.mock import MagicMock
+from unittest.mock import MagicMock, Mock
 
 import resend
 from resend import EmailsReceiving
@@ -485,3 +485,65 @@ def test_email_send_with_template_and_variables(self) -> None:
         }
         email: resend.Emails.SendResponse = resend.Emails.send(params)
         assert email["id"] == "49a3999c-0ce1-4ea6-ab68-afcd6dc2e794"
+
+    def test_email_send_with_custom_headers(self) -> None:
+        self.set_mock_json(
+            {
+                "id": "49a3999c-0ce1-4ea6-ab68-afcd6dc2e794",
+            }
+        )
+        params: resend.Emails.SendParams = {
+            "to": "to@email.com",
+            "from": "from@email.com",
+            "subject": "subject",
+            "html": "html",
+            "headers": {
+                "X-Entity-Ref-ID": "123456",
+            },
+        }
+        email: resend.Emails.SendResponse = resend.Emails.send(params)
+        assert email["id"] == "49a3999c-0ce1-4ea6-ab68-afcd6dc2e794"
+
+
+import unittest as _unittest
+
+
+class TestEmailHeadersRegression(_unittest.TestCase):
+    """
+    Tests that mock at the HTTP client level to exercise request.py's injection
+    code. ResendBaseTest mocks make_request directly, which bypasses that code
+    and would not have caught the v2.23.0 regression.
+    """
+
+    def setUp(self) -> None:
+        resend.api_key = "re_123"
+
+    def test_receiving_get_email_headers_not_overwritten_by_http_headers(self) -> None:
+        mock_client = Mock()
+        mock_client.request.return_value = (
+            b'{"object":"inbound","id":"67d9bcdb-5a02-42d7-8da9-0d6feea18cff",'
+            b'"to":["received@example.com"],"from":"sender@example.com",'
+            b'"created_at":"2023-04-07T23:13:52.669661+00:00","subject":"Test",'
+            b'"html":null,"text":"hello","bcc":null,"cc":null,"reply_to":null,'
+            b'"message_id":"<msg123>","headers":{"X-Custom":"email-value"},'
+            b'"attachments":[]}',
+            200,
+            {
+                "content-type": "application/json",
+                "x-request-id": "req_abc123",
+            },
+        )
+
+        original_client = resend.default_http_client
+        resend.default_http_client = mock_client
+
+        try:
+            email: resend.ReceivedEmail = resend.Emails.Receiving.get(
+                email_id="67d9bcdb-5a02-42d7-8da9-0d6feea18cff",
+            )
+            # Email MIME headers must survive the HTTP headers injection
+            assert email["headers"] == {"X-Custom": "email-value"}
+            # HTTP response headers are available separately
+            assert email["http_headers"]["x-request-id"] == "req_abc123"
+        finally:
+            resend.default_http_client = original_client

tests/response_headers_integration_test.py

@@ -48,11 +48,11 @@ def test_email_send_response_includes_headers(self) -> None:
             assert response.get("from") == "test@example.com"
 
             # Verify new feature - headers are accessible via dict key
-            assert "headers" in response
-            assert response["headers"]["x-request-id"] == "req_abc123"
-            assert response["headers"]["x-ratelimit-limit"] == "100"
-            assert response["headers"]["x-ratelimit-remaining"] == "95"
-            assert response["headers"]["x-ratelimit-reset"] == "1699564800"
+            assert "http_headers" in response
+            assert response["http_headers"]["x-request-id"] == "req_abc123"
+            assert response["http_headers"]["x-ratelimit-limit"] == "100"
+            assert response["http_headers"]["x-ratelimit-remaining"] == "95"
+            assert response["http_headers"]["x-ratelimit-reset"] == "1699564800"
 
         finally:
             # Restore original HTTP client
@@ -82,8 +82,8 @@ def test_list_response_headers(self) -> None:
             assert isinstance(response, dict)
             assert "data" in response
             # Headers are injected into the dict
-            assert "headers" in response
-            assert response["headers"]["x-request-id"] == "req_xyz"
+            assert "http_headers" in response
+            assert response["http_headers"]["x-request-id"] == "req_xyz"
 
         finally:
             resend.default_http_client = original_client