rda-python-dscheck 2.0.0__tar.gz → 2.0.2__tar.gz

{rda_python_dscheck-2.0.0 → rda_python_dscheck-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dscheck
-Version: 2.0.0
+Version: 2.0.2
 Summary: RDA python package to add and process batch jobs
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dscheck

{rda_python_dscheck-2.0.0 → rda_python_dscheck-2.0.2}/pyproject.toml

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

{rda_python_dscheck-2.0.0 → rda_python_dscheck-2.0.2}/src/rda_python_dscheck/dscheck.py

@@ -123,7 +123,7 @@ class DsCheck(PgCheck):
          ss = "is"
       subject = "{} active Check Record{}".format(allcnt, s)
       mbuf = "{} {} listed:\n".format(subject, ss)
-      pgrecs = {'status' : self.get_check_status(pgrecs, allcnt)}
+      pgrecs = {'status': self.get_check_status(pgrecs, allcnt)}
       for i in range(allcnt):
          if i > 0: mbuf += self.PGLOG['SEPLINE']
          mbuf += self.build_check_message(self.onerecord(pgrecs, i))
@@ -362,7 +362,7 @@ class DsCheck(PgCheck):
             if dlupdt and self.pgexec("UPDATE dlupdt set pid = 0 WHERE lindex = {}".format(dlupdt['lindex']), self.PGOPT['extlog']):
                self.pglog("Update Local File Index {} unlocked".format(dlupdt['lindex']), self.LOGWRN)
          elif pgrec['command'] == 'dsrqst':
-            record = {'status' : 'I', 'pid' : 0}
+            record = {'status': 'I', 'pid': 0}
             if pgrec['otype'] == 'P':
                table = "ptrqst"
                field = "pindex"
@@ -435,7 +435,7 @@ class DsCheck(PgCheck):
           cnd += "specialist = '{}' AND ".format(self.params['LN'])
       acnd = self.get_hash_condition("dscheck", None, "ST", 1)
       if acnd: acnd += " AND "
-      self.set_dscheck_options(self.get_host(1), cnd + acnd, logact)
+      self.set_dscheck_options(cnd + acnd, logact)
       if self.PGLOG['ERRCNT']: self.send_error_email()
 
    # rdadata daemon handles the daemon controls
@@ -494,7 +494,7 @@ class DsCheck(PgCheck):
       hash = self.TBLHASH[tname]
       condition = self.get_hash_condition(tname, None, "H", 1)
       if 'HN' in self.params:
-         pgrecs = {'specialist' : [], 'hostname' : []}
+         pgrecs = {'specialist': [], 'hostname': []}
          spclsts = self.pgmget(tname, "DISTINCT specialist", condition, self.PGOPT['extlog'])
          if spclsts:
             for specialist in spclsts['specialist']:

{rda_python_dscheck-2.0.0 → rda_python_dscheck-2.0.2}/src/rda_python_dscheck/dscheck.usg

@@ -170,11 +170,11 @@ categories:
   is present. Combination of specialist login name, command name and hostname of
   computer must be unique for for each daemon control record.
 
-  Specify host name 'SLURM' for putting the command in the SLURM batch control system. If
+  Specify host name 'PBS' for putting the command in the PBS batch control system. If
   a specified command name is not found in the daemon control, the general 'dscheck'
   configuration for command name 'ALL' is used.
   
-  For example, set daemon control information for schuster, all commands on SLURM hosts,
+  For example, set daemon control information for schuster, all commands on PBS hosts,
   for maximum 4 checks can be processed at the same time with priority 1, the smaller
   the number the higher the priority is, via input file daemon.ctl
 
@@ -182,7 +182,7 @@ categories:
 
 <<Content of input file daemon.ctl>>
 DaemonIndex<:>Command<:>Specialist<:>Hostname<:>ProcessLimit<:>Priority<:>
-0<:>schuster<:>ALL<:>SLURM<:>4<:>1<:>
+0<:>schuster<:>ALL<:>PBS<:>4<:>1<:>
 
 
 3.1.2 Get Daemon Control
@@ -311,11 +311,11 @@ DaemonIndex<:>Command<:>Specialist<:>Hostname<:>ProcessLimit<:>Priority<:>
 (ls -l | grep test) 1> test2.out 2>test2.err
 
   For example, to add testing command 'test2' into 'dscheck' for delayed mode execution on
-  SLURM
+  PBS
 
-  dsheck AC -CM test2 -HN SLURM
+  dsheck AC -CM test2 -HN PBS
 
-  The command 'test2' must be executable at the current working directory on SLURM machines.
+  The command 'test2' must be executable at the current working directory on PBS machines.
 
 
 3.2.2 Get Check
@@ -591,7 +591,7 @@ Information options are used to pass information, one or multiple values, into
 
   -LH or -LocalHost, specify a local hostname to processes checks on the host for
   action -PC(-ProcessCheck). It defaults to '' to use the local host name. Specify
-  SLURM or PBS to process batch jobs.
+  PBS to process batch jobs.
 
   -MT or -MaxrunTime, specify the maxmum run time for deamon mode. It defaults to 0
    for unlimit time. For examples, 5000 means seconds, and 1D means 1 day for 86400

{rda_python_dscheck-2.0.0 → rda_python_dscheck-2.0.2}/src/rda_python_dscheck/pg_check.py

@@ -1,15 +1,15 @@
 ###############################################################################
 #
-#     Title : pg_check.py
-#    Author : Zaihua Ji,  zji@ucar.edu
-#      Date : 08/26/2020
+#     Title: pg_check.py
+#    Author: Zaihua Ji,  zji@ucar.edu
+#      Date: 08/26/2020
 #             2025-02-10 transferred to package rda_python_dscheck from
 #             https://github.com/NCAR/rda-shared-libraries.git
 #             2025-12-04 convert to class PgOPT
-#   Purpose : python library module for for holding some global variables and
+#   Purpose: python library module for for holding some global variables and
 #             functions for dscheck utility
 #
-#    Github : https://github.com/NCAR/rda-python-dscheck.git
+#    Github: https://github.com/NCAR/rda-python-dscheck.git
 #
 ###############################################################################
 #
@@ -30,147 +30,145 @@ class PgCheck(PgOPT, PgCMD):
       self.SHELLS = {}      # shell names used by specialists
       # define initially the needed option values
       self.OPTS.update({
-         'PC' : [0x0004, 'ProcessCheck',    1],
-         'AC' : [0x0008, 'AddCheck',        1],
-         'GD' : [0x0010, 'GetDaemon',       0],
-         'SD' : [0x0020, 'SetDaemon',       1],
-         'GC' : [0x0040, 'GetCheck',        0],
-         'DL' : [0x0080, 'Delete',          1],
-         'UL' : [0x0100, 'UnLockCheck',     1],
-         'EC' : [0x0200, 'EmailCheck',      0],
-         'IC' : [0x0400, 'InterruptCheck',  1],
-         'CH' : [0x1000, 'CheckHost',       0],
-         'SO' : [0x1000, 'SetOptions',      1],      
-         'AW' : [0, 'AnyWhere',      0],
-         'BG' : [0, 'BackGround',    0],
-         'CP' : [0, 'CheckPending',  0],
-         'CS' : [0, 'CheckStatus',   0],
-         'FI' : [0, 'ForceInterrrupt', 0],
-         'FO' : [0, 'FormatOutput',  0],
-         'LO' : [0, 'LogOn',         0],
-         'MD' : [0, 'PgDataset',     3],
-         'NC' : [0, 'NoCommand',     0],
-         'ND' : [0, 'NewDaemon',     0],
-         'NT' : [0, 'NoTrim',        0],
-         'WR' : [0, 'WithdsRqst',    0],
-         'WU' : [0, 'WithdsUpdt',    0],
-         'DM' : [1, 'DaemonMode',    1],  # for action PC, start|quit|logon|logoff
-         'DV' : [1, 'Divider',       1],  # default to <:>
-         'ES' : [1, 'EqualSign',     1],  # default to <=>
-         'FN' : [1, 'FieldNames',     0],
-         'LH' : [1, 'LocalHost',      0,  ''],
-         'MT' : [1, 'MaxrunTime',     0],
-         'OF' : [1, 'OutputFile',     0],
-         'ON' : [1, 'OrderNames',     0],
-         'AO' : [1, 'ActOption',      1],  # default to <!>
-         'WI' : [1, 'WaitInterval',   1],
-         'AN' : [2, 'ActionName',     0],
-         'AV' : [2, 'ArgumentVector', 0],
-         'AX' : [2, 'ArgumenteXtra',  0],
-         'CC' : [2, 'CarbonCopy',     0],
-         'CD' : [2, 'CheckDate',    256],
-         'CI' : [2, 'CheckIndex',    16],
-         'CM' : [2, 'Command',        1],
-         'CT' : [2, 'CheckTime',     32],
-         'DB' : [2, 'Debug',          0],
-         'DC' : [2, 'DoneCount',     17],
-         'DF' : [2, 'DownFlags',      1],
-         'DI' : [2, 'DaemonIndex',   16],
-         'DS' : [2, 'Dataset',        1],
-         'ER' : [2, 'ERrormessage',   0],
-         'EV' : [2, 'Environments',   1],
-         'FC' : [2, 'FileCount',     17],
-         'HN' : [2, 'HostName',       1],
-         'IF' : [2, 'InputFile',      0],
-         'MC' : [2, 'MaxCount',      17],
-         'MH' : [2, 'MatchHost',      1],
-         'MO' : [2, 'Modules',        1],
-         'PI' : [2, 'ParentIndex',   17],
-         'PL' : [2, 'ProcessLimit',  17],
-         'PO' : [2, 'Priority',      17],
-         'PQ' : [2, 'PBSQueue',       0],
-         'QS' : [2, 'QSubOptions',    0],
-         'SN' : [2, 'Specialist',     1],
-         'ST' : [2, 'Status',         0],
-         'SZ' : [2, 'DataSize',      16],
-         'TC' : [2, 'TryCount',      17],
-         'WD' : [2, 'WorkDir',        0],
+         'PC': [0x0004, 'ProcessCheck',    1],
+         'AC': [0x0008, 'AddCheck',        1],
+         'GD': [0x0010, 'GetDaemon',       0],
+         'SD': [0x0020, 'SetDaemon',       1],
+         'GC': [0x0040, 'GetCheck',        0],
+         'DL': [0x0080, 'Delete',          1],
+         'UL': [0x0100, 'UnLockCheck',     1],
+         'EC': [0x0200, 'EmailCheck',      0],
+         'IC': [0x0400, 'InterruptCheck',  1],
+         'CH': [0x1000, 'CheckHost',       0],
+         'SO': [0x1000, 'SetOptions',      1],      
+         'AW': [0, 'AnyWhere',      0],
+         'BG': [0, 'BackGround',    0],
+         'CP': [0, 'CheckPending',  0],
+         'CS': [0, 'CheckStatus',   0],
+         'FI': [0, 'ForceInterrrupt', 0],
+         'FO': [0, 'FormatOutput',  0],
+         'LO': [0, 'LogOn',         0],
+         'MD': [0, 'PgDataset',     3],
+         'NC': [0, 'NoCommand',     0],
+         'ND': [0, 'NewDaemon',     0],
+         'NT': [0, 'NoTrim',        0],
+         'WR': [0, 'WithdsRqst',    0],
+         'WU': [0, 'WithdsUpdt',    0],
+         'DM': [1, 'DaemonMode',    1],  # for action PC, start|quit|logon|logoff
+         'DV': [1, 'Divider',       1],  # default to <:>
+         'ES': [1, 'EqualSign',     1],  # default to <=>
+         'FN': [1, 'FieldNames',     0],
+         'LH': [1, 'LocalHost',      0,  ''],
+         'MT': [1, 'MaxrunTime',     0],
+         'OF': [1, 'OutputFile',     0],
+         'ON': [1, 'OrderNames',     0],
+         'AO': [1, 'ActOption',      1],  # default to <!>
+         'WI': [1, 'WaitInterval',   1],
+         'AN': [2, 'ActionName',     0],
+         'AV': [2, 'ArgumentVector', 0],
+         'AX': [2, 'ArgumenteXtra',  0],
+         'CC': [2, 'CarbonCopy',     0],
+         'CD': [2, 'CheckDate',    256],
+         'CI': [2, 'CheckIndex',    16],
+         'CM': [2, 'Command',        1],
+         'CT': [2, 'CheckTime',     32],
+         'DB': [2, 'Debug',          0],
+         'DC': [2, 'DoneCount',     17],
+         'DF': [2, 'DownFlags',      1],
+         'DI': [2, 'DaemonIndex',   16],
+         'DS': [2, 'Dataset',        1],
+         'ER': [2, 'ERrormessage',   0],
+         'EV': [2, 'Environments',   1],
+         'FC': [2, 'FileCount',     17],
+         'HN': [2, 'HostName',       1],
+         'IF': [2, 'InputFile',      0],
+         'MC': [2, 'MaxCount',      17],
+         'MH': [2, 'MatchHost',      1],
+         'MO': [2, 'Modules',        1],
+         'PI': [2, 'ParentIndex',   17],
+         'PL': [2, 'ProcessLimit',  17],
+         'PO': [2, 'Priority',      17],
+         'PQ': [2, 'PBSQueue',       0],
+         'QS': [2, 'QSubOptions',    0],
+         'SN': [2, 'Specialist',     1],
+         'ST': [2, 'Status',         0],
+         'SZ': [2, 'DataSize',      16],
+         'TC': [2, 'TryCount',      17],
+         'WD': [2, 'WorkDir',        0],
       })
       self.ALIAS.update({
-         'AN' : ['Action'],
-         'BG' : ['b'],
-         'CF' : ['Confirmation', 'ConfirmAction'],
-         'CM' : ['CommandName'],
-         'DL' : ['RM', 'Remove'],
-         'DS' : ['Dsid', 'DatasetID'],
-         'DV' : ['Delimiter', 'Separater'],
-         'EV' : ['Envs'],
-         'GZ' : ['GMT', 'GreenwichZone', 'UTC'],
-         'MC' : ['MaximumCount', 'MaxTryCount'],
-         'MH' : ['MatchHostname'],
-         'NC' : ['NoRemoteCommand'],
-         'MO' : ['Mods'],
-         'PI' : ['ParentCheckIndex'],
-         'QS' : ['PBSOptions'],
-         'SO' : ['SetBatchOptions'],
-         'SZ' : ['Size', "ProcSize"],
-         'UL' : ['UnLock'],
-         'WD' : ["WorkDirectory"],
-         'WR' : ["WithRequest"],
-         'WU' : ["WithUpdate"],
+         'AN': ['Action'],
+         'BG': ['b'],
+         'CF': ['Confirmation', 'ConfirmAction'],
+         'CM': ['CommandName'],
+         'DL': ['RM', 'Remove'],
+         'DS': ['Dsid', 'DatasetID'],
+         'DV': ['Delimiter', 'Separater'],
+         'EV': ['Envs'],
+         'GZ': ['GMT', 'GreenwichZone', 'UTC'],
+         'MC': ['MaximumCount', 'MaxTryCount'],
+         'MH': ['MatchHostname'],
+         'NC': ['NoRemoteCommand'],
+         'MO': ['Mods'],
+         'PI': ['ParentCheckIndex'],
+         'QS': ['PBSOptions'],
+         'SO': ['SetBatchOptions'],
+         'SZ': ['Size', "ProcSize"],
+         'UL': ['UnLock'],
+         'WD': ["WorkDirectory"],
+         'WR': ["WithRequest"],
+         'WU': ["WithUpdate"],
       })
       self.TBLHASH['dscheck'] = {
         #SHORTNM KEYS DBFIELD
-         'C' : ['CI', "cindex",         0],
-         'O' : ['CM', "command",        1],
-         'V' : ['AV', "argv",           1],
-         'T' : ['DS', "dsid",           1],
-         'A' : ['AN', "action",         1],
-         'U' : ['ST', "status",         1],
-         'P' : ['PQ', "pbsqueue",       1],
-         'R' : ['PI', "pindex",         0],
-         'B' : ['DF', "dflags",         0],
-         'F' : ['FC', "fcount",         0],
-         'J' : ['DC', "dcount",         0],
-         'K' : ['TC', "tcount",         0],
-         'L' : ['MC', "mcount",         0],
-         'Z' : ['SZ', "size",           0],
-         'D' : ['CD', "date",           1],
-         'Y' : ['CT', "time",           1],
-         'H' : ['HN', "hostname",       1],
-         'N' : ['SN', "specialist",     1],
-         'W' : ['WD', "workdir",        1],
-         'M' : ['MO', "modules",        1],
-         'I' : ['EV', "environments",   1],
-         'Q' : ['QS', "qoptions",       1],
-         'X' : ['AX', "argextra",      -1],
-         'E' : ['ER', "errmsg",        -1],
+         'C': ['CI', "cindex",         0],
+         'O': ['CM', "command",        1],
+         'V': ['AV', "argv",           1],
+         'T': ['DS', "dsid",           1],
+         'A': ['AN', "action",         1],
+         'U': ['ST', "status",         1],
+         'P': ['PQ', "pbsqueue",       1],
+         'R': ['PI', "pindex",         0],
+         'B': ['DF', "dflags",         0],
+         'F': ['FC', "fcount",         0],
+         'J': ['DC', "dcount",         0],
+         'K': ['TC', "tcount",         0],
+         'L': ['MC', "mcount",         0],
+         'Z': ['SZ', "size",           0],
+         'D': ['CD', "date",           1],
+         'Y': ['CT', "time",           1],
+         'H': ['HN', "hostname",       1],
+         'N': ['SN', "specialist",     1],
+         'W': ['WD', "workdir",        1],
+         'M': ['MO', "modules",        1],
+         'I': ['EV', "environments",   1],
+         'Q': ['QS', "qoptions",       1],
+         'X': ['AX', "argextra",      -1],
+         'E': ['ER', "errmsg",        -1],
       }
       self.TBLHASH['dsdaemon'] = {
         #SHORTNM KEYS DBFIELD
-         'I' : ['DI', "dindex",         0],
-         'C' : ['CM', "command",        1],
-         'H' : ['HN', "hostname",       1],
-         'M' : ['MH', "matchhost",      1],
-         'S' : ['SN', "specialist",     1],
-         'P' : ['PL', "proclimit",      0],
-         'O' : ['PO', "priority",       0],
+         'I': ['DI', "dindex",         0],
+         'C': ['CM', "command",        1],
+         'H': ['HN', "hostname",       1],
+         'M': ['MH', "matchhost",      1],
+         'S': ['SN', "specialist",     1],
+         'P': ['PL', "proclimit",      0],
+         'O': ['PO', "priority",       0],
       }
       self.CHKHOST = {
-         'curhost' : self.get_host(1),
-         'chkhost' : None,
-         'hostcond' : None,
-         'isbatch' : 0
+         'curhost': self.get_host(1),
+         'chkhost': None,
+         'hostcond': None,
+         'isbatch': 0
       }
       self.PGOPT['dscheck']   = "COVTUPFJDNW"            # default
       self.PGOPT['chkall']    = "COVTAUPRBFJKLZDYHNWMIQXE"   # default to all   
       self.PGOPT['dsdaemon']  = "ICHQSPO"                 # default to all
       self.PGOPT['waitlimit'] = 280      # limit of C and P request checks at a time
       self.PGOPT['totallimit'] = 380     # maximum number of checks can be started on PBS
-      self.PBSQUEUES = {'rda' : None, 'htc' : 'casper@casper-pbs'}
-      self.PBSTIMES = {'default' : 21600, 'rda' : self.PGLOG['PBSTIME'], 'htc' : 86400}
-      #self.DOPTHOSTS = {'rda-work' : None, 'PBS' : ['!subconv -Q']}
-      self.DOPTHOSTS = {'rda-work' : None, 'PBS' : None, 'cron' : None}
+      self.PBSQUEUES = {'rda': None, 'htc': 'casper@casper-pbs'}
+      self.PBSTIMES = {'default': 21600, 'rda': self.PGLOG['PBSTIME'], 'htc': 86400}
       self.DSLMTS = {}
       self.EMLMTS = {}
 
@@ -280,7 +278,7 @@ class PgCheck(PgOPT, PgCMD):
          self.PLIMITS[ckey] = 0
          return 0
       j = 0
-      self.PLIMITS[ckey] = {'host' : [], 'priority' : [], 'acnt' : [], 'match' : [], 'pcnd' : []}
+      self.PLIMITS[ckey] = {'host': [], 'priority': [], 'acnt': [], 'match': [], 'pcnd': []}
       for i in range(cnt):
          if pgrecs['proclimit'][i] <= 0: continue
          host = pgrecs['hostname'][i]
@@ -366,7 +364,7 @@ class PgCheck(PgOPT, PgCMD):
             else:
                self.update_dscheck_time(pgrec, ltime, logact)
          elif not pgrec['lockhost'] or pgrec['lockhost'] == 'rda_config':
-            record = {'pid' : 0, 'lockhost' : ''}
+            record = {'pid': 0, 'lockhost': ''}
             if self.pgupdt("dscheck", record, "cindex = {} AND pid = {}".format(cidx, pgrec['pid']), logact):
                self.pglog("CHK{}: unlocked {}".format(cidx, lmsg), self.LOGWRN)
                lcnt += 1
@@ -398,7 +396,7 @@ class PgCheck(PgOPT, PgCMD):
    # update dscheck time in case in pending status or
    # the command does not updateupdates not on time by itself
    def update_dscheck_time(self, pgrec, ltime, logact = 0):
-      record = {'chktime' : ltime}
+      record = {'chktime': ltime}
       if(self.CHKHOST['chkhost'] and self.CHKHOST['chkhost'] == self.PGLOG['PBSNAME']
          and pgrec['lockhost'] == self.PGLOG['PBSNAME']):
          info = self.get_pbs_info(pgrec['pid'], 0, logact)
@@ -756,7 +754,7 @@ class PgCheck(PgOPT, PgCMD):
          newrec['stttime'] > pgrec['stttime'] or newrec['tcount'] > pgrec['tcount']): return 1
       if self.lock_dscheck(pgrec['cindex'], 1) <= 0: return 1
       if pgrec['subtime'] or pgrec['stttime']:
-         newrec = {'stttime' : 0, 'subtime' : 0, 'runhost' : '', 'bid' : 0}
+         newrec = {'stttime': 0, 'subtime': 0, 'runhost': '', 'bid': 0}
          (newrec['ttltime'], newrec['quetime']) = self.get_dscheck_runtime(pgrec)
          if not self.pgupdt("dscheck", newrec, "cindex = {}".format(pgrec['cindex']), logact): return 1
       return 0
@@ -808,7 +806,7 @@ class PgCheck(PgOPT, PgCMD):
    def validate_dsrqst_partitions(self, pgrec, logact = 0):
       pgctl = self.get_dsrqst_control(pgrec, logact)
       if pgctl and (pgctl['ptlimit'] or pgctl['ptsize']): return True
-      record = {'ptcount' : 1}
+      record = {'ptcount': 1}
       pgrec['ptcount'] = 1
       if pgrec['ptlimit']: pgrec['ptlimit'] = record['ptlimit'] = 0
       if pgrec['ptsize']: pgrec['ptsize'] = record['ptsize'] = 0
@@ -816,19 +814,16 @@ class PgCheck(PgOPT, PgCMD):
       return False
 
    # call given command to evaluate dynamically the dscheck.qoptions
-   def set_dscheck_options(self, chost, cnd, logact):
-      if chost not in self.DOPTHOSTS: return
+   def set_dscheck_options(self, cnd, logact):
       qcnt = 0
-      skipcmds = self.DOPTHOSTS[chost]
       pgrecs = self.pgmget("dscheck", "*", cnd + "pid = 0 AND status = 'C' AND LEFT(qoptions, 1) = '!'", logact)
       cnt = len(pgrecs['cindex']) if pgrecs else 0
       for i in range(cnt):
          pgrec = self.onerecord(pgrecs, i)
-         if skipcmds and pgrec['qoptions'] in skipcmds: continue   # skip
          if self.lock_dscheck(pgrec['cindex'], 1) <= 0: continue
          qoptions = self.build_dscheck_options(pgrec, 'qoptions', 'PBS')
          if not qoptions and pgrec['status'] == 'E': continue  # failed evaluating qoptions
-         record = {'pid' : 0, 'qoptions': qoptions}
+         record = {'pid': 0, 'qoptions': qoptions}
          qcnt += self.pgupdt('dscheck', record, "cindex = {}".format(pgrec['cindex']), self.PGOPT['errlog'])
       if qcnt and cnt > 1: self.pglog("{} of {} DSCHECK PBS options Dynamically set on {}".format(qcnt, cnt, self.PGLOG['HOSTNAME']), self.WARNLG)
 
@@ -927,7 +922,7 @@ class PgCheck(PgOPT, PgCMD):
                self.pglog("Rqst{}: time updated for {}".format(ridx, lmsg), self.LOGWRN|self.FRCLOG)
          elif(not pgrec['lockhost'] or pgrec['lockhost'] == 'rda_config' or pgrec['lockhost'] == 'partition' and
               not self.pgget('ptrqst', '', "rindex = {} AND pid > 0".format(ridx), logact)):
-            record = {'pid' : 0, 'lockhost' : ''}
+            record = {'pid': 0, 'lockhost': ''}
             if self.pgupdt("dsrqst", record, "rindex = {} AND pid = {}".format(ridx, pgrec['pid']), logact):
                self.pglog("Rqst{}: unlocked {}".format(ridx, pgrec['lockhost'], pgrec['pid'], self.current_datetime(ltime)), self.LOGWRN)
                lcnt += 1
@@ -956,7 +951,7 @@ class PgCheck(PgOPT, PgCMD):
                not self.pgget("dscheck", "", "oindex = {} AND command = 'dsrqst' AND otype = 'P'".format(pidx))):
                self.pglog("RPT{}: time updated for {}".format(pidx, lmsg), self.LOGWRN)
          elif not pgrec['lockhost'] or pgrec['lockhost'] == 'rda_config':
-            record = {'pid' : 0, 'lockhost' : ''}
+            record = {'pid': 0, 'lockhost': ''}
             if self.pgupdt("ptrqst", record, "pindex = {} AND pid = {}".format(pidx, pgrec['pid']), logact):
                self.pglog("RPT{}: unlocked {}".format(pidx, lmsg), self.LOGWRN)
                lcnt += 1
@@ -973,7 +968,7 @@ class PgCheck(PgOPT, PgCMD):
       cnd += " OR status = 'O' AND (date_purge < '{}' OR date_purge = '{}' AND time_purge < '{}')) ORDER BY rindex".format(sdate, sdate, stime)                   
       pgrecs = self.pgmget("dsrqst", "rindex, dsid, email, specialist", cnd, logact)
       cnt = (len(pgrecs['rindex']) if pgrecs else 0)
