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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 3.0.4
+Version: 3.0.6
 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
@@ -54,10 +54,7 @@ The package provides two categories of programs:
 | `fillosdfusage` | Fill OSDF usage metrics into the database |
 | `fillrdadb` | Fill RDA database usage metrics |
 | `filltdsusage` | Fill TDS (THREDDS) usage metrics into the database |
-| `filluser` | Fill user information into the database |
 | `fillzenodousage` | Fill Zenodo usage metrics into the database |
-| `pgperson` | Retrieve user info from the UCAR People API by field |
-| `pgusername` | Retrieve user info from the UCAR People API by username |
 | `viewallusage` | View combined usage statistics |
 | `viewawsusage` | View AWS usage statistics |
 | `viewcheckusage` | View usage check results |

{rda_python_metrics-3.0.4 → rda_python_metrics-3.0.6}/README.md

@@ -29,10 +29,7 @@ The package provides two categories of programs:
 | `fillosdfusage` | Fill OSDF usage metrics into the database |
 | `fillrdadb` | Fill RDA database usage metrics |
 | `filltdsusage` | Fill TDS (THREDDS) usage metrics into the database |
-| `filluser` | Fill user information into the database |
 | `fillzenodousage` | Fill Zenodo usage metrics into the database |
-| `pgperson` | Retrieve user info from the UCAR People API by field |
-| `pgusername` | Retrieve user info from the UCAR People API by username |
 | `viewallusage` | View combined usage statistics |
 | `viewawsusage` | View AWS usage statistics |
 | `viewcheckusage` | View usage check results |

{rda_python_metrics-3.0.4 → rda_python_metrics-3.0.6}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "rda_python_metrics"
-version = "3.0.4"
+version = "3.0.6"
 authors = [
   { name="Zaihua Ji",  email="zji@ucar.edu" },
 ]
