Merge pull request #111 from jgieseler/main

Catch ReadTimeout error when downloading Wind/3DP data from UBerkeley server

Author: jgieseler

seppy/loader/wind.py

@@ -113,16 +113,16 @@ def wind3dp_single_download(file, path=None):
 
     data = file.split('_')[1]  # e.g. 'sfsp'
     year = file.split('_')[3][:4]
-    base = f"https://sprg.ssl.berkeley.edu/wind3dp/data/wi/3dp/{data}/{year}/"
+    base = f"https://sprg.ssl.berkeley.edu/wind3dp/data/wi/3dp/{data}/{year}"
 
     url = base+'/'+file
 
     try:
         downloaded_file = pooch.retrieve(url=url, known_hash=None, fname=file, path=path, progressbar=True)
     except ModuleNotFoundError:
         downloaded_file = pooch.retrieve(url=url, known_hash=None, fname=file, path=path, progressbar=False)
-    except requests.HTTPError:
-        print(f'No corresponding data found at {url}')
+    except (requests.ReadTimeout, requests.Timeout) as e:
+        print(f'No corresponding data found at {url}: {e}')
         downloaded_file = []
     print('')
 

seppy/tests/test_loader.py

@@ -2,6 +2,7 @@
 import numpy as np
 import pandas as pd
 import pytest
+import requests
 from astropy.utils.data import get_pkg_data_filename
 from pathlib import Path
 from seppy.loader.bepi import bepi_sixsp_l3_loader
@@ -10,7 +11,8 @@
 from seppy.loader.soho import soho_load
 from seppy.loader.solo import mag_load
 from seppy.loader.stereo import stereo_load
-from seppy.loader.wind import wind3dp_load
+from seppy.loader.wind import wind3dp_load, wind3dp_single_download
+from unittest.mock import patch
 
 
 def test_bepi_sixs_load_online():
@@ -237,3 +239,22 @@ def test_wind3dp_load_offline():
     assert meta['FLUX_LABELS'].flatten()[0] == 'ElecNoFlux_Ch1_Often~27keV '
     # Check that fillvals are replaced by NaN
     assert np.sum(np.isnan(df['FLUX_0'])) == 352
+
+
+def test_wind3dp_single_download_exceptions():
+    """
+    Test wind3dp_single_download with mocked request exceptions.
+    """
+    wind_file = 'wi_sfsp_3dp_20220602_v01.cdf'
+
+    with patch('requests.get', side_effect=requests.exceptions.ReadTimeout):
+        downloaded_file = wind3dp_single_download(wind_file)
+        assert downloaded_file == []
+
+    with patch('requests.get', side_effect=requests.exceptions.Timeout):
+        downloaded_file = wind3dp_single_download(wind_file)
+        assert downloaded_file == []
+
+    with patch('requests.get', side_effect=requests.exceptions.HTTPError):
+        with pytest.raises(requests.exceptions.HTTPError):
+            downloaded_file = wind3dp_single_download(wind_file)