rda-python-metrics 1.0.39__py3-none-any.whl → 1.0.41__py3-none-any.whl

rda_python_metrics/fillcdgusage.py

@@ -31,29 +31,28 @@ USAGE = {
 }
 
 DSIDS = {
-#   'ucar.cgd.cesm2.cam6.prescribed_sst_amip' : ['d651010'],
-#   'ucar.cgd.ccsm4.CLM_LAND_ONLY' : ['d651011'],
-#   'ucar.cgd.artmip' : ['d651012', 'd651016', 'd651017', 'd651018'],
-#   'tamip' : ['d651013'],
-#   'ucar.cgd.ccsm4.CLIVAR_LE' : ['d651014'],
-#   'ucar.cgd.cesm2.Gettelman_CESM2_ECS' : ['d651015'],
-#   'ucar.cgd.ccsm4.geomip.ssp5' : ['d651024'],
-#   'ucar.cgd.ccsm4.IOD-PACEMAKER' : ['d651021'],
-#   'ucar.cgd.ccsm4.past2k_transient' : ['651023'],
-#   'ucar.cgd.ccsm4.lowwarming' : ['d651025'],
-#   'ucar.cgd.ccsm4.CESM_CAM5_BGC_ME' : ['d651000'],
-#   'ucar.cgd.ccsm4.iTRACE' : ['d651022'],
-#   'ucar.cgd.ccsm4.so2_geoeng' : ['d651026'],
-#   'ucar.cgd.ccsm4.cesmLE' : ['d651027'],
-#   'ucar.cgd.ccsm4.CESM1-CAM5-DP' : ['d651028'],
-#   'ucar.cgd.ccsm4.amv_lens' : ['d651031'],
-#   'ucar.cgd.ccsm4.ATL-PACEMAKER' : ['d651032'],
-#   'ucar.cgd.ccsm4.pac-pacemaker' : ['d651033'],
-#   'ucar.cgd.ccsm4.SD-WACCM-X_v2.1' : ['d651034'],
-#   'ucar.cgd.ccsm4.amv_lens' : ['d651035'],
-#   'ucar.cgd.cesm2.cism_ismip6' : ['d651036'],
-#   'ucar.cgd.ccsm4.pliomip2' : ['d651037'],
-   # new added
+   'ucar.cgd.cesm2.cam6.prescribed_sst_amip' : ['d651010'],
+   'ucar.cgd.ccsm4.CLM_LAND_ONLY' : ['d651011'],
+   'ucar.cgd.artmip' : ['d651012', 'd651016', 'd651017', 'd651018'],
+   'tamip' : ['d651013'],
+   'ucar.cgd.ccsm4.CLIVAR_LE' : ['d651014'],
+   'ucar.cgd.cesm2.Gettelman_CESM2_ECS' : ['d651015'],
+   'ucar.cgd.ccsm4.geomip.ssp5' : ['d651024'],
+   'ucar.cgd.ccsm4.IOD-PACEMAKER' : ['d651021'],
+   'ucar.cgd.ccsm4.past2k_transient' : ['651023'],
+   'ucar.cgd.ccsm4.lowwarming' : ['d651025'],
+   'ucar.cgd.ccsm4.CESM_CAM5_BGC_ME' : ['d651000'],
+   'ucar.cgd.ccsm4.iTRACE' : ['d651022'],
+   'ucar.cgd.ccsm4.so2_geoeng' : ['d651026'],
+   'ucar.cgd.ccsm4.cesmLE' : ['d651027'],
+   'ucar.cgd.ccsm4.CESM1-CAM5-DP' : ['d651028'],
+   'ucar.cgd.ccsm4.amv_lens' : ['d651031'],
+   'ucar.cgd.ccsm4.ATL-PACEMAKER' : ['d651032'],
+   'ucar.cgd.ccsm4.pac-pacemaker' : ['d651033'],
+   'ucar.cgd.ccsm4.SD-WACCM-X_v2.1' : ['d651034'],
+   'ucar.cgd.ccsm4.amv_lens' : ['d651035'],
+   'ucar.cgd.cesm2.cism_ismip6' : ['d651036'],
+   'ucar.cgd.ccsm4.pliomip2' : ['d651037'],
    'ucar.cgd.cesm2-waccm.s2s_hindcasts': ['d651040'],
    'ucar.cgd.CESM1.3_SH_storm_tracks': ['d651044'],
    'ucar.cgd.cesm2.waccm6.ssp245': ['d651045'],
@@ -67,13 +66,12 @@ DSIDS = {
    'ucar.cgd.ccsm4.PaleoIF' : ['d651052'],
    'ucar.cgd.ccsm4.b.e11.B20LE_fixedO3' : ['d651053'],
    'ucar.cgd.cesm2.single.forcing.large.ensemble' : ['d651055'],
-   'ucar.cgd.cesm2le.output': ['d651056'],    # 2025-01 done
+   'ucar.cgd.cesm2le.output': ['d651056'],
    'ucar.cgd.ccsm4.ARISE-SAI-1.5' : ['d651059'],
    'ucar.cgd.cesm2.s2s_hindcasts': ['d651060'],
    'ucar.cgd.cesm2.s2s_hindcasts.mjo': ['d651061'],
    'ucar.cgd.cesm2.s2s_hindcasts.tc_tracks': ['d651062'],
    'ucar.cgd.cesm2.s2s_hindcasts.cesm2.climo': ['d651063'],
-   #add 2025-08-06
    'ucar.cgd.ccsm4.cesmLME' : ['d651058'],
    'ucar.cgd.ccsm4.GLENS' : ['d651064'],
    'ucar.cgd.ccsm4.CESM2-CISM2-LIGtransient' : ['d651066'],
@@ -85,8 +83,8 @@ DSIDS = {
    'ucar.cgd.cesm1.cldmod': ['d651069'],
    'ucar.cgd.cesm2.marine.biogeochemistry': ['d651071'],
    'ucar.cgd.nw2.mom6': ['d651072'],
-#   'ucar.cgd.cesm2.smyle': ['d651065'],  # not done util the end of Aug.
-   
+   'ucar.cgd.cesm2.cam6.ppe': ['d651076'],
+   'ucar.cgd.cesm2.smyle': ['d651065']
 }
 
 ALLIDS = list(DSIDS.keys())

rda_python_metrics/fillrdadb.py

@@ -144,8 +144,7 @@ def send_email_notice():
          if receiver: receiver += ', '
          receiver += (logname + "@ucar.edu")
 
-      ret = PgLOG.send_email("RDADB Weekly Data Usage Gathered on " + PgUtil.curdate(), receiver, msg)
-      if ret: PgLOG.pglog(ret, PgLOG.LOGWRN)
+      PgLOG.send_email("RDADB Weekly Data Usage Gathered on " + PgUtil.curdate(), receiver, msg)
 
 #
 # call main() to start program

rda_python_metrics/logarch.py

@@ -325,8 +325,8 @@ def add_sublog_files(fext, sext, minsize = 0):
       if ms:
          bid = int(ms.group(1))
          if bid not in BIDS:
-            if PgUtil.diffdate(cdate, ary[1]) > 6:
-               BIDS[bid] = -1
+            if PgUtil.diffdate(cdate, ary[0]) > 6:
+               BIDS[bid] = 0
             else:
                BIDS[bid] = PgSIG.check_pbs_process(bid, afile)
          if BIDS[bid] > 0: continue

{rda_python_metrics-1.0.39.dist-info → rda_python_metrics-1.0.41.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.39
+Version: 1.0.41
 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.39.dist-info → rda_python_metrics-1.0.41.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=jJVxQ4d5at0lXXKmV7TVf2GrPWSrJv5XBiHGMc3uxEA,16706
+rda_python_metrics/fillcdgusage.py,sha256=CSfyefeUJjGGLUlsH5H8C9d14WWtUJ_jPkyS7AFmL3o,16636
 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
@@ -19,13 +19,13 @@ rda_python_metrics/filloneorder.py,sha256=ADHbcKCDh9bJunnxYbkbjwU2QpC43hvGlLWaUR
 rda_python_metrics/filloneorder.usg,sha256=mtOySKx6-D4k2bbTcmi6cSYtINiycRyHQkHozi0CQu0,1466
 rda_python_metrics/fillosdfusage.py,sha256=--c6PzeZ6EZXpb0zxy4lZCDjwwIBb7c6xgP7QCKLoMQ,7087
 rda_python_metrics/fillosdfusage.usg,sha256=Qc5YdUuOiAH74FfVdkwkrQRDYXcASVbxMdBsVQj4X1k,635
-rda_python_metrics/fillrdadb.py,sha256=cb6upPApAZloOouUSzZZmjGvOsYT_Nzh9Lz926WE3ZQ,5333
+rda_python_metrics/fillrdadb.py,sha256=5OIzLUo-MHWVIA3sQE7CRMQSW8tX9PH7DocDy4rvbYA,5282
 rda_python_metrics/fillrdadb.usg,sha256=E_Bf4G8yVABogjRmIOaIbTGgnII2W6RltaFad2XEV2Q,1228
 rda_python_metrics/filltdsusage.py,sha256=vOwVzAtWUHO4O-FCSJMg0GKxw-Xc5AzSbfqVFktUAlA,10201
 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/logarch.py,sha256=xdbdY3_pbM219t0qA_im-bJgQhNYwfdFzqtRWvityAc,13897
+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
 rda_python_metrics/pgsyspath.py,sha256=DZhFp-r-LzN0qrHtfdCYfnGDnmD_R4ufuEduk0_vRIw,1039
@@ -50,9 +50,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.39.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-1.0.39.dist-info/METADATA,sha256=KPq_pf5Zt5hSKCWFc0Rir4UWVpc9mC1X8UA3OO0hzhY,761
-rda_python_metrics-1.0.39.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-rda_python_metrics-1.0.39.dist-info/entry_points.txt,sha256=_Cw8KvtYwxLPt3kLJHwQ1r2swsKKbXk-2zYPZAg2czc,1345
-rda_python_metrics-1.0.39.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-1.0.39.dist-info/RECORD,,
+rda_python_metrics-1.0.41.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-1.0.41.dist-info/METADATA,sha256=PHbC5WBqX7ffTCXPqAvj0BISQ6OKHePcb54s_gYkLpU,761
+rda_python_metrics-1.0.41.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+rda_python_metrics-1.0.41.dist-info/entry_points.txt,sha256=_Cw8KvtYwxLPt3kLJHwQ1r2swsKKbXk-2zYPZAg2czc,1345
+rda_python_metrics-1.0.41.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-1.0.41.dist-info/RECORD,,