async-mail

CHECKS

@@ -1,5 +1,5 @@
 WAIT=10
-TIMEOUT=10
-ATTEMPTS=10
+TIMEOUT=5
+ATTEMPTS=3
 
 /

auth/email.py

@@ -1,15 +1,14 @@
-import requests
-
+import httpx
 from settings import MAILGUN_API_KEY, MAILGUN_DOMAIN
 
-api_url = "https://api.mailgun.net/v3/%s/messages" % (MAILGUN_DOMAIN or "discours.io")
-noreply = "discours.io <noreply@%s>" % (MAILGUN_DOMAIN or "discours.io")
+api_url = f"https://api.mailgun.net/v3/{MAILGUN_DOMAIN or 'discours.io'}/messages"
+noreply = f"discours.io <noreply@{MAILGUN_DOMAIN or 'discours.io'}>"
 lang_subject = {"ru": "Подтверждение почты", "en": "Confirm email"}
 
 
 async def send_auth_email(user, token, lang="ru", template="email_confirmation"):
     try:
-        to = "%s <%s>" % (user.name, user.email)
+        to = f"{user.name} <{user.email}>"
         if lang not in ["ru", "en"]:
             lang = "ru"
         subject = lang_subject.get(lang, lang_subject["en"])
@@ -19,12 +18,13 @@ async def send_auth_email(user, token, lang="ru", template="email_confirmation")
             "to": to,
             "subject": subject,
             "template": template,
-            "h:X-Mailgun-Variables": '{ "token": "%s" }' % token,
+            "h:X-Mailgun-Variables": f'{{ "token": "{token}" }}',
         }
-        print("[auth.email] payload: %r" % payload)
-        # debug
-        # print('http://localhost:3000/?modal=auth&mode=confirm-email&token=%s' % token)
-        response = requests.post(api_url, auth=("api", MAILGUN_API_KEY), data=payload)
-        response.raise_for_status()
+        print(f"[auth.email] payload: {payload}")
+        async with httpx.AsyncClient() as client:
+            response = await client.post(
+                api_url, auth=("api", MAILGUN_API_KEY), data=payload
+            )
+            response.raise_for_status()
     except Exception as e:
         print(e)