cdasws 1.8.11__tar.gz → 1.8.13__tar.gz

{cdasws-1.8.11 → cdasws-1.8.13}/LICENSE

@@ -17,7 +17,7 @@ Government Agency Original Software Designation: GSC-14730-1
 Government Agency Original Software Title: "Space Physics Data Facility Web Services"
 User Registration Requested.  Please Visit http://spdf.gsfc.nasa.gov/
 Government Agency Point of Contact for Original Software: 
-    gsfc-spdf-support@lists.nasa.gov
+    NASA-SPDF-Support@nasa.onmicrosoft.com
 
 
 1. DEFINITIONS

{cdasws-1.8.11 → cdasws-1.8.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdasws
-Version: 1.8.11
+Version: 1.8.13
 Summary: NASA's Coordinated Data Analysis System Web Service Client Library
 Home-page: https://cdaweb.gsfc.nasa.gov/WebServices/REST
 Author: Bernie Harris
@@ -16,6 +16,7 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: NASA Open Source Agreement v1.3 (NASA-1.3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
@@ -57,6 +58,8 @@ and can return data from any of
 [pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html)
 with all source and 
 [ISTP/SPDF](https://spdf.gsfc.nasa.gov/sp_use_of_cdf.html) metadata.
+Note that this package is included in the [HelioCloud](https://heliocloud.org/)
+base image, so there is no need to install it there.
 Frequently asked questions concerning this library are at 
 [FAQ](https://cdaweb.gsfc.nasa.gov/WebServices/REST/py/FAQ.html).
 For more general details about the CDAS web services, see

{cdasws-1.8.11 → cdasws-1.8.13}/README.md

@@ -13,6 +13,8 @@ and can return data from any of
 [pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html)
 with all source and 
 [ISTP/SPDF](https://spdf.gsfc.nasa.gov/sp_use_of_cdf.html) metadata.
+Note that this package is included in the [HelioCloud](https://heliocloud.org/)
+base image, so there is no need to install it there.
 Frequently asked questions concerning this library are at 
 [FAQ](https://cdaweb.gsfc.nasa.gov/WebServices/REST/py/FAQ.html).
 For more general details about the CDAS web services, see

cdasws-1.8.13/cdasws/__init__.py

@@ -0,0 +1,85 @@
+#!/usr/bin/env python3
+
+#
+# NOSA HEADER START
+#
+# The contents of this file are subject to the terms of the NASA Open
+# Source Agreement (NOSA), Version 1.3 only (the "Agreement").  You may
+# not use this file except in compliance with the Agreement.
+#
+# You can obtain a copy of the agreement at
+#   docs/NASA_Open_Source_Agreement_1.3.txt
+# or
+#   https://cdaweb.gsfc.nasa.gov/WebServices/NASA_Open_Source_Agreement_1.3.txt.
+#
+# See the Agreement for the specific language governing permissions
+# and limitations under the Agreement.
+#
+# When distributing Covered Code, include this NOSA HEADER in each
+# file and include the Agreement file at
+# docs/NASA_Open_Source_Agreement_1.3.txt.  If applicable, add the
+# following below this NOSA HEADER, with the fields enclosed by
+# brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# NOSA HEADER END
+#
+# Copyright (c) 2018-2026 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.
+#
+
+
+"""
+Package for accessing the Coordinate Data Analysis System (CDAS)
+web services <https://cdaweb.gsfc.nasa.gov/WebServices/REST/>.<br>
+
+Copyright &copy; 2018-2026 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.
+
+Notes
+-----
+<ul>
+  <li>Due to rate limiting implemented by the CDAS web services, an
+      attempt to make simultaneous requests from many threads is likely
+      to actually reduce performance.  At this time, it is best to make
+      calls from five or fewer threads.</li>
+  <li>Since CDAS data has datetime values with a UTC timezone, all
+      client provided datetime values should have a timezone of UTC.
+      If a given value's timezone is not UTC, the value is adjusted to
+      UTC.  If a given value has no timezone (is naive), a UTC timezone
+      is set.</li>
+</ul>
+"""
+
+
+__version__ = "1.8.13"
+
+
+#
+# Limit on the number of times an HTTP request which returns a
+# 429 or 503 status with a Retry-After header will be retried.
+#
+RETRY_LIMIT = 100
+
+#
+# XML schema namespace
+#
+NS = 'http://cdaweb.gsfc.nasa.gov/schema'
+#
+# XHTML schema namespace
+#
+XHTML_NS = 'http://www.w3.org/1999/xhtml'
+#
+# All namespaces found in responses.
+#
+NAMESPACES = {
+    'cdas': NS,
+    'xhtml': XHTML_NS
+}
+#
+# For backward compatibility with cdasws versions < 1.8.12.
+#
+from cdasws.cdasws import *  # pylint: disable=wrong-import-position

{cdasws-1.8.11 → cdasws-1.8.13}/cdasws/__main__.py

@@ -24,7 +24,7 @@
 #
 # NOSA HEADER END
 #
-# Copyright (c) 2018-2025 United States Government as represented by
+# Copyright (c) 2018-2026 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-2025 United States Government as represented by the
+Copyright © 2018-2026 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.
 """
@@ -48,10 +48,11 @@ 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
+from cdasws.doi import get_doi_landing_page_url
 
 
 logging.basicConfig()
@@ -147,7 +148,7 @@ def example(
 
     cdas = CdasWs(endpoint=endpoint, ca_certs=ca_certs,
                   disable_ssl_certificate_validation=
-                  disable_ssl_certificate_validation, 
+                  disable_ssl_certificate_validation,
                   disable_cache = disable_cache, user_agent='Example')
 
     print(cdas.get_observatory_groups(
@@ -166,7 +167,7 @@ def example(
         #print('  ', json.dumps(dataset, indent=4))
 
     print('DOI landing page:',
-          cdas.get_doi_landing_page_url('10.48322/e0dc-0h53'))
+          get_doi_landing_page_url('10.48322/e0dc-0h53'))
 
     print('citation = ' + cdas.get_citation('10.48322/541v-1f57'))
 

cdasws-1.8.11/cdasws/__init__.py → cdasws-1.8.13/cdasws/cdasws.py

@@ -24,7 +24,7 @@
 #
 # NOSA HEADER END
 #
-# Copyright (c) 2018-2025 United States Government as represented by
+# Copyright (c) 2018-2026 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.
@@ -32,10 +32,10 @@
 
 
 """
-Package for accessing the Coordinate Data Analysis System (CDAS)
+Module for accessing the Coordinate Data Analysis System (CDAS)
 web services <https://cdaweb.gsfc.nasa.gov/WebServices/REST/>.<br>
 
-Copyright &copy; 2018-2025 United States Government as represented by the
+Copyright &copy; 2018-2026 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.
 
@@ -60,19 +60,19 @@ import os
 import platform
 import logging
 import re
-from importlib.util import find_spec
+#from importlib.util import find_spec
 import urllib.parse
 from urllib.parse import urlparse
-import json
+#import json
 from operator import itemgetter
 import time
-from datetime import datetime, timedelta, timezone
+from datetime import datetime, timedelta
 import xml.etree.ElementTree as ET
 from tempfile import mkstemp
 from typing import Any, Callable, Dict, List, Tuple, Union
 
 import requests
-import dateutil.parser
+#import dateutil.parser
 
 from cdasws.datarepresentation import DataRepresentation
 from cdasws.datarequest import AudioRequest, DataRequest
@@ -80,6 +80,8 @@ from cdasws.datarequest import CdfFormat, CdfRequest, Compression
 from cdasws.datarequest import ImageFormat, GraphOptions, GraphRequest
 from cdasws.datarequest import TextFormat, TextRequest, ThumbnailRequest
 from cdasws.timeinterval import TimeInterval
+from cdasws.doi import get_doi_landing_page_url
+from cdasws import __version__, RETRY_LIMIT, NAMESPACES as NS
 
 
 # requires python >= 3.4
@@ -144,32 +146,6 @@ except ImportError:
     CACHE_AVAILABLE = False
 
 
-__version__ = "1.8.11"
-
-
-#
-# Limit on the number of times an HTTP request which returns a
-# 429 or 503 status with a Retry-After header will be retried.
-#
-RETRY_LIMIT = 100
-
-#
-# XML schema namespace
-#
-NS = 'http://cdaweb.gsfc.nasa.gov/schema'
-#
-# XHTML schema namespace
-#
-XHTML_NS = 'http://www.w3.org/1999/xhtml'
-#
-# All namespaces found in responses.
-#
-NAMESPACES = {
-    'cdas': NS,
-    'xhtml': XHTML_NS
-}
-
-
 def _get_data_progress(
         progress: float,
         msg: str,
@@ -389,17 +365,17 @@ class CdasWs:
 
         observatory_group_descriptions = []
         for description in observatory_response.findall(\
-            'cdas:ObservatoryGroupDescription', namespaces=NAMESPACES):
+            'cdas:ObservatoryGroupDescription', namespaces=NS):
 
             observatory_ids = []
             for observatory_id in description.findall(\
-                'cdas:ObservatoryId', namespaces=NAMESPACES):
+                'cdas:ObservatoryId', namespaces=NS):
 
                 observatory_ids.append(observatory_id.text)
 
             observatory_group_descriptions.append({
                 'Name': description.find(\
-                    'cdas:Name', namespaces=NAMESPACES).text,
+                    'cdas:Name', namespaces=NS).text,
                 'ObservatoryId': observatory_ids
             })
 
@@ -464,11 +440,11 @@ class CdasWs:
 
         instrument_types = []
         for description in instrument_response.findall(\
-            'cdas:InstrumentTypeDescription', namespaces=NAMESPACES):
+            'cdas:InstrumentTypeDescription', namespaces=NS):
 
             instrument_types.append({
                 'Name': description.find('cdas:Name',
-                                         namespaces=NAMESPACES).text
+                                         namespaces=NS).text
                 })
         return instrument_types
 
@@ -531,15 +507,15 @@ class CdasWs:
 
         instruments = []
         for instrument_description in instruments_response.findall(\
-            'cdas:InstrumentDescription', namespaces=NAMESPACES):
+            'cdas:InstrumentDescription', namespaces=NS):
 
             instruments.append({
                 'Name': instrument_description.find(\
-                    'cdas:Name', namespaces=NAMESPACES).text,
+                    'cdas:Name', namespaces=NS).text,
                 'ShortDescription': instrument_description.find(\
-                    'cdas:ShortDescription', namespaces=NAMESPACES).text,
+                    'cdas:ShortDescription', namespaces=NS).text,
                 'LongDescription': instrument_description.find(\
-                    'cdas:LongDescription', namespaces=NAMESPACES).text
+                    'cdas:LongDescription', namespaces=NS).text
             })
 
         return instruments
