Merge pull request #128 from pysat/develop_lisird_fix

Develop lisird fix
pysat · Oct 24, 2023 · baaf37e · baaf37e
2 parents 0d33b54 + cdb38a2
commit baaf37e
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -16,6 +16,8 @@ This project adheres to [Semantic Versioning](https://semver.org/).
   * Added new test attributes for clean messages to the ACE instruments
 * Maintenance
   * Updated package documentation, yamls, and other supporting files
+  * Updated the LISIRD download routine to reflect new behaviour
+  * Changed F10.7 daily test day to ensure new pysat padding tests work
 
 [0.0.10] - 2023-06-01
 ---------------------

diff --git a/pysatSpaceWeather/instruments/methods/lisird.py b/pysatSpaceWeather/instruments/methods/lisird.py
@@ -148,8 +148,11 @@ def download(date_array, data_path, local_file_prefix, local_date_fmt,
                 raise IOError(''.join(['Gateway timeout when requesting ',
                                        'file using command: ', url]))
 
-            if req.ok:
-                raw_dict = json.loads(req.text)[lisird_data_name]
+            # Load the dict if text was retrieved
+            json_dict = json.loads(req.text) if req.ok else {'': {}}
+
+            if lisird_data_name in json_dict.keys():
+                raw_dict = json_dict[lisird_data_name]
                 data = pds.DataFrame.from_dict(raw_dict['samples'])
                 if data.empty:
                     pysat.logger.warning("no data for {:}".format(dl_date))
@@ -176,8 +179,12 @@ def download(date_array, data_path, local_file_prefix, local_date_fmt,
                     # Create a local CSV file
                     data.to_csv(local_file, header=True)
             else:
-                pysat.logger.info("".join(["Data not downloaded for ",
-                                           dl_date.strftime("%d %b %Y"),
-                                           ", date may be out of range ",
-                                           "for the database."]))
+                if len(json_dict.keys()) == 1 and '' in json_dict.keys():
+                    pysat.logger.info("".join(["Data not downloaded for ",
+                                               dl_date.strftime("%d %b %Y"),
+                                               ", date may be out of range ",
+                                               "for the database."]))
+                else:
+                    raise IOError(''.join(['Returned unexpectedly formatted ',
+                                           'data using command: ', url]))
     return
diff --git a/pysatSpaceWeather/instruments/sw_f107.py b/pysatSpaceWeather/instruments/sw_f107.py
@@ -105,7 +105,7 @@
 
 _test_dates = {'': {'historic': dt.datetime(2009, 1, 1),
                     'prelim': dt.datetime(2009, 1, 1),
-                    'daily': tomorrow,
+                    'daily': today,
                     'forecast': tomorrow,
                     '45day': tomorrow},
                'obs': {'now': dt.datetime(2009, 1, 1)},

diff --git a/pysatSpaceWeather/tests/test_instruments.py b/pysatSpaceWeather/tests/test_instruments.py
@@ -34,6 +34,7 @@ class TestInstruments(clslib.InstLibTests):
     ----
     All standard tests, setup, and teardown inherited from the core pysat
     instrument test class.
+
     """
-Original file line number
+Diff line change
@@ Expand Up / @@ -34,6 +34,7 @@ class TestInstruments(clslib.InstLibTests): @@
         ----
         All standard tests, setup, and teardown inherited from the core pysat
         instrument test class.
         """
@@ Expand Down @@