rda-python-metrics 1.0.7__py3-none-any.whl → 1.0.8__py3-none-any.whl

rda_python_metrics/fillcountry.py

@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3/
 #
 ###############################################################################
 #
@@ -17,7 +17,6 @@
 import sys
 import re
 from rda_python_common import PgLOG
-from rda_python_common import PgIMMA
 from rda_python_common import PgUtil
 from rda_python_common import PgDBI
 
@@ -29,7 +28,7 @@ def main():
    argv = sys.argv[1:]
    tables = ['allusage', 'user', 'wuser']
    table = None
-   
+
    # check command line
    for arg in argv:
       if arg == "-b":
@@ -40,7 +39,7 @@ def main():
          table = arg
       else:
          PgLOG.pglog(arg + ": one table name at a time", PgLOG.LGEREX)
-   
+
    if not table:
       print("Usage: fillcountry TableName\n")
       sys.exit(0)
@@ -51,7 +50,7 @@ def main():
    PgLOG.cmdlog("fillcountry {}".format(' '.join(argv)))
 
    process_countries(table)
-   
+
    sys.exit(0)
 
 def process_countries(table):

rda_python_metrics/filloneorder.py

@@ -17,12 +17,11 @@ import sys
 import re
 from rda_python_common import PgLOG
 from rda_python_common import PgDBI
-from rda_python_common import PgIMMA
 from rda_python_common import PgUtil
 
 # -t dsid, -e email, -v request data volume, -i data input volume,
 # -m delivery method, -a amount charged, -p pay method, -d request date, -x close date,
-# -y close time, -c file count, -s specialist login name, -o order id, 
+# -y close time, -c file count, -s specialist login name, -o order id,
 # mandatory options: -t, -e, -v, and -m
 
 #
@@ -63,7 +62,7 @@ def add_one_order(params):
 
    year = None
    record = {}
-   
+
    record['dsid'] = params['t']
    record['wuid_request'] = params['u']
    record['dss_uname'] = params['s']
@@ -100,7 +99,7 @@ def add_to_allusage(record, year, ctime):
       pgrec['method'] = record['method']
       pgrec['source'] = 'O'
       return PgDBI.add_yearly_allusage(year, pgrec)
-      
+
    return 0
 
 #

rda_python_metrics/pgsyspath.py

@@ -0,0 +1,36 @@
+#
+##################################################################################
+#
+#     Title: pgsyspath
+#    Author: Zaihua Ji, zji@ucar.edu
+#      Date: 10/21/2020
+#   Purpose: python script to set sys.path properly to include paths for local
+#            modules
+#
+# Work File: $DSSHOME/bin/python/pgsyspath.py*
+#    Github: https://github.com/NCAR/rda-utility-programs.git
+#
+##################################################################################
+
+import sys
+import os
+import re
+
+#
+# intinialize the sys.path to include paths for local modules
+#
+def include_local_paths():
+
+   rpath = '/glade/u/home/rdadata'
+   if re.match('PG', rpath): rpath = os.getenv('DSSHOME', '/glade/u/home/rdadata')
+
+   # add more path to pgpaths list as needed
+   pgpaths = [rpath + '/lib/python',
+              rpath + '/lib/python/site-packages']
+   for pgpath in pgpaths:
+      if pgpath not in sys.path: sys.path.insert(0, pgpath)
+
+#
+# call to include local paths when this module is imported or run independently
+#
+include_local_paths()

rda_python_metrics/viewordusage.py

@@ -14,11 +14,11 @@
 import os
 import re
 import sys
