arpakitlib 1.8.157__py3-none-any.whl → 1.8.159__py3-none-any.whl

arpakitlib/_arpakit_project_template_v_5/project/util/send_email_.py

@@ -2,7 +2,9 @@ import asyncio
 import datetime as dt
 import logging
 import smtplib
+import ssl
 from email.message import EmailMessage
+from email.utils import formataddr
 
 import aiosmtplib
 
@@ -12,79 +14,137 @@ from project.core.util import setup_logging
 _logger = logging.getLogger(__name__)
 
 
+def _build_email_message(
+        *,
+        from_email: str,
+        to_email: str,
+        subject: str,
+        html_content: str,
+        from_name: str | None = None,
+) -> EmailMessage:
+    msg = EmailMessage()
+    if from_name:
+        msg["From"] = formataddr((from_name, from_email))
+    else:
+        msg["From"] = from_email  # без имени
+    msg["To"] = to_email.strip()
+    msg["Subject"] = subject
+    msg.add_alternative(html_content, subtype="html")
+    return msg
+
+
 def sync_send_email(
         *,
+        from_name: str | None = get_cached_settings().project_name,
         to_email: str,
-        subject: str = "Gamer.Market",
+        subject: str = get_cached_settings().project_name,
         html_content: str,
-        emulate: bool = False
+        emulate: bool = False,
 ):
-    to_email = to_email.strip()
-
     if emulate:
-        _logger.info(f"emulate email sending, {to_email=}, {subject=}, {html_content=}")
+        _logger.info(f"emulate email sending, to_email={to_email!r}, subject={subject!r}")
         return
 
-    message = EmailMessage()
-    message["From"] = get_cached_settings().email_smtp_user
-    message["To"] = to_email
-    message["Subject"] = subject
-    message.add_alternative(html_content, subtype="html")
-
-    with smtplib.SMTP_SSL(
-            host=get_cached_settings().email_smtp_hostname,
-            port=get_cached_settings().email_smtp_port,
-            timeout=dt.timedelta(seconds=15).total_seconds()
-
-    ) as server:
-        server.login(
-            get_cached_settings().email_smtp_user,
-            get_cached_settings().email_smtp_password
-        )
-        server.send_message(message)
+    message = _build_email_message(
+        from_email=get_cached_settings().email_smtp_user,
+        from_name=from_name,
+        to_email=to_email, subject=subject, html_content=html_content
+    )
 
-    _logger.info(f"email was send, {to_email=}")
+    if get_cached_settings().email_smtp_port == 465:
+        _logger.info("using port 465 (SSL)")
+        with smtplib.SMTP_SSL(
+                host=get_cached_settings().email_smtp_hostname,
+                port=465,
+                timeout=dt.timedelta(seconds=15).total_seconds(),
+                context=ssl.create_default_context(),
+        ) as server:
+            server.login(
+                get_cached_settings().email_smtp_user,
+                get_cached_settings().email_smtp_password,
+            )
+            server.send_message(message)
+
+    elif get_cached_settings().email_smtp_port == 587:
+        _logger.info("using port 587 (STARTTLS)")
+        with smtplib.SMTP(
+                host=get_cached_settings().email_smtp_hostname,
+                port=587,
+                timeout=dt.timedelta(seconds=15).total_seconds(),
+        ) as server:
+            server.ehlo()
+            server.starttls(context=ssl.create_default_context())
+            server.ehlo()
+            server.login(
+                get_cached_settings().email_smtp_user,
+                get_cached_settings().email_smtp_password,
+            )
+            server.send_message(message)
+    else:
+        raise ValueError("Unsupported SMTP port")
+
+    _logger.info(f"email was sent, to_email={to_email!r}")
 
 
 async def async_send_email(
         *,
+        from_name: str | None = get_cached_settings().project_name,
         to_email: str,
-        subject: str = "Gamer.Market",
+        subject: str = get_cached_settings().project_name,
         html_content: str,
-        emulate: bool = False
+        emulate: bool = False,
 ):
-    to_email = to_email.strip()
-
     if emulate:
-        _logger.info(f"emulate email sending, {to_email=}, {subject=}, {html_content=}")
+        _logger.info(f"emulate email sending, to_email={to_email!r}, subject={subject!r}")
         return
 
-    message = EmailMessage()
-    message["From"] = get_cached_settings().email_smtp_user
-    message["To"] = to_email
-    message["Subject"] = subject
-    message.add_alternative(html_content, subtype="html")
-
-    await aiosmtplib.send(
-        message,
-        hostname=get_cached_settings().email_smtp_hostname,
-        port=get_cached_settings().email_smtp_port,
-        username=get_cached_settings().email_smtp_user,
-        password=get_cached_settings().email_smtp_password,
-        use_tls=True,
-        timeout=dt.timedelta(seconds=15).total_seconds()
+    message = _build_email_message(
+        from_email=get_cached_settings().email_smtp_user,
+        from_name=from_name,
+        to_email=to_email, subject=subject, html_content=html_content
     )
 
-    _logger.info(f"email was send, {to_email=}")
+    if get_cached_settings().email_smtp_port == 465:
+        _logger.info("using port 465 (SSL)")
+        await aiosmtplib.send(
+            message,
+            hostname=get_cached_settings().email_smtp_hostname,
+            port=465,
+            username=get_cached_settings().email_smtp_user,
+            password=get_cached_settings().email_smtp_password,
+            use_tls=True,
+            start_tls=False,
+            timeout=dt.timedelta(seconds=15).total_seconds(),
+            tls_context=ssl.create_default_context(),
+        )
+
+    elif get_cached_settings().email_smtp_port == 587:
+        _logger.info("using port 587 (STARTTLS)")
+        await aiosmtplib.send(
+            message,
+            hostname=get_cached_settings().email_smtp_hostname,
+            port=587,
+            username=get_cached_settings().email_smtp_user,
+            password=get_cached_settings().email_smtp_password,
+            use_tls=False,
+            start_tls=True,
+            timeout=dt.timedelta(seconds=15).total_seconds(),
+            tls_context=ssl.create_default_context(),
+        )
+    else:
+        raise ValueError("Unsupported SMTP port")
+
+    _logger.info(f"email was sent, to_email={to_email!r}")
 
 
 async def __async_example():
     setup_logging()
     await async_send_email(
         to_email="arpakit@gmail.com",
-        html_content="Hello world 2"
+        html_content="Hello world 2",
+        from_name="Gamer Market"
     )
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     asyncio.run(__async_example())

{arpakitlib-1.8.157.dist-info → arpakitlib-1.8.159.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: arpakitlib
-Version: 1.8.157
+Version: 1.8.159
 Summary: arpakitlib
 License: Apache-2.0
 Keywords: arpakitlib,arpakit,arpakit-company,arpakitcompany,arpakit_company

{arpakitlib-1.8.157.dist-info → arpakitlib-1.8.159.dist-info}/RECORD

@@ -359,7 +359,7 @@ arpakitlib/_arpakit_project_template_v_5/project/tg_bot_notifier/tg_bot_notifier
 arpakitlib/_arpakit_project_template_v_5/project/util/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 arpakitlib/_arpakit_project_template_v_5/project/util/arpakitlib_project_template_util.py,sha256=syA_IuszHVub0zm0sVdB4_7rPJXwXRW4JmQ4qHbjXPk,396
 arpakitlib/_arpakit_project_template_v_5/project/util/etc.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-arpakitlib/_arpakit_project_template_v_5/project/util/send_email_.py,sha256=ehpBiIt6vpUXeuIY_tvr-80LGM7VBCUhgASGZpWy-Ok,2387
+arpakitlib/_arpakit_project_template_v_5/project/util/send_email_.py,sha256=ZfJkdCxyZhbNs4A2FgOQcath75BtJLLIhMFwYhVxmqg,4707
 arpakitlib/_arpakit_project_template_v_5/todo.txt,sha256=q132Jbx229ThY77S3YiN-Cj5AVm7k1VlJcMYIbZUHUY,3
 arpakitlib/ar_additional_model_util.py,sha256=GFg-glLCxH9X95R2bhTJsscVwv37FgE1qbaAAyXrnIE,917
 arpakitlib/ar_aiogram_util.py,sha256=4bizX5Xg-E2-r2TXXGQGanJozsIWPVf5luO3vKUN8p8,8471
@@ -408,8 +408,8 @@ arpakitlib/ar_ssh_runner_util.py,sha256=yvAwza480MkHKvLkDEsR7JNh2bYNs6P9rCVo4NA8
 arpakitlib/ar_str_util.py,sha256=2lGpnXDf2h1cBZpVf5i1tX_HCv5iBd6IGnrCw4QWWlY,4350
 arpakitlib/ar_type_util.py,sha256=Cs_tef-Fc5xeyAF54KgISCsP11NHyzIsglm4S3Xx7iM,4049
 arpakitlib/ar_yookassa_api_client_util.py,sha256=VozuZeCJjmLd1zj2BdC9WfiAQ3XYOrIMsdpNK-AUlm0,5347
-arpakitlib-1.8.157.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
-arpakitlib-1.8.157.dist-info/METADATA,sha256=JrajnfsEw_XyxLDxB-5qvd1cjf6LQSaVCmjGtjBahyQ,3706
-arpakitlib-1.8.157.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-arpakitlib-1.8.157.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
-arpakitlib-1.8.157.dist-info/RECORD,,
+arpakitlib-1.8.159.dist-info/LICENSE,sha256=GPEDQMam2r7FSTYqM1mm7aKnxLaWcBotH7UvQtea-ec,11355
+arpakitlib-1.8.159.dist-info/METADATA,sha256=jHymW1AC6wM8BZW-PSxW_USIXesFIPr6GYZW5P8Ey6k,3706
+arpakitlib-1.8.159.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+arpakitlib-1.8.159.dist-info/entry_points.txt,sha256=36xqR3PJFT2kuwjkM_EqoIy0qFUDPKSm_mJaI7emewE,87
+arpakitlib-1.8.159.dist-info/RECORD,,