hdpws 0.6.22__tar.gz → 0.6.24__tar.gz

{hdpws-0.6.22 → hdpws-0.6.24}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: hdpws
-Version: 0.6.22
+Version: 0.6.24
 Summary: NASA's Heliophysics Data Portal Web Service Client Library
 Home-page: https://heliophysicsdata.gsfc.nasa.gov/WebServices
 Author: Bernie Harris
@@ -21,6 +21,19 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: python-dateutil>=2.8.0
+Requires-Dist: requests>=2.20
+Requires-Dist: urllib3>=1.26.14
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 
 ## Synopsis

{hdpws-0.6.22 → hdpws-0.6.24}/hdpws/__init__.py

@@ -34,14 +34,14 @@
 Package for accessing the NASA's Heliophysics Data Portal (HDP) web
 services https://heliophysicsdata.gsfc.nasa.gov/WebServices/.
 
-Copyright © 2023-2024 United States Government as represented by the
+Copyright © 2023-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.
 
 """
 
 
-__version__ = "0.6.22"
+__version__ = "0.6.24"
 
 
 #

{hdpws-0.6.22 → hdpws-0.6.24}/hdpws/__main__.py

@@ -24,7 +24,7 @@
 #
 # NOSA HEADER END
 #
-# Copyright (c) 2023 United States Government as represented by
+# Copyright (c) 2023-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 Heliophysics Data Portal (HDP) web services client.
 https://heliophysicsdata.gsfc.nasa.gov/WebServices/.
 
-Copyright © 2023 United States Government as represented by the
+Copyright © 2023-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.
 """
@@ -410,6 +410,7 @@ def example(
     }
 
 
+    result = hdp.get_spase_software(query)
     if result['HttpStatus'] == 200:
         #print('HDP Spase:')
         #print(ET.tostring(result['Result']))

{hdpws-0.6.22 → hdpws-0.6.24}/hdpws.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: hdpws
-Version: 0.6.22
+Version: 0.6.24
 Summary: NASA's Heliophysics Data Portal Web Service Client Library
 Home-page: https://heliophysicsdata.gsfc.nasa.gov/WebServices
 Author: Bernie Harris
@@ -21,6 +21,19 @@ Classifier: Topic :: Scientific/Engineering :: Physics
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: python-dateutil>=2.8.0
+Requires-Dist: requests>=2.20
+Requires-Dist: urllib3>=1.26.14
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: summary
 
 
 ## Synopsis

{hdpws-0.6.22 → hdpws-0.6.24}/setup.py

