push

backend/app/main.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 import io
-
+import base64
+import requests
 import matplotlib
 matplotlib.use("Agg")
 import matplotlib.dates as mdates
@@ -20,8 +21,6 @@ import json
 import math
 import sys
 import hashlib
-import smtplib
-from email.message import EmailMessage
 from pathlib import Path
 from typing import Any, Dict, List, Optional, Tuple
 from time import perf_counter
@@ -1101,26 +1100,15 @@ def send_calc_email(
     pdf_bytes: bytes | None = None,
     pdf_filename: str = "wind_report.pdf",
 ) -> None:
-    """
-    Sends a notification email when a detailed (non-fast) calculation was completed."""
-
+    api_key = "0a87a8fed6c0c3a9e0ad1f75822de83fcebfc82ca06fe315d46277431e8a61b8"
+    from_addr = "no-reply@c9a9257150c29993.maileroo.org"
+    from_name = "Wind Model Backend Team"
 
-    smtp_host = os.getenv("SMTP_HOST")
-    smtp_port = int(os.getenv("SMTP_PORT", "587"))
-    smtp_user = os.getenv("SMTP_USER")
-    smtp_pass = os.getenv("SMTP_PASS")
-    smtp_from = os.getenv("SMTP_FROM", smtp_user or "")
-
-    if not smtp_host or not smtp_from:
-        print("[email] SMTP not configured. Skipping email.")
+    if not api_key or not from_addr:
+        print("[email] MAILEROO_API_KEY / MAILEROO_FROM not set. Skipping email.")
         return
 
-    use_tls = os.getenv("SMTP_TLS", "true").strip().lower() in ("1", "true", "yes", "on")
-
-    msg = EmailMessage()
-    msg["Subject"] = "Your wind park analysis is ready"
-    msg["From"] = smtp_from
-    msg["To"] = to_email
+    subject = "Your wind park analysis is ready"
 
     body = (
         "Dear Sir or Madam,\n\n"
@@ -1135,28 +1123,46 @@ def send_calc_email(
         "Kind regards,\n"
         "Wind Model Backend Team\n"
     )
-    msg.set_content(body)
+
+    payload = {
+        "from": {"address": from_addr, "display_name": from_name},
+        "to": {"address": to_email},
+        "subject": subject,
+        "plain": body,
+        # If you want HTML too, add: "html": "<p>...</p>"
+    }
 
     # Attach PDF (optional)
     if pdf_bytes:
-        msg.add_attachment(
-            pdf_bytes,
-            maintype="application",
-            subtype="pdf",
-            filename=pdf_filename,
+        payload["attachments"] = [
+            {
+                "file_name": pdf_filename,
+                "content_type": "application/pdf",
+                "content": base64.b64encode(pdf_bytes).decode("ascii"),
+                "inline": False,
+            }
+        ]
+
+    try:
+        resp = requests.post(
+            "https://smtp.maileroo.com/api/v2/emails",
+            headers={
+                "Content-Type": "application/json",
+                "X-Api-Key": api_key,  # Maileroo auth header
+            },
+            json=payload,
+            timeout=20,
         )
 
+        # Helpful debug output if something goes wrong
+        if resp.status_code >= 400:
+            print("[email] Maileroo error:", resp.status_code, resp.text)
+            return
 
-    try:
-        with smtplib.SMTP(smtp_host, smtp_port, timeout=15) as server:
-            if use_tls:
-                server.starttls()
-            if smtp_user and smtp_pass:
-                server.login(smtp_user, smtp_pass)
-            server.send_message(msg)
-            print(f"[email] Sent calculation email to {to_email}")
+        print(f"[email] Sent calculation email to {to_email} via Maileroo.")
     except Exception as e:
-        print(f"[email] Failed to send email to {to_email}: {e}")
+        print(f"[email] Failed to send email to {to_email} via Maileroo: {e}")
+
 
 
 # ============================================================

entrypoint.sh

@@ -107,21 +107,6 @@ except Exception:
     print("[FATAL] Import of app.main failed. Full traceback:")
     traceback.print_exc()
     raise SystemExit(1)
-PY
-python - <<'PY'
-import socket
-
-def test(host, port):
-    try:
-        s = socket.create_connection((host, port), timeout=5)
-        s.close()
-        print("OK  ", host, port)
-    except Exception as e:
-        print("FAIL", host, port, repr(e))
-
-test("www.google.com", 443)
-test("smtp.gmail.com", 587)
-PY
 # Uvicorn: lade app.main:app (entspricht /app/backend/app/main.py)
 exec python -m uvicorn app.main:app --host 0.0.0.0 --port "${PORT:-7860}" --log-level info
 

requirements.txt

@@ -16,6 +16,7 @@ h5netcdf
 scikit-learn==1.8.0
 dask
 dask[dataframe]
+requests
 # --- add for your backend/app/main.py deployment ---
 reportlab
 huggingface_hub