@@ -603,14 +579,14 @@ class CdasWs:
         observatories = []
 
         for observatory in observatory_response.findall(\
-            'cdas:ObservatoryDescription', namespaces=NAMESPACES):
+            'cdas:ObservatoryDescription', namespaces=NS):
             observatories.append({
                 'Name': observatory.find(\
-                    'cdas:Name', namespaces=NAMESPACES).text,
+                    'cdas:Name', namespaces=NS).text,
                 'ShortDescription': observatory.find(\
-                    'cdas:ShortDescription', namespaces=NAMESPACES).text,
+                    'cdas:ShortDescription', namespaces=NS).text,
                 'LongDescription': observatory.find(\
-                    'cdas:LongDescription', namespaces=NAMESPACES).text
+                    'cdas:LongDescription', namespaces=NS).text
             })
 
         return observatories
@@ -670,27 +646,27 @@ class CdasWs:
 
         for o_g_i_d in observatories_response.findall(\
             'cdas:ObservatoryGroupInstrumentDescription',\
-            namespaces=NAMESPACES):
+            namespaces=NS):
 
             o_g_i_d_name = o_g_i_d.find('cdas:Name',
-                                        namespaces=NAMESPACES).text
+                                        namespaces=NS).text
             o_is = []
             for o_i in o_g_i_d.findall('cdas:ObservatoryInstruments',
-                                       namespaces=NAMESPACES):
+                                       namespaces=NS):
 
                 o_i_name = o_i.find('cdas:Name',
-                                    namespaces=NAMESPACES).text
+                                    namespaces=NS).text
                 i_ds = []
                 for i_d in o_i.findall('cdas:InstrumentDescription',
-                                       namespaces=NAMESPACES):
+                                       namespaces=NS):
                     i_d_name = i_d.find('cdas:Name',
-                                        namespaces=NAMESPACES).text
+                                        namespaces=NS).text
                     i_d_short_description = \
                         i_d.find('cdas:ShortDescription',
-                                 namespaces=NAMESPACES).text
+                                 namespaces=NS).text
                     i_d_long_description = \
                          i_d.find('cdas:LongDescription',
-                                  namespaces=NAMESPACES).text
+                                  namespaces=NS).text
                     i_ds.append({
                         'Name': i_d_name,
                         'ShortDescription': i_d_short_description,
@@ -851,74 +827,74 @@ class CdasWs:
 
         datasets = []
         for ds in dss.findall('cdas:DatasetDescription',
-                              namespaces=NAMESPACES):
+                              namespaces=NS):
 
             observatory_groups = []
             for o_g in ds.findall('cdas:ObservatoryGroup',
-                                  namespaces=NAMESPACES):
+                                  namespaces=NS):
                 observatory_groups.append(o_g.text)
 
             instrument_types = []
             for i_t in ds.findall('cdas:InstrumentType',
-                                  namespaces=NAMESPACES):
+                                  namespaces=NS):
                 instrument_types.append(i_t.text)
 
             dataset_links = []
             for d_l in ds.findall('cdas:DatasetLink',
-                                  namespaces=NAMESPACES):
+                                  namespaces=NS):
                 dataset_links.append({
                     'Title': d_l.find('cdas:Title',
-                                      namespaces=NAMESPACES).text,
+                                      namespaces=NS).text,
                     'Text': d_l.find('cdas:Text',
-                                     namespaces=NAMESPACES).text,
+                                     namespaces=NS).text,
                     'Url': d_l.find('cdas:Url',
-                                    namespaces=NAMESPACES).text,
+                                    namespaces=NS).text,
                 })
 
             observatories = []
             for obs_elem in ds.findall('cdas:Observatory',
-                                       namespaces=NAMESPACES):
+                                       namespaces=NS):
                 observatories.append(obs_elem.text)
 
             instruments = []
             for instr_elem in ds.findall('cdas:Instrument',
-                                         namespaces=NAMESPACES):
+                                         namespaces=NS):
                 instruments.append(instr_elem.text)
 
             dataset = {
-                'Id': ds.find('cdas:Id', namespaces=NAMESPACES).text,
+                'Id': ds.find('cdas:Id', namespaces=NS).text,
                 'Observatory': observatories,
                 'Instrument': instruments,
                 'ObservatoryGroup': observatory_groups,
                 'InstrumentType': instrument_types,
                 'Label': ds.find('cdas:Label',
-                                 namespaces=NAMESPACES).text,
+                                 namespaces=NS).text,
                 'TimeInterval': {
                     'Start': ds.find('cdas:TimeInterval/cdas:Start',
-                                     namespaces=NAMESPACES).text,
+                                     namespaces=NS).text,
                     'End': ds.find('cdas:TimeInterval/cdas:End',
-                                   namespaces=NAMESPACES).text
+                                   namespaces=NS).text
                 },
                 'PiName': ds.find('cdas:PiName',
-                                  namespaces=NAMESPACES).text,
+                                  namespaces=NS).text,
                 'PiAffiliation': ds.find('cdas:PiAffiliation',
-                                         namespaces=NAMESPACES).text,
+                                         namespaces=NS).text,
                 'Notes': ds.find('cdas:Notes',
-                                 namespaces=NAMESPACES).text,
+                                 namespaces=NS).text,
                 'DatasetLink': dataset_links
             }
