rda-python-metrics 3.0.3__tar.gz → 3.0.4__tar.gz

{rda_python_metrics-3.0.3/src/rda_python_metrics.egg-info → rda_python_metrics-3.0.4}/PKG-INFO

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

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

{rda_python_metrics-3.0.3 → rda_python_metrics-3.0.4}/src/rda_python_metrics/filluser.py

@@ -11,11 +11,10 @@
 ###############################################################################
 import sys
 import re
-import time
-from os import path as op
 from rda_python_common.pg_util import PgUtil
+from rda_python_common.pg_dbi import PgDBI
 
-class FillUser(PgUtil):
+class FillUser(PgUtil, PgDBI):
 
    """Retrieve user info from the UCAR People API and fill table user in PostgreSQL database rdadb."""
 
@@ -131,7 +130,7 @@ class FillUser(PgUtil):
             if neworg: return 0
             newrec['org_name'] = orarec['org_name']
          if orarec['country'] and (not pgrec['country'] or orarec['country'] and pgrec['country'] != orarec['country']):
-            orarec['country'] = self.set_country_code(orarec)
+            orarec['country'] = self.set_country_code(orarec['email'], orarec['country'])
             if not pgrec['country'] or pgrec['country'] != orarec['country']:
                if neworg: return 0
                newrec['country'] = orarec['country']

{rda_python_metrics-3.0.3 → rda_python_metrics-3.0.4}/src/rda_python_metrics/pgperson.py

@@ -53,15 +53,13 @@ class PgPerson:
       url = self.urlfmt.format(self.option, self.optval)
       response, content = http.request(url, 'GET', headers=headers)
       status = response.status
-      if status == 200:
-         persons=json.loads(content)
-         for person in persons:
-            for key, value in person.items():
-               print("{}<=>{}".format(key, value))
-      elif status == 399:
-         print(content)
-      elif status == 500:
-         print('Server error')
+      if status != 200:
+         print("pgperson: HTTP {} from {}\n{}".format(status, url, content.decode(errors='replace')), file=sys.stderr)
+         sys.exit(1)
+      persons=json.loads(content)
+      for person in persons:
+         for key, value in person.items():
+            print("{}<=>{}".format(key, value))
 
 # main function to execute this script
 def main():

{rda_python_metrics-3.0.3 → rda_python_metrics-3.0.4}/src/rda_python_metrics/pgusername.py

@@ -32,16 +32,15 @@ class PgUserName:
    def start_actions(self):
       headers = {'Content-type': 'application/json'}
       http=httplib2.Http()
-      response, content = http.request(self.url + self.uname, 'GET', headers=headers)
+      url = self.url + self.uname
+      response, content = http.request(url, 'GET', headers=headers)
       status = response.status
-      if status == 200:
-         person=json.loads(content)
-         for key, value in person.items():
-            print("{}<=>{}".format(key, value))
-      elif status == 399:
-         print(content)
-      elif status == 500:
-         print('Server error')
+      if status != 200:
+         print("pgusername: HTTP {} from {}\n{}".format(status, url, content.decode(errors='replace')), file=sys.stderr)
+         sys.exit(1)
+      person=json.loads(content)
+      for key, value in person.items():
+         print("{}<=>{}".format(key, value))
 
 # main function to execute this script
 def main():

{rda_python_metrics-3.0.3 → rda_python_metrics-3.0.4/src/rda_python_metrics.egg-info}/PKG-INFO

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