Merge pull request #37 from NCAR/hua-work-common

send_python_email()

Author: zaihuaji

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_common"
-version = "1.0.32"
+version = "1.0.33"
 authors = [
   { name="Zaihua Ji", email="zji@ucar.edu" },
 ]

src/rda_python_common/PgDBI.py

@@ -1849,21 +1849,24 @@ def build_customized_email(table, field, condition, subject, logact = 0):
    estat = PgLOG.FAILURE
    msg = PgLOG.get_email()
    if not msg: return estat
-   
+
    sender = PgLOG.PGLOG['CURUID'] + "@ucar.edu"
    receiver = PgLOG.PGLOG['EMLADDR'] if PgLOG.PGLOG['EMLADDR'] else (PgLOG.PGLOG['CURUID'] + "@ucar.edu")
    if receiver.find(sender) < 0: PgLOG.add_carbon_copy(sender, 1)
-   ebuf = "From: {}\nTo: {}\n".format(sender, receiver)
-   if PgLOG.PGLOG['CCDADDR']: ebuf += "Cc: {}\n".format(PgLOG.PGLOG['CCDADDR']) 
+   cc = PgLOG.PGLOG['CCDADDR']
    if not subject: subject = "Message from {}-{}".format(PgLOG.PGLOG['HOSTNAME'], PgLOG.get_command())
-   ebuf += "Subject: {}!\n\n{}\n".format(subject, msg)
-
-   if PgLOG.PGLOG['EMLSEND']:
-      estat = PgLOG.send_customized_email(f"{table}.{condition}", ebuf, logact)
+   estat = PgLOG.send_python_email(subject, receiver, msg, sender, cc, logact)
    if estat != PgLOG.SUCCESS:
-      estat = cache_customized_email(table, field, condition, ebuf, 0)
-      if estat and logact:
-         PgLOG.pglog("Email {} cached to '{}.{}' for {}, Subject: {}".format(receiver, table, field, condition, subject), logact)
+      ebuf = "From: {}\nTo: {}\n".format(sender, receiver)
+      if cc: ebuf += "Cc: {}\n".format(cc)
+      ebuf += "Subject: {}!\n\n{}\n".format(subject, msg)
+   
+      if PgLOG.PGLOG['EMLSEND']:
+         estat = PgLOG.send_customized_email(f"{table}.{condition}", ebuf, logact)
+      if estat != PgLOG.SUCCESS:
+         estat = cache_customized_email(table, field, condition, ebuf, 0)
+         if estat and logact:
+            PgLOG.pglog("Email {} cached to '{}.{}' for {}, Subject: {}".format(receiver, table, field, condition, subject), logact)
 
    return estat
 

src/rda_python_common/PgLOG.py

@@ -20,6 +20,8 @@
 import pwd
 import grp
 import shlex
+import smtplib
+from email.message import EmailMessage
 from subprocess import Popen, PIPE
 from os import path as op
 import time
@@ -116,7 +118,7 @@
    'PGBATCH' : '',       # current batch service name, SLURM or PBS
    'PGBINDIR' : '',
    'SLMTIME' : 604800,   # max runtime for SLURM bath job, (7x24x60x60 seconds)
-   'PBSTIME' : 86400,    # max runtime for SLURM bath job, (7x24x60x60 seconds)
+   'PBSTIME' : 86400,    # max runtime for PBS bath job, (24x60x60 seconds)
    'MSSGRP'  : None,     # set if set to different HPSS group
    'RDAGRP'  : "decs",
    'EMLSEND' : None,     # path to sendmail, None if not exists
@@ -131,7 +133,9 @@
    'ERR2STD' : [],       # if non-empty reference to array of strings, change stderr to stdout if match
    'STD2ERR' : [],       # if non-empty reference to array of strings, change stdout to stderr if match
    'MISSFILE': "No such file or directory",
