rda-python-metrics 1.0.23__tar.gz → 1.0.24__tar.gz

{rda_python_metrics-1.0.23/src/rda_python_metrics.egg-info → rda_python_metrics-1.0.24}/PKG-INFO

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

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

{rda_python_metrics-1.0.23 → rda_python_metrics-1.0.24}/src/rda_python_metrics/PgIPInfo.py

@@ -104,6 +104,23 @@ def domain_ipinfo_record(dmname):
 
    return None
 
+#
+# try to get hostname via socket for given ip address
+#
+def get_ip_hostname(ip, iprec, record):
+
+   if iprec and 'hostname' in iprec:
+      record['hostname'] = iprec['hostname']
+      record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
+   else:
+      record['hostname'] = ip
+      try:
+         hostrec = socket.gethostbyaddr(ip)
+         record['hostname'] = hostrec[1][0] if hostrec[1] else hostrec[0]
+         record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
+      except Exception as e:
+         PgLOG.pglog("socket: {} - {}".format(ip, str(e)), PgLOG.LOGWRN)
+
 #
 # get a ipinfo record for given ip address
 #
@@ -117,9 +134,7 @@ def get_ipinfo_record(ip):
       return None
       
    record = {'ip' : ip, 'stat_flag' : 'A', 'hostname' : ip, 'org_type' : '-'}
-   if 'hostname' in iprec:
-      record['hostname'] = iprec['hostname']
-      record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
+   get_ip_hostname(ip, iprec, record)
    record['lat'] = float(iprec['latitude']) if iprec['latitude'] else 0
    record['lon'] = float(iprec['longitude']) if iprec['longitude'] else 0
    if 'org' in iprec: record['org_name'] = iprec['org']
@@ -153,6 +168,7 @@ def get_geoip2_record(ip):
       return None
 
    record = {'ip' : ip, 'stat_flag' : 'M', 'org_type' : '-'}
+   get_ip_hostname(ip, None, record)
    record['lat'] = float(city.location.latitude) if city.location.latitude else 0
    record['lon'] = float(city.location.longitude) if city.location.longitude else 0
    record['country'] = get_country_name_code(city.country.name)
@@ -160,17 +176,8 @@ def get_geoip2_record(ip):
    record['region'] = PgLOG.convert_chars(city.subdivisions.most_specific.name) if city.subdivisions.most_specific.name else None
    record['postal'] =  city.postal.code
    record['timezone'] = city.location.time_zone
-   record['hostname'] = ip
    record['ipinfo'] = json.dumps(object_to_dict(city))
 
-   try:
-      hostrec = socket.gethostbyaddr(ip)
-   except Exception as e:
-      PgLOG.pglog("socket: {} - {}".format(ip, str(e)), PgLOG.LOGWRN)
-      return record
-   record['hostname'] = hostrec[1][0] if hostrec[1] else hostrec[0]
-   record['org_type'] = PgDBI.get_org_type(None, record['hostname'])
-
    return record
 
 #
@@ -223,11 +230,11 @@ def set_ipinfo(ip, ipopt = True):
 
    if ip in IPRECS:
       pgrec = IPRECS[ip]
-      if not pgrec or not ipopt or pgrec['stat_flag'] == 'A': return pgrec
+      if pgrec or not ipopt: return pgrec
    else:
       pgrec = PgDBI.pgget('ipinfo', '*', "ip = '{}'".format(ip))
 
-   if not pgrec or ipopt and pgrec['stat_flag'] == 'M':
+   if not pgrec:
       record = get_ipinfo_record(ip) if ipopt else None
       if not record: record = get_geoip2_record(ip)
       if record and update_ipinfo_record(record, pgrec): pgrec = record

{rda_python_metrics-1.0.23 → rda_python_metrics-1.0.24}/src/rda_python_metrics/fillipinfo.py

@@ -101,9 +101,10 @@ def fill_ip_info(option, inputs, table):
       else:
          date = input + "-01-01"
          edate = input + "-12-31"
-      while date <= edate:
+      while True:
          (ndate, cond) = get_next_date(date, edate)
          cntall += func(date, cond)
+         if ndate >= edate: break
          date = PgUtil.adddate(ndate, 0, 0, 1)
 
    if cntall > 2:
@@ -113,13 +114,13 @@ def get_next_date(date, edate):
 
    if date < edate:
       ndate = PgUtil.enddate(date, 'M')
-      if ndate > edate: ndate = edate
-   if date < ndate:
-      cond = f"BETWEEN '{date}' AND '{ndate}'"
+      if ndate < edate: edate = ndate
+   if date < edate:
+      cond = f"BETWEEN '{date}' AND '{edate}'"
    else:
       cond = f"= '{date}'"
 
-   return (ndate, cond)
+   return (edate, cond)
 
 
 def fix_allusage_records(date, cnd):

{rda_python_metrics-1.0.23 → rda_python_metrics-1.0.24/src/rda_python_metrics.egg-info}/PKG-INFO

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