Add support for Mailtrap

.github/workflows/integration-test.yml

@@ -44,6 +44,7 @@ jobs:
           - { tox: django52-py313-mailersend, python: "3.13" }
           - { tox: django52-py313-mailgun, python: "3.13" }
           - { tox: django52-py313-mailjet, python: "3.13" }
+          - { tox: django41-py313-mailtrap, python: "3.13" }
           - { tox: django52-py313-mandrill, python: "3.13" }
           - { tox: django52-py313-postal, python: "3.13" }
           - { tox: django52-py313-postmark, python: "3.13" }
@@ -89,6 +90,10 @@ jobs:
           ANYMAIL_TEST_MAILJET_DOMAIN: ${{ vars.ANYMAIL_TEST_MAILJET_DOMAIN }}
           ANYMAIL_TEST_MAILJET_SECRET_KEY: ${{ secrets.ANYMAIL_TEST_MAILJET_SECRET_KEY }}
           ANYMAIL_TEST_MAILJET_TEMPLATE_ID: ${{ vars.ANYMAIL_TEST_MAILJET_TEMPLATE_ID }}
+          ANYMAIL_TEST_MAILTRAP_API_TOKEN: ${{ secrets.ANYMAIL_TEST_MAILTRAP_API_TOKEN }}
+          ANYMAIL_TEST_MAILTRAP_TEST_INBOX_ID: ${{ vars.ANYMAIL_TEST_MAILTRAP_TEST_INBOX_ID }}
+          ANYMAIL_TEST_MAILTRAP_TEMPLATE_UUID: ${{ vars.ANYMAIL_TEST_MAILTRAP_TEMPLATE_UUID }}
+          ANYMAIL_TEST_MAILTRAP_DOMAIN: ${{ vars.ANYMAIL_TEST_MAILTRAP_DOMAIN }}
           ANYMAIL_TEST_MANDRILL_API_KEY: ${{ secrets.ANYMAIL_TEST_MANDRILL_API_KEY }}
           ANYMAIL_TEST_MANDRILL_DOMAIN: ${{ secrets.ANYMAIL_TEST_MANDRILL_DOMAIN }}
           ANYMAIL_TEST_POSTMARK_DOMAIN: ${{ secrets.ANYMAIL_TEST_POSTMARK_DOMAIN }}

CHANGELOG.rst

@@ -25,6 +25,18 @@ Release history
 ^^^^^^^^^^^^^^^
     ..  This extra heading level keeps the ToC from becoming unmanageably long
 
+vNext
+-----
+
+*Unreleased changes*
+
+Features
+~~~~~~~~
+
+* **Mailtrap:** Add support for this ESP.
+  (See `docs <https://anymail.dev/en/latest/esps/mailtrap/>`__.
+  Thanks to `@cahna`_ for the contribution.)
+
 v13.1
 -----
 
@@ -1819,6 +1831,7 @@ Features
 .. _@Arondit: https://github.com/Arondit
 .. _@b0d0nne11: https://github.com/b0d0nne11
 .. _@blag: https://github.com/blag
+.. _@cahna: https://github.com/cahna
 .. _@calvin: https://github.com/calvin
 .. _@carrerasrodrigo: https://github.com/carrerasrodrigo
 .. _@chickahoona: https://github.com/chickahoona

README.rst

@@ -31,6 +31,7 @@ Anymail currently supports these ESPs:
 * **MailerSend**
 * **Mailgun** (Sinch transactional email)
 * **Mailjet** (Sinch transactional email)
+* **Mailtrap**
 * **Mandrill** (MailChimp transactional email)
 * **Postal** (self-hosted ESP)
 * **Postmark** (ActiveCampaign transactional email)

anymail/backends/mailtrap.py