-   'GITHUB' : "https://github.com"  # github server
+   'GITHUB' : "https://github.com" , # github server
+   'EMLSRVR' : "ndir.ucar.edu",   # UCAR email server and port
+   'EMLPORT' : 25
 }
 
 HOSTTYPES = {
@@ -270,30 +274,42 @@ def send_customized_email(logmsg, emlmsg, logact = 0):
    if entries['cc'][2]: logmsg += " Cc'd " + entries['cc'][2]
    logmsg += " Subject: " + entries['sb'][2]
 
-   if pgsystem(PGLOG['EMLSEND'], logact, 4, emlmsg):
+   ret = FAILURE
+   if PGLOG['EMLSEND']: ret = pgsystem(PGLOG['EMLSEND'], logact, 4, emlmsg)
+   if not ret: ret = send_python_email(entries['sb'][2], entries['to'][2], emlmsg, entries['fr'][2], entries['cc'][2], logact)
+
+   if ret:      
       log_email(emlmsg)
       if logact: pglog(logmsg, logact&(~EXITLG))
-      return SUCCESS
    else:
       errmsg = "Error sending email: " + logmsg
-      return pglog(logmsg, (logact|ERRLOG)&~EXITLG)
+      pglog(errmsg, (logact|ERRLOG)&~EXITLG)
+
+   return ret
 
 #
-#  send an email, if empty msg; send email message saved in PGLOG['EMLMSG'] instead
+#  send an email; if empty msg send email message saved in PGLOG['EMLMSG'] instead
 #
 def send_email(subject = None, receiver = None, msg = None, sender = None, logact = 0):
 
+   return send_python_email(subject, receiver, msg, sender, None, logact)
+
+#
+#  send an email via python module smtplib; if empty msg send email message saved in PGLOG['EMLMSG'] instead
+#
+def send_python_email(subject = None, receiver = None, msg = None, sender = None, cc = None, logact = 0):
+
    if not msg:
       if PGLOG['EMLMSG']:
          msg = PGLOG['EMLMSG']
          PGLOG['EMLMSG'] = ''
       else:
          return ''
 
-   docc = 0
+   docc = False if cc else True 
    if not sender:
       sender = PGLOG['CURUID']
-      if sender != PGLOG['RDAUSER']: docc = 1
+      if sender != PGLOG['RDAUSER']: docc = False
    if sender == PGLOG['RDAUSER']: sender = PGLOG['RDAEMAIL']
    if sender.find('@') == -1: sender += "@ucar.edu"
    if not receiver:
@@ -302,26 +318,31 @@ def send_email(subject = None, receiver = None, msg = None, sender = None, logac
    if receiver.find('@') == -1: receiver += "@ucar.edu"
 
    if docc and not re.match(PGLOG['RDAUSER'], sender): add_carbon_copy(sender, 1)
-
-   emlmsg = "From: {}\nTo: {}\n".format(sender, receiver)
+   emlmsg = EmailMessage()
+   emlmsg.set_content(msg)
+   emlmsg['From'] = sender
+   emlmsg['To'] = receiver
    logmsg = "Email " + receiver
-   if PGLOG['CCDADDR']:
-      emlmsg += "Cc: {}\n".format(PGLOG['CCDADDR'])
-      logmsg += " Cc'd " + PGLOG['CCDADDR']
+   if not cc: cc = PGLOG['CCDADDR']
+   if cc:
+      emlmsg['Cc'] = cc
+      logmsg += " Cc'd " + cc
    if not subject: subject = "Message from {}-{}".format(PGLOG['HOSTNAME'], get_command())
    if not re.search(r'!$', subject): subject += '!'
-   emlmsg += "Subject: {}\n{}\n".format(subject, msg)
+   emlmsg['Subject'] = subject
    if CPID['CPID']: logmsg += " in " + CPID['CPID']
    logmsg += ", Subject: {}\n".format(subject)
-
-   if pgsystem(PGLOG['EMLSEND'], logact, 4, emlmsg):
-      log_email(emlmsg)
+   try:
+      eml = smtplib.SMTP(PGLOG['EMLSRVR'], PGLOG['EMLPORT'])
+      eml.send_message(emlmsg)
+   except smtplib.SMTPException as err:
+      errmsg = f"Error sending email:\n{err}\n{logmsg}"
+      return pglog(errmsg, (logact|ERRLOG)&~EXITLG)
+   finally:
+      eml.quit()
+      log_email(str(emlmsg))
       if logact: pglog(logmsg, logact&~EXITLG)
-      return logmsg
-   else:
-      errmsg = "Error sending email: " + logmsg
-      pglog(logmsg, (logact|ERRLOG)&~EXITLG)
-      return errmsg
+      return SUCCESS
 
 #
 # log email sent

src/rda_python_common/PgOPT.py

@@ -1692,7 +1692,7 @@ def send_request_email_notice(pgrqst, errmsg, fcount, rstat, readyfile = None, p
       tbl = "dsrqst"
       cnd = "rindex = {}".format(pgrqst['rindex'])
 
-   if PgLOG.PGLOG['EMLSEND'] and PgLOG.send_customized_email(f"{tbl}.{cnd}", ebuf, 0):
+   if PgLOG.send_customized_email(f"{tbl}.{cnd}", ebuf, 0):
       if errmsg:
          PgLOG.pglog("Error Email sent to {} for {}.{}:\n{}".format(einfo['SENDER'], tbl, cnd, errmsg), PGOPT['errlog'])
          readyfile = None