rda-python-metrics 1.0.42__py3-none-any.whl → 1.0.43__py3-none-any.whl

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/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.dist-info → rda_python_metrics-1.0.43.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.42
+Version: 1.0.43
 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.dist-info → rda_python_metrics-1.0.43.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=CSfyefeUJjGGLUlsH5H8C9d14WWtUJ_jPkyS7AFmL3o,16636
+rda_python_metrics/fillcdgusage.py,sha256=LplVm16Ct9HPpfabC16FO5ZFQBntKjqkuvt30H2dAPs,16714
 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
@@ -25,7 +25,7 @@ rda_python_metrics/filltdsusage.py,sha256=vOwVzAtWUHO4O-FCSJMg0GKxw-Xc5AzSbfqVFk
 rda_python_metrics/filltdsusage.usg,sha256=yqTHRe8WpZWpu3gso_obgt6LO41-JC27rTIDfdZcISo,538
 rda_python_metrics/filluser.py,sha256=CvaMRaUPaR9nxJAExkLTb3Ci4sD7RQMOpWhWJdbyMF0,8907
 rda_python_metrics/filluser.usg,sha256=Xgqi0QwA9-4jpYj3L4Q4TISpVwRlsomt2G7T0oYAFak,520
-rda_python_metrics/fillzenodousage.py,sha256=BWm1SLNNX7nhO6he9Ccl6lH9jUY9G83AmrusDMY6Dc8,13204
+rda_python_metrics/fillzenodousage.py,sha256=wZiHs_cD061sUwTM0zujSkddUKtzACR1l2UG7smOioA,13212
 rda_python_metrics/logarch.py,sha256=8OFirXeO24dljXQPbNJqGDvP9F0qWK11VHSw38CdUuM,13896
 rda_python_metrics/logarch.usg,sha256=6ksFxu_-lzhRpQE2YFAqgGVhwFP4PTweCbFBuGhhICU,960
 rda_python_metrics/pgperson.py,sha256=4XTDnVBFyF9drzx2I_DGCxQ-8I1bpclqTuQvOx3wST4,2088
@@ -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.42.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-1.0.42.dist-info/METADATA,sha256=X6jSYha4z0rwsLp1cFusK5TL2fAFzQbHNqEQt0ocJlw,761
-rda_python_metrics-1.0.42.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_metrics-1.0.42.dist-info/entry_points.txt,sha256=fv4wjyEdiLFYNaJzhmet0SxZcF_J6M42koft2Na1XMs,1403
-rda_python_metrics-1.0.42.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-1.0.42.dist-info/RECORD,,
+rda_python_metrics-1.0.43.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-1.0.43.dist-info/METADATA,sha256=XvvSglsHwORdaHPF8dUgmASGuGXjMlo37TFpgUkmw1U,761
+rda_python_metrics-1.0.43.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_metrics-1.0.43.dist-info/entry_points.txt,sha256=fv4wjyEdiLFYNaJzhmet0SxZcF_J6M42koft2Na1XMs,1403
+rda_python_metrics-1.0.43.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-1.0.43.dist-info/RECORD,,