-      pgctl = {'qoptions' : "-l walltime=1:00:00"}
+      pgctl = {'qoptions': "-l walltime=1:00:00"}
       pcnt = 0
       for i in range(cnt):
          pgrec = self.onerecord(pgrecs, i)
@@ -1099,7 +1094,7 @@ class PgCheck(PgOPT, PgCMD):
                not self.pgget("dscheck", "", "oindex = {} AND command = 'dsupdt'".format(idx))):
                self.pglog("UC{}: time updated for {}".format(idx, lmsg), self.LOGWRN)
          elif not pgrec['lockhost'] or pgrec['lockhost'] == 'rda_config':
-            record = {'pid' : 0, 'lockhost' : ''}
+            record = {'pid': 0, 'lockhost': ''}
             if self.pgupdt("dcupdt", record, "cindex = {} AND pid = {}".format(idx, pgrec['pid']), logact):
                self.pglog("UC{}: unlocked {}".format(idx, lmsg), self.LOGWRN)
                lcnt += 1
@@ -1124,7 +1119,7 @@ class PgCheck(PgOPT, PgCMD):
                continue
             self.pgexec("UPDATE dlupdt SET locktime = {} WHERE lindex = {} AND pid = {}".format(ltime, idx, pgrec['pid']), logact)
          elif not pgrec['hostname'] or pgrec['hostname'] == 'rda_config':
