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

cdasws/__init__.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.
@@ -35,7 +35,7 @@
 Package 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.
 
@@ -55,7 +55,7 @@ Notes
 """
 
 
-__version__ = "1.8.12"
+__version__ = "1.8.14"
 
 
 #
@@ -82,4 +82,4 @@ NAMESPACES = {
 #
 # For backward compatibility with cdasws versions < 1.8.12.
 #
-from cdasws.cdasws import *
+from cdasws.cdasws import *  # pylint: disable=wrong-import-position

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.
 """
@@ -52,6 +52,7 @@ 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/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.
@@ -35,7 +35,7 @@
 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
@@ -143,8 +145,6 @@ try:
 except ImportError:
     CACHE_AVAILABLE = False
 
-from cdasws import __version__, RETRY_LIMIT, NAMESPACES as NS
-
 
 def _get_data_progress(
         progress: float,
@@ -919,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
@@ -929,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

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/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.12.dist-info → cdasws-1.8.14.dist-info}/METADATA

@@ -1,12 +1,12 @@
 Metadata-Version: 2.4
 Name: cdasws
-Version: 1.8.12
+Version: 1.8.14
 Summary: NASA's Coordinated Data Analysis System Web Service Client Library
 Home-page: https://cdaweb.gsfc.nasa.gov/WebServices/REST
 Author: Bernie Harris
 Author-email: NASA-SPDF-Support@nasa.onmicrosoft.com
 License: NOSA
-Keywords: heliophysics,coordinated data analysis,multi-mission,multi-instrument,space physics,spdf,cdaweb
+Keywords: heliophysics,coordinated data analysis,multi-mission,multi-instrument,space physics,SPDF,CDAweb,HDRL,HelioCloud
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Environment :: Web Environment
@@ -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,12 +58,13 @@ 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/)
+Note that this package is included in the 
+<a href="https://heliocloud.org"><img src="/logos/HelioCloud.png" width="100" height="auto" alt="HelioCloud" /></a>
 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
-https://cdaweb.gsfc.nasa.gov/WebServices/REST/.
+[https://cdaweb.gsfc.nasa.gov/WebServices/REST/](https://cdaweb.gsfc.nasa.gov/WebServices/REST/).
 
 ## Code Example
 

cdasws-1.8.14.dist-info/RECORD

@@ -0,0 +1,14 @@
+cdasws/__init__.py,sha256=aOLTuB9fD3pn17_-N6GnGhilYVg9v1FKY3rTmyb8cqU,2629
+cdasws/__main__.py,sha256=6XEenCcOcxCM9POH2BiTM9z6cnHqZDQU8gZ4Ia7xqoA,13515
+cdasws/cdasws.py,sha256=KN_n2MwfR8QY0nsUxr6fz-3ZMsoIZEvXTC8Kp_QcyeU,91514
+cdasws/datarepresentation.py,sha256=kKgAKCA4uzGoBQ8r8jbXstBg8SCg_EQtsoGhO8kIpco,2164
+cdasws/datarequest.py,sha256=dlAq9H1Tn8COPOWurv3w5wLGWoFNDQXgGQtROlK6zxg,28978
+cdasws/doi.py,sha256=ph0uQ_dM081V4d_uFN1lNCn7-UxHERIyYbTO3JqyqMQ,3172
+cdasws/timeinterval.py,sha256=UcKB-rFSk2eeaw0a29gOQQq7rNY0ab4Qwfz4iwJFelg,7839
+cdasws-1.8.14.dist-info/licenses/LICENSE,sha256=9VDxMcDDn3_T-sDQTMPxmiPZBDkPIiTO4OzYK5olDmk,12589
+tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/test_cdasws.py,sha256=DsKesU19_9zUIO1a7oyWWtywBGN7gjdQHFLMGUZ4X8c,24395
+cdasws-1.8.14.dist-info/METADATA,sha256=YYKsnwXNNcBPcZ5232vHDDQtjvGFi-6DeZ8GA8hrInE,7252
+cdasws-1.8.14.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+cdasws-1.8.14.dist-info/top_level.txt,sha256=GyIvHk5F6ysnTdDfnQsjZbTBt_EYrKyC0oeiIt9l-AE,7
+cdasws-1.8.14.dist-info/RECORD,,

cdasws-1.8.12.dist-info/RECORD

@@ -1,13 +0,0 @@
-cdasws/__init__.py,sha256=_IYGnCuHvpHeTdiA4DLwqIm0HV6H2H_DK5l_1uA5hbQ,2588
-cdasws/__main__.py,sha256=ABTe9FhZKTai2onoUTfN-0CBLSqzOEHw9N4yUKoqsaM,13473
-cdasws/cdasws.py,sha256=wHyXD9CjLHUc8rc8zUASfLJkUCdVvc22zfzAJCZDIaU,91424
-cdasws/datarepresentation.py,sha256=kKgAKCA4uzGoBQ8r8jbXstBg8SCg_EQtsoGhO8kIpco,2164
-cdasws/datarequest.py,sha256=fQVroT8RXYhJLG7_y-HO3ABnJUQJjWGFPeLNrtwbWtk,29080
-cdasws/timeinterval.py,sha256=UcKB-rFSk2eeaw0a29gOQQq7rNY0ab4Qwfz4iwJFelg,7839
-cdasws-1.8.12.dist-info/licenses/LICENSE,sha256=9VDxMcDDn3_T-sDQTMPxmiPZBDkPIiTO4OzYK5olDmk,12589
-tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/test_cdasws.py,sha256=DsKesU19_9zUIO1a7oyWWtywBGN7gjdQHFLMGUZ4X8c,24395
-cdasws-1.8.12.dist-info/METADATA,sha256=NLFbgMvIG6lrB4ATvkbqCusN5SHdzDT66MA7AeubfH8,7059
-cdasws-1.8.12.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
-cdasws-1.8.12.dist-info/top_level.txt,sha256=GyIvHk5F6ysnTdDfnQsjZbTBt_EYrKyC0oeiIt9l-AE,7
-cdasws-1.8.12.dist-info/RECORD,,