-            doi = ds.find('cdas:Doi', namespaces=NAMESPACES)
+            doi = ds.find('cdas:Doi', namespaces=NS)
             if doi is not None:
                 dataset['Doi'] = doi.text
 
             spase_resource_id = ds.find('cdas:SpaseResourceId',
-                                        namespaces=NAMESPACES)
+                                        namespaces=NS)
             if spase_resource_id is not None:
                 dataset['SpaseResourceId'] = spase_resource_id.text
 
             additional_metadata = []
             for add_meta in ds.findall('cdas:AdditionalMetadata',
-                                       namespaces=NAMESPACES):
+                                       namespaces=NS):
                 meta_type = add_meta.attrib['Type']
                 value = add_meta.text
                 additional_metadata.append({
@@ -943,6 +919,9 @@ class CdasWs:
         Returns a URL to the given Digital Object Identifier's landing
         page (metadata for the DOI).
 
+        Note: this method is deprecated.  You should call 
+        doi.get_doi_landing_page_url directly.
+
         Parameters
         ----------
         doi
@@ -953,9 +932,7 @@ class CdasWs:
             A URL to the DOI's landing page.
         """
 
-        if not doi.startswith('http'):
-            return 'https://doi.org/' + doi
-        return doi
+        return get_doi_landing_page_url(doi)
 
 
     @staticmethod
@@ -1034,16 +1011,16 @@ class CdasWs:
         intervals = []
         for inventory_desc in inventory.findall(\
                                   'cdas:InventoryDescription',
-                                  namespaces=NAMESPACES):
+                                  namespaces=NS):
             for time_interval in inventory_desc.findall(\
                                      'cdas:TimeInterval',
-                                     namespaces=NAMESPACES):
+                                     namespaces=NS):
                 intervals.append(
                     TimeInterval(
                         time_interval.find('cdas:Start',
-                                           namespaces=NAMESPACES).text,
+                                           namespaces=NS).text,
                         time_interval.find('cdas:End',
-                                           namespaces=NAMESPACES).text
+                                           namespaces=NS).text
                     )
                 )
 
@@ -1124,18 +1101,18 @@ class CdasWs:
         variables = []
         for var_description in var_descriptions.findall(\
                                    'cdas:VariableDescription',
-                                   namespaces=NAMESPACES):
+                                   namespaces=NS):
             name = var_description.find('cdas:Name',
-                                        namespaces=NAMESPACES).text
+                                        namespaces=NS).text
             short_description = var_description.find(\
                                         'cdas:ShortDescription',
-                                        namespaces=NAMESPACES).text
+                                        namespaces=NS).text
             if short_description is None:
                 short_description = ''
 
             long_description = var_description.find(\
                                         'cdas:LongDescription',
-                                        namespaces=NAMESPACES).text
+                                        namespaces=NS).text
             if long_description is None:
                 long_description = ''
 
@@ -1194,55 +1171,55 @@ class CdasWs:
         """
         thumbnail_desc = file_description_elem.find(\
                              'cdas:ThumbnailDescription',
-                             namespaces=NAMESPACES)
+                             namespaces=NS)
         if thumbnail_desc is not None:
             time_interval = thumbnail_desc.find('cdas:TimeInterval',
-                                                namespaces=NAMESPACES)
+                                                namespaces=NS)
             start = time_interval.find('cdas:Start',
-                                       namespaces=NAMESPACES).text
+                                       namespaces=NS).text
             end = time_interval.find('cdas:End',
-                                     namespaces=NAMESPACES).text
+                                     namespaces=NS).text
             return {
                 'Name': thumbnail_desc.find('cdas:Name',
-                                            namespaces=NAMESPACES).text,
+                                            namespaces=NS).text,
                 'Dataset': thumbnail_desc.find('cdas:Dataset',
-                                               namespaces=NAMESPACES).text,
+                                               namespaces=NS).text,
                 'TimeInterval': {
                     'Start': start,
                     'End': end
                 },
                 'VarName': thumbnail_desc.find('cdas:VarName',
-                                               namespaces=NAMESPACES).text,
+                                               namespaces=NS).text,
                 'Options': int(thumbnail_desc.find(\
                                    'cdas:Options',
-                                   namespaces=NAMESPACES).text),
+                                   namespaces=NS).text),
                 'NumFrames': int(thumbnail_desc.find(\
                                      'cdas:NumFrames',
-                                     namespaces=NAMESPACES).text),
+                                     namespaces=NS).text),
                 'NumRows': int(thumbnail_desc.find(\
                                    'cdas:NumRows',
-                                   namespaces=NAMESPACES).text),
+                                   namespaces=NS).text),
                 'NumCols': int(thumbnail_desc.find(\
                                    'cdas:NumCols',
-                                   namespaces=NAMESPACES).text),
+                                   namespaces=NS).text),
                 'TitleHeight': int(thumbnail_desc.find(\
                                        'cdas:TitleHeight',
-                                       namespaces=NAMESPACES).text),
+                                       namespaces=NS).text),
                 'ThumbnailHeight': int(thumbnail_desc.find(\
                                            'cdas:ThumbnailHeight',
-                                           namespaces=NAMESPACES).text),
+                                           namespaces=NS).text),
                 'ThumbnailWidth': int(thumbnail_desc.find(\
                                            'cdas:ThumbnailWidth',
-                                           namespaces=NAMESPACES).text),
+                                           namespaces=NS).text),
                 'StartRecord': int(thumbnail_desc.find(\
                                        'cdas:StartRecord',
-                                       namespaces=NAMESPACES).text),
+                                       namespaces=NS).text),
                 'MyScale': float(thumbnail_desc.find(\
                                      'cdas:MyScale',
-                                     namespaces=NAMESPACES).text),
+                                     namespaces=NS).text),
                 'XyStep': float(thumbnail_desc.find(\
                                     'cdas:XyStep',
-                                    namespaces=NAMESPACES).text)
+                                    namespaces=NS).text)
             }
         return None
 