@@ -55,9 +55,6 @@ pythonpath = [
 "fillosdfusage" = "rda_python_metrics.fillosdfusage:main"
 "fillrdadb" = "rda_python_metrics.fillrdadb:main"
 "filltdsusage" = "rda_python_metrics.filltdsusage:main"
-"filluser" = "rda_python_metrics.filluser:main"
-"pgperson" = "rda_python_metrics.pgperson:main"
-"pgusername" = "rda_python_metrics.pgusername:main"
 "viewallusage" = "rda_python_metrics.viewallusage:main"
 "viewawsusage" = "rda_python_metrics.viewawsusage:main"
 "viewcheckusage" = "rda_python_metrics.viewcheckusage:main"

{rda_python_metrics-3.0.4 → rda_python_metrics-3.0.6}/src/rda_python_metrics/fillosdfusage.py

@@ -113,7 +113,8 @@ class FillOSDFUsage(PgIPInfo, PgFile, PgSplit):
             if entcnt%20000 == 0:
                dcnt = len(records)
                self.pglog("{}: {}/{} OSDF log entries processed/records added".format(logfile, entcnt, dcnt), self.WARNLG)
-            ms = re.match(r'^\[(\S+)\] \[Objectname:\/ncar\/rda\/([a-z]\d{6})\/\S+\].* \[Site:(\S+)\].* \[Host:(\S+)\].* \[AppInfo:(\S*)\].* \[Read:(\d+)\]', line)
+            # the OSDF namespace was renamed from /ncar/rda to /ncar/gdex
+            ms = re.match(r'^\[(\S+)\] \[Objectname:\/ncar\/(?:rda|gdex)\/([a-z]\d{6})\/\S+\].* \[Site:(\S+)\].* \[Host:(\S+)\].* \[AppInfo:(\S*)\].* \[Read:(\d+)\]', line)
             if not ms: continue
             dt = ms.group(1)
             dsid = ms.group(2)

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 3.0.4
+Version: 3.0.6
 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
@@ -54,10 +54,7 @@ The package provides two categories of programs:
 | `fillosdfusage` | Fill OSDF usage metrics into the database |
 | `fillrdadb` | Fill RDA database usage metrics |
 | `filltdsusage` | Fill TDS (THREDDS) usage metrics into the database |
-| `filluser` | Fill user information into the database |
 | `fillzenodousage` | Fill Zenodo usage metrics into the database |
-| `pgperson` | Retrieve user info from the UCAR People API by field |
-| `pgusername` | Retrieve user info from the UCAR People API by username |
 | `viewallusage` | View combined usage statistics |
 | `viewawsusage` | View AWS usage statistics |
 | `viewcheckusage` | View usage check results |

{rda_python_metrics-3.0.4 → rda_python_metrics-3.0.6}/src/rda_python_metrics.egg-info/SOURCES.txt

@@ -16,7 +16,6 @@ src/rda_python_metrics/fill_oneorder.py
 src/rda_python_metrics/fill_osdfusage.py
 src/rda_python_metrics/fill_rdadb.py
 src/rda_python_metrics/fill_tdsusage.py
-src/rda_python_metrics/fill_user.py
 src/rda_python_metrics/fillawsusage.py
 src/rda_python_metrics/fillawsusage.usg
 src/rda_python_metrics/fillcdgusage.py
@@ -39,20 +38,14 @@ src/rda_python_metrics/fillrdadb.py
 src/rda_python_metrics/fillrdadb.usg
 src/rda_python_metrics/filltdsusage.py
 src/rda_python_metrics/filltdsusage.usg
-src/rda_python_metrics/filluser.py
-src/rda_python_metrics/filluser.usg
 src/rda_python_metrics/fillzenodousage.py
 src/rda_python_metrics/fillzenodousage.usg
 src/rda_python_metrics/log_arch.py
 src/rda_python_metrics/logarch.py
 src/rda_python_metrics/logarch.usg
 src/rda_python_metrics/pg_ipinfo.py
-src/rda_python_metrics/pg_person.py
-src/rda_python_metrics/pg_username.py
 src/rda_python_metrics/pg_view.py
-src/rda_python_metrics/pgperson.py
 src/rda_python_metrics/pgsyspath.py
-src/rda_python_metrics/pgusername.py
 src/rda_python_metrics/view_allusage.py
 src/rda_python_metrics/view_awsusage.py
 src/rda_python_metrics/view_checkusage.py

{rda_python_metrics-3.0.4 → rda_python_metrics-3.0.6}/src/rda_python_metrics.egg-info/entry_points.txt

@@ -11,10 +11,7 @@ filloneorder = rda_python_metrics.filloneorder:main
 fillosdfusage = rda_python_metrics.fillosdfusage:main
 fillrdadb = rda_python_metrics.fillrdadb:main
 filltdsusage = rda_python_metrics.filltdsusage:main
-filluser = rda_python_metrics.filluser:main
 fillzenodousage = rda_python_metrics.fillzenodousage:main
-pgperson = rda_python_metrics.pgperson:main
-pgusername = rda_python_metrics.pgusername:main
 setuid_logarch = rda_python_metrics.logarch:main
 viewallusage = rda_python_metrics.viewallusage:main
 viewawsusage = rda_python_metrics.viewawsusage:main

{rda_python_metrics-3.0.4 → rda_python_metrics-3.0.6}/tests/test_metrics.py

@@ -15,12 +15,9 @@ def test_metrics():
     import rda_python_metrics.fillosdfusage
     import rda_python_metrics.fillrdadb
     import rda_python_metrics.filltdsusage
-    import rda_python_metrics.filluser
     import rda_python_metrics.logarch
     import rda_python_metrics.PgIPInfo
     import rda_python_metrics.pg_ipinfo
-    import rda_python_metrics.pgperson
-    import rda_python_metrics.pgusername
     import rda_python_metrics.PgView
     import rda_python_metrics.pg_view
     import rda_python_metrics.viewallusage

rda_python_metrics-3.0.4/src/rda_python_metrics/fill_user.py

@@ -1,216 +0,0 @@
-#!/usr/bin/env python3
-#
-###############################################################################
-#
-#     Title : filluser
-#    Author : Zaihua Ji,  zji@ucar.edu
-#      Date : 02/15/2024
-#             2025-03-26 transferred to package rda_python_metrics from
-#             https://github.com/NCAR/rda-database.git
-#   Purpose : python functions to retrieve info from Oracle database and fill
-#             table user in PostgreSQL database.schema rdadb.dssdb.
-#
-#    Github : https://github.com/NCAR/rda-python-metrics.git
-#
-###############################################################################
-import sys
-import re
-import time
-from os import path as op
-from rda_python_common import PgLOG
-from rda_python_common import PgUtil
-from rda_python_common import PgDBI
-
-TBNAME = 'dssdb.user'
-
-#
-# main function to run this program
-#
-def main():
-
-   argv = sys.argv[1:]
-   missed = False
-   userno = logname = option = None
-
-   for arg in argv:
-      if arg == "-b":
-         PgLOG.PGLOG['BCKGRND'] = 1
-      elif re.match(r'^-[inu]$', arg):
-         option = arg[1]
-         if option == 'i':
-            missed = True
-            option = None
-      elif arg[0] == '-':
-         PgLOG.pglog(arg + ": Invalid Option", PgLOG.LGWNEX)
-      elif option == "n":
-         userno = arg
-         option = None
-      elif option == "u":
-         logname = arg
-         option = None
-      else:
-         PgLOG.pglog(arg + ": Invalid Parameter", PgLOG.LGWNEX)
-
-   if not (missed or userno or logname): PgLOG.show_usage('filluser')
-
-   if not PgLOG.valid_command("pgperson"):
-      errmsg = PgLOG.PGLOG['SYSERR'] if PgLOG.PGLOG['SYSERR'] else "Cannot find command"
-      PgLOG.pglog("filluser: Cannot be executed on '{}'\n{}".format(PgLOG.PGLOG['HOSTNAME'], errmsg), PgLOG.LGWNEX)
-
-   PgDBI.dssdb_scname()
-   PgLOG.cmdlog("filluser {}".format(' '.join(argv)))
-   if missed: # checking and fill missed ones in user table
-      fill_missed_users()
-   else:
-      fill_one_user(userno, logname)
-
-   sys.exit(0)
-
-#
-# update users with missed info in table dssdb.user
-#
-def fill_missed_users():
-
-   PgLOG.pglog("Getting incomplete user info", PgLOG.LOGWRN)
-   pgusers = PgDBI.pgmget(TBNAME, "*", "stat_flag = 'M'", PgLOG.LOGWRN)
-   cntall = len(pgusers['logname']) if pgusers else 0
-   s = 's' if cntall > 1 else ''
-   PgLOG.pglog("{} record{} retrieved at {}".format(cntall, s, PgLOG.current_datetime()), PgLOG.LOGWRN)
-   if not cntall: return
-   modcnt = 0
-   for i in range(cntall):
-      pgrec = PgUtil.onerecord(pgusers, i)
-      record = PgDBI.ucar_user_info(pgrec['userno'], pgrec['logname'])
-      if record:
-         modcnt += PgDBI.pgupdt(TBNAME, record, "uid = {}".format(pgrec['uid']), PgLOG.LOGWRN)
-      
-      if (i%500) == 499:
-         PgLOG.pglog("{}/{} Records modifiled/processed".format(modcnt, (i+1)), PgLOG.WARNLG)
-   s = 's' if modcnt > 1 else ''
-   PgLOG.pglog("{} User Record{} modified".format(modcnt, s), PgLOG.LOGWRN)
-   return modcnt
-
-#
-# Fill one user for given condition userno or logname
-#
-def fill_one_user(userno, logname):
-
-   if userno:
-      msg = "User ID {}: ".format(userno)
-   else:
-      msg = "User Login Name {}: ".format(logname)
-   modcnt = cntadd = 0
-   newrec = PgDBI.ucar_user_info(userno, logname)
-   if not newrec:
-      PgLOG.pglog(msg + "No User info found from People DB", PgLOG.LOGWRN)
-      return
-
-   cond = 'userno = {}'.format(userno) if userno else  "logname = '{}'".format(logname)
-   pgrec = PgDBI.pgget(TBNAME, "*", cond + " AND until_date is null", PgLOG.LGWNEX)
-   record = get_user_record(newrec, pgrec, (newrec['stat_flag'] == 'A'))
-   if record == None:
-      PgLOG.pglog(msg + "User record saved already", PgLOG.LOGWRN)
-      return
-   if record:
-      if pgrec:
-         if PgDBI.pgupdt(TBNAME, record, "uid = {}".format(pgrec['uid']), PgLOG.LOGWRN):
-            PgLOG.pglog(msg + "Existing User record Modified", PgLOG.LOGWRN)
-            modcnt += 1
-      else:
-         if PgDBI.pgadd(TBNAME, record, PgLOG.LGWNEX):
-            PgLOG.pglog(msg + "New user record added", PgLOG.LOGWRN)
-            cntadd += 1               
-   else:
-      record = {'stat_flag' : 'C'}
-      record['until_date'] = PgUtil.adddate(newrec['start_date'], 0, 0, -1)
-      if PgDBI.pgupdt(TBNAME, record, "uid = {}".format(pgrec['uid']), PgLOG.LOGWRN):
-         PgLOG.pglog(msg + "Existing User record Closed", PgLOG.LOGWRN)
-         modcnt += 1
-
-      record = get_user_record(newrec)
-      if record and PgDBI.pgadd(TBNAME, record, PgLOG.LGWNEX):
-         PgLOG.pglog(msg + "Additional New user record added", PgLOG.LOGWRN)
-         cntadd += 1
-
-#
-# local function: get_user_record(orarec: refer to oracle hush record 
-#                                 pgrecs: refer to exist, mysql hush records)
-
-#         return: a reference to a new mysql record for update or add
-#
-def get_user_record(orarec, pgrec = None, neworg = False):
-
-   if not orarec['email']: return None
-
-   ms = re.match("^(.+\@).+\.ucar\.edu$", orarec['email'], re.I)
-   if ms: orarec['email'] = ms.group(1) + "ucar.edu"
-
-   newrec = {}   
-   if pgrec:
-      if neworg and PgUtil.diffdate(orarec['start_date'], pgrec['start_date']) <= 0:
-         neworg = False
-      if not pgrec['division'] or pgrec['division'] != orarec['division']:
-         if neworg and orarec['org_type'] == 'NCAR': return 0
-         newrec['division'] = orarec['division']
-      if orarec['org_name'] and (not pgrec['org_name'] or pgrec['org_name'] != orarec['org_name']):
-         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'] = PgDBI.set_country_code(orarec)
-         if not pgrec['country'] or pgrec['country'] != orarec['country']:
-            if neworg: return 0
-            newrec['country'] = orarec['country']
-      if not pgrec['org_type'] or (orarec['org_type'] and pgrec['org_type'] != orarec['org_type']):
-         orarec['org_type'] = PgDBI.get_org_type(orarec['org_type'], orarec['email'])
-         if not pgrec['org_type'] or pgrec['org_type'] != orarec['org_type']:
-            if neworg: return 0
-            newrec['org_type'] = orarec['org_type']
-      if not pgrec['email'] or pgrec['email'] != orarec['email']:
-         if neworg: return 0
-         newrec['email'] = orarec['email']
-      if not pgrec['ucaremail'] or pgrec['ucaremail'] != orarec['ucaremail']:
-         newrec['ucaremail'] = orarec['ucaremail']
-      if 'until_date' in orarec and PgUtil.diffdate(pgrec['until_date'], orarec['until_date']):
-         newrec['until_date'] = orarec['until_date']
-      if not pgrec['userno'] or pgrec['userno'] != orarec['userno']:
-         newrec['userno'] = orarec['userno']
-      if not pgrec['upid'] or pgrec['upid'] != orarec['upid']:
-         newrec['upid'] = orarec['upid']
-      if not pgrec['logname'] or pgrec['logname'] != orarec['logname']:
-         newrec['logname'] = orarec['logname']
-      if orarec['lstname'] and (not pgrec['lstname'] or pgrec['lstname'] != orarec['lstname']):
-         newrec['lstname'] = orarec['lstname']
-      if orarec['fstname'] and (not pgrec['fstname'] or pgrec['fstname'] != orarec['fstname']):
-         newrec['fstname'] = orarec['fstname']
-      if pgrec['stat_flag'] != orarec['stat_flag']:
-         newrec['stat_flag'] = orarec['stat_flag']
-      if 'phoneno' in orarec and orarec['phoneno'] and (not pgrec['phoneno'] or pgrec['phoneno'] != orarec['phoneno']):
-         newrec['phoneno'] = orarec['phoneno']
-      if 'faxno' in orarec and orarec['faxno'] and (not pgrec['faxno'] or pgrec['faxno'] != orarec['faxno']):
-         newrec['faxno'] = orarec['faxno']
-      if orarec['start_date'] and (not pgrec['start_date'] or PgUtil.diffdate(pgrec['start_date'], orarec['start_date']) > 0):
-         newrec['start_date'] = orarec['start_date']      
-   elif orarec['stat_flag'] == 'A':
-      newrec['upid'] = orarec['upid']
-      newrec['userno'] = orarec['userno']
-      newrec['logname'] = orarec['logname']
-      newrec['lstname'] = orarec['lstname']
-      newrec['fstname'] = orarec['fstname']
-      newrec['stat_flag'] = orarec['stat_flag']
-      if orarec['start_date']: newrec['start_date'] = orarec['start_date']
-      if 'until_date' in orarec: newrec['until_date'] = orarec['until_date']
-      newrec['division'] = orarec['division']
-      newrec['org_name'] = orarec['org_name']
-      newrec['org_type'] = PgDBI.get_org_type(orarec['org_type'], orarec['email'])
-      newrec['country'] = PgDBI.set_country_code(orarec['email'], orarec['country'])
-      newrec['email'] = orarec['email']
-      newrec['ucaremail'] = orarec['ucaremail']
-      if 'phoneno' in orarec: newrec['phoneno'] = orarec['phoneno']
-      if 'faxno' in orarec: newrec['faxno'] = orarec['faxno']
-
-   return newrec if newrec else None
-
-#
-# call main() to start program
-#
-if __name__ == "__main__": main()

rda_python_metrics-3.0.4/src/rda_python_metrics/filluser.py

@@ -1,194 +0,0 @@
-#!/usr/bin/env python3
-###############################################################################
-#     Title : filluser
-#    Author : Zaihua Ji,  zji@ucar.edu
-#      Date : 02/15/2024
-#             2025-03-26 transferred to package rda_python_metrics from
-#             https://github.com/NCAR/rda-database.git
-#   Purpose : python functions to retrieve info from Oracle database and fill
-#             table user in PostgreSQL database.schema rdadb.dssdb.
-#    Github : https://github.com/NCAR/rda-python-metrics.git
-###############################################################################
-import sys
-import re
-from rda_python_common.pg_util import PgUtil
-from rda_python_common.pg_dbi import PgDBI
-
-class FillUser(PgUtil, PgDBI):
-
-   """Retrieve user info from the UCAR People API and fill table user in PostgreSQL database rdadb."""
-
-   def __init__(self):
-      super().__init__()
-      self.TBNAME = 'dssdb.user'
-      self.userno = self.logname = None
-      self.missed = False
-
-   def read_parameters(self):
-      """Function to read parameters."""
-      argv = sys.argv[1:]
-      option = None
-      for arg in argv:
-         if arg == "-b":
-            self.PGLOG['BCKGRND'] = 1
-         elif re.match(r'^-[inu]$', arg):
-            option = arg[1]
-            if option == 'i':
-               self.missed = True
-               option = None
-         elif arg[0] == '-':
-            self.pglog(arg + ": Invalid Option", self.LGWNEX)
-         elif option == "n":
-            self.userno = arg
-            option = None
-         elif option == "u":
-            self.logname = arg
-            option = None
-         else:
-            self.pglog(arg + ": Invalid Parameter", self.LGWNEX)
-      if not (self.missed or self.userno or self.logname): self.show_usage('filluser')
-      if not self.valid_command("pgperson"):
-         errmsg = self.PGLOG['SYSERR'] if self.PGLOG['SYSERR'] else "Cannot find command"
-         self.pglog("filluser: Cannot be executed on '{}'\n{}".format(self.PGLOG['HOSTNAME'], errmsg), self.LGWNEX)
-      self.cmdlog("filluser {}".format(' '.join(argv)))
-
-   def start_actions(self):
-      """Function to start actions."""
-      self.dssdb_scname()
-      if self.missed: # checking and fill missed ones in user table
-         self.fill_missed_users()
-      else:
-         self.fill_one_user()
-
-   def fill_missed_users(self):
-      """Update users with missed info in table dssdb.user."""
-      self.pglog("Getting incomplete user info", self.LOGWRN)
-      pgusers = self.pgmget(self.TBNAME, "*", "stat_flag = 'M'", self.LOGWRN)
-      cntall = len(pgusers['logname']) if pgusers else 0
-      s = 's' if cntall > 1 else ''
-      self.pglog("{} record{} retrieved at {}".format(cntall, s, self.current_datetime()), self.LOGWRN)
-      if not cntall: return
-      modcnt = 0
-      for i in range(cntall):
-         pgrec = self.onerecord(pgusers, i)
-         record = self.ucar_user_info(pgrec['userno'], pgrec['logname'])
-         if record:
-            modcnt += self.pgupdt(self.TBNAME, record, "uid = {}".format(pgrec['uid']), self.LOGWRN)
-         if (i%500) == 499:
-            self.pglog("{}/{} Records modifiled/processed".format(modcnt, (i+1)), self.WARNLG)
-      s = 's' if modcnt > 1 else ''
-      self.pglog("{} User Record{} modified".format(modcnt, s), self.LOGWRN)
-      return modcnt
-
-   def fill_one_user(self):
-      """Fill one user for given condition userno or logname."""
-      if self.userno:
-         msg = "User ID {}: ".format(self.userno)
-      else:
-         msg = "User Login Name {}: ".format(self.logname)
-      newrec = self.ucar_user_info(self.userno, self.logname)
-      if not newrec:
-         self.pglog(msg + "No User info found from People DB", self.LOGWRN)
-         return
-      cond = 'userno = {}'.format(self.userno) if self.userno else  "logname = '{}'".format(self.logname)
-      pgrec = self.pgget(self.TBNAME, "*", cond + " AND until_date is null", self.LGWNEX)
-      record = self.get_user_record(newrec, pgrec, (newrec['stat_flag'] == 'A'))
-      if record == None:
-         self.pglog(msg + "User record saved already", self.LOGWRN)
-         return
-      if record:
-         if pgrec:
-            if self.pgupdt(self.TBNAME, record, "uid = {}".format(pgrec['uid']), self.LOGWRN):
-               self.pglog(msg + "Existing User record Modified", self.LOGWRN)
-         else:
-            if self.pgadd(self.TBNAME, record, self.LGWNEX):
-               self.pglog(msg + "New user record added", self.LOGWRN)
-      else:
-         record = {'stat_flag' : 'C'}
-         record['until_date'] = self.adddate(newrec['start_date'], 0, 0, -1)
-         if self.pgupdt(self.TBNAME, record, "uid = {}".format(pgrec['uid']), self.LOGWRN):
-            self.pglog(msg + "Existing User record Closed", self.LOGWRN)
-         record = self.get_user_record(newrec)
-         if record and self.pgadd(self.TBNAME, record, self.LGWNEX):
-            self.pglog(msg + "Additional New user record added", self.LOGWRN)
-
-   # local function: get_user_record(orarec: refer to oracle hush record 
-   #                                 pgrecs: refer to exist, mysql hush records)
-   def get_user_record(self, orarec, pgrec = None, neworg = False):
-      """        return: a reference to a new mysql record for update or add."""
-      if not orarec['email']: return None
-      ms = re.match(r"^(.+@).+\.ucar\.edu$", orarec['email'], re.I)
-      if ms: orarec['email'] = ms.group(1) + "ucar.edu"
-      newrec = {}   
-      if pgrec:
-         if neworg and self.diffdate(orarec['start_date'], pgrec['start_date']) <= 0:
-            neworg = False
-         if not pgrec['division'] or pgrec['division'] != orarec['division']:
-            if neworg and orarec['org_type'] == 'NCAR': return 0
-            newrec['division'] = orarec['division']
-         if orarec['org_name'] and (not pgrec['org_name'] or pgrec['org_name'] != orarec['org_name']):
-            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['email'], orarec['country'])
-            if not pgrec['country'] or pgrec['country'] != orarec['country']:
-               if neworg: return 0
-               newrec['country'] = orarec['country']
-         if not pgrec['org_type'] or (orarec['org_type'] and pgrec['org_type'] != orarec['org_type']):
-            orarec['org_type'] = self.get_org_type(orarec['org_type'], orarec['email'])
-            if not pgrec['org_type'] or pgrec['org_type'] != orarec['org_type']:
-               if neworg: return 0
-               newrec['org_type'] = orarec['org_type']
-         if not pgrec['email'] or pgrec['email'] != orarec['email']:
-            if neworg: return 0
-            newrec['email'] = orarec['email']
-         if not pgrec['ucaremail'] or pgrec['ucaremail'] != orarec['ucaremail']:
-            newrec['ucaremail'] = orarec['ucaremail']
-         if 'until_date' in orarec and self.diffdate(pgrec['until_date'], orarec['until_date']):
-            newrec['until_date'] = orarec['until_date']
-         if not pgrec['userno'] or pgrec['userno'] != orarec['userno']:
-            newrec['userno'] = orarec['userno']
-         if not pgrec['upid'] or pgrec['upid'] != orarec['upid']:
-            newrec['upid'] = orarec['upid']
-         if not pgrec['logname'] or pgrec['logname'] != orarec['logname']:
-            newrec['logname'] = orarec['logname']
-         if orarec['lstname'] and (not pgrec['lstname'] or pgrec['lstname'] != orarec['lstname']):
-            newrec['lstname'] = orarec['lstname']
-         if orarec['fstname'] and (not pgrec['fstname'] or pgrec['fstname'] != orarec['fstname']):
-            newrec['fstname'] = orarec['fstname']
-         if pgrec['stat_flag'] != orarec['stat_flag']:
-            newrec['stat_flag'] = orarec['stat_flag']
-         if 'phoneno' in orarec and orarec['phoneno'] and (not pgrec['phoneno'] or pgrec['phoneno'] != orarec['phoneno']):
-            newrec['phoneno'] = orarec['phoneno']
-         if 'faxno' in orarec and orarec['faxno'] and (not pgrec['faxno'] or pgrec['faxno'] != orarec['faxno']):
-            newrec['faxno'] = orarec['faxno']
-         if orarec['start_date'] and (not pgrec['start_date'] or self.diffdate(pgrec['start_date'], orarec['start_date']) > 0):
-            newrec['start_date'] = orarec['start_date']      
-      elif orarec['stat_flag'] == 'A':
-         newrec['upid'] = orarec['upid']
-         newrec['userno'] = orarec['userno']
-         newrec['logname'] = orarec['logname']
-         newrec['lstname'] = orarec['lstname']
-         newrec['fstname'] = orarec['fstname']
-         newrec['stat_flag'] = orarec['stat_flag']
-         if orarec['start_date']: newrec['start_date'] = orarec['start_date']
-         if 'until_date' in orarec: newrec['until_date'] = orarec['until_date']
-         newrec['division'] = orarec['division']
-         newrec['org_name'] = orarec['org_name']
-         newrec['org_type'] = self.get_org_type(orarec['org_type'], orarec['email'])
-         newrec['country'] = self.set_country_code(orarec['email'], orarec['country'])
-         newrec['email'] = orarec['email']
-         newrec['ucaremail'] = orarec['ucaremail']
-         if 'phoneno' in orarec: newrec['phoneno'] = orarec['phoneno']
-         if 'faxno' in orarec: newrec['faxno'] = orarec['faxno']
-      return newrec if newrec else None
-
-# main function to execute this script
-def main():
-   object = FillUser()
-   object.read_parameters()
-   object.start_actions()
-   object.pgexit(0)
-
-# call main() to start program
-if __name__ == "__main__": main()

