rda-python-metrics 1.0.44__py3-none-any.whl → 1.0.46__py3-none-any.whl

rda_python_metrics/fillcdgusage.py

@@ -86,7 +86,12 @@ DSIDS = {
    'ucar.cgd.cesm2.marine.biogeochemistry': ['d651071'],
    'ucar.cgd.nw2.mom6': ['d651072'],
    'ucar.cgd.cesm2.cam6.ppe': ['d651076'],
-   'ucar.cgd.cesm2.smyle': ['d651065']
+   'ucar.cgd.cesm2.smyle': ['d651065'],
+# new added
+   'gridded_precip_and_temp' : ['d010078'],
+   '29_newman' : ['d010079'],
+   'waccm-x.ion.asymmetry' : ['d010081'],
+   'NARCCAP' : ['d316015']   
 }
 
 ALLIDS = list(DSIDS.keys())

rda_python_metrics/fillglobususage.py

@@ -27,7 +27,7 @@ from . import PgIPInfo
 
 USAGE = {
    'PGTBL'  : "wusage",
-   'GBSDIR' : PgLOG.PGLOG["DSSDATA"] + "/work/logs/gridftp/",
+   'GBSDIR' : PgLOG.PGLOG["GDEXWORK"] + "/logs/gridftp/",
    'GBSLOG' : "access_log_gridftp0{}_{}",
 }
 
@@ -43,7 +43,7 @@ def main():
    
 
    for arg in argv:
-      ms = re.match(r'^-(b|d|p|N)$', arg)
+      ms = re.match(r'^-(b|d|f|p|N)$', arg)
       if ms:
          opt = ms.group(1)
          if opt == 'b':
@@ -80,7 +80,9 @@ def main():
 def get_log_file_names(option, params, datelimits):
 
    filenames = []
-   if option == 'd':
+   if option == 'f':
+      filenames = params
+   elif option == 'd':
       for pdate in params:
          fdate = PgUtil.format_date(pdate, 'MMDDYYYY')
          fname = USAGE['GBSLOG'].format('?', fdate)

rda_python_metrics/fillglobususage.usg

@@ -3,14 +3,16 @@
    /gpfs/fs1/collections/rda/work/logs/gridftp/ to fill table 'wusage' in
    database 'rdadb'.
 
- Usage: fillglobususage [-b] [-d LogFileDates] [-N NumberDay] [-p BeginDate [Enddate]]
+ Usage: fillglobususage [-b] [-d LogFileDates] [-f LogFileNames] [-N NumberDay] [-p BeginDate [Enddate]]
 
-      select option, -d, -N or -p to run this application.
+      select option, -d, -f, -N or -p to run this application.
 
       - Option -b, log process information into logfile only;
 
       - Option -d, retrieve usage info from given log file dates; 
 
+      - Option -f, retrieve usage info from given log file names; 
+
       - Option -N, retrieve usage info in recent NumberDay days;
 
       - Option -p, retrieve usage info between given period. For missing EndDate,

rda_python_metrics/fillosdfusage.py

@@ -23,7 +23,7 @@ from . import PgIPInfo
 
 USAGE = {
    'OSDFTBL'  : "osdfusage",
-   'OSDFDIR' : PgLOG.PGLOG["DSSDATA"] + "/work/zji/osdflogs/",
+   'OSDFDIR' : PgLOG.PGLOG["GDEXWORK"] + "/zji/osdflogs/",
    'OSDFGET' : 'wget -m -nH -np -nd https://pelicanplatform.org/pelican-access-logs/ncar-access-log/',
    'OSDFLOG' : "{}-cache.log",   # YYYY-MM-DD-cache.log
 }

rda_python_metrics/logarch.py

@@ -264,6 +264,7 @@ def archive_dssdb_log():
       PgLOG.pgsystem("cp -p -f {} backup/{}".format(file, file), PgLOG.LWEMEX, 5)
       if info['logname'] != PgLOG.PGLOG['GDEXUSER']: PgLOG.pgsystem("rm -rf " + file)
       PgLOG.pgsystem("cat /dev/null > " + file, 0, 1024)
+      if file == 'gdexls.log': PgLOG.pgsystem("chmod 666 " + file, 0, 1024)
       if op.exists(logfile):
          PgLOG.pgsystem("tar -uvf {} -C backup {}".format(logfile, file), PgLOG.LWEMEX, 5)
       else:

{rda_python_metrics-1.0.44.dist-info → rda_python_metrics-1.0.46.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.44
+Version: 1.0.46
 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
@@ -17,6 +17,7 @@ Requires-Dist: geoip2
 Requires-Dist: ipinfo
 Requires-Dist: httplib2
 Requires-Dist: dnspython
+Requires-Dist: unidecode
 Dynamic: license-file
 
 RDA Python Package to gather and view data usage metrics.

{rda_python_metrics-1.0.44.dist-info → rda_python_metrics-1.0.46.dist-info}/RECORD

@@ -3,7 +3,7 @@ rda_python_metrics/PgView.py,sha256=r6otb3DjfiaQJdg0z8bZQAOlhr4JnrXJzp9wgWh_8qQ,
 rda_python_metrics/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
 rda_python_metrics/fillawsusage.py,sha256=bylk7m8VJyXMZMZwyPkU3rQqIdttjkeo8aTYeneqMDQ,7073
 rda_python_metrics/fillawsusage.usg,sha256=-lLTRLTaEPL2rSQ4mhpIekhyYrLGahy7NWtaq_8PCDM,611
-rda_python_metrics/fillcdgusage.py,sha256=LplVm16Ct9HPpfabC16FO5ZFQBntKjqkuvt30H2dAPs,16714
+rda_python_metrics/fillcdgusage.py,sha256=bbqzO_szzRV1be17Ha502CSC2YJZ7xnA1FokAN3luP0,16873
 rda_python_metrics/fillcdgusage.usg,sha256=5lkd4Zdi72nQcha-JtbaLnxl66V4wBDykKwQtUOtMrw,667
 rda_python_metrics/fillcodusage.py,sha256=_RUcgY1Cf17dSjidhQCMOwVaPO1VL26s3bYGT8oSPWU,8322
 rda_python_metrics/fillcodusage.usg,sha256=3B5IkQ4uwylqY8uEfUdnZ_MXqhYudeylMp5ulhUGXH8,678
@@ -11,13 +11,13 @@ rda_python_metrics/fillcountry.py,sha256=7i5LNi3scRoyRCT6t7aeNTGKOpxzJ2mA9tnvUqj
 rda_python_metrics/fillendtime.py,sha256=skZttlpoY19g0dGwqGQI8t_1YPPTPEXwg3EfNlfL90I,2533
 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=zuxzoeV9BAMoVUu_VCYECPddYNrBWpV74kkYpyqIQhg,8443
-rda_python_metrics/fillglobususage.usg,sha256=1GgmCP22IQZdADwL5Mmkz3v8Ws-G7U3teQ1AxRJfV_4,637
+rda_python_metrics/fillglobususage.py,sha256=q4RoGdsu1njEEKIB20_3-7KN0WivxVpbIq6_NUGJG8o,8489
+rda_python_metrics/fillglobususage.usg,sha256=mgo6LPFTJNy5h7codAA_HK0JSmrV_QvAcH-t_gJHVBE,727
 rda_python_metrics/fillipinfo.py,sha256=BrboxAIs8Q5jhz_4GYW_GibMT5GyEbnQkYfFR8hc_yo,6747
 rda_python_metrics/fillipinfo.usg,sha256=YeCR58xGv0emqHUZ_9R977HrqaeBwbd6j5QRF2Lc7TA,702
 rda_python_metrics/filloneorder.py,sha256=ADHbcKCDh9bJunnxYbkbjwU2QpC43hvGlLWaURHNxkg,5433
 rda_python_metrics/filloneorder.usg,sha256=mtOySKx6-D4k2bbTcmi6cSYtINiycRyHQkHozi0CQu0,1466
-rda_python_metrics/fillosdfusage.py,sha256=--c6PzeZ6EZXpb0zxy4lZCDjwwIBb7c6xgP7QCKLoMQ,7087
+rda_python_metrics/fillosdfusage.py,sha256=osl2jdbDrh5l2H19Aw8LN-drSTV1NAKPc_cKdWIJSQU,7083
 rda_python_metrics/fillosdfusage.usg,sha256=Qc5YdUuOiAH74FfVdkwkrQRDYXcASVbxMdBsVQj4X1k,635
 rda_python_metrics/fillrdadb.py,sha256=5OIzLUo-MHWVIA3sQE7CRMQSW8tX9PH7DocDy4rvbYA,5282
 rda_python_metrics/fillrdadb.usg,sha256=E_Bf4G8yVABogjRmIOaIbTGgnII2W6RltaFad2XEV2Q,1228
@@ -26,7 +26,7 @@ rda_python_metrics/filltdsusage.usg,sha256=yqTHRe8WpZWpu3gso_obgt6LO41-JC27rTIDf
 rda_python_metrics/filluser.py,sha256=CvaMRaUPaR9nxJAExkLTb3Ci4sD7RQMOpWhWJdbyMF0,8907
 rda_python_metrics/filluser.usg,sha256=Xgqi0QwA9-4jpYj3L4Q4TISpVwRlsomt2G7T0oYAFak,520
 rda_python_metrics/fillzenodousage.py,sha256=wZiHs_cD061sUwTM0zujSkddUKtzACR1l2UG7smOioA,13212
-rda_python_metrics/logarch.py,sha256=DrKwBUIdyRNtiE-mWvD3_YjXDSCtqqqsehMkt0bDdPc,13897
+rda_python_metrics/logarch.py,sha256=6RQLKzNChoQeZmEyBjukUNOsmQOXzCSLrn6V9fV85J4,13973
 rda_python_metrics/logarch.usg,sha256=6ksFxu_-lzhRpQE2YFAqgGVhwFP4PTweCbFBuGhhICU,960
 rda_python_metrics/pgperson.py,sha256=4XTDnVBFyF9drzx2I_DGCxQ-8I1bpclqTuQvOx3wST4,2088
 rda_python_metrics/pgsyspath.py,sha256=DZhFp-r-LzN0qrHtfdCYfnGDnmD_R4ufuEduk0_vRIw,1039
@@ -51,9 +51,9 @@ rda_python_metrics/viewwebfile.py,sha256=HSMNkQQawonu6W3blV7g9UbJuNy9VAOn9COqgmj
 rda_python_metrics/viewwebfile.usg,sha256=lTNi8Yu8BUJuExEDJX-vsJyWUSUIQTS-DiiBEVFo33s,10054
 rda_python_metrics/viewwebusage.py,sha256=ES2lI8NaCeCpTGi94HU-cDRBxHMiUBbplyYsZf2KqF0,16650
 rda_python_metrics/viewwebusage.usg,sha256=OVDZ78p87E3HLW34ZhasNJ7Zmw8XXjmZPPWZfRhPLXo,9936
-rda_python_metrics-1.0.44.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-1.0.44.dist-info/METADATA,sha256=dLs-hpvmeQcwctc2CcWJzAMuNIq71xYUzY6Vo6G25y8,761
-rda_python_metrics-1.0.44.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_metrics-1.0.44.dist-info/entry_points.txt,sha256=fv4wjyEdiLFYNaJzhmet0SxZcF_J6M42koft2Na1XMs,1403
-rda_python_metrics-1.0.44.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-1.0.44.dist-info/RECORD,,
+rda_python_metrics-1.0.46.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-1.0.46.dist-info/METADATA,sha256=EKyf_eq-mCqY18vi3MiJHlSh9Tqq2z-mLeCUlfFMjcA,786
+rda_python_metrics-1.0.46.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_metrics-1.0.46.dist-info/entry_points.txt,sha256=fv4wjyEdiLFYNaJzhmet0SxZcF_J6M42koft2Na1XMs,1403
+rda_python_metrics-1.0.46.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-1.0.46.dist-info/RECORD,,