@@ -1268,26 +1245,26 @@ class CdasWs:
         data_result = ET.fromstring(xml_data_result)
         file_descriptions = []
         for file_description in data_result.findall(\
-            'cdas:FileDescription', namespaces=NAMESPACES):
+            'cdas:FileDescription', namespaces=NS):
 
             dict_file_description = {
                 'Name': file_description.find('cdas:Name',
-                                              namespaces=NAMESPACES).text,
+                                              namespaces=NS).text,
                 'MimeType': file_description.find(\
                                 'cdas:MimeType',
-                                namespaces=NAMESPACES).text,
+                                namespaces=NS).text,
                 'StartTime': file_description.find(\
                                  'cdas:StartTime',
-                                 namespaces=NAMESPACES).text,
+                                 namespaces=NS).text,
                 'EndTime': file_description.find(\
                                'cdas:EndTime',
-                               namespaces=NAMESPACES).text,
+                               namespaces=NS).text,
                 'Length': int(file_description.find(\
                                   'cdas:Length',
-                                  namespaces=NAMESPACES).text),
+                                  namespaces=NS).text),
                 'LastModified': file_description.find(\
                                     'cdas:LastModified',
-                                    namespaces=NAMESPACES).text
+                                    namespaces=NS).text
             }
             thumbnail_dict = CdasWs._get_thumbnail_description_dict(\
                                      file_description)
