rda-python-metrics 1.0.16__py3-none-any.whl → 1.0.18__py3-none-any.whl

rda_python_metrics/viewallusage.py

@@ -22,18 +22,18 @@ from rda_python_common import PgDBI
 from . import PgView
 
 VUSG = {
-   'SNMS' : "ABCDEFGHMNOPQRSTUVWY",            # all available short field names in FLDS
-   'OPTS' : 'AabcCdDeEfghHImnLMNoOqsStTUvVwyz', # all available options, used for params
-   'NOPT' : 'abhwz',                           # stand alone option without inputs
-   'ACND' : 'cdefgmMoqStvy',                   # available array condition options
-   'RCND' : 'DsNT',                            # available range condition options
-   'CNDS' : 'acdDeEfgmMnNoqsStTvVy',           # condition options, ACND, RCND and 'a'
-   'HCND' : 'N',                               # condition options for having clause
-   'ECND' : 'my',                              # condition options need evaluating
-   'TCND' : 'dDmy',                            # temporal condition options
-   'SFLD' : 'DEFGNOPTVW',                      # string fields, to be quoted in condition
-   'UFLD' : 'GNOVW',                           # string fields must be in upper case
-   'LFLD' : 'EPT'                              # string fields must be in lower case
+   'SNMS' : "ABCDEFGHKMNOPQRSTUVWY",            # all available short field names in FLDS
+   'OPTS' : 'AabcCdDeEfghHIkmnLMNoOqsStTUvVwyz', # all available options, used for params
+   'NOPT' : 'abhwz',                            # stand alone option without inputs
+   'ACND' : 'cdefgkmMoqStvy',                   # available array condition options
+   'RCND' : 'DsNT',                             # available range condition options
+   'CNDS' : 'acdDeEfgkmMnNoqsStTvVy',           # condition options, ACND, RCND and 'a'
+   'HCND' : 'N',                                # condition options for having clause
+   'ECND' : 'my',                               # condition options need evaluating
+   'TCND' : 'dDmy',                             # temporal condition options
+   'SFLD' : 'DEFGKNOPTVW',                      # string fields, to be quoted in condition
+   'UFLD' : 'GNOVW',                            # string fields must be in upper case
+   'LFLD' : 'EPT'                               # string fields must be in lower case
 }
 
 # keys FLDS - short field names
@@ -52,6 +52,7 @@ FLDS = {
    'F' : ['FORMAT',    "data_format",                    'data_format', 'dataset',   0,   0,  'G'],
    'M' : ['MONTH',     PgDBI.fmtym("date"),              'date',       'allusage',   7,   0,  'G'],
    'N' : ['COUNTRY',   "country",                        'country',    'allusage',   0,   0,  'G'],
+   'K' : ['REGION',    "region",                         'region',     'allusage',   0,   0,  'G'],
    'G' : ['GROUP',     "source",                         'source',     'allusage',   0,   0,  'G'],
    'O' : ['ORGTYPE',   "org_type",                       'org_type',   'allusage',   7,   0,  'G'],
    'P' : ['DSOWNER',   "specialist",                     'specialist', 'dsowner',    8,   0,  'G'],
@@ -82,10 +83,10 @@ EXPAND = {
    'Q' : ["TIME",   "dDmy"],
    'Y' : ["TIME",   "dDmy"],
 
-   'E' : ["USER",   "ecgo",  "email",     "wuser",  "user"],
-   'O' : ["USER",   "ecgo",  "org_type",  "wuser",  "user"],
-   'N' : ["USER",   "ecgo",  "country",   "wuser",  "user"],
-   'G' : ["USER",   "ecgo",  "region",    "wuser",  "user"],
+   'E' : ["USER",   "ecko",  "email",     "wuser",  "user"],
+   'O' : ["USER",   "ecko",  "org_type",  "wuser",  "user"],
+   'N' : ["USER",   "ecko",  "country",   "wuser",  "user"],
+   'K' : ["USER",   "ecko",  "region",    "wuser",  "user"],
 
    'R' : ["DSID",   "fFsStT", "search.datasets.title", "search.datasets"],
    'T' : ["DSID",   "fFsStT", "dataset.dsid",   "dataset"],
@@ -109,6 +110,7 @@ EXPAND = {
 #   h -- for give emails, include their histical emails registered before
 #   H -- a string of report title to replace the default one
 #   I -- use given email IDs for email notice of data update
+#   k -- array of specified region names
 #   L -- column delimiter for output
 #   m -- array of specified months 
 #   M -- array of specified download methods
@@ -131,8 +133,9 @@ 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 
 SNS = {
-   'c' : 'N', 'd' : 'D', 'D' : 'D', 'e' : 'E', 'f' : 'F', 'g' : 'G', 'm' : 'M', 'M' : 'W', 'N' : 'H',
-   'o' : 'O', 'q' : 'Q', 's' : 'S', 'S' : 'P', 't' : 'T', 'T' : 'T', 'u' : 'U', 'v' : 'V', 'V' : 'V', 'y' : 'Y'
+   'c' : 'N', 'd' : 'D', 'D' : 'D', 'e' : 'E', 'f' : 'F', 'g' : 'G', 'm' : 'M',
+   'M' : 'W', 'N' : 'H', 'k' : 'K', 'o' : 'O', 'q' : 'Q', 's' : 'S', 'S' : 'P',
+   't' : 'T', 'T' : 'T', 'u' : 'U', 'v' : 'V', 'V' : 'V', 'y' : 'Y'
 }
 
 tablenames = fieldnames = condition = ''

rda_python_metrics/viewallusage.usg

@@ -6,10 +6,9 @@
                      [-A RowLimit] [-c CountryCodes] [-d DateList] \
                      [-D StartDate [EndDate]] [-e EMailList] -h \
                      [-E StartNoticeDate [EndNoticeDate]] [-f DataFormats] \
-                     [-g SourceGroups] [-I EmailIDList] [-m MonthList] \
-                     [-M MethodList] [-N MinNumberRead [MaxNumberRead]] \
-                     [-o OrganizationTypes] \
-                     [-q QuaterList] [-s MinSize [MaxSize]] \
+                     [-g SourceGroups] [-I EmailIDList] [-k RegionLost] \
+                     [-m MonthList] [-M MethodList] [-N MinNumberRead [MaxNumberRead]] \
+                     [-o OrganizationTypes] [-q QuaterList] [-s MinSize [MaxSize]] \
                      [-S SpecialistLoginNames] [-t DatasetList] \
                      [-T MinDataset [MaxDataset]] [-y YearList] \
                      [-v IPAddressList] [-V MinIPAddress [MaxIPAddress]] \
@@ -18,7 +17,7 @@
 
       Specify [-C] ColumnNames, refer to Option -C section for detail
       description, and choose at least one of the condition options, -a, -c,
-      -d, -D, -e, -E, -f, -g, -I, -m, -M, -N, -o, -q, -s, -S -t, -T, -v, -V
+      -d, -D, -e, -E, -f, -g, -I, -k, -m, -M, -N, -o, -q, -s, -S -t, -T, -v, -V
       and -y, to run this application.
 
       For all condition options, except option -a, an '!' sign can be added
@@ -28,10 +27,10 @@
       OrganizationTypes.  Refer to the example given at the end of this help
       document for how to select excluding condition.
 
-      String condition options, -c, -e, -f, -g, -M, -o, -S, -t and -v, allow wildcard
-      inputs. '%' matches any number of characters and '_' matches any one
-      character.  Refer to the example given at the end of this help document
-      for how to use wildcard for string condition options.
+      String condition options, -c, -e, -f, -g, -k, -M, -o, -S, -t and -v, allow
+      wildcard inputs. '%' matches any number of characters and '_' matches
+      any one character.  Refer to the example given at the end of this help
+      document for how to use wildcard for string condition options.
 
       Output of this application is defaulted to page format with a page
       header on each page. A page header includes main title, sub titles and
@@ -55,6 +54,7 @@
               F*- FORMAT       - dataset default data format
               G*- GROUP        - data usage source group: W - Web log, G - Globus,
                                  T - Thredds, O - Order, and A - AWS log
+              K*- REGION       - Region Name users from
               M*- MONTH        - format as YYYY-MM, for example 2004-04
               N*- COUNTRY      - country codes users from
               O*- ORGTYPE      - organization types (DSS, NCAR, UNIV and OTHER)
@@ -64,7 +64,20 @@
               S - BSIZE        - size of data read each time, default to Bytes
               T*- DATASET      - format as dsnnn.n, for example d540001
               V*- IPADDRESS    - format as n.n.n.n (n = 0 - 999)
-              W*- METHOD       - method of data transfer (FTP, Tape, etc.)
+              W*- METHOD       - method of data transfer:
+                                 AIOBT - aiobotocore on AWS
+                                 CDG - CDG data metrics gathered from GDEX
+                                 CURL - curl
+                                 GLOB - Globus
+                                 OSDF - OSDF downloads
+                                 PYTHON - python
+                                 R-C - Customized requests
+                                 RCLON - rclone on AWS
+                                 R-S - Subset Requests
+                                 R-T - Subset+Format Conversion requests
+                                 TDS - RDA THREDDS server
+                                 WEB - General Web downloads
+                                 WGET - wget
               Y*- YEAR         - format as YYYY, for example 2004
 
                 * - field names can processed with zero usages
@@ -127,6 +140,8 @@
       - Option -h, works with Option -e to include historical user emails
            registered before;
 
+      - Option -k, for data read by users from given region names;
+
       - Option -m, for data read in given months, in format YYYY-MM;
 
       - Option -M, for data read via given medium methods;

rda_python_metrics/viewcodusage.py

@@ -22,16 +22,16 @@ from rda_python_common import PgDBI
 from . import PgView
 
 VUSG = {
-   'SNMS' : "ABCDEGHIJMNOPQRSTUVY",          # cod available short field names in FLDS
-   'OPTS' : 'AabcCdDeEghHiLmnoOqStTUwyz',    # cod available options, used for params
-   'NOPT' : 'abhwz',                         # stand alone option without inputs
-   'ACND' : 'cdegiImoqSty',                 # available array condition options
-   'RCND' : 'DET',                           # available range condition options
-   'CNDS' : 'acdDeEgiImMnoqStTy',           # condition options, ACND, RCND and 'a'
-   'ECND' : 'my',                            # condition options need evaluating
-   'SFLD' : 'DEGINOTU',                      # string fields, to be quoted in condition
-   'UFLD' : 'NO',                            # string fields must be in upper case
-   'LFLD' : 'EMPT'                           # string fields must be in lower case
+   'SNMS' : "ABCDEGHIJKMNOPQRSTUVY",          # cod available short field names in FLDS
+   'OPTS' : 'AabcCdDeEghHikLmnoOqStTUwyz',    # cod available options, used for params
+   'NOPT' : 'abhwz',                          # stand alone option without inputs
+   'ACND' : 'cdegiIkmoqSty',                  # available array condition options
+   'RCND' : 'DET',                            # available range condition options
+   'CNDS' : 'acdDeEgiIkmMnoqStTy',            # condition options, ACND, RCND and 'a'
+   'ECND' : 'my',                             # condition options need evaluating
+   'SFLD' : 'DEGIKNOTU',                      # string fields, to be quoted in condition
+   'UFLD' : 'NO',                             # string fields must be in upper case
+   'LFLD' : 'EMPT'                            # string fields must be in lower case
 }
 
 # keys FLDS - short field names
@@ -51,6 +51,7 @@ FLDS = {
    'I' : ['IP',        "ip",                             'ip',         'codusage',   0,   0,  'G'],
    'M' : ['MONTH',     PgDBI.fmtym("date"),              'date',       'codusage',   7,   0,  'G'],
    'N' : ['COUNTRY',   "country",                        'country',    'codusage',   0,   0,  'G'],
+   'K' : ['REGION',    "region",                         'region',     'codusage',   0,   0,  'G'],
    'O' : ['ORGTYPE',   "org_type",                       'org_type',   'codusage',   7,   0,  'G'],
    'P' : ['DSOWNER',   "specialist",                     'specialist', 'dsowner',    8,   0,  'G'],
    'Q' : ['QUARTER',   "quarter",                        'quarter',    'codusage',   7,   0,  'G'],
@@ -80,9 +81,10 @@ EXPAND = {
    'Q' : ["TIME",   "dDmy"],
    'Y' : ["TIME",   "dDmy"],
 
-   'E' : ["USER",   "eco",  "email",        "wuser",  "user"],
-   'O' : ["USER",   "eco",  "org_type",     "wuser",  "user"],
-   'N' : ["USER",   "eco",  "country",      "wuser",  "user"],
+   'E' : ["USER",   "ecko",  "email",        "wuser",  "user"],
+   'O' : ["USER",   "ecko",  "org_type",     "wuser",  "user"],
+   'N' : ["USER",   "ecko",  "country",      "wuser",  "user"],
+   'K' : ["USER",   "ecko",  "region",       "wuser",  "user"],
 
    'R' : ["DSID",   "fFsStT", "search.datasets.title", "search.datasets"],
    'T' : ["DSID",   "fFsStT", "dataset.dsid",   "dataset"],
@@ -103,6 +105,7 @@ EXPAND = {
 #   H -- a string of report title to replace the default one
 #   i -- array of specified IP addresses
 #   I -- use given email IDs for email notice of data update
+#   k -- array of specified region names
 #   L -- column delimiter for output
 #   m -- array of specified months 
 #   o -- array of specified orginization types
@@ -121,8 +124,8 @@ 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 
 SNS = {
-   'c' : 'N', 'd' : 'D', 'D' : 'D', 'e' : 'E', 'g' : 'G', 'i' : 'I', 'm' : 'M',
-   'o' : 'O', 'q' : 'Q', 'S' : 'P', 't' : 'T', 'T' : 'T', 'y' : 'Y'
+   'c' : 'N', 'd' : 'D', 'D' : 'D', 'e' : 'E', 'g' : 'G', 'i' : 'I', 'k' : 'K',
+   'm' : 'M', 'o' : 'O', 'q' : 'Q', 'S' : 'P', 't' : 'T', 'T' : 'T', 'y' : 'Y'
 }
 
 tablenames = fieldnames = condition = ''

rda_python_metrics/viewcodusage.usg

@@ -7,7 +7,7 @@
                      [-D StartDate [EndDate]] [-e EMailList] -h \
                      [-E StartNoticeDate [EndNoticeDate]] \
                      [-g AggregationIDs] [-i IPAddresses] \
-                     [-I EmailIDList] [-m MonthList] \
+                     [-I EmailIDList] [-k RegionNames] [-m MonthList] \
                      [-N MinNumberRead [MaxNumberRead]] \
                      [-o OrganizationTypes] [-q QuaterList] \
                      [-S SpecialistLoginNames] [-t DatasetList] \
@@ -17,7 +17,7 @@
 
       Specify [-C] ColumnNames, refer to Option -C section for detail
       description, and choose at least one of the condition options, -a, -c,
-      -d, -D, -e, -E, -g, -i, -I, -m, -N, -o, -q, -S -t, -T, and -y, to
+      -d, -D, -e, -E, -g, -i, -I, -k, -m, -N, -o, -q, -S -t, -T, and -y, to
       run this application.
 
       For all condition options, except option -a, an '!' sign can be added
@@ -27,7 +27,7 @@
       OrganizationTypes.  Refer to the example given at the end of this help
       document for how to select excluding condition.
 
-      String condition options, -c, -e, -g, -i, -o, -S, and -t, allow wildcard
+      String condition options, -c, -e, -g, -i, -k, -o, -S, and -t, allow wildcard
       inputs. '%' matches any number of characters and '_' matches any one
       character.  Refer to the example given at the end of this help document
       for how to use wildcard for string condition options.
@@ -55,6 +55,7 @@
               I*- IP           - user IP address
               M*- MONTH        - format as YYYY-MM, for example 2004-04
               N*- COUNTRY      - country codes users from
+              K*- REGION       - region names users from
               O*- ORGTYPE      - organization types (DSS, NCAR, UNIV and OTHER)
               P*- DSOWNER      - login names of specialists who own the datasets
               Q*- QUARTER      - quarter of year, 1, 2, 3, or 4
@@ -122,6 +123,8 @@
 
       - Option -i, for data read from machines with given IP addresses;
  
+      - Option -k, for files read by users from given region names;
+
       - Option -m, for data read in given months, in format YYYY-MM;
  
       - Option -N, for files for numbers of read by each group between

rda_python_metrics/viewordusage.py

@@ -22,14 +22,14 @@ from rda_python_common import PgDBI
 
 VUSG = {
    'SNMS' : "ABCDEFGHIJKLMNOPQRSTVWYZ",          # all available short field names in FLDS
-   'OPTS' : 'AabcCdDeEghHijlLmMnNoOpqsStTUvwyz', # all available options, used for %params
+   'OPTS' : 'AabcCdDeEghHijklLmMnNoOqsStTUvwyz', # all available options, used for %params
    'NOPT' : 'abhwz',                             # stand alone option without inputs
-   'ACND' : 'cdegijlmMnopqStvy',                 # available array condition options
+   'ACND' : 'cdegijlkmMnoqStvy',                 # available array condition options
    'RCND' : 'DsNT',                              # available range condition options
-   'CNDS' : 'acdDegijlmMnNopqsStTvy',            # condition options, ACND, RCND and 'a'
+   'CNDS' : 'acdDegijlkmMnNoqsStTvy',            # condition options, ACND, RCND and 'a'
    'HCND' : 'N',                                 # condition options for having clause
    'ECND' : 'my',                                # condition options need evaluating
-   'SFLD' : 'DEGIJLNOPTVW',                      # string fields, to be quoted in condition
+   'SFLD' : 'DEGIJKLNOPTVW',                     # string fields, to be quoted in condition
    'UFLD' : 'ILNOW',                             # string fields must be in upper case
    'LFLD' : 'ETP'                                # string fields must be in lower case
 }
@@ -50,10 +50,10 @@ FLDS = {
    'G' : ['ORGNAME',      "org_name",                            'org_name',    'wuser',    0,  0,  'G'],
    'I' : ['FIRSTNAME',    "fstname",                             'fstname',     'wuser',    0,  0,  'G'],
    'J' : ['PROJECT',      "project",                             'project',     'ousage',   7,  0,  'G'],
-   'K' : ['PAYMENT',      "pay_method",                          'pay_method',  'ousage',   0,  0,  'G'],
    'L' : ['LASTNAME',     "lstname",                             'lstname',     'wuser',    0,  0,  'G'],
    'M' : ['MONTH',        PgDBI.fmtym("date_request"),           'date_request','ousage',   7,  0,  'G'],
    'N' : ['COUNTRY',      "country",                             'country',     'wuser',    0,  0,  'G'],
+   'K' : ['REGION',       "region",                              'region',      'wuser',    0,  0,  'G'],
    'O' : ['ORGTYPE',      "org_type",                            'org_type',    'wuser',    5,  0,  'G'],
    'P' : ['PROCESSBY',    "dss_uname",                           'dss_uname',   'ousage',   9,  0,  'G'],
    'Q' : ['QUARTER',      "quarter",                             'quarter',     'ousage',   7,  0,  'G'],
@@ -90,6 +90,7 @@ EXPAND = {
    'G' : ["USER",   "eilgco",  "org_name",     "wuser"],
    'O' : ["USER",   "eilgco",  "org_type",     "wuser"],
    'N' : ["USER",   "eilgco",  "country",      "wuser"],
+   'K' : ["USER",   "eilgcko", "region",       "wuser"],
 
    'T' : ["DSID",   "fFsStT", "dataset.dsid",   "dataset"],
    'R' : ["DSID",   "fFsStT", "search.datasets.title", "search.datasets"],
@@ -114,6 +115,7 @@ EXPAND = {
 #   H -- a string of report title to replace the default one
 #   i -- array of specified first names
 #   j -- array of specified projects
+#   k -- array of specified regions
 #   l -- array of specified last names
 #   L -- column delimiter for output
 #   m -- array of specified months
@@ -122,7 +124,6 @@ EXPAND = {
 #   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
 #   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
@@ -138,7 +139,7 @@ params = {}
 # 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',
+   'k' : 'K', 'l' : 'L', 'm' : 'M', 'M' : 'W', 'n' : 'V', 'N' : 'H', 'o' : 'O',
    'q' : 'Q', 's' : 'S', 'S' : 'P', 't' : 'T', 'T' : 'T', 'y' : 'Y'
 }
 

rda_python_metrics/viewordusage.usg

@@ -6,11 +6,10 @@
                      [-A RowLimit] [-c CountryCodes] [-d DataRequestDates] \
                      [-D StartRquestDate [EndRequestDate]] \
                      [-e EMailList] -h [-E StartNoticeDate [EndNoticeDate]] \
-                     [-g OrganizationNames] \
-                     [-i FirstNamelist] [-j Projects] [-l LastNameList] \
+                     [-g OrganizationNames] [-i FirstNamelist] [-j Projects] \
+                     [-k Region Names] [-l LastNameList] \
                      [-m MonthList] [-M MethodList] [-n OrderNumberList] \
-                     [-o OrganizationTypes] [-p PaymentMethods] \
-                     [-s MinInputSize [MaxInputSize]] \
+                     [-o OrganizationTypes] [-s MinInputSize [MaxInputSize]] \
                      [-S SpecialistLoginNames] [-t DatasetList] \
                      [-T MinDataset [MaxDataset]] [-u ProcessSpecialists] \
                      [-v OrderNumbers] [-y YearList] \
@@ -19,7 +18,7 @@
 
       Specify [-C] ColumnNames, refer to Option -C section for detail
       description, and choose at least one of the condition options, -a, -c, 
-      -d, -D, -e, -g, -i, -j, -l, -m, -M, -N, -n, -o, -p, -s, -S, -t, -T, -u
+      -d, -D, -e, -g, -i, -j, -k, -l, -m, -M, -N, -n, -o, -s, -S, -t, -T, -u
       -v and -y, to run this application.
 
       For all condition options, except option -a, an '!' sign can be added
@@ -29,7 +28,7 @@
       OrganizationList.  Refer to the example given at the end of this help
       document for how to select excluding condition.
 
-      String condition options, -c, -e, -g, -i, -j, -l, -n, -o, -p, -S, -t, -u
+      String condition options, -c, -e, -g, -i, -j, -k, -l, -n, -o, -S, -t, -u
       and -v, allow wildcard inputs. '%' matches any number of characters and '_'
       matches any one character.  Refer to the example given at the end of
       this help document for how to use wildcard for string condition options.
@@ -56,13 +55,13 @@
               G*- ORGNAME      - organization name 
               I*- FIRSTNAME    - user first name 
               J - PROJECT      - project id, i.e, icoads, era40, tigge
-              K - PAYMENT      - payment methods (free, invce, etc.)
               L*- LASTNAME     - user last name 
               M*- MONTH        - format as YYYY-MM, for example 2004-04
               N*- ORDERNO      - order number 
               O*- ORGTYPE      - organization types (DSS, NCAR, UNIV and OTHER)
               P - PROCESSBY    - specialist login names who own the orders
               Q*- COUNTRY      - user country names
+              K - REGION       - user region names
               R*- DSTITLE      - dataset titles
               S*- OUTSIZE      - requested data size in MB
               T*- DATASET      - format as dsnnn.n, for example d540001
@@ -132,6 +131,8 @@
 
       - Option -j, for order data requested for specified projects;
 
+      - Option -k, for order data requested by users from given regions;
+
       - Option -l, for order data requested by users with given last names;
 
       - Option -m, for data requested in given months, in format YYYY-MM;
@@ -148,8 +149,6 @@
            types. It defaults to -o ! DSS to exclude usage from DSS specialists;
            Set it to ALL to include all orgnization types;
 
-      - Option -p, for order data via given payment methods;
-
       - Option -s, for output data with sizes, in unit of MByte, between
            MinInputSize and MaxInputSize. Omit MaxInputSize for no upper limit;
 

rda_python_metrics/viewtdsusage.py

@@ -22,16 +22,16 @@ from rda_python_common import PgDBI
 from . import PgView
 
 VUSG = {
-   'SNMS' : "ABCDEFHIMNOPQRSTUWY",           # all available short field names in %FLDS
-   'OPTS' : 'AabcCdDeEfhHiLmMnoOqsStTUwyz',  # all available options, used for %params
-   'NOPT' : 'abhnwz',                        # stand alone option without inputs
-   'ACND' : 'cdefiImMoqSty',                 # available array condition options
-   'RCND' : 'DEsT',                          # available range condition options
-   'CNDS' : 'acdDeEfiImMnoqsStTy',           # condition options, ACND, RCND and 'a'
-   'ECND' : 'my',                            # condition options need evaluating
-   'SFLD' : 'DEFINOTUW',                     # string fields, to be quoted in condition
-   'UFLD' : 'FNO',                           # string fields must be in upper case
-   'LFLD' : 'EMPT'                           # string fields must be in lower case
+   'SNMS' : "ABCDEFHIKMNOPQRSTUWY",           # all available short field names in %FLDS
+   'OPTS' : 'AabcCdDeEfhHikLmMnoOqsStTUwyz',  # all available options, used for %params
+   'NOPT' : 'abhnwz',                         # stand alone option without inputs
+   'ACND' : 'cdefiIkmMoqSty',                 # available array condition options
+   'RCND' : 'DEsT',                           # available range condition options
+   'CNDS' : 'acdDeEfiIkmMnoqsStTy',           # condition options, ACND, RCND and 'a'
+   'ECND' : 'my',                             # condition options need evaluating
+   'SFLD' : 'DEFIKNOTUW',                     # string fields, to be quoted in condition
+   'UFLD' : 'FNO',                            # string fields must be in upper case
+   'LFLD' : 'EMPT'                            # string fields must be in lower case
 }
 
 # keys %FLDS - short field names
@@ -51,6 +51,7 @@ FLDS = {
    'I' : ['IP',        "ip",                             'ip',         'tdsusage',   0,   0,  'G'],
    'M' : ['MONTH',     PgDBI.fmtym("date"),              'date',       'tdsusage',   7,   0,  'G'],
    'N' : ['COUNTRY',   "country",                        'country',    'tdsusage',   0,   0,  'G'],
+   'K' : ['REGION',    "region",                         'region',     'tdsusage',   0,   0,  'G'],
    'O' : ['ORGTYPE',   "org_type",                       'org_type',   'tdsusage',   7,   0,  'G'],
    'P' : ['DSOWNER',   "specialist",                     'specialist', 'dsowner',    8,   0,  'G'],
    'Q' : ['QUARTER',   "quarter",                        'quarter',    'tdsusage',   7,   0,  'G'],
@@ -79,9 +80,10 @@ EXPAND = {
    'Q' : ["TIME",   "dDmy"],
    'Y' : ["TIME",   "dDmy"],
 
-   'E' : ["USER",   "eco",  "email",        "wuser",  "user"],
-   'O' : ["USER",   "eco",  "org_type",     "wuser",  "user"],
-   'N' : ["USER",   "eco",  "country",      "wuser",  "user"],
+   'E' : ["USER",   "ecko",  "email",        "wuser",  "user"],
+   'O' : ["USER",   "ecko",  "org_type",     "wuser",  "user"],
+   'N' : ["USER",   "ecko",  "country",      "wuser",  "user"],
+   'K' : ["USER",   "ecko",  "region",       "wuser",  "user"],
 
    'R' : ["DSID",   "fFsStT", "search.datasets.title", "search.datasets"],
    'T' : ["DSID",   "fFsStT", "dataset.dsid",   "dataset"],
@@ -105,6 +107,7 @@ EXPAND = {
 #   H -- a string of report title to replace the default one
 #   i -- array of specified IP addresses
 #   I -- use given email IDs for email notice of data update
+#   k -- array of specified region names
 #   L -- column delimiter for output
 #   m -- array of specified months 
 #   M -- array of specified download methods 
@@ -125,7 +128,7 @@ 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 
 SNS = {
-   'c' : 'N', 'd' : 'D', 'D' : 'D', 'e' : 'E', 'f' : 'F', 'i' : 'I', 'm' : 'M',
+   'c' : 'N', 'd' : 'D', 'D' : 'D', 'e' : 'E', 'f' : 'F', 'i' : 'I', 'k' : 'K', 'm' : 'M',
    'M' : 'W', 'o' : 'O', 'q' : 'Q', 's' : 'S', 'S' : 'P', 't' : 'T', 'T' : 'T', 'y' : 'Y'
 }
 

rda_python_metrics/viewtdsusage.usg

@@ -6,8 +6,8 @@
                      [-A RowLimit] [-c CountryCodes] [-d DateList] \
                      [-D StartDate [EndDate]] [-e EMailList] -h \
                      [-E StartNoticeDate [EndNoticeDate]] \
-                     [-f EndTypeFlags] [-i IPAddresses]  \
-                     [-I EmailIDList] [-m MonthList] [-M AccessMethods]  \
+                     [-f EndTypeFlags] [-i IPAddresses] [-I EmailIDList] \
+                     [-RegionNamess] [-m MonthList] [-M AccessMethods]  \
                      [-N MinNumberRead [MaxNumberRead]] \
                      [-o OrganizationTypes] \
                      [-q QuaterList] [-s MinSize [MaxSize]] \
@@ -18,8 +18,8 @@
 
       Specify [-C] ColumnNames, refer to Option -C section for detail
       description, and choose at least one of the condition options, -a, -c,
-      -d, -D, -e, -E, -f, -i, -I, -m, -M, -N, -o, -q, -s, -S -t, -T, and -y, to
-      run this application.
+      -d, -D, -e, -E, -f, -i, -I, -k, -m, -M, -N, -o, -q, -s, -S -t, -T, and -y,
+      to run this application.
 
       For all condition options, except option -a, an '!' sign can be added
       between an option flag and its option values to get an excluding
@@ -28,8 +28,8 @@
       OrganizationTypes.  Refer to the example given at the end of this help
       document for how to select excluding condition.
 
-      String condition options, -c, -e, -f, -g, -i, -M, -o, -S, and -t, allow wildcard
-      inputs. '%' matches any number of characters and '_' matches any one
+      String condition options, -c, -e, -f, -g, -i, -k, -M, -o, -S, and -t, allow
+      wildcard inputs. '%' matches any number of characters and '_' matches any one
       character.  Refer to the example given at the end of this help document
       for how to use wildcard for string condition options.
 
@@ -56,6 +56,7 @@
               I*- IP           - user IP address
               M*- MONTH        - format as YYYY-MM, for example 2004-04
               N*- COUNTRY      - country codes users from
+              K*- REGION       - region names users from
               O*- ORGTYPE      - organization types (DSS, NCAR, UNIV and OTHER)
               P*- DSOWNER      - login names of specialists who own the datasets
               Q*- QUARTER      - quarter of year, 1, 2, 3, or 4
@@ -124,6 +125,8 @@
 
       - Option -i, for data read from machines with given IP addresses;
  
+      - Option -k, for files read by users from given region names;
+
       - Option -m, for data read in given months, in format YYYY-MM;
 
       - Option -M, for data read via access methods;

rda_python_metrics/viewwebusage.py

@@ -22,7 +22,7 @@ from rda_python_common import PgUtil
 from . import PgView
 
 VUSG = {
-   'SNMS' : "ABCDEFGHIJKLMNOPRQTUVWYZ",   # all available short field names in %FLDS
+   'SNMS' : "ABCDEFGHIJKLMNOPQRTUVWYZ",   # all available short field names in %FLDS
    'OPTS' : 'AabcCdDeEfFhHiIklLmMNoOStTUvVwyz',  # all available options, used for %params
    'NOPT' : 'abhRwz',                     # stand alone option without inputs
    'ACND' : 'cdefiklmMoStvy',             # available array condition options
@@ -52,11 +52,11 @@ FLDS = {
    'F' : ['FILENAME',     "wfile",                               'wfile',       'wfile',    0,  0,  'G'],
    'G' : ['PRODUCT',      "tindex",                              'tindex',      'wfile',    0,  0,  'G'],
    'I' : ['FIRSTNAME',    "fstname",                             'fstname',     'wuser',    0,  0,  'G'],
-   'K' : ['ORGNAME',      "org_name",                            'org_name',    'wuser',    0,  0,  'G'],
    'Z' : ['TIME',         "time_read",                           'time_read',   'wusage',   8,  0,  'G'],
    'L' : ['LASTNAME',     "lstname",                             'lstname',     'wuser',    0,  0,  'G'],
-   'M' : ['MONTH',        PgDBI.fmtym("date_read"),             'date_read',   'wusage',   7,  0,  'G'],
+   'M' : ['MONTH',        PgDBI.fmtym("date_read"),              'date_read',   'wusage',   7,  0,  'G'],
    'N' : ['COUNTRY',      "country",                             'country',     'wuser',    0,  0,  'G'],
+   'K' : ['REGION',       "region",                              'region',    'wuser',    0,  0,  'G'],
    'O' : ['ORGTYPE',      "org_type",                            'org_type',    'wuser',    7,  0,  'G'],
    'P' : ['DSOWNER',      "specialist",                          'specialist',  'dsowner',  8,  0,  'G'],
    'Q' : ['QUARTER',      "quarter",                             'quarter',     'wusage',   7,  0,  'G'],
@@ -89,7 +89,7 @@ EXPAND = {
    'E' : ["USER",   "eilkco",  "email",        "wuser"],
    'I' : ["USER",   "eilkco",  "fstname",      "wuser"],
    'L' : ["USER",   "eilkco",  "lstname",      "wuser"],
-   'K' : ["USER",   "eilkco",  "org_name",     "wuser"],
+   'K' : ["USER",   "eilkco",  "region",       "wuser"],
    'O' : ["USER",   "eilkco",  "org_type",     "wuser"],
    'N' : ["USER",   "eilkco",  "country",      "wuser"],
 
@@ -116,7 +116,7 @@ EXPAND = {
 #   H -- a string of report title to replace the default one
 #   i -- array of specified first names
 #   I -- use given email IDs for email notice of data update
-#   k -- array of specified orginization names
+#   k -- array of specified region names
 #   l -- array of specified last names
 #   L -- column delimiter for output
 #   m -- array of specified months 

rda_python_metrics/viewwebusage.usg

@@ -8,7 +8,7 @@
                      [-E StartNoticeDate [EndNoticeDate]] \
                      [-f FileNameList] [-F MinFileName [MaxFileName]] \
                      [-i FirstNamelist] [-I EmailIDList] \
-                     [-j] [-J] [-k OrganizationNames] [-l LastNameList] \
+                     [-j] [-J] [-k RegionNames] [-l LastNameList] \
                      [-m MonthList] [-M DownloadMethodList] \
                      [-N MinNumberRead [MaxNumberRead]] \
                      [-o OrganizationTypes] [-q QuaterList] \
@@ -57,10 +57,10 @@
               F*- FILENAME     - WEB file name accessed
               G*- PRODUCT      - product (top group) information 
               I*- FIRSTNAME    - user first name 
-              K*- ORGNAME      - organization name 
               L*- LASTNAME     - user last name 
               M*- MONTH        - format as YYYY-MM, for example 2004-04
               N*- COUNTRY      - country codes users from
+              K*- REGION       - region names users from 
               O*- ORGTYPE      - organization types (DSS, NCAR, UNIV and OTHER)
               P*- DSOWNER      - login names of specialists who own the datasets
               Q*- QUARTER      - quarter of year, 1, 2, 3, or 4
@@ -140,7 +140,7 @@
 
       - Option -J, includes Group Titles in column PRODUCT;
 
-      - Option -k, for WEB files read by users from given organization names;
+      - Option -k, for files read by users from given region names;
 
       - Option -l, for WEB files read by users with given last names;
 

{rda_python_metrics-1.0.16.dist-info → rda_python_metrics-1.0.18.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rda_python_metrics
-Version: 1.0.16
+Version: 1.0.18
 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
@@ -16,6 +16,7 @@ Requires-Dist: rda_python_setuid
 Requires-Dist: geoip2
 Requires-Dist: ipinfo
 Requires-Dist: httplib2
+Requires-Dist: dnspython
 Dynamic: license-file
 
 RDA Python Package to gather and view data usage metrics.