rda-python-metrics 1.0.42__tar.gz → 1.0.44__tar.gz

{rda_python_metrics-1.0.42/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.44}/PKG-INFO

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

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_metrics"
-version = "1.0.42"
+version = "1.0.44"
 authors = [
   { name="Zaihua Ji",  email="zji@ucar.edu" },
 ]

{rda_python_metrics-1.0.42 → rda_python_metrics-1.0.44}/src/rda_python_metrics/fillcdgusage.py

@@ -31,6 +31,8 @@ USAGE = {
 }
 
 DSIDS = {
+   'pi_cesm2_atm_river_analysis' : ['d010073'],
+   'na-cordex' : ['d316009'],
    'ucar.cgd.cesm2.cam6.prescribed_sst_amip' : ['d651010'],
    'ucar.cgd.ccsm4.CLM_LAND_ONLY' : ['d651011'],
    'ucar.cgd.artmip' : ['d651012', 'd651016', 'd651017', 'd651018'],

{rda_python_metrics-1.0.42 → rda_python_metrics-1.0.44}/src/rda_python_metrics/fillzenodousage.py

@@ -2,11 +2,11 @@
 #
 ###############################################################################
 #
-#     Title : fillgdexusage
+#     Title : fillzenodousage
 #    Author : Zaihua Ji,  zji@ucar.edu
 #      Date : 2025-04-14
-#   Purpose : python program to retrieve info from ZENODO Postgres database for GDS 
-#             file accesses and backup fill table tdsusage in PostgreSQL database dssdb.
+#   Purpose : python program to retrieve info from GDEX Postgres database for GDEX 
+#             file accesses and backup fill table gdexzenodo in PostgreSQL database dssdb.
 # 
 #    Github : https://github.com/NCAR/rda-python-metrics.git
 #
@@ -187,17 +187,17 @@ def main():
          PgLOG.pglog(arg + ": Value passed in without leading option", PgLOG.LGWNEX)
 
    if not opt:
-      PgLOG.show_usage('fillgdexusage')
+      PgLOG.show_usage('fillzenodousage')
    elif 's' not in params:
       PgLOG.pglog("-s: Missing dataset short name to gather ZENODO metrics", PgLOG.LGWNEX)
    elif len(params) < 2:
       PgLOG.pglog("-(m|N|y): Missing Month, NumberDays or Year to gather ZENODO metrics", PgLOG.LGWNEX)
       
    
-   PgLOG.cmdlog("fillgdexusage {}".format(' '.join(argv)))
+   PgLOG.cmdlog("fillzenodousage {}".format(' '.join(argv)))
    dranges = get_date_ranges(params)
    dsids = get_dataset_ids(params['s'])
-   if dranges and dsids: fill_gdex_usages(dsids, dranges)
+   if dranges and dsids: fill_zenodo_usages(dsids, dranges)
    PgLOG.pglog(None, PgLOG.LOGWRN|PgLOG.SNDEML)  # send email out if any
 
    sys.exit(0)
@@ -306,7 +306,7 @@ def get_dsid_records(gdexids, dates, strids):
 #
 # Fill ZND usages into table dssdb.tdsusage from gdex access records
 #
-def fill_gdex_usages(dsids, dranges):
+def fill_zenodo_usages(dsids, dranges):
 
    allcnt = awcnt = azcnt = lcnt = 0
    for dates in dranges:
@@ -359,7 +359,7 @@ def fill_gdex_usages(dsids, dranges):
                   zcnt += add_zusage_records(zrecs, cdate)
                   zrecs = {}
                cdate = date
-            zkey = "{}:{}:{}:{}".format(ip, zndid, method)
+            zkey = "{}:{}:{}".format(ip, zndid, method)
             if zkey in zrecs:
                zrecs[zkey]['size'] += dsize
                zrecs[zkey]['fcount'] += 1

{rda_python_metrics-1.0.42 → rda_python_metrics-1.0.44}/src/rda_python_metrics/logarch.py

@@ -262,7 +262,7 @@ 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 op.exists(logfile):
          PgLOG.pgsystem("tar -uvf {} -C backup {}".format(logfile, file), PgLOG.LWEMEX, 5)

{rda_python_metrics-1.0.42 → rda_python_metrics-1.0.44/src/rda_python_metrics.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.42
+Version: 1.0.44
 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