-import pgsyspath
-import PgLOG
-import PgUtil
-import PgView
-import PgDBI
+from . import pgsyspath
+from . import PgView
+from rda_python_common import PgLOG
+from rda_python_common import PgUtil
+from rda_python_common import PgDBI
 
 VUSG = {
    'SNMS' : "ABCDEFGHIJKLMNOPQRSTVWYZ",          # all available short field names in FLDS
@@ -38,7 +38,7 @@ VUSG = {
 # column 0   - column title showing in usage view
 # column 1   - field name in format as shown in select clauses
 # column 2   - field name shown in where condition query string
-# column 3   - table name that the field belongs to 
+# column 3   - table name that the field belongs to
 # column 4   - output field length, the longer one of data size and comlun title, determine
 #              dynamically if it is 0. Negative values indicate right justification
 # column 5   - precision for floating point value if positive and show total value if not zero
@@ -76,7 +76,7 @@ FLDS = {
 # column 0   - expand ID for group of fields
 # column 1   - field name shown in where condition query string
 # column 2   - field name in format as shown in select clauses
-# column 3   - table name that the field belongs to 
+# column 3   - table name that the field belongs to
 EXPAND = {
 # SHRTNM EXPID     CNDSTR    FIELDNAME       TBLNAM
    'D' : ["TIME",   "dDmy"],
@@ -105,7 +105,7 @@ EXPAND = {
 #   A -- number or records to return
 #   c -- array of specified country codes
 #   C -- a string of short field names for viewing usages
-#   d -- array of specified dates 
+#   d -- array of specified dates
 #   D -- dates range, array of 1 or 2 dates in format of YYYY-MM-DD
 #   e -- array of specified email addresses
 #   E -- use given date or date range for email notice of data update
@@ -116,13 +116,13 @@ EXPAND = {
 #   j -- array of specified projects
 #   l -- array of specified last names
 #   L -- column delimiter for output
-#   m -- array of specified months 
-#   M -- array of specified download methods 
-#   n -- array of specified order numbers 
+#   m -- array of specified months
+#   M -- array of specified download methods
+#   n -- array of specified order numbers
 #   N -- number request range, arrage of 1 or 2 integers
 #   o -- array of specified orginization types
 #   O -- a string of short field names for sorting on
-#   p -- array of specified payment methods 
+#   p -- array of specified payment methods
 #   s -- output data size range, arrage of 1 or 2 sizes in unit of MByte
 #   S -- array of login names of specialists who processed the orders
 #   t -- array of specified dataset names
@@ -130,12 +130,12 @@ EXPAND = {
 #   U -- use given unit for file or data sizes
 #   v -- aray of specified roder numbers
 #   w -- generate view without totals
-#   y -- array of specified years 
+#   y -- array of specified years
 #   z -- generate view including entries without usage
 params = {}
 
 # relationship between parameter options and short field names, A option is not
-# related to a field name if it is not in keys %SNS 
+# related to a field name if it is not in keys %SNS
 SNS = {
    'c' : 'N', 'd' : 'D', 'D' : 'D', 'e' : 'E', 'g' : 'G', 'i' : 'I', 'j' : 'J',
    'l' : 'L', 'm' : 'M', 'M' : 'W', 'n' : 'V', 'N' : 'H', 'o' : 'O', 'p' : 'K',
@@ -194,18 +194,18 @@ def main():
       params[option] = 1
    elif inputs:
       params[option] = inputs   # record input array
-   
+
    if not params:
       PgLOG.show_usage(pgname)
    else:
       check_enough_options()
-   
+
    if 'o' not in params:
       if 'e' not in params:
          params['o'] = ['!', "'DSS'"]   # default to exclude 'DSS' for organization
    elif params['o'][0] == "'ALL'":
       del params['o']
-   
+
    usgtable = "ousage"
    build_query_strings(usgtable)  # build tablenames, fieldnames, and conditions
    records = PgDBI.pgmget(tablenames, fieldnames, condition, PgLOG.UCLWEX)

rda_python_metrics/viewwebfile.py

@@ -16,9 +16,9 @@
 import os
 import re
 import sys
-import PgLOG
-import PgUtil
-import PgDBI
+from rda_python_common import PgLOG
+from rda_python_common import PgUtil
+from rda_python_common import PgDBI
 from . import PgView
 
 FILE = {
@@ -38,9 +38,9 @@ FILE = {
 # column 0   - column title showing in mss file view
 # column 1   - field name in format as shown in select clauses
 # column 2   - field name shown in where condition query string
-# column 3   - table name that the field belongs to 
+# column 3   - table name that the field belongs to
 # column 4   - output field length, the longer one of data size and comlun title, determine
-#              dynamically if it is 0. Negative values indicate right justification 
+#              dynamically if it is 0. Negative values indicate right justification
 # column 5   - precision for floating point value if positive and show total value if not zero
 # column 6   - field flag to indicate it is a group, distinct or sum field
 FLDS = {
@@ -77,7 +77,7 @@ FLDS = {
 #   a -- 1 to view all usage info available
 #   A -- number or records to return
 #   C -- a string of short field names for viewing usages
-#   d -- array of specified dates of file last written 
+#   d -- array of specified dates of file last written
 #   D -- last written dates range, array of 1 or 2 dates in format of YYYY-MM-DD
 #   e -- array of specified email addresses
 #   f -- array of specified online file names
@@ -90,16 +90,16 @@ FLDS = {
 #   J -- 1 to include group title for GROUP
 #   l -- array of specified last names
 #   L -- column delimiter for output
-#   m -- array of specified months of file last written 
-#   M -- array of specified months of file created 
-#   n -- array of specified user numbers 
+#   m -- array of specified months of file last written
+#   M -- array of specified months of file created
+#   n -- array of specified user numbers
 #   D -- dates range, datasets created between, array of 1 or 2 dates in format of YYYY-MM-DD
 #   o -- array of specified file status
 #   O -- a string of short field names for sorting on
 #   p -- array of web file types, Data, Document, and etc.
 #   r -- group index range, array of 1 or 2 group indices
 #   s -- file size range, arrage of 1 or 2 sizes in unit of MByte
-#   S -- specialist lognames who handle the datasets 
+#   S -- specialist lognames who handle the datasets
 #   t -- array of specified dataset names
 #   T -- dataset range, array of 1 or 2 dataset names
 #   u -- array of specified specialist user names
@@ -113,7 +113,7 @@ FLDS = {
 params = {}
 
 # relationship between parameter options and short field names, A option is not
-# related to a field name if it is not in keys %SNS 
+# related to a field name if it is not in keys %SNS
 SNS = {
    'd' : 'D', 'D' : 'D', 'e' : 'E', 'f' : 'F', 'F' : 'F', 'g' : 'G', 'i' : 'I',
    'l' : 'L', 'm' : 'M', 'M' : 'H', 'N' : 'N', 'o' : 'O', 'p' : 'P', 'r' : 'G',
@@ -174,7 +174,7 @@ def main():
       params[option] = 1
    elif inputs:
       params[option] = inputs   # record input array
-   
+
    if not params:
       PgLOG.show_usage(pgname)
    else:
@@ -196,7 +196,7 @@ def main():
    PgView.simple_output(params, FLDS, records, totals)
 
    PgLOG.pgexit(0)
-   
+
 #
 # cehck if enough information entered on command line for generate view/report, exit if not
 #
@@ -209,7 +209,7 @@ def check_enough_options():
       if sn == 'X': continue  # do not process INDEX field
       if FILE['SNMS'].find(sn) < 0:
          PgLOG.pglog("{}: Field {} must be in field names '{}X'".format(pgname, sn, FILE['SNMS']), PgLOG.LGWNEX)
-   
+
    if 'g' in params or 'G' in params:
       if 't' not in params:
          PgLOG.pglog("Miss dataset condition via Option -t for processing Group", PgLOG.LGWNEX)

{rda_python_metrics-1.0.7.dist-info → rda_python_metrics-1.0.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.7
+Version: 1.0.8
 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
@@ -13,6 +13,9 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: rda_python_common
 Requires-Dist: rda_python_setuid
+Requires-Dist: geoip2
+Requires-Dist: ipinfo
+Requires-Dist: httplib2
 Dynamic: license-file
 
 RDA Python Package to gather and view data usage metrics.

{rda_python_metrics-1.0.7.dist-info → rda_python_metrics-1.0.8.dist-info}/RECORD

@@ -5,13 +5,13 @@ rda_python_metrics/fillawsusage.py,sha256=dpI3-EFINJECdCSUOm37A97CJNIxOS2nYwA0fB
 rda_python_metrics/fillawsusage.usg,sha256=qHdQGMbXlbsqEAoEmM71_zlE3yw704nyhXZ4sw4FIbI,631
 rda_python_metrics/fillcodusage.py,sha256=Hp3VrlIqHBWRI6Zjbi0nxWZPNvPrKsGBSZ1L9qA9_y0,8006
 rda_python_metrics/fillcodusage.usg,sha256=QAM6wqycyDb-6t5PhlL2niPiGxZ4Gln0QVdKdyN3ShI,684
-rda_python_metrics/fillcountry.py,sha256=YYm0lIIfljA7rIAOFgP1fhyhqkBDOY6vdk7g11WFPLc,2359
+rda_python_metrics/fillcountry.py,sha256=7i5LNi3scRoyRCT6t7aeNTGKOpxzJ2mA9tnvUqje2AU,2314
 rda_python_metrics/fillendtime.py,sha256=skZttlpoY19g0dGwqGQI8t_1YPPTPEXwg3EfNlfL90I,2533
 rda_python_metrics/fillglobususage.py,sha256=-cvIipaFju75aw9axHkx6JIe9HWYwQOD8-0blQaxxUM,9442
 rda_python_metrics/fillglobususage.usg,sha256=p-f5hGGDkcM2O8ADEP0Do_lMIIFj8KkiFG1HJ-YgtQM,637
 rda_python_metrics/fillipinfo.py,sha256=xIVJ6nDvVvMOjb7s_6-YDLVRBC09pDFugnjB3Nrmqus,5641
 rda_python_metrics/fillipinfo.usg,sha256=taITqZa6GL0-wxXcMEdMU3ZlQbJ1CsmFclTvXpG5TLg,644
-rda_python_metrics/filloneorder.py,sha256=MhllvtS2PM1SMkf1dHmGTIppIkt__SRMKIUPrv_iRRU,5472
+rda_python_metrics/filloneorder.py,sha256=H4XIskpViaiKgc9StvS4cQT_LpM3VYLCsuuqCm4UqmA,5425
 rda_python_metrics/filloneorder.usg,sha256=mtOySKx6-D4k2bbTcmi6cSYtINiycRyHQkHozi0CQu0,1466
 rda_python_metrics/fillosdfusage.py,sha256=l9hV58WOZmvmenlm_zqWXZ03u6dkn_dQCI91fQYKrEk,8758
 rda_python_metrics/fillosdfusage.usg,sha256=Jlyn6K1LS1ZqDbmOQpR3KNVnp43-kfyvqYlcDt4jPOM,632
@@ -24,6 +24,7 @@ rda_python_metrics/filluser.usg,sha256=Xgqi0QwA9-4jpYj3L4Q4TISpVwRlsomt2G7T0oYAF
 rda_python_metrics/logarch.py,sha256=cMty6vI5t4oBAKnA4VYZjEvfYoj_8cSUuW0orPOJOZQ,13721
 rda_python_metrics/logarch.usg,sha256=6ksFxu_-lzhRpQE2YFAqgGVhwFP4PTweCbFBuGhhICU,960
 rda_python_metrics/pgperson.py,sha256=q_0jSlTyqEQh2J8yq5Nrf9TLg1awvREdp3E8XyN7PoI,2068
+rda_python_metrics/pgsyspath.py,sha256=DZhFp-r-LzN0qrHtfdCYfnGDnmD_R4ufuEduk0_vRIw,1039
 rda_python_metrics/pgusername.py,sha256=sNtPNKdubZYNPWR89pAXHGTuP6q8kuf71ig7-XJLXrQ,1245
 rda_python_metrics/viewallusage.py,sha256=B-4s3aoAkAkeB1QM_xfZceRe_QI16vwpI81ekb8VPgc,15586
 rda_python_metrics/viewallusage.usg,sha256=ABtOCqGoE6HKE1IPsk02ppC883vNiJILRPBRrpbnzRM,9296
@@ -31,19 +32,19 @@ rda_python_metrics/viewcheckusage.py,sha256=HougqjDAOVG6pYglFjyHQ-UdLBcYe7v_jzU1
 rda_python_metrics/viewcheckusage.usg,sha256=KuJFycggGiUcSezQ9vywDbituvu63SZ-ZnNTaMpbc-A,8930
 rda_python_metrics/viewcodusage.py,sha256=ScyZFjMSss1GNZdmXVs9wWRbaPZRahaFXsWG8kIVRP4,14012
 rda_python_metrics/viewcodusage.usg,sha256=_kgF7Tk2_n1JVf9km2MiwO86vtZRCdu4i8hkWN0eETo,8637
-rda_python_metrics/viewordusage.py,sha256=9zIJkThKgSOW58qXyQs2Hq8EeEp645lnpD5bstSzR_0,15370
+rda_python_metrics/viewordusage.py,sha256=0TIUM-V63m4Ol0rW4QIbnw9FrFlSQ2Rv3hGgopSIIz0,15435
 rda_python_metrics/viewordusage.usg,sha256=TqZDQk-DzOWC6_uzmFzGyA4F98ojOifANJGv9BCfH1I,10599
 rda_python_metrics/viewrqstusage.py,sha256=wNH5DTEBYrUQKAms10weBH939r-m3tLXXg5PwS6bzlk,16690
 rda_python_metrics/viewrqstusage.usg,sha256=Ii5-7h_RO2rkoE9VLxuLhc9klgkEJSqHoDrsOlQOTKo,10481
 rda_python_metrics/viewtdsusage.py,sha256=-dMj2xaxEHxRM8c8ifkHYEWURQBze_3ITe9BAuglD0M,14276
 rda_python_metrics/viewtdsusage.usg,sha256=-q3tsV3S0-pnfSXFwH62MWm_l1WywPoQGHc5l9LNXI0,8884
-rda_python_metrics/viewwebfile.py,sha256=BqtA_YNhprnrGE6GWEW7n5PDxzNlljfv_MOPezOQaeU,13594
+rda_python_metrics/viewwebfile.py,sha256=HSMNkQQawonu6W3blV7g9UbJuNy9VAOn9COqgmjv5dI,13646
 rda_python_metrics/viewwebfile.usg,sha256=lTNi8Yu8BUJuExEDJX-vsJyWUSUIQTS-DiiBEVFo33s,10054
 rda_python_metrics/viewwebusage.py,sha256=jhoHuRPVNtp7Lbjv0l-Jy_vp2p2nWQC7IVZ0P4JUJ4I,16657
 rda_python_metrics/viewwebusage.usg,sha256=IsT72v22xyZf7ng_IodVs0dLTsH1Q4BtFvT-gs0-xJY,9946
-rda_python_metrics-1.0.7.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
-rda_python_metrics-1.0.7.dist-info/METADATA,sha256=Lyuoi1SjX1ZPY8XkgiMk-kTOAOz7ygsqaQ78FqJ6JMI,667
-rda_python_metrics-1.0.7.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-rda_python_metrics-1.0.7.dist-info/entry_points.txt,sha256=uoCDpwsZJNKXSxkngolWGgmi7arXp7BM-p6tVHVWvgc,1133
-rda_python_metrics-1.0.7.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
-rda_python_metrics-1.0.7.dist-info/RECORD,,
+rda_python_metrics-1.0.8.dist-info/licenses/LICENSE,sha256=1dck4EAQwv8QweDWCXDx-4Or0S8YwiCstaso_H57Pno,1097
+rda_python_metrics-1.0.8.dist-info/METADATA,sha256=pLLx0jNG31tY-7pjEZvH5EP1nfMd2_kJuKjU52VpeKs,735
+rda_python_metrics-1.0.8.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+rda_python_metrics-1.0.8.dist-info/entry_points.txt,sha256=uoCDpwsZJNKXSxkngolWGgmi7arXp7BM-p6tVHVWvgc,1133
+rda_python_metrics-1.0.8.dist-info/top_level.txt,sha256=aoBgbR_o70TP0QmMW0U6inRHYtfKld47OBmnWnLnDOs,19
+rda_python_metrics-1.0.8.dist-info/RECORD,,