@@ -10,7 +10,7 @@ README = (HERE / "README.md").read_text()
 # This call to setup() does all the work
 setup(
     name="hdpws",
-    version="0.6.22",
+    version="0.6.24",
     description="NASA's Heliophysics Data Portal Web Service Client Library",
     long_description=README,
     long_description_content_type="text/markdown",

{hdpws-0.6.22 → hdpws-0.6.24}/tests/test_hdpws.py

@@ -24,7 +24,7 @@
 #
 # NOSA HEADER END
 #
-# Copyright (c) 2023-2024 United States Government as represented by
+# Copyright (c) 2023-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.
@@ -33,7 +33,7 @@
 """
 Module for unittest of the HdpWs class.<br>
 
-Copyright &copy; 2023 United States Government as represented by the
+Copyright &copy; 2023-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.
 """
@@ -74,7 +74,8 @@ class TestHdpWs(unittest.TestCase):
         self.assertEqual(result['HttpStatus'], 200)
         application_interfaces = result['ApplicationInterface']
         self.assertTrue(len(application_interfaces) > 0)
-        self.assertTrue(application_interfaces[0] == 'CLI')
+        #print(f'ai = {application_interfaces}')
+        self.assertTrue(application_interfaces[0] == 'API')
 
 
     def test_get_keywords(self):
@@ -195,8 +196,10 @@ class TestHdpWs(unittest.TestCase):
         """
 
         resource_ids = [ 
-            'spase://NASA/Collection/IRIS_AIA',
-            'spase://SMWG/Service/CCMC/Models'
+            #'spase://NASA/Collection/IRIS_AIA',
+            'spase://NASA/Collection/IRIS/IRIS_Hinode',
+            'spase://SMWG/Service/CCMC/Models',
+            'spase://NASA/NumericalData/LANL/1991/SOPA+ESP/PT10M'
         ]   
         result = self._hdp.get_spase(resource_ids)
 
@@ -204,6 +207,38 @@ class TestHdpWs(unittest.TestCase):
         result = result['Result']
         result_id_elements = result.findall('.//ResourceID', namespaces=NS)
         result_ids = list(map(lambda e: e.text, result_id_elements))
+        #print(f'resources = {resource_ids}')
+        #print(f'result_ids = {result_ids}')
+        # self.assertTrue(len(result_ids) == 3) 
+        # above should be == 2 when duplicate is removed from hdp and
+        # then the following will work
+        self.assertTrue(sorted(result_ids) == sorted(resource_ids))
+
+
+    def test_get_spase_w_prior_ids(self):
+        """
+        Test for get_spase function using PriorID values.
+        """
+
+        resource_ids = [ 
+            'spase://NASA/Collection/IRIS/IRIS_Hinode',
+            'spase://NASA/Catalog/CarringtonEvent/AuroralSightings',
+            'spase://NASA/NumericalData/LANL/1991/SOPA+ESP/PT10M'
+        ]   
+        prior_ids = [ 
+            'spase://NASA/Collection/IRIS_HINODE',
+            'spase://NASA/Catalog/Carrington_Event/Great_Magnetic_Storm_of_1859_List_of_Auroral_Sightings',
+            'spase://VSPO/NumericalData/LANL/1991/SOPA+ESP/PT10M'
+        ]   
+        result = self._hdp.get_spase(prior_ids)
+
+        self.assertEqual(result['HttpStatus'], 200)
+        result = result['Result']
+        result_id_elements = result.findall('.//ResourceID', namespaces=NS)
+        result_ids = list(map(lambda e: e.text, result_id_elements))
+        #print(f'resources = {resource_ids}')
+        #print(f'prior_ids = {prior_ids}')
+        #print(f'result_ids = {result_ids}')
         # self.assertTrue(len(result_ids) == 3) 
         # above should be == 2 when duplicate is removed from hdp and
         # then the following will work
@@ -351,22 +386,53 @@ class TestHdpWs(unittest.TestCase):
         Test for get_spase_catalog function.
         """
 
+        #query = { 
+        #    'InstrumentID': 'spase://SMWG/Instrument/ACE/MAG',
+        #    'PhenomenonType': 'MagneticCloud',
+        #    'Description': 'ICME'
+        #} 
+        #time_range = ['1999-01-01', '1999-01-02']
+        query = { 
+            'InstrumentID': 'spase://SMWG/Instrument/Wind/MFI',
+            'PhenomenonType': 'SolarWindExtreme'
+        } 
+        time_range = ['1999-01-01', '1999-01-02']
+
+        result = self._hdp.get_spase_catalog(query, time_range)
+
+        #print(f'get_spase_catalog HttpStatus = {result["HttpStatus"]}')
+        self.assertEqual(result['HttpStatus'], 200)
+        result = result['Result']
+        result_id_elements = result.findall('.//ResourceID',
+                                            namespaces=NS)
+        result_ids = list(map(lambda e: e.text, result_id_elements))
+        self.assertTrue(len(result_ids) == 1)
+        #self.assertTrue(result_ids[0] == 'spase://NASA/Catalog/CME-ICME_Cho2003')
+        self.assertTrue(result_ids[0] == 'spase://NASA/Catalog/ISTP/SWCAT')
+
+
+    def test_get_spase_catalog_prior_id(self):
+        """
+        Test for get_spase_catalog function with a PriorID value for 
+        ResourceID query.
+        """
+
+        #time_range = ['1999-01-01', '1999-01-02']
         query = { 
-            'InstrumentID': 'spase://SMWG/Instrument/ACE/MAG',
-            'PhenomenonType': 'MagneticCloud',
-            'Description': 'ICME'
+            'ResourceID': 'spase://VSPO/Catalog/ISTP/SWCAT'
         } 
         time_range = ['1999-01-01', '1999-01-02']
 
         result = self._hdp.get_spase_catalog(query, time_range)
 
+        #print(f'get_spase_catalog HttpStatus = {result["HttpStatus"]}')
         self.assertEqual(result['HttpStatus'], 200)
         result = result['Result']
         result_id_elements = result.findall('.//ResourceID',
                                             namespaces=NS)
         result_ids = list(map(lambda e: e.text, result_id_elements))
         self.assertTrue(len(result_ids) == 1)
-        self.assertTrue(result_ids[0] == 'spase://NASA/Catalog/CME-ICME_Cho2003')
+        self.assertTrue(result_ids[0] == 'spase://NASA/Catalog/ISTP/SWCAT')
 
 
     def test_get_spase_collection(self):
@@ -374,21 +440,51 @@ class TestHdpWs(unittest.TestCase):
         Test for get_spase_collection function.
         """
 
+        #query = { 
+        #    'ResourceID': 'spase://NASA/Collection/IRIS_AIA',
+        #    'MemberID': 'spase://NASA/NumericalData/SDO/AIA/PT10S',
+        #    'Description': 'IRIS AND SDO and AIA'
+        #} 
+        query = { 
+            'ResourceID': 'spase://NASA/Collection/IRIS/IRIS_Hinode',
+            'MemberID': 'spase://NASA/NumericalData/IRIS/IRIS/PT1S',
+            'Description': 'IRIS AND EIS and Hinode'
+        } 
+
+        result = self._hdp.get_spase_collection(query)
+
+        #print(f'get_spase_collection HttpStatus = {result["HttpStatus"]}')
+        self.assertEqual(result['HttpStatus'], 200)
+        result = result['Result']
+        result_id_elements = result.findall('.//ResourceID',
+                                            namespaces=NS)
+        result_ids = list(map(lambda e: e.text, result_id_elements))
+        self.assertTrue(len(result_ids) == 1)
+        #self.assertTrue(result_ids[0] == 'spase://NASA/Collection/IRIS_AIA')
+        self.assertTrue(result_ids[0] == 'spase://NASA/Collection/IRIS/IRIS_Hinode')
+
+
+    def test_get_spase_collection_prior_id(self):
+        """
+        Test for get_spase_collection function with a prior_id.
+        """
+
         query = { 
-            'ResourceID': 'spase://NASA/Collection/IRIS_AIA',
-            'MemberID': 'spase://NASA/NumericalData/SDO/AIA/PT10S',
-            'Description': 'IRIS AND SDO and AIA'
+            # PriorID
+            'ResourceID': 'spase://NASA/Collection/IRIS_HINODE',
         } 
 
         result = self._hdp.get_spase_collection(query)
 
+        #print(f'get_spase_collection HttpStatus = {result["HttpStatus"]}')
         self.assertEqual(result['HttpStatus'], 200)
         result = result['Result']
         result_id_elements = result.findall('.//ResourceID',
                                             namespaces=NS)
         result_ids = list(map(lambda e: e.text, result_id_elements))
+        #print(f'get_spase_collection: result_ids = {result_ids}')
         self.assertTrue(len(result_ids) == 1)
-        self.assertTrue(result_ids[0] == 'spase://NASA/Collection/IRIS_AIA')
+        self.assertTrue(result_ids[0] == 'spase://NASA/Collection/IRIS/IRIS_Hinode')
 
 
     def test_get_spase_document(self):