Add support for Mailjet API

blossomtune_gradio/config.py

@@ -4,8 +4,8 @@ from blossomtune_gradio import util
 
 
 # HF Space ID
-SPACE_ID = os.getenv("SPACE_ID")
-SPACE_OWNER = SPACE_ID.split("/")[0] if SPACE_ID else None
+SPACE_ID = os.getenv("SPACE_ID", "ethicalabs/BlossomTune-Orchestrator")
+SPACE_OWNER = os.getenv("SPACE_OWNER", SPACE_ID.split("/")[0] if SPACE_ID else None)
 
 # Use persistent storage if available
 DB_PATH = "/data/federation.db" if os.path.isdir("/data") else "federation.db"
@@ -16,3 +16,4 @@ SMTP_PORT = int(os.getenv("SMTP_PORT", "1025"))
 SMTP_REQUIRE_TLS = util.strtobool(os.getenv("SMTP_REQUIRE_TLS", "false"))
 SMTP_USER = os.getenv("SMTP_USER", "")
 SMTP_PASSWORD = os.getenv("SMTP_PASSWORD", "")
+EMAIL_PROVIDER = os.getenv("EMAIL_PROVIDER", "smtp")

blossomtune_gradio/mail.py

@@ -1,17 +1,137 @@
 import smtplib
-
+from abc import ABC, abstractmethod
 from email.mime.text import MIMEText
-
+import requests
 
 from blossomtune_gradio.logs import log
 from blossomtune_gradio import config as cfg
 
 
-def send_activation_email(recipient_email, activation_code):
-    """Sends the activation code to the user.
+class EmailSender(ABC):
+    """
+    Abstract Base Class for email sending.
+
+    This class defines the interface for all email sending implementations,
+    ensuring they have a consistent `send_email` method.
+    """
+
+    @abstractmethod
+    def send_email(
+        self, recipient_email: str, subject: str, body: str
+    ) -> tuple[bool, str]:
+        """
+        Sends an email to the specified recipient.
+
+        Args:
+            recipient_email: The email address of the recipient.
+            subject: The subject line of the email.
+            body: The body content of the email.
+
+        Returns:
+            A tuple containing a boolean success status and an error message string.
+            The error message is empty if the email was sent successfully.
+        """
+        pass
+
 
-    Note: This function assumes that SMTP server settings (SMTP_SERVER, SMTP_PORT,
-    SMTP_SENDER) are configured in the `blossomtune_gradio.config` module.
+class SMTPMailSender(EmailSender):
+    """
+    Concrete implementation of EmailSender using standard SMTP.
+    """
+
+    def send_email(
+        self, recipient_email: str, subject: str, body: str
+    ) -> tuple[bool, str]:
+        """
+        Sends an email using the SMTP server configured in `cfg`.
+        """
+        msg = MIMEText(body)
+        msg["Subject"] = subject
+        msg["From"] = cfg.SMTP_SENDER
+        msg["To"] = recipient_email
+
+        try:
+            with smtplib.SMTP(cfg.SMTP_SERVER, cfg.SMTP_PORT) as server:
+                if cfg.SMTP_REQUIRE_TLS:
+                    server.starttls()
+                    server.login(cfg.SMTP_USER, cfg.SMTP_PASSWORD)
+                server.send_message(msg)
+            log(f"[Email] SMTP email sent to {recipient_email}")
+            return True, ""
+        except Exception as e:
+            log(f"[Email] CRITICAL ERROR sending to {recipient_email} via SMTP: {e}")
+            return False, f"Error sending email via SMTP: {e}"
+
+
+class MailjetSender(EmailSender):
+    """
+    Concrete implementation of EmailSender using the Mailjet API.
+    """
+
+    def send_email(
+        self, recipient_email: str, subject: str, body: str
+    ) -> tuple[bool, str]:
+        """
+        Sends an email using the Mailjet transactional API v3.1.
+        """
+        if not all([hasattr(cfg, "SMTP_USER"), hasattr(cfg, "SMTP_PASSWORD")]):
+            error_msg = "Mailjet API keys are not configured."
+            log(f"[Email] {error_msg}")
+            return False, error_msg
+
+        api_key = cfg.SMTP_USER
+        api_secret = cfg.SMTP_PASSWORD
+
+        url = "https://api.mailjet.com/v3.1/send"
+        data = {
+            "Messages": [
+                {
+                    "From": {
+                        "Email": cfg.SMTP_SENDER,
+                        "Name": cfg.SMTP_SENDER.split("@")[0],
+                    },
+                    "To": [{"Email": recipient_email}],
+                    "Subject": subject,
+                    "TextPart": body,
+                }
+            ]
+        }
+
+        try:
+            response = requests.post(url, auth=(api_key, api_secret), json=data)
+            response.raise_for_status()
+            log(
+                f"[Email] Mailjet email sent to {recipient_email}. Status: {response.status_code}"
+            )
+            return True, ""
+        except requests.exceptions.RequestException as e:
+            error_msg = f"Error sending email via Mailjet API: {e}. Response: {e.response.text if e.response else 'No response'}"
+            log(f"[Email] CRITICAL ERROR: {error_msg}")
+            return False, error_msg
+
+
+def get_email_sender() -> EmailSender:
+    """
+    Factory function to get the correct email sender implementation.
+
+    This function reads the `EMAIL_PROVIDER` variable from the `config` module
+    and returns an appropriate EmailSender instance. Defaults to SMTP.
+    """
+    provider = getattr(cfg, "EMAIL_PROVIDER", "smtp")
+    if provider == "mailjet":
+        return MailjetSender()
+    # Default to SMTP if the provider is not Mailjet or is missing.
+    return SMTPMailSender()
+
+
+def send_activation_email(
+    recipient_email: str, activation_code: str
+) -> tuple[bool, str]:
+    """
+    Sends the activation code to the user using the configured email provider.
+
+    This function uses the factory to get the correct sender and abstracts the
+    implementation details.
     """
     subject = "Your BlossomTune Activation Code"
     body = (
@@ -20,25 +140,14 @@ def send_activation_email(recipient_email, activation_code):
         f"{activation_code}\n\n"
         "Thank you!"
     )
-    msg = MIMEText(body)
-    msg["Subject"] = subject
-    msg["From"] = cfg.SMTP_SENDER
-    msg["To"] = recipient_email
-
-    try:
-        # For local testing with a basic SMTP server like MailHog
-        with smtplib.SMTP(cfg.SMTP_SERVER, cfg.SMTP_PORT) as server:
-            # If your SMTP server requires TLS or authentication, add:
-            if cfg.SMTP_REQUIRE_TLS:
-                server.starttls()
-                server.login(cfg.SMTP_USER, cfg.SMTP_PASSWORD)
-            server.send_message(msg)
-        log(f"[Email] Activation code sent to {recipient_email}")
-    except Exception as e:
-        # FIX: return False if mail send fails.
-        log(f"[Email] CRITICAL ERROR sending to {recipient_email}: {e}")
+
+    sender = get_email_sender()
+    success, error_message = sender.send_email(recipient_email, subject, body)
+
+    if not success:
         return (
             False,
-            "There was an error sending the activation email. Please contact an administrator.",
+            f"There was an error sending the activation email. Please contact an administrator. Original error: {error_message}",
         )
+
     return True, ""