rda-python-metrics 1.0.28__tar.gz → 1.0.31__tar.gz

{rda_python_metrics-1.0.28/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.31}/PKG-INFO

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

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

{rda_python_metrics-1.0.28 → rda_python_metrics-1.0.31}/src/rda_python_metrics/PgIPInfo.py

@@ -138,7 +138,10 @@ def get_ipinfo_record(ip):
    except Exception as e:
       PgLOG.pglog("ipinfo: {} - {}".format(ip, str(e)), PgLOG.LOGWRN)
       return None
-      
+
+   if 'bogon' in iprec and iprec['bogon']:
+      PgLOG.pglog(f"ipinfo: {ip} - bogon", PgLOG.LOGWRN)
+      return None
    record = {'ip' : ip, 'stat_flag' : 'A', 'hostname' : ip, 'org_type' : '-'}
    get_ip_hostname(ip, iprec, record)
    record['lat'] = float(iprec['latitude']) if iprec['latitude'] else 0
@@ -234,12 +237,9 @@ def update_ipinfo_record(record, pgrec = None):
 #
 def set_ipinfo(ip, ipopt = True):
 
-   if ip in IPRECS:
-      pgrec = IPRECS[ip]
-      if pgrec or not ipopt: return pgrec
-   else:
-      pgrec = PgDBI.pgget('ipinfo', '*', "ip = '{}'".format(ip))
+   if ip in IPRECS: return IPRECS[ip]
 
+   pgrec = PgDBI.pgget('ipinfo', '*', "ip = '{}'".format(ip))
    if not pgrec or ipopt and pgrec['stat_flag'] == 'M':
       record = get_ipinfo_record(ip) if ipopt else None
       if not record: record = get_geoip2_record(ip)

{rda_python_metrics-1.0.28 → rda_python_metrics-1.0.31}/src/rda_python_metrics/fillcdgusage.py

@@ -31,28 +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'],
+#   '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-waccm.s2s_hindcasts': ['d651040'],
    'ucar.cgd.CESM1.3_SH_storm_tracks': ['d651044'],
@@ -61,18 +61,32 @@ DSIDS = {
    'ucar.cgd.ccsm4.TC-CESM': ['d651047'],
    'ucar.cgd.cesm2.ISSI_OSSE': ['d651048'],
    'ucar.cgd.ccsm4.SOcean_Eddies_mclong': ['d651049'],
-   'trace': ['d651050'],
+   'ucar.cgd.ccsm.trace': ['d651050'],
    'ucar.cgd.cesm2.waccm.solar': ['d651051'],
    'ucar.cgd.ccsm4.CESM1-CCSM4_mid-Pliocene' : ['d651042'],
    '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'],
+   'ucar.cgd.cesm2le.output': ['d651056'],    # 2025-01 done
+   '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'],
-   'ucar.cgd.ccsm4.ARISE-SAI-1.5' : ['d651059']
+   #add 2025-08-06
+   'ucar.cgd.ccsm4.cesmLME' : ['d651058'],
+   'ucar.cgd.ccsm4.GLENS' : ['d651064'],
+   'ucar.cgd.ccsm4.CESM2-CISM2-LIGtransient' : ['d651066'],
+   'ucar.cgd.cesm2.pacific.pacemaker' : ['d651068'],
+   'ucar.cgd.cesm2.tuned.sea.ice.albedo' : ['d651070'],
+   'ucar.cgd.cesm2.cmip5.forcing' : ['d651075'],
+   'ucar.cgd.cesm2.ssp245.biomass.burning' : ['d651073'],
+   'ucar.cgd.cesm2.ssp585.biomass.burning' : ['d651067'],
+   '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.
+   
 }
 
 ALLIDS = list(DSIDS.keys())