@@ -0,0 +1,276 @@
+import sys
+from urllib.parse import quote
+
+if sys.version_info < (3, 11):
+    from typing_extensions import Any, Dict, List, Literal, NotRequired, TypedDict
+else:
+    from typing import Any, Dict, List, Literal, NotRequired, TypedDict
+
+from ..exceptions import AnymailRequestsAPIError
+from ..message import AnymailMessage, AnymailRecipientStatus
+from ..utils import Attachment, EmailAddress, get_anymail_setting, update_deep
+from .base_requests import AnymailRequestsBackend, RequestsPayload
+
+
+class MailtrapAddress(TypedDict):
+    email: str
+    name: NotRequired[str]
+
+
+class MailtrapAttachment(TypedDict):
+    content: str
+    type: NotRequired[str]
+    filename: str
+    disposition: NotRequired[Literal["attachment", "inline"]]
+    content_id: NotRequired[str]
+
+
+MailtrapData = TypedDict(
+    "MailtrapData",
+    {
+        "from": MailtrapAddress,
+        "to": NotRequired[List[MailtrapAddress]],
+        "cc": NotRequired[List[MailtrapAddress]],
+        "bcc": NotRequired[List[MailtrapAddress]],
+        "attachments": NotRequired[List[MailtrapAttachment]],
+        "headers": NotRequired[Dict[str, str]],
+        "custom_variables": NotRequired[Dict[str, str]],
+        "subject": str,
+        "text": str,
+        "html": NotRequired[str],
+        "category": NotRequired[str],
+        "template_uuid": NotRequired[str],
+        "template_variables": NotRequired[Dict[str, Any]],
+    },
+)
+
+
+class MailtrapPayload(RequestsPayload):
+    def __init__(
+        self,
+        message: AnymailMessage,
+        defaults,
+        backend: "EmailBackend",
+        *args,
+        **kwargs,
+    ):
+        http_headers = {
+            "Api-Token": backend.api_token,
+            "Content-Type": "application/json",
+            "Accept": "application/json",
+        }
+        # Yes, the parent sets this, but setting it here, too, gives type hints
+        self.backend = backend
+        self.metadata = None
+
+        # needed for backend.parse_recipient_status
+        self.recipients_to: List[str] = []
+        self.recipients_cc: List[str] = []
+        self.recipients_bcc: List[str] = []
+
+        super().__init__(
+            message, defaults, backend, *args, headers=http_headers, **kwargs
+        )
+
+    def get_api_endpoint(self):
+        if self.backend.use_sandbox:
+            test_inbox_id = quote(self.backend.test_inbox_id, safe="")
+            return f"send/{test_inbox_id}"
+        return "send"
+
+    def serialize_data(self):
+        return self.serialize_json(self.data)
+
+    #
+    # Payload construction
+    #
+
+    def init_payload(self):
+        self.data: MailtrapData = {
+            "from": {
+                "email": "",
+            },
+            "subject": "",
+            "text": "",
+        }
+
+    @staticmethod
+    def _mailtrap_email(email: EmailAddress) -> MailtrapAddress:
+        """Expand an Anymail EmailAddress into Mailtrap's {"email", "name"} dict"""
+        result = {"email": email.addr_spec}
+        if email.display_name:
+            result["name"] = email.display_name
+        return result
+
+    def set_from_email(self, email: EmailAddress):
+        self.data["from"] = self._mailtrap_email(email)
+
+    def set_recipients(
+        self, recipient_type: Literal["to", "cc", "bcc"], emails: List[EmailAddress]
+    ):
+        assert recipient_type in ["to", "cc", "bcc"]
+        if emails:
+            self.data[recipient_type] = [
+                self._mailtrap_email(email) for email in emails
+            ]
+
+            if recipient_type == "to":
+                self.recipients_to = [email.addr_spec for email in emails]
+            elif recipient_type == "cc":
+                self.recipients_cc = [email.addr_spec for email in emails]
+            elif recipient_type == "bcc":
+                self.recipients_bcc = [email.addr_spec for email in emails]
+
+    def set_subject(self, subject):
+        self.data["subject"] = subject
+
+    def set_reply_to(self, emails: List[EmailAddress]):
+        self.data.setdefault("headers", {})["Reply-To"] = ", ".join(
+            email.address for email in emails
+        )
+
+    def set_extra_headers(self, headers):
+        self.data.setdefault("headers", {}).update(headers)
+
+    def set_text_body(self, body):
+        self.data["text"] = body
+
+    def set_html_body(self, body):
+        if "html" in self.data:
+            # second html body could show up through multiple alternatives,
+            # or html body + alternative
+            self.unsupported_feature("multiple html parts")
+        self.data["html"] = body
+
+    def add_attachment(self, attachment: Attachment):
+        att: MailtrapAttachment = {
+            "disposition": "attachment",
+            "filename": attachment.name,
+            "content": attachment.b64content,
+        }
+        if attachment.mimetype:
+            att["type"] = attachment.mimetype
+        if attachment.inline:
+            if not attachment.cid:
+                self.unsupported_feature("inline attachment without content-id")
+            att["disposition"] = "inline"
+            att["content_id"] = attachment.cid
+        elif not attachment.name:
+            self.unsupported_feature("attachment without filename")
+        self.data.setdefault("attachments", []).append(att)
+
+    def set_tags(self, tags: List[str]):
+        if len(tags) > 1:
+            self.unsupported_feature("multiple tags")
+        if len(tags) > 0:
+            self.data["category"] = tags[0]
+
+    def set_metadata(self, metadata):
+        self.data.setdefault("custom_variables", {}).update(
+            {str(k): str(v) for k, v in metadata.items()}
+        )
+        self.metadata = metadata  # save for set_merge_metadata
+
+    def set_template_id(self, template_id):
+        self.data["template_uuid"] = template_id
+
+    def set_merge_global_data(self, merge_global_data: Dict[str, Any]):
+        self.data.setdefault("template_variables", {}).update(merge_global_data)
+
+    def set_esp_extra(self, extra):
+        update_deep(self.data, extra)
+
+
+class EmailBackend(AnymailRequestsBackend):
+    """
+    Mailtrap API Email Backend
+    """
+
+    esp_name = "Mailtrap"
+
+    DEFAULT_API_URL = "https://send.api.mailtrap.io/api/"
+    DEFAULT_SANDBOX_API_URL = "https://sandbox.api.mailtrap.io/api/"
+
+    def __init__(self, **kwargs):
+        """Init options from Django settings"""
+        self.api_token = get_anymail_setting(
+            "api_token", esp_name=self.esp_name, kwargs=kwargs, allow_bare=True
+        )
+        self.test_inbox_id = get_anymail_setting(
+            "test_inbox_id", esp_name=self.esp_name, kwargs=kwargs, default=None
+        )
+        self.use_sandbox = self.test_inbox_id is not None
+
+        api_url = get_anymail_setting(
+            "api_url",
+            esp_name=self.esp_name,
+            kwargs=kwargs,
+            default=(
+                self.DEFAULT_SANDBOX_API_URL
+                if self.use_sandbox
+                else self.DEFAULT_API_URL
+            ),
+        )
+        if not api_url.endswith("/"):
+            api_url += "/"
+
+        super().__init__(api_url, **kwargs)
+
+    def build_message_payload(self, message, defaults):
+        return MailtrapPayload(message, defaults, self)
+
+    def parse_recipient_status(
+        self, response, payload: MailtrapPayload, message: AnymailMessage
+    ):
+        parsed_response = self.deserialize_json_response(response, payload, message)
+
+        if parsed_response.get("errors") or not parsed_response.get("success"):
+            # Superclass has already filtered error status responses, so this shouldn't happen.
+            status = response.status_code
+            raise AnymailRequestsAPIError(
+                f"Unexpected API failure fields with response status {status}",
+                email_message=message,
+                payload=payload,
+                response=response,
+                backend=self,
+            )
+
+        try:
+            message_ids = parsed_response["message_ids"]
+        except KeyError:
+            raise AnymailRequestsAPIError(
+                "Unexpected API response format",
+                email_message=message,
+                payload=payload,
+                response=response,
+                backend=self,
+            )
+
+        # The sandbox API always returns a single message id for all recipients;
+        # the production API returns one message id per recipient in this order:
+        recipients = [
+            *payload.recipients_to,
+            *payload.recipients_cc,
+            *payload.recipients_bcc,
+        ]
+        expected_count = 1 if self.use_sandbox else len(recipients)
+        actual_count = len(message_ids)
+        if expected_count != actual_count:
+            raise AnymailRequestsAPIError(
+                f"Expected {expected_count} message_ids, got {actual_count}",
+                email_message=message,
+                payload=payload,
+                response=response,
+                backend=self,
+            )
+        if self.use_sandbox:
+            message_ids = [message_ids[0]] * expected_count
+
+        recipient_status = {
+            email: AnymailRecipientStatus(
+                message_id=parsed_response["message_ids"][0],
+                status="sent",
+            )
+            for email, message_id in zip(recipients, message_ids)
+        }
+        return recipient_status

anymail/urls.py

@@ -11,6 +11,7 @@
 )
 from .webhooks.mailgun import MailgunInboundWebhookView, MailgunTrackingWebhookView
 from .webhooks.mailjet import MailjetInboundWebhookView, MailjetTrackingWebhookView
+from .webhooks.mailtrap import MailtrapTrackingWebhookView
 from .webhooks.mandrill import MandrillCombinedWebhookView
 from .webhooks.postal import PostalInboundWebhookView, PostalTrackingWebhookView
 from .webhooks.postmark import PostmarkInboundWebhookView, PostmarkTrackingWebhookView
@@ -108,6 +109,11 @@
         MailjetTrackingWebhookView.as_view(),
         name="mailjet_tracking_webhook",
     ),
+    path(
+        "mailtrap/tracking/",
+        MailtrapTrackingWebhookView.as_view(),
+        name="mailtrap_tracking_webhook",
+    ),
     path(
         "postal/tracking/",
         PostalTrackingWebhookView.as_view(),