@@ -1297,7 +1274,7 @@ class CdasWs:
 
             thumbnail_id_elem = file_description.find(\
                                     'cdas:ThumbnailId',
-                                    namespaces=NAMESPACES)
+                                    namespaces=NS)
             if thumbnail_id_elem is not None:
                 dict_file_description['ThumbnailId'] = \
                     thumbnail_id_elem.text

{cdasws-1.8.11 → cdasws-1.8.13}/cdasws/datarequest.py

@@ -24,7 +24,7 @@
 #
 # NOSA HEADER END
 #
-# Copyright (c) 2019-2024 United States Government as represented by
+# Copyright (c) 2019-2026 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.
@@ -36,7 +36,7 @@ Package defining classes to represent the DataRequestEntity and its
 sub-classes from
 <https://cdaweb.gsfc.nasa.gov/WebServices/REST/CDAS.xsd>.<br>
 
-Copyright &copy; 2019-2024 United States Government as represented by the
+Copyright &copy; 2019-2026 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.
 """
@@ -350,7 +350,6 @@ class DataRequest(metaclass=ABCMeta): # pylint: disable=too-few-public-methods
             string XML representation of this object.
         """
 
-        #return ET.tostring(self.xml_element(), encoding="utf-8", method='xml', xml_declaration=True)
         return ET.tostring(self.xml_element(), encoding="utf-8", method='xml')
 
 

