cdasws 1.8.10__py3-none-any.whl → 1.8.12__py3-none-any.whl

cdasws/__main__.py

@@ -24,7 +24,7 @@
 #
 # NOSA HEADER END
 #
-# Copyright (c) 2018-2024 United States Government as represented by
+# Copyright (c) 2018-2025 United States Government as represented by
 # the National Aeronautics and Space Administration. No copyright is
 # claimed in the United States under Title 17, U.S.Code. All Other
 # Rights Reserved.
@@ -34,7 +34,7 @@
 Example Coordinate Data Analysis System (CDAS) web service client.
 Includes example calls to most of the web services.
 
-Copyright © 2018-2024 United States Government as represented by the
+Copyright © 2018-2025 United States Government as represented by the
 National Aeronautics and Space Administration. No copyright is claimed in
 the United States under Title 17, U.S.Code. All Other Rights Reserved.
 """
@@ -42,12 +42,13 @@ the United States under Title 17, U.S.Code. All Other Rights Reserved.
 import sys
 import getopt
 import json
+import time
 import logging
 import logging.config
 from typing import List
 import urllib3
 #import matplotlib.pyplot as plt
-from cdasws import CdasWs
+from cdasws.cdasws import CdasWs
 from cdasws.timeinterval import TimeInterval
 from cdasws.datarequest import GraphOptions, ImageFormat, Overplot, TextFormat
 from cdasws.datarepresentation import DataRepresentation
@@ -56,7 +57,7 @@ from cdasws.datarepresentation import DataRepresentation
 logging.basicConfig()
 LOGGING_CONFIG_FILE = 'logging_config.json'
 try:
-    with open(LOGGING_CONFIG_FILE, 'r') as fd:
+    with open(LOGGING_CONFIG_FILE, 'r', encoding='utf-8') as fd:
         logging.config.dictConfig(json.load(fd))
 except BaseException as exc:    # pylint: disable=broad-except
     if not isinstance(exc, FileNotFoundError):
@@ -85,9 +86,10 @@ def print_usage(
     -------
     None
     """
-    print('USAGE: {name} [-e url][-d][-c cacerts][-h]'.format(name=name))
+    print(f'USAGE: {name} [-e url][-d][-c cacerts][-n][-h]')
     print('WHERE: url = CDAS web service endpoint URL')
     print('       -d disables TLS server certificate validation')
+    print('       -n disables the use of http caching')
     print('       cacerts = CA certificate filename')
 
 
@@ -108,13 +110,14 @@ def example(
             containing the CA certificates to use.<br>
         -d or --disable-cert-check to disable verification of the server's
             certificate
+        -n or --nocache disables the use of http caching
         -h or --help prints help information.
     """
 
     try:
-        opts = getopt.getopt(argv[1:], 'he:c:d',
+        opts = getopt.getopt(argv[1:], 'he:c:dn',
                              ['help', 'endpoint=', 'cacerts=',
-                              'disable-cert-check'])[0]
+                              'disable-cert-check', 'nocache'])[0]
     except getopt.GetoptError:
         print('ERROR: invalid option')
         print_usage(argv[0])
@@ -125,6 +128,7 @@ def example(
     endpoint = ENDPOINT
     ca_certs = None
     disable_ssl_certificate_validation = False
+    disable_cache = False
 
     for opt, arg in opts:
         if opt in ('-e', '--endpoint'):
@@ -134,6 +138,8 @@ def example(
         elif opt in ('-d', '--disable-cert-check'):
             disable_ssl_certificate_validation = True
             urllib3.disable_warnings(urllib3.exceptions.InsecureRequestWarning)
+        elif opt in ('-n', '--nocache'):
+            disable_cache = True
         elif opt in ('-h', '--help'):
             print_usage(argv[0])
             sys.exit()
@@ -141,7 +147,8 @@ def example(
 
     cdas = CdasWs(endpoint=endpoint, ca_certs=ca_certs,
                   disable_ssl_certificate_validation=
-                  disable_ssl_certificate_validation, user_agent='Example')
+                  disable_ssl_certificate_validation, 
+                  disable_cache = disable_cache, user_agent='Example')
 
     print(cdas.get_observatory_groups(
         instrumentType='Magnetic Fields (Balloon)'))
@@ -163,14 +170,30 @@ def example(
 
     print('citation = ' + cdas.get_citation('10.48322/541v-1f57'))
 
-    mms_brst_inventory = cdas.get_inventory('MMS1_FPI_BRST_L2_DES-MOMS',
+    dataset = 'MMS1_FPI_BRST_L2_DES-MOMS'
+    t0 = time.perf_counter()
+    mms_brst_inventory = cdas.get_inventory(dataset,
                                             timeInterval=TimeInterval(
                                                 '2018-08-30T08:09:53Z',
                                                 '2018-08-30T08:52:00Z'))
-    print('MMS1_FPI_BRST_L2_DES-MOMS inventory:')
+    t1 = time.perf_counter()
+    print(f'{dataset} inventory took {t1 - t0}s')
+    print(f'{dataset} inventory:')
     for interval in mms_brst_inventory:
         print('    ' + str(interval))
 
+    t0 = time.perf_counter()
+    mms_brst_inventory = cdas.get_inventory(dataset,
+                                            timeInterval=TimeInterval(
+                                                '2018-08-30T08:09:53Z',
+                                                '2018-08-30T08:52:00Z'))
+    t1 = time.perf_counter()
+    print(f'second {dataset} inventory took {t1 - t0}s')
+    print(f'second {dataset} inventory:')
+    for interval in mms_brst_inventory:
+        print('    ' + str(interval))
+
+
     doi_inventory = cdas.get_inventory('10.21978/P8T923')
     print('10.21978/P8T923 inventory:')
     for interval in doi_inventory: