Uses output format value from config as fallback when requesting data

from proxy for AMDA, Fixes #90

Signed-off-by: Alexis Jeandet <alexis.jeandet@member.fsf.org>

Author: jeandet

speasy/webservices/amda/utils.py

@@ -11,7 +11,7 @@
 
 import numpy as np
 import pandas as pds
-
+from speasy.config import amda as amda_cfg
 from speasy.core import epoch_to_datetime64
 from speasy.core.datetime_range import DateTimeRange
 from speasy.core.http import urlopen_with_retry
@@ -223,4 +223,5 @@ def get_parameter_args(start_time: datetime, stop_time: datetime, product: str,
         parameter arguments in dictionary
     """
     return {'path': f"amda/{product}", 'start_time': f'{start_time.isoformat()}',
-            'stop_time': f'{stop_time.isoformat()}', 'output_format': kwargs.get('output_format', 'ASCII')}
+            'stop_time': f'{stop_time.isoformat()}',
+            'output_format': kwargs.get('output_format', amda_cfg.output_format.get())}

tests/test_amda.py

@@ -6,9 +6,10 @@
 import unittest
 from datetime import datetime, timezone
 
-from ddt import data, ddt, unpack
-
+import numpy as np
 import speasy as spz
+from ddt import data, ddt, unpack
+from speasy.config import amda as amda_cfg
 from speasy.inventories import flat_inventories
 from speasy.products import SpeasyVariable
 from speasy.webservices.amda import ProductType
@@ -253,6 +254,16 @@ def test_raises_if_user_passes_unknown_product_kwargs_to_get_data(self):
         with self.assertRaises(ValueError):
             spz.get_data('amda/This_product_does_not_exist', "2018-01-01", "2018-01-02")
 
+    def test_non_regression_CDF_ISTP_with_proxy_and_config(self):
+        ref = spz.get_data(spz.inventories.tree.amda.Parameters.MMS.MMS1.FPI.fast_mode.mms1_fpi_dismoms.mms1_dis_omni,
+                           "2021-06-01", "2021-06-08T02", output_format='CDF_ISTP')
+        os.environ[amda_cfg.output_format.env_var_name] = 'CDF_ISTP'
+        var = spz.get_data(spz.inventories.tree.amda.Parameters.MMS.MMS1.FPI.fast_mode.mms1_fpi_dismoms.mms1_dis_omni,
+                           "2021-06-01", "2021-06-08T02")
+        self.assertTrue(len(ref.axes), 2)
+        self.assertTrue(len(var.axes), 2)
+        self.assertTrue(np.all(var.axes[1].values == ref.axes[1].values))
+
 
 if __name__ == '__main__':
     unittest.main()