rda-python-metrics 3.0.3__py3-none-any.whl → 3.0.4__py3-none-any.whl

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

@@ -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.dist-info → rda_python_metrics-3.0.4.dist-info}/RECORD

@@ -35,7 +35,7 @@ rda_python_metrics/fillrdadb.py,sha256=8ZDTxhP3OcWS-6OHg1r44tBv6y1lODjZWzyt076yM
 rda_python_metrics/fillrdadb.usg,sha256=8BMED3KWJTb0INyVlu9UA4N_ulOR26kN0k27FVel3D0,1064
 rda_python_metrics/filltdsusage.py,sha256=vunz1Ml2xCOPdXLE71iBhnQJH9pTk9D6mB8pcahhmWU,8801
 rda_python_metrics/filltdsusage.usg,sha256=IFPkAHfGjGuOqGsQUHASX_ony7bIAQbPQsh5YM5rS6g,826
-rda_python_metrics/filluser.py,sha256=5-UIWq0nLItQKd90lMKu3kjIEqAOP5p2avPOkJEsFJc,9630
+rda_python_metrics/filluser.py,sha256=TBMCTo1KEJNombjYEaj_O9GMrd7rugvxMPy0AOduxPM,9670
 rda_python_metrics/filluser.usg,sha256=DR8TVutdI78ksoSqvvl1nefImO1cOtVluMORdf41gWw,689
 rda_python_metrics/fillzenodousage.py,sha256=Rb09bmHwAnY5_5pyx6qA-1Jgt2W05IqYeCHdYOZS9r8,14954
 rda_python_metrics/fillzenodousage.usg,sha256=gHeJK_7tcSu5222-0BN4zGWuHoXWQIF1mEh0XsbQFCM,904
@@ -46,9 +46,9 @@ rda_python_metrics/pg_ipinfo.py,sha256=l8rSvrzQUDhaMFXGnJVEchhp7eQnwDFFVd3hOMZBq
 rda_python_metrics/pg_person.py,sha256=1Pvvpnsv_qjJM6F5ikOEMTEaErB12lALtARx5U9z6f0,2087
 rda_python_metrics/pg_username.py,sha256=OBTG4-4tNIX35Ncpm2Xmbl2KHnm_n_xOwSJ8f92b0dA,1264
 rda_python_metrics/pg_view.py,sha256=yXcdgNPuhHipgcdR-2QGIJe2g_vg3CAVuGlUnUhG7ws,26134
-rda_python_metrics/pgperson.py,sha256=h5D_a72AE3pL-TlFZkQRyi3d-9YbFEVcIpzbYaATPyQ,2564
+rda_python_metrics/pgperson.py,sha256=EvU7mVV0r0XAZqGE0h3JqPYON8j2FkQFBubSzhcw1aQ,2585
 rda_python_metrics/pgsyspath.py,sha256=uBVi8VHyzI_1TA8tq2DYVfMkj2HZXu03fPg9Wv1MB6c,1038
-rda_python_metrics/pgusername.py,sha256=KcDU2YK7vq4nMhv16Da0pQ-vQJBSwGFYoMU4S1dz_PI,1638
+rda_python_metrics/pgusername.py,sha256=dzXRqbjHKhQgvXJFJUtHMm9agdWKsF5DAr4wqKheuEI,1680
 rda_python_metrics/view_allusage.py,sha256=Nu-c31_x1jEe9XpQahemrFx-ATcKpKEv2ZfQVuvsw28,15756
 rda_python_metrics/view_awsusage.py,sha256=FBBmbel1l4pfVRt7QmvN7ADlqUN6Ia-6FMAVz6WZz3w,14125
 rda_python_metrics/view_checkusage.py,sha256=Ko96y9m0xWToU0NpqVC-L-2b7hOAdEo_5eZPBiE_Lm8,12985
@@ -79,9 +79,9 @@ rda_python_metrics/viewwebfile.py,sha256=07Xa9e7NVozZ6KVBFvyGhJRVi-Oil26g-e3PMxd
 rda_python_metrics/viewwebfile.usg,sha256=b7QE8USiVCzY91q5d5IiCekvdZz_YB24hPbz_fqb_jg,6072
 rda_python_metrics/viewwebusage.py,sha256=LzCGAVHY_xoIFIZdiKivI8idalMqvZdIGz53bYWda38,18768
 rda_python_metrics/viewwebusage.usg,sha256=FnGoFqS7O5l7EDoLG1pKxMktibxeu28jxV9h9q80hQk,6077
-rda_python_metrics-3.0.3.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-3.0.3.dist-info/METADATA,sha256=F_epk9in2izcUMAdn6KWr_rkD-hS4SrSINlkV1sHsLo,6503
-rda_python_metrics-3.0.3.dist-info/WHEEL,sha256=K260EYznzXsJYBQGqmI8VTxEdiZYNvDZwW9cBh9-_MA,91
-rda_python_metrics-3.0.3.dist-info/entry_points.txt,sha256=BnO0_Q6GLKOLeEf8fySfQT67RGHm6vrWq8YmOgrLruk,1407
-rda_python_metrics-3.0.3.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-3.0.3.dist-info/RECORD,,
+rda_python_metrics-3.0.4.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-3.0.4.dist-info/METADATA,sha256=k9eF-dFAgtZm7D3MKGrig9YQYPcenlg0OGJtCZ3nHMU,6503
+rda_python_metrics-3.0.4.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+rda_python_metrics-3.0.4.dist-info/entry_points.txt,sha256=BnO0_Q6GLKOLeEf8fySfQT67RGHm6vrWq8YmOgrLruk,1407
+rda_python_metrics-3.0.4.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-3.0.4.dist-info/RECORD,,

{rda_python_metrics-3.0.3.dist-info → rda_python_metrics-3.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (83.0.0)
+Generator: setuptools (84.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any