cdasws-1.8.13/cdasws/doi.py

@@ -0,0 +1,127 @@
+#!/usr/bin/env python3
+
+#
+# NOSA HEADER START
+#
+# The contents of this file are subject to the terms of the NASA Open
+# Source Agreement (NOSA), Version 1.3 only (the "Agreement").  You may
+# not use this file except in compliance with the Agreement.
+#
+# You can obtain a copy of the agreement at
+#   docs/NASA_Open_Source_Agreement_1.3.txt
+# or
+#   https://cdaweb.gsfc.nasa.gov/WebServices/NASA_Open_Source_Agreement_1.3.txt.
+#
+# See the Agreement for the specific language governing permissions
+# and limitations under the Agreement.
+#
+# When distributing Covered Code, include this NOSA HEADER in each
+# file and include the Agreement file at
+# docs/NASA_Open_Source_Agreement_1.3.txt.  If applicable, add the
+# following below this NOSA HEADER, with the fields enclosed by
+# brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# NOSA HEADER END
+#
+# Copyright (c) 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.
+#
+
+
+"""
+Module defines utility functions related to Digital Object Identifiers
+(DOI).<br>
+
+Copyright &copy; 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.
+"""
+
+
+def get_canonical_doi(
+        doi: str
+    ) -> str:
+    """
+    Returns a canonical representation (no leading https://doi.org/ and 
+    lower case) Digital Object Identifier (DOI) value.
+
+    Parameters
+    ----------
+    doi
+        digital object identifier.
+    Returns
+    -------
+    str
+        The canonical DOI value.
+    """
+    return doi.replace('https://doi.org/', '').lower()
+
+
+def get_doi_landing_page_url(
+        doi: str
+    ) -> str:
+    """
+    Returns a URL to the given Digital Object Identifier's landing
+    page (metadata for the DOI).
+
+    Parameters
+    ----------
+    doi
+        digital object identifier.
+    Returns
+    -------
+    str
+        A URL to the DOI's landing page.
+    """
+
+    if not doi.startswith('http'):
+        return 'https://doi.org/' + doi
+    return doi
+
+
+def get_doi_badge_url(
+        doi: str
+    ) -> str:
+    """
+    Returns a URL to the given Digital Object Identifier's badge.
+
+    Parameters
+    ----------
+    doi
+        digital object identifier.
+    Returns
+    -------
+    str
+        A URL to the DOI's badge.
+    """
+
+    canonical_doi = get_canonical_doi(doi)
+
+    return 'https://img.shields.io/badge/DOI-' + \
+           canonical_doi.replace('-', '--') + '-blue'
+
+
+def get_doi_hdp_url(
+        doi: str
+    ) -> str:
+    """
+    Returns a URL to the given Digital Object Identifier's Heliophysics
+    Data Portal (HDP) page.
+
+    Parameters
+    ----------
+    doi
+        digital object identifier.
+    Returns
+    -------
+    str
+        A URL to the DOI's HDP page.
+    """
+
+    canonical_doi = get_canonical_doi(doi)
+
+    return 'https://heliophysicsdata.gsfc.nasa.gov/WS/hdp/1/Spase/' \
+           'NumericalData;DisplayData?DOI=' + canonical_doi

