markdown-merge 0.1.4__tar.gz → 0.1.6__tar.gz

{markdown_merge-0.1.4/markdown_merge.egg-info → markdown_merge-0.1.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown_merge
-Version: 0.1.4
+Version: 0.1.6
 Summary: Send email using markdown
 Home-page: https://github.com/AnswerDotAI/markdown_merge
 Author: Jeremy Howard

markdown_merge-0.1.6/markdown_merge/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "0.1.6"
+from .core import *

{markdown_merge-0.1.4 → markdown_merge-0.1.6}/markdown_merge/core.py

@@ -12,11 +12,13 @@ from fastcore.utils import *
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
 from email.mime.base import MIMEBase
+from email.policy import EmailPolicy
 from email import encoders
 
 from contextlib import contextmanager
 from markdown import markdown
 from email.headerregistry import Address
+from email.header import Header
 from time import sleep
 
 # %% ../nbs/00_core.ipynb
@@ -36,10 +38,11 @@ def attach_file(msg, f):
     msg.attach(part)
 
 # %% ../nbs/00_core.ipynb
-def create_multipart_msg(subj, from_addr, to_addrs, md=None, html=None, attach=None):
+def create_multipart_msg(subj, from_addr, to_addrs, md=None, html=None, attach=None, hdrs=None):
     "Create a multipart email with markdown text and HTML"
-    msg = MIMEMultipart('alternative')
+    msg = MIMEMultipart('alternative', policy=EmailPolicy())
     msg['Subject'],msg['From'] = subj,str(from_addr)
+    for k,v in (hdrs or {}).items(): msg[k]=v
     msg['To'] = ', '.join([str(a) for a in listify(to_addrs)])
     if md: msg.attach(MIMEText(md, 'plain'))
     if html: msg.attach(MIMEText(html, 'html'))
@@ -47,39 +50,43 @@ def create_multipart_msg(subj, from_addr, to_addrs, md=None, html=None, attach=N
     return msg
 
 # %% ../nbs/00_core.ipynb
-def md2email(subj, from_addr, to_addrs, md, attach=None):
+def md2email(subj, from_addr, to_addrs, md, attach=None, hdrs=None):
     "Create a multipart email from markdown"
     html = markdown(md)
-    return create_multipart_msg(subj, from_addr, to_addrs, md=md, html=html, attach=attach)
+    return create_multipart_msg(subj, from_addr, to_addrs, md=md, html=html, attach=attach, hdrs=hdrs)
 
 # %% ../nbs/00_core.ipynb
-@contextmanager
 def smtp_connection(host, port, user=None, password=None, use_ssl=True, use_tls=False):
-    "Context manager for SMTP connection"
+    "Create and return an SMTP connection"
     conn = smtplib.SMTP_SSL(host, port) if use_ssl else smtplib.SMTP(host, port)
     if use_tls and not use_ssl: conn.starttls()
     if user and password: conn.login(user, password)
-    try: yield conn
-    finally: conn.quit()
+    return conn
 
 # %% ../nbs/00_core.ipynb
 class MarkdownMerge:
     "Send templated email merge messages formatted with Markdown"
-    def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False):
+    def __init__(self, addrs, from_addr, subj, msg, smtp_cfg=None, inserts=None, test=False, hdrs=None):
         self.addrs,self.from_addr,self.subj,self.msg,self.i = addrs,from_addr,subj,msg,0
         self.inserts = [{}]*len(addrs) if inserts is None else inserts
-        self.smtp_cfg,self.test = smtp_cfg,test
+        self.smtp_cfg,self.test,self.hdrs = smtp_cfg,test,hdrs
 
-    def send_msgs(self, pause=0.5):
+    def send_msgs(self, pause=0.2):
         "Send all unsent messages to `addrs` with `pause` secs between each send"
-        with smtp_connection(**self.smtp_cfg) as conn:
-            while self.i < len(self.addrs):
-                addr,insert = self.addrs[self.i],self.inserts[self.i]
-                msg = self.msg.format(**insert)
-                eml = md2email(self.subj, self.from_addr, addr, md=msg)
-                if self.test: print(f"To: {addr}\n{'-'*40}\n{msg}\n{'='*40}\n")
-                else: conn.send_message(eml); sleep(pause)
-                self.i += 1
-                if self.i%100==0: print(self.i)
+        conn = smtp_connection(**self.smtp_cfg)
+        while self.i < len(self.addrs):
+            addr,insert = self.addrs[self.i],self.inserts[self.i]
+            msg = self.msg.format(**insert)
+            eml = md2email(self.subj, self.from_addr, addr, md=msg, hdrs=self.hdrs)
+            if self.test: print(f"To: {addr}\n{'-'*40}\n{msg}\n{'='*40}\n")
+            else:
+                conn.send_message(eml)
+                sleep(pause)
+            self.i += 1
+            if self.i%100==0:
+                print(self.i)
+                conn.quit()
+                conn = smtp_connection(**self.smtp_cfg)
+        conn.quit()
 
     def reset(self): self.i=0

{markdown_merge-0.1.4 → markdown_merge-0.1.6/markdown_merge.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: markdown_merge
-Version: 0.1.4
+Version: 0.1.6
 Summary: Send email using markdown
 Home-page: https://github.com/AnswerDotAI/markdown_merge
 Author: Jeremy Howard

{markdown_merge-0.1.4 → markdown_merge-0.1.6}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = markdown_merge
 lib_name = markdown_merge
-version = 0.1.4
+version = 0.1.6
 min_python = 3.10
 license = apache2
 black_formatting = False

markdown_merge-0.1.4/markdown_merge/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "0.1.4"
-from .core import *