rda-python-metrics 1.0.43__tar.gz → 1.0.45__tar.gz

{rda_python_metrics-1.0.43/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.45}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.43
+Version: 1.0.45
 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.43 → rda_python_metrics-1.0.45}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_metrics"
-version = "1.0.43"
+version = "1.0.45"
 authors = [
   { name="Zaihua Ji",  email="zji@ucar.edu" },
 ]
@@ -25,7 +25,8 @@ dependencies = [
   "geoip2",
   "ipinfo",
   "httplib2",
-  "dnspython"
+  "dnspython",
+  "unidecode"
 ]
 
 [tool.pytest.ini_options]

{rda_python_metrics-1.0.43 → rda_python_metrics-1.0.45}/src/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-1.0.43 → rda_python_metrics-1.0.45}/src/rda_python_metrics/fillglobususage.py

@@ -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-1.0.43 → rda_python_metrics-1.0.45}/src/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-1.0.43 → rda_python_metrics-1.0.45}/src/rda_python_metrics/logarch.py

@@ -262,8 +262,9 @@ def archive_dssdb_log():
       if(not info or info['data_size'] < 10000): continue   # skip log files small than 10KB
 
       PgLOG.pgsystem("cp -p -f {} backup/{}".format(file, file), PgLOG.LWEMEX, 5)
-      if info['logname'] != PgLOG.PGLOG['RDAUSER']: PgLOG.pgsystem("rm -rf " + file)
+      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.43 → rda_python_metrics-1.0.45/src/rda_python_metrics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.43
+Version: 1.0.45
 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.43 → rda_python_metrics-1.0.45}/src/rda_python_metrics.egg-info/requires.txt

@@ -4,3 +4,4 @@ geoip2
 ipinfo
 httplib2
 dnspython
+unidecode