rda-python-metrics 2.0.4__py3-none-any.whl → 2.0.5__py3-none-any.whl

rda_python_metrics/fillawsusage.py

@@ -20,7 +20,7 @@ from .pg_ipinfo import PgIPInfo
 class FillAWSUsage(PgIPInfo, PgFile):
 
    def __init__(self):
-      super().__init()
+      super().__init__()
       self.USAGE = {
          'PGTBL'  : "awsusage",
          'AWSDIR' : self.PGLOG["TRANSFER"] + "/AWSera5log",

rda_python_metrics/fillcdgusage.py

@@ -19,7 +19,7 @@ from .pg_ipinfo import PgIPInfo
 class FillCDGUsage(PgSplit, PgIPInfo):
 
    def __init__(self):
-      super().__init()
+      super().__init__()
       self.USAGE = {
          'TDSTBL'  : "tdsusage",
          'WEBTBL'  : "wusage",

rda_python_metrics/fillcodusage.py

@@ -19,7 +19,7 @@ from .pg_ipinfo import PgIPInfo
 class FillCODUsage(PgIPInfo):
 
    def __init__(self):
-      super().__init()
+      super().__init__()
       # the define options for gathering COD data usage, one at a time
       self.MONTH = 0x02  # fet COD data usages for given months
       self.YEARS = 0x04  # get COD data usages for given years

rda_python_metrics/fillglobususage.py

@@ -21,7 +21,7 @@ from .pg_ipinfo import PgIPInfo
 class FillGlobusUsage(PgIPInfo, PgSplit, PgFile):
 
    def __init__(self):
-      super().__init()
+      super().__init__()
       self.USAGE = {
          'PGTBL'  : "wusage",
          'GBSDIR' : self.PGLOG["GDEXWORK"] + "/logs/gridftp/",

rda_python_metrics/fillrdadb.py

@@ -13,8 +13,9 @@
 import sys
 import re
 from rda_python_common.pg_util import PgUtil
+from rda_python_common.pg_dbi import PgDBI
 
-class FillRDADB(PgUtil):
+class FillRDADB(PgUtil, PgDBI):
 
    def __init__(self):
       super().__init__()
@@ -33,90 +34,90 @@ class FillRDADB(PgUtil):
       }
       self.params = []   # array of input values
 
-# function to read parameters
-def read_paramers(self):
-   argv = sys.argv[1:]
-   for arg in argv:
-      if arg == "-b":
-         self.PGLOG['BCKGRND'] = "-b"
-         self.RDADB['BCKGRND'] = " -b"
-      elif arg == "-n":
-         self.RDADB['DOMAIL'] = 0
-         self.PGLOG['LOGMASK'] &= ~(self.EMLALL)
-      elif re.match(r'^-[cdmNy]$', arg) and not self.RDADB['OPTVAL']:
-         self.RDADB['OPTVAL'] = arg
-         if arg == "-c":
-            self.RDADB['OPTION'] |= self.CLNFL
-         elif arg == "-d":
-            self.RDADB['OPTION'] |= self.DATES
-         elif arg == "-m":
-            self.RDADB['OPTION'] |= self.MONTH
-         elif arg == "-y":
-            self.RDADB['OPTION'] |= self.YEARS
-         elif arg == "-N":
-            self.RDADB['OPTION'] |= self.NDAYS
-      elif re.match(r'^-.*', arg):
-         self.pglog(arg + ": Invalid Option", self.LGWNEX)
+   # function to read parameters
+   def read_parameters(self):
+      argv = sys.argv[1:]
+      for arg in argv:
+         if arg == "-b":
+            self.PGLOG['BCKGRND'] = "-b"
+            self.RDADB['BCKGRND'] = " -b"
+         elif arg == "-n":
+            self.RDADB['DOMAIL'] = 0
+            self.PGLOG['LOGMASK'] &= ~(self.EMLALL)
+         elif re.match(r'^-[cdmNy]$', arg) and not self.RDADB['OPTVAL']:
+            self.RDADB['OPTVAL'] = arg
+            if arg == "-c":
+               self.RDADB['OPTION'] |= self.CLNFL
+            elif arg == "-d":
+               self.RDADB['OPTION'] |= self.DATES
+            elif arg == "-m":
+               self.RDADB['OPTION'] |= self.MONTH
+            elif arg == "-y":
+               self.RDADB['OPTION'] |= self.YEARS
+            elif arg == "-N":
+               self.RDADB['OPTION'] |= self.NDAYS
+         elif re.match(r'^-.*', arg):
+            self.pglog(arg + ": Invalid Option", self.LGWNEX)
+         elif self.RDADB['OPTION']&self.MASKS:
+            self.params.append(arg)
+         else:
+            self.pglog(arg + ": Invalid Parameter", self.LGWNEX)
+      if not self.RDADB['OPTION'] or (self.RDADB['OPTION']&self.MASKS and not self.params):
+         self.show_usage('fillrdadb')
+      self.cmdlog("fillrdadb {}".format(' '.join(argv)))
+   
+   # function to start actions
+   def start_actions(self):
+      self.dssdb_dbname()
+      if self.RDADB['OPTION']&self.CLNFL: # clean unused file only
+         self.clean_unused_files()
       elif self.RDADB['OPTION']&self.MASKS:
-         self.params.append(arg)
-      else:
-         self.pglog(arg + ": Invalid Parameter", self.LGWNEX)
-   if not self.RDADB['OPTION'] or (self.RDADB['OPTION']&self.MASKS and not self.params):
-      self.show_usage('fillrdadb')
-   self.cmdlog("fillrdadb {}".format(' '.join(argv)))
-
-# function to start actions
-def start_actions(self):
-   self.dssdb_dbname()
-   if self.RDADB['OPTION']&self.CLNFL: # clean unused file only
-      self.clean_unused_files()
-   elif self.RDADB['OPTION']&self.MASKS:
-      self.fill_rdadb(self.RDADB['OPTVAL'])
-
-# Fill self.RDADB info for given condition
-def fill_rdadb(self, option):
-   filecond = '{} {}'.format(option, ' '.join(self.params))
-   self.pglog("Filling self.RDADB info for '{}' at {}".format(filecond, self.current_datetime()), self.LOGWRN)
-   # fill available custom OPeNDAP usages
-   self.pgsystem("fillcodusage {} {}".format(self.RDADB['BCKGRND'], filecond), self.LGWNEM, 5)
-   # fill available globus web data usages
-   self.pgsystem("fillglobususage {} {}".format(self.RDADB['BCKGRND'], filecond), self.LGWNEM, 5)
-   # fill available AWS web data usages
-   self.pgsystem("fillawsusage {} {}".format(self.RDADB['BCKGRND'], filecond), self.LGWNEM, 5)
-   # fill available OSDF web data usages
-   self.pgsystem("fillosdfusage {} {}".format(self.RDADB['BCKGRND'], filecond), self.LGWNEM, 5)
-   if self.RDADB['DOMAIL']: self.send_email_notice()
-   self.pglog("End Filling self.RDADB info at {}".format(self.current_datetime()), self.LGWNEM)
-
-# clean unused MSS and Web files
-def clean_unused_files(self):
-   self.pglog("Check and clean deleted Web files that never been used at {}".format(self.current_datetime()), self.LOGWRN)
-   pgrecs = self.pgmget("wfile", "wid", "status = 'D'", self.LGWNEX)
-   allcnt = len(pgrecs['wid']) if pgrecs else 0
-   self.pglog("{} record(s) retrieved from Table 'wfile' at {}".format(allcnt, self.current_datetime()), self.LOGWRN)
-   procnt = delcnt = 0
-   if allcnt:
-      fcond = r"wid = {} AND org_type <> 'DSS' AND wuid_read = wuid"
-      for fid in pgrecs['wid']:
-         procnt += 1
-         if procnt%5000 == 0:
-            self.pglog("{}/{} record(s) processed/removed from Table 'wfile'".format(procnt, delcnt), self.WARNLG)
-         if not self.pgget("wusage, wuser", "", fcond.format(fid), self.LGWNEX):
-            # deleted web file never been used
-            delcnt += self.pgdel("wfile", "wid = {}".format(fid), self.LGWNEX)
-   self.pglog("{} record(s) removed from Table 'wfile' at {}".format(delcnt, self.current_datetime()), self.LOGWRN)
-
-# email notice of job done
-def send_email_notice(self):
-   msg = ("Hi All,\n\nself.RDADB weekly data usage gathering is done at {}.\n\n".format(self.current_datetime()) +
-          "Please Let me know if you notice any problem.\n\nThanks,\n\nHua\n")
-   pgrecs = self.pgmget("dssgrp", "logname", "email_flag = 'Y'", self.LGWNEX)
-   if pgrecs:
-      receiver = ""
-      for logname in pgrecs['logname']:
-         if receiver: receiver += ', '
-         receiver += (logname + "@ucar.edu")
-      self.send_email("self.RDADB Weekly Data Usage Gathered on " + self.curdate(), receiver, msg)
+         self.fill_rdadb(self.RDADB['OPTVAL'])
+   
+   # Fill self.RDADB info for given condition
+   def fill_rdadb(self, option):
+      filecond = '{} {}'.format(option, ' '.join(self.params))
+      self.pglog("Filling RDADB info for '{}' at {}".format(filecond, self.current_datetime()), self.LOGWRN)
+      # fill available custom OPeNDAP usages
+      self.pgsystem("fillcodusage {} {}".format(self.RDADB['BCKGRND'], filecond), self.LGWNEM, 5)
+      # fill available globus web data usages
+      self.pgsystem("fillglobususage {} {}".format(self.RDADB['BCKGRND'], filecond), self.LGWNEM, 5)
+      # fill available AWS web data usages
+      self.pgsystem("fillawsusage {} {}".format(self.RDADB['BCKGRND'], filecond), self.LGWNEM, 5)
+      # fill available OSDF web data usages
+      self.pgsystem("fillosdfusage {} {}".format(self.RDADB['BCKGRND'], filecond), self.LGWNEM, 5)
+      if self.RDADB['DOMAIL']: self.send_email_notice()
+      self.pglog("End Filling RDADB info at {}".format(self.current_datetime()), self.LGWNEM)
+   
+   # clean unused MSS and Web files
+   def clean_unused_files(self):
+      self.pglog("Check and clean deleted Web files that never been used at {}".format(self.current_datetime()), self.LOGWRN)
+      pgrecs = self.pgmget("wfile", "wid", "status = 'D'", self.LGWNEX)
+      allcnt = len(pgrecs['wid']) if pgrecs else 0
+      self.pglog("{} record(s) retrieved from Table 'wfile' at {}".format(allcnt, self.current_datetime()), self.LOGWRN)
+      procnt = delcnt = 0
+      if allcnt:
+         fcond = r"wid = {} AND org_type <> 'DSS' AND wuid_read = wuid"
+         for fid in pgrecs['wid']:
+            procnt += 1
+            if procnt%5000 == 0:
+               self.pglog("{}/{} record(s) processed/removed from Table 'wfile'".format(procnt, delcnt), self.WARNLG)
+            if not self.pgget("wusage, wuser", "", fcond.format(fid), self.LGWNEX):
+               # deleted web file never been used
+               delcnt += self.pgdel("wfile", "wid = {}".format(fid), self.LGWNEX)
+      self.pglog("{} record(s) removed from Table 'wfile' at {}".format(delcnt, self.current_datetime()), self.LOGWRN)
+   
+   # email notice of job done
+   def send_email_notice(self):
+      msg = ("Hi All,\n\nRDADB weekly data usage gathering is done at {}.\n\n".format(self.current_datetime()) +
+             "Please Let me know if you notice any problem.\n\nThanks,\n\nHua\n")
+      pgrecs = self.pgmget("dssgrp", "logname", "email_flag = 'Y'", self.LGWNEX)
+      if pgrecs:
+         receiver = ""
+         for logname in pgrecs['logname']:
+            if receiver: receiver += ', '
+            receiver += (logname + "@ucar.edu")
+         self.send_email("RDADB Weekly Data Usage Gathered on " + self.curdate(), receiver, msg)
 
 # main function to excecute this script
 def main():

{rda_python_metrics-2.0.4.dist-info → rda_python_metrics-2.0.5.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 2.0.4
+Version: 2.0.5
 Summary: RDA Python Package to gather and view data usage metrics
 Author-email: Zaihua Ji <zji@ucar.edu>
 Project-URL: Homepage, https://github.com/NCAR/rda-python-metrics

{rda_python_metrics-2.0.4.dist-info → rda_python_metrics-2.0.5.dist-info}/RECORD

@@ -13,17 +13,17 @@ rda_python_metrics/fill_osdfusage.py,sha256=lSSzQiQ3sElfT0c_IWcnhcJHfPaIsgzHCWo1
 rda_python_metrics/fill_rdadb.py,sha256=5OIzLUo-MHWVIA3sQE7CRMQSW8tX9PH7DocDy4rvbYA,5282
 rda_python_metrics/fill_tdsusage.py,sha256=HWcfnl226pGY2JigpJmMOr4k6Ddfu8pWky6J30QCEQI,10463
 rda_python_metrics/fill_user.py,sha256=CvaMRaUPaR9nxJAExkLTb3Ci4sD7RQMOpWhWJdbyMF0,8907
-rda_python_metrics/fillawsusage.py,sha256=pokixxcI7daD5nbpTYXdvzy5XXNuil5EjX-0qbQje9o,7809
+rda_python_metrics/fillawsusage.py,sha256=sCdrM7Rx0jJTkUTG3JELxpqhVs7_OK2sTpZ9LLFUNMA,7811
 rda_python_metrics/fillawsusage.usg,sha256=-lLTRLTaEPL2rSQ4mhpIekhyYrLGahy7NWtaq_8PCDM,611
-rda_python_metrics/fillcdgusage.py,sha256=gHIbdf96WncAbEvQHO3qydbkyvEPhLlkBCc0Va3QpXs,18639
+rda_python_metrics/fillcdgusage.py,sha256=wj-6LZb4AwiNXaeNjiXcHqigHmVlFxHyN14DPRCM1nw,18641
 rda_python_metrics/fillcdgusage.usg,sha256=5lkd4Zdi72nQcha-JtbaLnxl66V4wBDykKwQtUOtMrw,667
-rda_python_metrics/fillcodusage.py,sha256=525yvcRVwnsIheg7maJwt94g6eqPzR7EdM8bagfKyWI,9329
+rda_python_metrics/fillcodusage.py,sha256=ap-MrUlrppCYxVA9bRrTN3I-ZWDs285TDTxtc0zzhWE,9331
 rda_python_metrics/fillcodusage.usg,sha256=3B5IkQ4uwylqY8uEfUdnZ_MXqhYudeylMp5ulhUGXH8,678
 rda_python_metrics/fillcountry.py,sha256=QYQ3fShTsbiDW3pKLkuT4Pl-WGTiRy0S82ONhRi8zxo,2728
 rda_python_metrics/fillendtime.py,sha256=VLL8nTES_ijRqRKeU1Xj_a7zbZNUnYaE8jlSqcF8GYk,2453
 rda_python_metrics/fillgdexusage.py,sha256=9U8k2WykGAmnyKvY6ZiYqzpw9MXpE1fpyJUjFDMb_Fc,38258
 rda_python_metrics/fillgdexusage.usg,sha256=mVYtK0pIYmvma0skT-wXM-NOEpkN_i3E61UdWgQWLfs,648
-rda_python_metrics/fillglobususage.py,sha256=2k87on9RVlJEyRJ0i77HVfQ4H6z9VH5T0kvrecPWUtI,9478
+rda_python_metrics/fillglobususage.py,sha256=oT-1AKe6FVP2XUNHq7FTANzFf3UfuSgwX-Wm0MUHGps,9480
 rda_python_metrics/fillglobususage.usg,sha256=mgo6LPFTJNy5h7codAA_HK0JSmrV_QvAcH-t_gJHVBE,727
 rda_python_metrics/fillipinfo.py,sha256=93ojnj_EHKlgl9D85H83FuBU8dHnk85EtlslKb-nzLM,7696
 rda_python_metrics/fillipinfo.usg,sha256=YeCR58xGv0emqHUZ_9R977HrqaeBwbd6j5QRF2Lc7TA,702
@@ -31,7 +31,7 @@ rda_python_metrics/filloneorder.py,sha256=oiar5FFElBFoO9gUGd-MMdR-HNFfudfD1Cg4VK
 rda_python_metrics/filloneorder.usg,sha256=mtOySKx6-D4k2bbTcmi6cSYtINiycRyHQkHozi0CQu0,1466
 rda_python_metrics/fillosdfusage.py,sha256=TtRCP8sW1rXFTTOxddYbgxGcg3aZs7HhCgrQHDtc8SA,7977
 rda_python_metrics/fillosdfusage.usg,sha256=Qc5YdUuOiAH74FfVdkwkrQRDYXcASVbxMdBsVQj4X1k,635
-rda_python_metrics/fillrdadb.py,sha256=lbQ_hMssecJ1cP6dOUSu7sMhrMF6NDVSsUoZJUVPqgY,5669
+rda_python_metrics/fillrdadb.py,sha256=-HxCuOhLXSy2k7I0Y3mzPnD2fhwG8EN_nFp2N_1ggdk,5953
 rda_python_metrics/fillrdadb.usg,sha256=E_Bf4G8yVABogjRmIOaIbTGgnII2W6RltaFad2XEV2Q,1228
 rda_python_metrics/filltdsusage.py,sha256=xb-t4hXyPazJ7OzoBXPjUWIXC5lHxQKPd-o-wZeXcsE,8539
 rda_python_metrics/filltdsusage.usg,sha256=HhqJnju6iqKrsB7AQfdwDxXnZ_NOykkDA0vsKEso4xY,588
@@ -78,9 +78,9 @@ rda_python_metrics/viewwebfile.py,sha256=1BWXfwyWEOuftky5caRU-Y2bkyBvKwTYWo6SG4Q
 rda_python_metrics/viewwebfile.usg,sha256=lTNi8Yu8BUJuExEDJX-vsJyWUSUIQTS-DiiBEVFo33s,10054
 rda_python_metrics/viewwebusage.py,sha256=-huycTw5X-qgwMC_7IpW6Yg0KHJ4q-lHHdnOwnODxZA,18741
 rda_python_metrics/viewwebusage.usg,sha256=OVDZ78p87E3HLW34ZhasNJ7Zmw8XXjmZPPWZfRhPLXo,9936
-rda_python_metrics-2.0.4.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-2.0.4.dist-info/METADATA,sha256=_0ILgRUyyvvPJfM6O1dk34yoY4KBtBjTuQ3UuElbKpQ,785
-rda_python_metrics-2.0.4.dist-info/WHEEL,sha256=YCfwYGOYMi5Jhw2fU4yNgwErybb2IX5PEwBKV4ZbdBo,91
-rda_python_metrics-2.0.4.dist-info/entry_points.txt,sha256=fv4wjyEdiLFYNaJzhmet0SxZcF_J6M42koft2Na1XMs,1403
-rda_python_metrics-2.0.4.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-2.0.4.dist-info/RECORD,,
+rda_python_metrics-2.0.5.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-2.0.5.dist-info/METADATA,sha256=YWhwLmVzyx8XLpzxn6HLjdyzaeb_REYwDh389UDXwu8,785
+rda_python_metrics-2.0.5.dist-info/WHEEL,sha256=aeYiig01lYGDzBgS8HxWXOg3uV61G9ijOsup-k9o1sk,91
+rda_python_metrics-2.0.5.dist-info/entry_points.txt,sha256=fv4wjyEdiLFYNaJzhmet0SxZcF_J6M42koft2Na1XMs,1403
+rda_python_metrics-2.0.5.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-2.0.5.dist-info/RECORD,,

{rda_python_metrics-2.0.4.dist-info → rda_python_metrics-2.0.5.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (82.0.0)
+Generator: setuptools (82.0.1)
 Root-Is-Purelib: true
 Tag: py3-none-any