rda-python-common 1.0.35__tar.gz → 1.0.37__tar.gz

{rda_python_common-1.0.35 → rda_python_common-1.0.37}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.35
+Version: 1.0.37
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common

{rda_python_common-1.0.35 → rda_python_common-1.0.37}/pyproject.toml

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

{rda_python_common-1.0.35 → rda_python_common-1.0.37}/src/rda_python_common/PgFile.py

@@ -9,7 +9,7 @@
 #   Purpose : python library module to copy, move and delete data files locally
 #             and remotely
 #
-#    Github : https://github.com/NCAR/rda-python_common.git
+#    Github : https://github.com/NCAR/rda-python-common.git
 #
 ###############################################################################
 #
@@ -101,21 +101,21 @@ QSTATS = {
 }
 
 QPOINTS = {
-   'L' : 'rda-glade',
-   'B' : 'rda-quasar',
-   'D' : 'rda-quasar-drdata'
+   'L' : 'gdex-glade',
+   'B' : 'gdex-quasar',
+   'D' : 'gdex-quasar-drdata'
 }
 
 QHOSTS = {
-   'rda-glade' : LHOST,
-   'rda-quasar' : BHOST,
-   'rda-quasar-drdata' : DHOST
+   'gdex-glade' : LHOST,
+   'gdex-quasar' : BHOST,
+   'gdex-quasar-drdata' : DHOST
 }
 
 ENDPOINTS = {
-   'rda-glade' : "NCAR RDA GLADE",
-   'rda-quasar' : "NCAR RDA Quasar",
-   'rda-quasar-drdata' : "NCAR RDA Quasar DRDATA"
+   'gdex-glade' : "NCAR RDA GLADE",
+   'gdex-quasar' : "NCAR RDA Quasar",
+   'gdex-quasar-drdata' : "NCAR RDA Quasar DRDATA"
 }
 
 BFILES = {}  # cache backup file names and dates for each bid
@@ -332,7 +332,7 @@ def local_copy_object(tofile, fromfile, bucket = None, meta = None, logact = 0):
 #   tofiles - target file name list, echo name leading with /dsnnn.n/ on Quasar and 
 #             leading with /data/ or /decsdata/ on local glade disk
 # fromfiles - source file name list, the same format as the tofiles
-#   topoint - target endpoint name, 'rda-glade', 'rda-quasar' or 'rda-quasar-drdata' 
+#   topoint - target endpoint name, 'gdex-glade', 'gdex-quasar' or 'gdex-quasar-drdata' 
 # frompoint - source endpoint name, the same choices as the topoint
 #
 def quasar_multiple_trasnfer(tofiles, fromfiles, topoint, frompoint, logact = 0):
@@ -374,7 +374,7 @@ def quasar_multiple_trasnfer(tofiles, fromfiles, topoint, frompoint, logact = 0)
 #    tofile - target file name, leading with /dsnnn.n/ on Quasar and 
 #             leading with /data/ or /decsdata/ on local glade disk
 #  fromfile - source file, the same format as the tofile
-#   topoint - target endpoint name, 'rda-glade', 'rda-quasar' or 'rda-quasar-drdata' 
+#   topoint - target endpoint name, 'gdex-glade', 'gdex-quasar' or 'gdex-quasar-drdata' 
 # frompoint - source endpoint name, the same choices as the topoint
 #
 def endpoint_copy_endpoint(tofile, fromfile, topoint, frompoint, logact = 0):
@@ -532,7 +532,7 @@ def check_globus_finished(tofile, topoint, logact = 0):
 def local_copy_backup(tofile, fromfile, endpoint = None, logact = 0):
 
    if not endpoint: endpoint = PgLOG.PGLOG['BACKUPEP']
-   return endpoint_copy_endpoint(tofile, fromfile, endpoint, 'rda-glade', logact)
+   return endpoint_copy_endpoint(tofile, fromfile, endpoint, 'gdex-glade', logact)
 
 #
 # Copy a  Quasar backup file to local Globus endpoint
@@ -544,7 +544,7 @@ def local_copy_backup(tofile, fromfile, endpoint = None, logact = 0):
 def backup_copy_local(tofile, fromfile, endpoint = None, logact = 0):
 
    if not endpoint: endpoint = PgLOG.PGLOG['BACKUPEP']
-   return endpoint_copy_endpoint(tofile, fromfile, 'rda-glade', endpoint, logact)
+   return endpoint_copy_endpoint(tofile, fromfile, 'gdex-glade', endpoint, logact)
 
 #
 # Copy a remote file to local
@@ -1484,7 +1484,7 @@ def local_host_action(host, action, info, logact = 0):
    if host == "partition":
       msg = "for individual partition"
    elif host == "rda_config":
-      msg = "via https://rda.ucar.edu/internal/rda_pg_config"
+      msg = "via https://gdex.ucar.edu/internal/rda_pg_config"
    elif host in PgLOG.BCHCMDS:
       msg = "on a {} Node".format(host)
    else:
@@ -1577,7 +1577,7 @@ def check_rda_file(file, host = LHOST, opt = 0, logact = 0):
 def check_globus_file(file, endpoint = None, opt = 0, logact = 0):
 
    if not endpoint: endpoint = PgLOG.PGLOG['BACKUPEP']
-   if endpoint == 'rda-glade':
+   if endpoint == 'gdex-glade':
       if re.match(r'^/(data|decsdata)/', file): file = PgLOG.PGLOG['DSSDATA'] + file
       return check_local_file(file, opt, logact)
    else:

{rda_python_common-1.0.35 → rda_python_common-1.0.37}/src/rda_python_common/PgLOG.py

@@ -402,15 +402,11 @@ def pglog(msg, logact = MSGLOG):
       if logact&EMLLOG: logact &= ~EMLLOG
       if not logact&ERRLOG: logact &= ~EMEROL
 
-   if msg: msg = msg.lstrip()  # remove leading whitespaces for logging message
-
+   msg = msg.lstrip() if msg else ''  # remove leading whitespaces for logging message
    if logact&EXITLG:
       ext = "Exit 1 in {}\n".format(os.getcwd())
-      if not msg:
-         msg = ext
-      else:
-         msg = msg.rstrip()
-         msg += "; " + ext
+      if msg: msg = msg.rstrip() + "; "
+      msg += ext
    else:
       if msg and not re.search(r'(\n|\r)$', msg): msg += "\n"
       if logact&RETMSG: retmsg = msg
@@ -418,7 +414,8 @@ def pglog(msg, logact = MSGLOG):
    if logact&EMLALL:
       if logact&SNDEML or not msg:
          title = (msg if msg else "Message from {}-{}".format(PGLOG['HOSTNAME'], get_command()))
-         msg = send_email(title.rstrip())
+         msg = title + '\n' + msg
+         send_email(title.rstrip())
       elif msg:
          set_email(msg, logact)
 
@@ -428,7 +425,8 @@ def pglog(msg, logact = MSGLOG):
       if not logact&EMLALL: set_email(msg, logact)
       title = "ABORTS {}-{}".format(PGLOG['HOSTNAME'], get_command())
       set_email((("ABORTS " + CPID['PID']) if CPID['PID'] else title), EMLTOP)
-      msg += send_email(title)
+      msg = title + '\n' + msg
+      send_email(title)
 
    if logact&LOGERR: # make sure error is always logged
       msg = break_long_string(msg)
@@ -1315,11 +1313,11 @@ def set_common_pglog():
    SETPGLOG("DBGLEVEL", '')                             # debug level
    SETPGLOG("DBGPATH", PGLOG['DSSDBHM']+"/log")         # path to debug log file
    SETPGLOG("OBJCTBKT", "rda-data")                     # default Bucket on Object Store
-   SETPGLOG("BACKUPEP", "rda-quasar")                   # default Globus Endpoint on Quasar
-   SETPGLOG("DRDATAEP", "rda-quasar-drdata")            # DRDATA Globus Endpoint on Quasar
+   SETPGLOG("BACKUPEP", "gdex-quasar")                   # default Globus Endpoint on Quasar
+   SETPGLOG("DRDATAEP", "gdex-quasar-drdata")            # DRDATA Globus Endpoint on Quasar
    SETPGLOG("DBGFILE", "pgdss.dbg")                     # debug file name
    SETPGLOG("CNFPATH", PGLOG['DSSHOME']+"/config")      # path to configuration files
-   SETPGLOG("DSSURL",  "https://rda.ucar.edu")          # current dss web URL
+   SETPGLOG("DSSURL",  "https://gdex.ucar.edu")          # current dss web URL
    SETPGLOG("RQSTURL", "/datasets/request")              # request URL path
    SETPGLOG("WEBSERVERS", "rda-web-prod01.ucar.edu:rda-web-test01.ucar.edu")                 # webserver names for Web server
    PGLOG['WEBHOSTS'] = PGLOG['WEBSERVERS'].split(':') if PGLOG['WEBSERVERS'] else []
@@ -1330,7 +1328,7 @@ def set_common_pglog():
    SETPGLOG("DSSWEB",  PGLOG['LOCDATA']+"/web")
    SETPGLOG("DSWHOME", PGLOG['DSSWEB']+"/datasets")     # datast web root path
    PGLOG['HOMEROOTS'] = "{}|{}".format(PGLOG['DSSHOME'], PGLOG['DSWHOME'])
-   SETPGLOG("DSSDATA", "/glade/campaign/collections/rda")                     # dss data root path
+   SETPGLOG("DSSDATA", "/glade/campaign/collections/gdex")                     # dss data root path
    SETPGLOG("DSDHOME", PGLOG['DSSDATA']+"/data")        # dataset data root path
    SETPGLOG("DECSHOME", PGLOG['DSSDATA']+"/decsdata")   # dataset decsdata root path
    SETPGLOG("DSHHOME", PGLOG['DECSHOME']+"/helpfiles")  # dataset help root path
@@ -1354,12 +1352,12 @@ def set_common_pglog():
    os.environ['history'] = '0'
 
    # set tmp dir
-   SETPGLOG("TMPPATH", "/glade/campaign/collections/rda/work/ptmp")
+   SETPGLOG("TMPPATH", "/glade/campaign/collections/gdex/work/ptmp")
    if not PGLOG['TMPPATH']: PGLOG['TMPPATH'] = "/data/ptmp"
 
    SETPGLOG("TMPDIR", '')
    if not PGLOG['TMPDIR']:
-      PGLOG['TMPDIR'] = "/glade/campaign/collections/rda/scratch/" + PGLOG['CURUID']
+      PGLOG['TMPDIR'] = "/glade/campaign/collections/gdex/scratch/" + PGLOG['CURUID']
       os.environ['TMPDIR'] = PGLOG['TMPDIR']
 
    # empty diretory for HOST-sync

{rda_python_common-1.0.35 → rda_python_common-1.0.37}/src/rda_python_common.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_common
-Version: 1.0.35
+Version: 1.0.37
 Summary: RDA Python common library codes shared by other RDA python packages
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-common