Fix from copilot review

Author: RichardHitier

speasy/core/codecs/bundled_codecs/__init__.py

@@ -1,2 +1,3 @@
 from .istp_cdf import IstpCdf
 from .hapi.csv import HapiCsv
+from .hapi.binary import HapiBinary

speasy/core/codecs/bundled_codecs/hapi/binary/reader.py

@@ -1,4 +1,3 @@
-from ast import Tuple
 import io
 import json
 from typing import Optional, Union, Dict, Any, Tuple
@@ -71,7 +70,7 @@ def _parse_hapi_binary(file: io.IOBase) -> Tuple[np.array, Dict[str, Any]]:
 
 def _load_binary(file: Union[Buffer, str, io.IOBase]) -> Tuple[Optional[np.array], Optional[Dict[str, Any]]]:
     if isinstance(file, str):
-        with any_loc_open(file, cache_remote_files=False, mode='br') as f:
+        with any_loc_open(file, cache_remote_files=False, mode='rb') as f:
             return _parse_hapi_binary(f)
     if isinstance(file, io.IOBase) or hasattr(file, 'read'):
         return _parse_hapi_binary(file)

speasy/core/codecs/bundled_codecs/hapi/codec.py

@@ -27,7 +27,7 @@ def _decode_meta(meta: Dict[str, Any]) -> Dict[str, Any]:
     return meta
 
 def _make_hapi_time_axis(time_axis: VariableTimeAxis) -> HapiParameter:
-    return HapiParameter(values=time_axis,
+    return HapiParameter(values=time_axis.values,
                             meta={"name": "Time", "type": "isotime", "units": "UTC", "length": 24, "fill": None})
 
 def _make_hapi_parameter(variable: SpeasyVariable) -> HapiParameter:
@@ -105,7 +105,7 @@ def _speasy_variables_to_hapi(variables: List[SpeasyVariable]) -> HapiFile:
     if len(variables) == 0:
         raise ValueError("No variables to save")
     hapi_file = HapiFile()
-    hapi_file.add_parameter(_make_hapi_time_axis(variables[0].time))
+    hapi_file.add_parameter(_make_hapi_time_axis(variables[0].axes[0]))
     for spz_var in variables:
         # add spz_var as hapi_param
         hapi_file.add_parameter(_make_hapi_parameter(spz_var))

speasy/core/codecs/bundled_codecs/hapi/writer.py

@@ -8,11 +8,14 @@
 def save_hapi(
     hapi_file: HapiFile,
     file: Optional[Union[str, io.IOBase]] = None,
-    to_func: Callable[[HapiFile, io.IOBase, bool], bool] = None,
+    to_func: Optional[Callable[[HapiFile, io.IOBase, bool], bool]] = None,
     mode: str = "wb",
     with_headers: bool = True
 ) -> Union[bool, Buffer]:
 
+    if to_func is None:
+        raise ValueError("to_func must be provided and cannot be None")
+
     if isinstance(file, str):
         with open(file, mode) as f:
             return to_func(hapi_file, f, with_headers=with_headers)

tests/test_hapi_codecs.py

@@ -221,7 +221,7 @@ class TestHapiBinaryCodec(unittest.TestCase):
     )
     @unpack
     def test_load_headers(self, fname, var_name, unit, description):
-        with open(os.path.join(__HERE__, 'resources', fname), 'br') as f:
+        with open(os.path.join(__HERE__, 'resources', fname), 'rb') as f:
             headers = hapi_binary.reader._extract_headers(f)
             time_param = headers['parameters'][0]
             self.assertEqual(time_param['units'], 'UTC')
@@ -258,7 +258,7 @@ def test_load_multiple_variables(self):
         fname = "HAPI_amda_imf_all.binary"
         file=str(os.path.join(__HERE__, 'resources', fname))
         var_names = ["imf_mag", "imf"]
-        with open(file, 'br') as f:
+        with open(file, 'rb') as f:
             variables = hapi_binary_codec.load_variables(file=f, variables=var_names, disable_cache=True)
             self.assertEqual(len(variables), len(var_names))
             for v in variables.values():
@@ -273,7 +273,7 @@ def test_load_multiple_variables(self):
 
     def test_load_time_independent_axis(self):
         hapi_binary_codec: CodecInterface = get_codec('hapi/binary')
-        with open(os.path.join(__HERE__, 'resources', 'HAPI_ndData_TimeIndependent_Axis.binary'), 'br') as f:
+        with open(os.path.join(__HERE__, 'resources', 'HAPI_ndData_TimeIndependent_Axis.binary'), 'rb') as f:
             variables = hapi_binary_codec.load_variables(file=f, variables=['ace_epam_de_e'], disable_cache=True)
             self.assertIn('ace_epam_de_e', variables)
             v: SpeasyVariable = variables['ace_epam_de_e']
@@ -310,7 +310,7 @@ def test_spz_getdata_to_binary(self):
 
     def test_save_time_varying_axis(self):
         hapi_binary_codec: CodecInterface = get_codec('hapi/binary')
-        with open(os.path.join(__HERE__, 'resources', 'HAPI_ndData_TimeVarying_Axis.binary'), 'br') as f:
+        with open(os.path.join(__HERE__, 'resources', 'HAPI_ndData_TimeVarying_Axis.binary'), 'rb') as f:
             # read to generate spz_vars
             var_name = 'spectra_time_dependent_bins'
             variables = hapi_binary_codec.load_variables(file=f, variables=[var_name], disable_cache=True)