{cdasws-1.8.11 → cdasws-1.8.13}/cdasws.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cdasws
-Version: 1.8.11
+Version: 1.8.13
 Summary: NASA's Coordinated Data Analysis System Web Service Client Library
 Home-page: https://cdaweb.gsfc.nasa.gov/WebServices/REST
 Author: Bernie Harris
@@ -16,6 +16,7 @@ Classifier: Intended Audience :: System Administrators
 Classifier: License :: OSI Approved :: NASA Open Source Agreement v1.3 (NASA-1.3)
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
 Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
@@ -57,6 +58,8 @@ and can return data from any of
 [pandas.DataFrame](https://pandas.pydata.org/pandas-docs/stable/reference/api/pandas.DataFrame.html)
 with all source and 
 [ISTP/SPDF](https://spdf.gsfc.nasa.gov/sp_use_of_cdf.html) metadata.
+Note that this package is included in the [HelioCloud](https://heliocloud.org/)
+base image, so there is no need to install it there.
 Frequently asked questions concerning this library are at 
 [FAQ](https://cdaweb.gsfc.nasa.gov/WebServices/REST/py/FAQ.html).
 For more general details about the CDAS web services, see

{cdasws-1.8.11 → cdasws-1.8.13}/cdasws.egg-info/SOURCES.txt

@@ -3,8 +3,10 @@ README.md
 setup.py
 cdasws/__init__.py
 cdasws/__main__.py
+cdasws/cdasws.py
 cdasws/datarepresentation.py
 cdasws/datarequest.py
+cdasws/doi.py
 cdasws/timeinterval.py
 cdasws.egg-info/PKG-INFO
 cdasws.egg-info/SOURCES.txt
@@ -13,4 +15,5 @@ cdasws.egg-info/requires.txt
 cdasws.egg-info/top_level.txt
 tests/test_cdasws.py
 tests/test_datarequest.py
+tests/test_doi.py
 tests/test_timeinterval.py

{cdasws-1.8.11 → cdasws-1.8.13}/setup.py

@@ -10,7 +10,7 @@ README = (HERE / "README.md").read_text()
 # This call to setup() does all the work
 setup(
     name="cdasws",
-    version="1.8.11",
+    version="1.8.13",
     description="NASA's Coordinated Data Analysis System Web Service Client Library",
     long_description=README,
     long_description_content_type="text/markdown",
@@ -40,6 +40,7 @@ setup(
         "License :: OSI Approved :: NASA Open Source Agreement v1.3 (NASA-1.3)",
         "Operating System :: OS Independent",
         "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
         "Topic :: Scientific/Engineering :: Physics",
         "Topic :: Software Development :: Libraries :: Python Modules"
     ],

{cdasws-1.8.11 → cdasws-1.8.13}/tests/test_cdasws.py

@@ -24,7 +24,7 @@
 #
 # NOSA HEADER END
 #
-# Copyright (c) 2019-2024 United States Government as represented by
+# Copyright (c) 2019-2026 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.
@@ -33,7 +33,7 @@
 """
 Module for unittest of the CdasWs class.<br>
 
-Copyright &copy; 2019-2024 United States Government as represented by the
+Copyright &copy; 2019-2026 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.
 """
@@ -47,8 +47,7 @@ from typing import Dict
 from context import cdasws  # pylint: disable=unused-import
 
 # pylint: enable=import-error,wrong-import-position
-from cdasws import CdasWs
-#from cdasws.cdasws import CdasWs
+from cdasws.cdasws import CdasWs
 from cdasws.timeinterval import TimeInterval
 from cdasws.datarequest import GraphOptions, ImageFormat, Overplot
 # pylint: enable=import-error,wrong-import-position
@@ -1407,7 +1406,7 @@ class TestCdasWs(unittest.TestCase):
         doi = '10.48322/541v-1f57'
         result = \
             self._cdas.get_citation(doi)
-        self.assertEqual(result, 'Nakamura, R., Torkar, K. M., Jeszenszky, H., &amp; Burch, J. L. (2022). <i>MMS 1 Active Spacecraft Potential Control (ASPOC), Sensors 1 and 2, Level 2 (L2), Survey Mode, 1 s Data</i> [Data set]. NASA Space Physics Data Facility. https://doi.org/10.48322/541V-1F57')
+        self.assertEqual(result, 'Nakamura, R., Torkar, K. M., Jeszenszky, H., &amp; Burch, J. L. (2022). <i>MMS 1 Active Spacecraft Potential Control (ASPOC), Sensors 1 and 2, Level 2 (L2), Survey Mode, 1 s Data</i> [Data set]. Laboratory for Atmospheric and Space Physics; Space Physics Data Facility. https://doi.org/10.48322/541V-1F57')
 
 
 if __name__ == '__main__':

cdasws-1.8.13/tests/test_doi.py

@@ -0,0 +1,94 @@
+#!/usr/bin/env python3
+
+#
+# NOSA HEADER START
+#
+# The contents of this file are subject to the terms of the NASA Open
+# Source Agreement (NOSA), Version 1.3 only (the "Agreement").  You may
+# not use this file except in compliance with the Agreement.
+#
+# You can obtain a copy of the agreement at
+#   docs/NASA_Open_Source_Agreement_1.3.txt
+# or
+#   https://cdaweb.gsfc.nasa.gov/WebServices/NASA_Open_Source_Agreement_1.3.txt.
+#
+# See the Agreement for the specific language governing permissions
+# and limitations under the Agreement.
+#
+# When distributing Covered Code, include this NOSA HEADER in each
+# file and include the Agreement file at
+# docs/NASA_Open_Source_Agreement_1.3.txt.  If applicable, add the
+# following below this NOSA HEADER, with the fields enclosed by
+# brackets "[]" replaced with your own identifying information:
+# Portions Copyright [yyyy] [name of copyright owner]
+#
+# NOSA HEADER END
+#
+# Copyright (c) 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.
+#
+
+"""
+Module for unittest of the doi functions.<br>
+
+Copyright &copy; 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.
+"""
+
+import unittest
+from cdasws.doi import *
+
+#from context import cdasws  # pylint: disable=unused-import
+
+
+
+class TestTimeInterval(unittest.TestCase):
+    """
+    Class for unittest of doi module functions.
+    """
+
+    def __init__(self, *args, **kwargs):
+        super(TestTimeInterval, self).__init__(*args, **kwargs)
+
+
+    def test_get_canonical_doi(self):
+        """
+        Test for get_canonical_doi function.
+        """
+
+        self.assertEqual(get_canonical_doi('https://doi.org/ABC/123'), 'abc/123')
+        self.assertEqual(get_canonical_doi('XYZ/321'), 'xyz/321')
+
+
+    def test_get_doi_landing_page_url(self):
+        """
+        Test for get_doi_landing_page_url function.
+        """
+
+        self.assertEqual(get_doi_landing_page_url('https://doi.org/ABC/123'), 'https://doi.org/ABC/123')
+        self.assertEqual(get_doi_landing_page_url('ABC/123'), 'https://doi.org/ABC/123')
+
+
+    def test_get_doi_badge_url(self):
+        """
+        Test for get_doi_badge_url function.
+        """
+
+        self.assertEqual(get_doi_badge_url('https://doi.org/ABC/123'), 'https://img.shields.io/badge/DOI-abc/123-blue')
+        self.assertEqual(get_doi_badge_url('XYZ/321'), 'https://img.shields.io/badge/DOI-xyz/321-blue')
+        self.assertEqual(get_doi_badge_url('XYZ/123-321'), 'https://img.shields.io/badge/DOI-xyz/123--321-blue')
+
+
+    def test_get_doi_hdp_url(self):
+        """
+        Test for get_doi_hdp_url function.
+        """
+
+        self.assertEqual(get_doi_hdp_url('https://doi.org/ABC/123'), 'https://heliophysicsdata.gsfc.nasa.gov/WS/hdp/1/Spase/NumericalData;DisplayData?DOI=abc/123')
+
+
+if __name__ == '__main__':
+    unittest.main()

{cdasws-1.8.11 → cdasws-1.8.13}/tests/test_timeinterval.py

@@ -43,8 +43,7 @@ from datetime import datetime, timezone
 
 from context import cdasws  # pylint: disable=unused-import
 
-from cdasws import TimeInterval  # pylint: disable=import-error
-#from cdasws.cdasws import TimeInterval  # pylint: disable=import-error
+from cdasws.cdasws import TimeInterval  # pylint: disable=import-error