-            record = {'pid' : 0, 'hostname' : ''}
+            record = {'pid': 0, 'hostname': ''}
             if self.pgupdt("dlupdt", record, "lindex = {} AND pid = {}".format(idx, pgrec['pid']), logact):
                self.pglog("Updt{}: unlocked {}".format(idx, lmsg), self.LOGWRN)
                lcnt += 1
@@ -1188,8 +1183,8 @@ class PgCheck(PgOPT, PgCMD):
          argv = argv[0:100]
       else:
          argextra = None
-      record = {'command' : cmd, 'argv' : argv, 'specialist' : specialist, 'workdir' : workdir,
-                'dsid' : dsid, 'action' : action, 'oindex' : oindex, 'otype' : otype}
+      record = {'command': cmd, 'argv': argv, 'specialist': specialist, 'workdir': workdir,
+                'dsid': dsid, 'action': action, 'oindex': oindex, 'otype': otype}
       (record['date'], record['time']) = self.get_date_time()
       if argextra: record['argextra'] = argextra
       if 'PI' in self.params: record['pindex'] = self.params['PI'][0]
@@ -1225,16 +1220,16 @@ class PgCheck(PgOPT, PgCMD):
    @staticmethod
    def dscheck_status(stat):
       STATUS = {
-         'C' : "Created",
-         'D' : "Done",
-         'E' : "Exit",
-         'F' : "Finished",
-         'H' : "Held",
-         'I' : "Interrupted",
-         'P' : "Pending",
-         'Q' : "Queueing",
-         'R' : "Run",
-         'S' : "Suspended",
+         'C': "Created",
+         'D': "Done",
+         'E': "Exit",
+         'F': "Finished",
+         'H': "Held",
+         'I': "Interrupted",
+         'P': "Pending",
+         'Q': "Queueing",
+         'R': "Run",
+         'S': "Suspended",
       }
       return (STATUS[stat] if stat in STATUS else "Unknown")
 

{rda_python_dscheck-2.0.0 → rda_python_dscheck-2.0.2}/src/rda_python_dscheck.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_dscheck
-Version: 2.0.0
+Version: 2.0.2
 Summary: RDA python package to add and process batch jobs
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-dscheck