rda_python_metrics-3.0.4/src/rda_python_metrics/filluser.usg

@@ -1,24 +0,0 @@
-
- filluser - Fill or refresh records in the 'user' table from an Oracle source.
-
- Retrieves user information from the NCAR ORACLE server and inserts or
- updates records in the 'user' table of PostgreSQL database 'rdadb'.
-
- USAGE:
-   filluser [-b] (-i | -n UserNumbers | -u UserLoginNames)
-
- OPTIONS (choose exactly one of -i, -n, or -u):
-
-   -i   Refresh users that currently have incomplete information in the
-        'user' table.
-
-   -n UserNumbers
-        Look up users by their NCAR system user numbers.
-
-   -u UserLoginNames
-        Look up users by their NCAR system login names.
-
-   -b   Run in background mode (log to file only, no terminal output).
-
- EXAMPLE:
-   filluser -u zji

rda_python_metrics-3.0.4/src/rda_python_metrics/pg_person.py

@@ -1,73 +0,0 @@
-#!/usr/bin/env python3
-#*******************************************************************
-#     Title : pgperson.py
-#    Author : Zaihua Ji,  zji@ucar.edu
-#      Date : 2025-03-27
-#   Purpose : utility program to retrieve user info from People DB
-#
-#    Github : https://github.com/NCAR/rda-python-metrics.git
-#
-#*******************************************************************
-
-import httplib2
-import json
-import sys
-from rda_python_common import PgLOG
-
-PERSON = [
-   "upid",          # Unique person id
-   "username",      # UCAR login  user name
-   "email",         # Email address
-   "uid",           # Scientist id or Unix id
-   "firstName",     # First name
-   "lastName",      # Last name
-   "forwardEmail"   # Forward Email address
-]
-
-urlfmt="https://people.api.ucar.edu/persons?{}={}&searchScope=all&includeActive=true&includeInactive=true&searchType=advancedSearch"
-
-#
-# main function to execute this script
-#
-def main():
-
-   pgname = "pgperson"
-   argv = sys.argv[1:]
-   argc = len(sys.argv)
-   optstr = '|'.join(PERSON)
-   if argc != 3:
-      print("Usage: {} -({}) OptopnValue".format(pgname, optstr))
-      sys.exit(0)
-
-   option = optval = None
-   for arg in argv:
-      if option:
-         optval = arg
-      elif arg[0] == '-':
-         option = arg[1:]
-         if option not in PERSON:
-            PgLOG.pglog("{}: unknown option, must be -({})".format(arg, optstr), PgLOG.LGEREX)
-      else:
-         PgLOG.pglog("{}: Value passed in without leading option -({})".format(arg, optstr), PgLOG.LGEREX)
-
-   headers = {'Content-type': 'application/json'}
-   http=httplib2.Http()
-   url = urlfmt.format(option, 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')
-
-   sys.exit(0)
-
-#
-# call main() to start program
-#
-if __name__ == "__main__": main()

rda_python_metrics-3.0.4/src/rda_python_metrics/pg_username.py

@@ -1,51 +0,0 @@
-#!/usr/bin/env python3
-#*******************************************************************
-#     Title : pgusername.py
-#    Author : Zaihua Ji,  zji@ucar.edu
-#      Date : 2025-03-27
-#   Purpose : utility program to retrieve user info from People DB
-#             for a given UCAR user login name
-#
-#    Github : https://github.com/NCAR/rda-python-metrics.git
-#
-#*******************************************************************
-
-import httplib2
-import json
-import sys
-from rda_python_common import PgLOG
-
-url="https://people.api.ucar.edu/usernames/"
-
-#
-# main function to execute this script
-#
-def main():
-
-   pgname = "pgusername"
-   argc = len(sys.argv)
-   if argc != 2:
-      print("Usage: {} UserName".format(pgname))
-      sys.exit(0)
-
-   uname = sys.argv[1]
-
-   headers = {'Content-type': 'application/json'}
-   http=httplib2.Http()
-   response, content = http.request(url + uname, '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')
-
-   sys.exit(0)
-
-#
-# call main() to start program
-#
-if __name__ == "__main__": main()

rda_python_metrics-3.0.4/src/rda_python_metrics/pgperson.py

@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-#*******************************************************************
-#     Title : pgperson.py
-#    Author : Zaihua Ji,  zji@ucar.edu
-#      Date : 2025-03-27
-#             2025-12-19 convert to class PgPerson
-#   Purpose : utility program to retrieve user info from People DB
-#    Github : https://github.com/NCAR/rda-python-metrics.git
-#*******************************************************************
-import httplib2
-import json
-import sys
-
-class PgPerson:
-
-   def __init__(self):
-      super().__init__()
-      self.PERSON = [
-         "upid",          # Unique person id
-         "username",      # UCAR login  user name
-         "email",         # Email address
-         "uid",           # Scientist id or Unix id
-         "firstName",     # First name
-         "lastName",      # Last name
-         "forwardEmail"   # Forward Email address
-      ]
-      self.urlfmt = "https://people.api.ucar.edu/persons?{}={}&searchScope=all&includeActive=true&includeInactive=true&searchType=advancedSearch"
-      self.option = self.optval = None
-
-   # function to read parameters
-   def read_parameters(self):
-      pgname = "pgperson"
-      argv = sys.argv[1:]
-      argc = len(sys.argv)
-      optstr = '|'.join(self.PERSON)
-      if argc != 3:
-         print("Usage: {} -({}) OptopnValue".format(pgname, optstr))
-         sys.exit(0)
-      for arg in argv:
-         if self.option:
-            self.optval = arg
-         elif arg[0] == '-':
-            self.option = arg[1:]
-            if self.option not in self.PERSON:
-               print("{}: unknown option, must be -({})".format(arg, optstr), file=sys.stderr)
-         else:
-            print("{}: Value passed in without leading option -({})".format(arg, optstr), file=sys.stderr)
-
-   # function to start actions
-   def start_actions(self):
-      headers = {'Content-type': 'application/json'}
-      http=httplib2.Http()
-      url = self.urlfmt.format(self.option, self.optval)
-      response, content = http.request(url, 'GET', headers=headers)
-      status = response.status
-      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():
-   object = PgPerson()
-   object.read_parameters()
-   object.start_actions()
-   sys.exit(0)
-
-# call main() to start program
-if __name__ == "__main__": main()

rda_python_metrics-3.0.4/src/rda_python_metrics/pgusername.py

@@ -1,53 +0,0 @@
-#!/usr/bin/env python3
-#*******************************************************************
-#     Title : pgusername.py
-#    Author : Zaihua Ji,  zji@ucar.edu
-#      Date : 2025-03-27
-#             2025-12-19 convert to class PgUserName
-#   Purpose : utility program to retrieve user info from People DB
-#             for a given UCAR user login name
-#    Github : https://github.com/NCAR/rda-python-metrics.git
-#*******************************************************************
-import httplib2
-import json
-import sys
-
-class PgUserName:
-
-   def __init__(self):
-      super().__init__()
-      self.url="https://people.api.ucar.edu/usernames/"
-      self.uname = None
-
-   # function to read parameters
-   def read_parameters(self):
-      pgname = "pgusername"
-      argc = len(sys.argv)
-      if argc != 2:
-         print("Usage: {} UserName".format(pgname))
-         sys.exit(0)
-      self.uname = sys.argv[1]
-
-   # function to start actions
-   def start_actions(self):
-      headers = {'Content-type': 'application/json'}
-      http=httplib2.Http()
-      url = self.url + self.uname
-      response, content = http.request(url, 'GET', headers=headers)
-      status = response.status
-      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():
-   object = PgUserName()
-   object.read_parameters()
-   object.start_actions()
-   sys.exit(0)
-
-# call main() to start program
-if __name__ == "__main__": main()