cloudnetpy 1.80.7__py3-none-any.whl → 1.81.0__py3-none-any.whl

cloudnetpy/instruments/hatpro.py

@@ -3,9 +3,12 @@
 import datetime
 import logging
 from collections import defaultdict
+from os import PathLike
 from pathlib import Path
 from typing import Literal
+from uuid import UUID
 
+import mwrpy.rpg_mwr
 import netCDF4
 import numpy as np
 from mwrpy.exceptions import MissingInputData
@@ -35,13 +38,13 @@ ITYPE_MAP: dict[IType, Instrument] = {
 
 
 def hatpro2l1c(
-    mwr_dir: str,
-    output_file: str,
+    mwr_dir: str | PathLike,
+    output_file: str | PathLike,
     site_meta: dict,
     instrument_type: IType = "hatpro",
-    uuid: str | None = None,
-    date: datetime.date | str | None = None,
-) -> str:
+    uuid: str | UUID | None = None,
+    date: str | datetime.date | None = None,
+) -> UUID:
     """Converts RPG HATPRO microwave radiometer data into Cloudnet Level 1c netCDF file.
 
     Args:
@@ -57,6 +60,7 @@ def hatpro2l1c(
     """
     if isinstance(date, str):
         date = datetime.date.fromisoformat(date)
+    uuid = utils.get_uuid(uuid)
 
     coeff_files = site_meta.get("coefficientFiles")
     time_offset = site_meta.get("time_offset")
@@ -64,9 +68,9 @@ def hatpro2l1c(
     try:
         hatpro_raw = lev1_to_nc(
             "1C01",
-            mwr_dir,
+            str(mwr_dir),
             instrument_type=instrument_type,
-            output_file=output_file,
+            output_file=str(output_file),
             coeff_files=coeff_files,
             instrument_config=site_meta,
             date=date,
@@ -122,7 +126,7 @@ def hatpro2l1c(
     attrs_copy = ATTRIBUTES_1B01.copy()
     attributes = output.add_time_attribute(attrs_copy, hatpro.date)
     output.update_attributes(hatpro.data, attributes)
-    uuid = output.save_level1b(hatpro, output_file, uuid)
+    output.save_level1b(hatpro, output_file, uuid)
     with netCDF4.Dataset(output_file, "a") as nc:
         nc.cloudnet_file_type = "mwr-l1c"
         nc.title = nc.title.replace("radiometer", "radiometer Level 1c")
@@ -134,22 +138,24 @@ def hatpro2l1c(
 
 
 class HatproL1c:
-    def __init__(self, hatpro, site_meta: dict, instrument: Instrument):
+    def __init__(
+        self, hatpro: mwrpy.rpg_mwr.Rpg, site_meta: dict, instrument: Instrument
+    ) -> None:
         self.raw_data = hatpro.raw_data
         self.data = hatpro.data
-        self.date = hatpro.date.isoformat().split("-")
+        self.date = hatpro.date
         self.site_meta = site_meta
         self.instrument = instrument
 
 
 def hatpro2nc(
-    path_to_files: str,
-    output_file: str,
+    path_to_files: str | PathLike,
+    output_file: str | PathLike,
     site_meta: dict,
     instrument_type: IType = "hatpro",
-    uuid: str | None = None,
-    date: str | None = None,
-) -> tuple[str, list]:
+    uuid: str | UUID | None = None,
+    date: str | datetime.date | None = None,
+) -> tuple[UUID, list[Path]]:
     """Converts RPG HATPRO microwave radiometer data into Cloudnet Level 1b
     netCDF file.
 
@@ -188,9 +194,12 @@ def hatpro2nc(
         >>> hatpro2nc('/path/to/files/', 'hatpro.nc', site_meta)
 
     """
+    if isinstance(date, str):
+        date = datetime.date.fromisoformat(date)
+    uuid = utils.get_uuid(uuid)
     hatpro_objects, valid_files = _get_hatpro_objects(Path(path_to_files), date)
-    is_lwp_files = any(f.endswith(".LWP") for f in valid_files)
-    is_iwv_files = any(f.endswith(".IWV") for f in valid_files)
+    is_lwp_files = any(f.suffix == ".LWP" for f in valid_files)
+    is_iwv_files = any(f.suffix == ".IWV" for f in valid_files)
     if not is_lwp_files:
         raise ValidTimeStampError
     if is_iwv_files:
@@ -203,14 +212,14 @@ def hatpro2nc(
     hatpro.remove_duplicate_timestamps()
     attributes = output.add_time_attribute({}, hatpro.date)
     output.update_attributes(hatpro.data, attributes)
-    uuid = output.save_level1b(hatpro, output_file, uuid)
+    output.save_level1b(hatpro, output_file, uuid)
     return uuid, valid_files
 
 
 def _get_hatpro_objects(
     directory: Path,
-    expected_date: str | None,
-) -> tuple[list[HatproBinCombined], list[str]]:
+    expected_date: datetime.date | None,
+) -> tuple[list[HatproBinCombined], list[Path]]:
     objects = defaultdict(list)
     for filename in directory.iterdir():
         try:
@@ -230,12 +239,12 @@ def _get_hatpro_objects(
             logging.warning("Ignoring file '%s': %s", filename, err)
             continue
 
-    valid_files: list[str] = []
+    valid_files: list[Path] = []
     combined_objs = []
     for _stem, objs in sorted(objects.items()):
         try:
             combined_objs.append(HatproBinCombined(objs))
-            valid_files.extend(str(obj.filename) for obj in objs)
+            valid_files.extend(obj.filename for obj in objs)
         except (TypeError, ValueError) as err:
             files = "'" + "', '".join(str(obj.filename) for obj in objs) + "'"
             logging.warning("Ignoring files %s: %s", files, err)
@@ -244,13 +253,13 @@ def _get_hatpro_objects(
     return combined_objs, valid_files
 
 
-def _validate_date(obj: HatproBin, expected_date: str) -> HatproBin:
+def _validate_date(obj: HatproBin, expected_date: datetime.date) -> HatproBin:
     if obj.header["_time_reference"] != 1:
         msg = "Can not validate non-UTC dates"
         raise ValueError(msg)
     inds = []
     for ind, timestamp in enumerate(obj.data["time"][:]):
-        date = "-".join(utils.seconds2date(timestamp)[:3])
+        date = utils.seconds2date(timestamp).date()
         if date == expected_date:
             inds.append(ind)
     if not inds:

cloudnetpy/instruments/lufft.py

@@ -1,6 +1,8 @@
 """Module with a class for Lufft chm15k ceilometer."""
 
+import datetime
 import logging
+from os import PathLike
 
 import netCDF4
 import numpy as np
@@ -16,10 +18,10 @@ class LufftCeilo(NcLidar):
 
     def __init__(
         self,
-        file_name: str,
+        file_name: str | PathLike,
         site_meta: dict,
-        expected_date: str | None = None,
-    ):
+        expected_date: datetime.date | None = None,
+    ) -> None:
         super().__init__()
         self.file_name = file_name
         self.site_meta = site_meta
@@ -89,7 +91,7 @@ class LufftCeilo(NcLidar):
             return 1
         return step_factor ** (-(nn1 - reference) / scale)
 
-    def _getvar(self, *args) -> float | ma.MaskedArray:
+    def _getvar(self, *args: str) -> float | ma.MaskedArray:
         if self.dataset is None:
             msg = "No dataset found"
             raise RuntimeError(msg)

cloudnetpy/instruments/mira.py

@@ -1,9 +1,13 @@
 """Module for reading raw cloud radar data."""
 
+import datetime
 import logging
 import os
 from collections import OrderedDict
+from collections.abc import Sequence
+from os import PathLike
 from tempfile import NamedTemporaryFile, TemporaryDirectory
+from uuid import UUID
 
 from numpy import ma
 
@@ -14,12 +18,12 @@ from cloudnetpy.metadata import MetaData
 
 
 def mira2nc(
-    raw_mira: str | list[str],
-    output_file: str,
+    raw_mira: str | PathLike | Sequence[str | PathLike],
+    output_file: str | PathLike,
     site_meta: dict,
-    uuid: str | None = None,
-    date: str | None = None,
-) -> str:
+    uuid: str | UUID | None = None,
+    date: str | datetime.date | None = None,
+) -> UUID:
     """Converts METEK MIRA-35 cloud radar data into Cloudnet Level 1b netCDF file.
 
     This function converts raw MIRA file(s) into a much smaller file that
@@ -55,6 +59,10 @@ def mira2nc(
           >>> mira2nc('/one/day/of/mira/znc/files/', 'radar.nc', site_meta)
 
     """
+    if isinstance(date, str):
+        date = datetime.date.fromisoformat(date)
+    uuid = utils.get_uuid(uuid)
+
     with TemporaryDirectory() as temp_dir:
         input_filename, keymap = _parse_input_files(raw_mira, temp_dir)
 
@@ -62,7 +70,7 @@ def mira2nc(
             mira.init_data(keymap)
             if date is not None:
                 mira.screen_by_date(date)
-                mira.date = date.split("-")
+                mira.date = date
             mira.sort_timestamps()
             mira.remove_duplicate_timestamps()
             mira.linear_to_db(("Zh", "ldr", "SNR"))
@@ -101,7 +109,8 @@ def mira2nc(
             mira.test_if_all_masked()
         attributes = output.add_time_attribute(ATTRIBUTES, mira.date)
         output.update_attributes(mira.data, attributes)
-        return output.save_level1b(mira, output_file, uuid)
+        output.save_level1b(mira, output_file, uuid)
+        return uuid
 
 
 class Mira(NcRadar):
@@ -113,9 +122,9 @@ class Mira(NcRadar):
 
     """
 
-    epoch = (1970, 1, 1)
+    epoch = datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc)
 
-    def __init__(self, full_path: str, site_meta: dict):
+    def __init__(self, full_path: str | PathLike, site_meta: dict) -> None:
         super().__init__(full_path, site_meta)
         self.date = self._init_mira_date()
         if "model" not in site_meta or site_meta["model"] == "mira-35":
@@ -126,21 +135,21 @@ class Mira(NcRadar):
             msg = f"Invalid model: {site_meta['model']}"
             raise ValueError(msg)
 
-    def screen_by_date(self, expected_date: str) -> None:
+    def screen_by_date(self, expected_date: datetime.date) -> None:
         """Screens incorrect time stamps."""
         time_stamps = self.getvar("time")
         valid_indices = []
         for ind, timestamp in enumerate(time_stamps):
             if not timestamp:
                 continue
-            date = "-".join(utils.seconds2date(timestamp, self.epoch)[:3])
+            date = utils.seconds2date(timestamp, self.epoch).date()
             if date == expected_date:
                 valid_indices.append(ind)
         self.screen_time_indices(valid_indices)
 
-    def _init_mira_date(self) -> list[str]:
+    def _init_mira_date(self) -> datetime.date:
         time_stamps = self.getvar("time")
-        return utils.seconds2date(float(time_stamps[0]), self.epoch)[:3]
+        return utils.seconds2date(float(time_stamps[0]), self.epoch).date()
 
     def screen_invalid_ldr(self) -> None:
         """Masks LDR in MIRA STSR mode data.
@@ -169,16 +178,21 @@ class Mira(NcRadar):
                 array[array > (upper + margin)] = ma.masked
 
 
-def _parse_input_files(input_files: str | list[str], temp_dir: str) -> tuple:
-    if isinstance(input_files, list) or os.path.isdir(input_files):
+def _parse_input_files(
+    input_files: str | PathLike | Sequence[str | PathLike], temp_dir: str
+) -> tuple[str | PathLike, dict[str, str]]:
+    input_filename: str | PathLike
+    if (
+        not isinstance(input_files, str) and isinstance(input_files, Sequence)
+    ) or os.path.isdir(input_files):
         with NamedTemporaryFile(
             dir=temp_dir,
             suffix=".nc",
             delete=False,
         ) as temp_file:
             input_filename = temp_file.name
-            if isinstance(input_files, list):
-                valid_files = sorted(input_files)
+            if not isinstance(input_files, str) and isinstance(input_files, Sequence):
+                valid_files = sorted(map(str, input_files))
             else:
                 valid_files = utils.get_sorted_filenames(input_files, ".znc")
                 if not valid_files:
@@ -210,7 +224,7 @@ def _parse_input_files(input_files: str | list[str], temp_dir: str) -> tuple:
             )
     else:
         input_filename = input_files
-        keymap = _get_keymap(input_filename.split(".")[-1])
+        keymap = _get_keymap(str(input_filename).split(".")[-1])
 
     return input_filename, keymap
 
@@ -227,7 +241,7 @@ def _get_ignored_variables(filetype: str) -> list | None:
     return keymaps.get(filetype.lower(), keymaps.get("mmclx"))
 
 
-def _get_keymap(filetype: str) -> dict:
+def _get_keymap(filetype: str) -> dict[str, str]:
     """Returns a dictionary mapping the variables in the raw data to the processed
     Cloudnet file.
     """

cloudnetpy/instruments/mrr.py

@@ -19,9 +19,9 @@ def mrr2nc(
     input_file: PathLike | str | Iterable[PathLike | str],
     output_file: PathLike | str,
     site_meta: dict,
-    uuid: UUID | str | None = None,
-    date: datetime.date | str | None = None,
-) -> str:
+    uuid: str | UUID | None = None,
+    date: str | datetime.date | None = None,
+) -> UUID:
     """Converts METEK MRR-PRO data into Cloudnet Level 1b netCDF file.
 
     This function converts raw MRR file(s) into a much smaller file that
@@ -48,10 +48,9 @@ def mrr2nc(
           >>> site_meta = {'name': 'LIM', 'latitude': 51.333, 'longitude': 12.389}
           >>> mrr2nc('input.nc', 'output.nc', site_meta)
     """
-    if isinstance(uuid, str):
-        uuid = UUID(uuid)
     if isinstance(date, str):
         date = datetime.date.fromisoformat(date)
+    uuid = utils.get_uuid(uuid)
 
     keymap = {
         "RR": "rainfall_rate",
@@ -112,7 +111,8 @@ def mrr2nc(
             mrr.sort_timestamps()
         attributes = output.add_time_attribute(ATTRIBUTES, mrr.date)
         output.update_attributes(mrr.data, attributes)
-        return output.save_level1b(mrr, output_file, uuid)
+        output.save_level1b(mrr, output_file, uuid)
+        return uuid
 
 
 class MrrPro(NcRadar):
@@ -125,9 +125,9 @@ class MrrPro(NcRadar):
 
     """
 
-    epoch = (1970, 1, 1)
+    epoch = datetime.datetime(1970, 1, 1, tzinfo=datetime.timezone.utc)
 
-    def __init__(self, full_path: PathLike | str, site_meta: dict):
+    def __init__(self, full_path: PathLike | str, site_meta: dict) -> None:
         super().__init__(full_path, site_meta)
         self.instrument = instruments.MRR_PRO
         if m := re.search(
@@ -137,9 +137,9 @@ class MrrPro(NcRadar):
         ):
             self.serial_number = m[1]
 
-    def init_date(self) -> list[str]:
+    def init_date(self) -> datetime.date:
         time_stamps = self.getvar("time")
-        return utils.seconds2date(time_stamps[0], (1970, 1, 1))[:3]
+        return utils.seconds2date(time_stamps[0], self.epoch).date()
 
     def fix_units(self) -> None:
         self.data["v"].data *= -1  # towards -> away from instrument
@@ -156,8 +156,8 @@ class MrrPro(NcRadar):
         time_stamps = self.getvar("time")
         valid_indices = []
         for ind, timestamp in enumerate(time_stamps):
-            date = "-".join(utils.seconds2date(timestamp, self.epoch)[:3])
-            if date == expected_date.isoformat():
+            date = utils.seconds2date(timestamp, self.epoch).date()
+            if date == expected_date:
                 valid_indices.append(ind)
         self.screen_time_indices(valid_indices)
 

cloudnetpy/instruments/nc_lidar.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 class NcLidar(Ceilometer):
     """Class for all lidars using netCDF files."""
 
-    def __init__(self):
+    def __init__(self) -> None:
         super().__init__()
         self.dataset: netCDF4.Dataset | None = None
 

cloudnetpy/instruments/nc_radar.py

@@ -1,5 +1,6 @@
 """Module for reading raw cloud radar data."""
 
+import datetime
 import logging
 from os import PathLike
 from typing import TYPE_CHECKING
@@ -28,10 +29,10 @@ class NcRadar(DataSource, CloudnetInstrument):
         Used with BASTA, MIRA and Copernicus radars.
     """
 
-    def __init__(self, full_path: PathLike | str, site_meta: dict):
+    def __init__(self, full_path: PathLike | str, site_meta: dict) -> None:
         super().__init__(full_path)
         self.site_meta = site_meta
-        self.date: list[str]
+        self.date: datetime.date
         self.instrument: Instrument | None = None
 
     def init_data(self, keymap: dict) -> None:
@@ -171,7 +172,7 @@ class NcRadar(DataSource, CloudnetInstrument):
 class ChilboltonRadar(NcRadar):
     """Class for Chilbolton cloud radars Galileo and Copernicus."""
 
-    def __init__(self, full_path: str, site_meta: dict) -> None:
+    def __init__(self, full_path: str | PathLike, site_meta: dict) -> None:
         super().__init__(full_path, site_meta)
         self.date = self._init_date()
 
@@ -181,10 +182,9 @@ class ChilboltonRadar(NcRadar):
         folding_velocity = self.dataset.variables[key].folding_velocity
         self.append_data(np.array(folding_velocity), "nyquist_velocity")
 
-    def check_date(self, date: str) -> None:
-        if self.date != date.split("-"):
+    def check_date(self, date: datetime.date) -> None:
+        if self.date != date:
             raise ValidTimeStampError
 
-    def _init_date(self) -> list[str]:
-        epoch = utils.get_epoch(self.dataset["time"].units)
-        return [str(x).zfill(2) for x in epoch]
+    def _init_date(self) -> datetime.date:
+        return utils.get_epoch(self.dataset["time"].units).date()

cloudnetpy/instruments/pollyxt.py

@@ -1,11 +1,15 @@
 """Module for reading / converting pollyxt data."""
 
+import datetime
 import glob
 import logging
 from collections import Counter
+from os import PathLike
+from uuid import UUID
 
 import netCDF4
 import numpy as np
+import numpy.typing as npt
 from numpy import ma
 from numpy.testing import assert_almost_equal
 
@@ -14,16 +18,15 @@ from cloudnetpy.exceptions import InconsistentDataError, ValidTimeStampError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.ceilometer import Ceilometer
 from cloudnetpy.metadata import COMMON_ATTRIBUTES, MetaData
-from cloudnetpy.utils import Epoch
 
 
 def pollyxt2nc(
-    input_folder: str,
-    output_file: str,
+    input_folder: str | PathLike,
+    output_file: str | PathLike,
     site_meta: dict,
-    uuid: str | None = None,
-    date: str | None = None,
-) -> str:
+    uuid: str | UUID | None = None,
+    date: str | datetime.date | None = None,
+) -> UUID:
     """Converts PollyXT Raman lidar data into Cloudnet Level 1b netCDF file.
 
     Args:
@@ -50,6 +53,9 @@ def pollyxt2nc(
         >>> pollyxt2nc('/path/to/files/', 'pollyxt.nc', site_meta)
 
     """
+    if isinstance(date, str):
+        date = datetime.date.fromisoformat(date)
+    uuid = utils.get_uuid(uuid)
     snr_limit = site_meta.get("snr_limit", 2)
     polly = PollyXt(site_meta, date)
     epoch = polly.fetch_data(input_folder)
@@ -64,11 +70,12 @@ def pollyxt2nc(
     attributes = output.add_time_attribute(ATTRIBUTES, polly.date)
     output.update_attributes(polly.data, attributes)
     polly.add_snr_info("beta", snr_limit)
-    return output.save_level1b(polly, output_file, uuid)
+    output.save_level1b(polly, output_file, uuid)
+    return uuid
 
 
 class PollyXt(Ceilometer):
-    def __init__(self, site_meta: dict, expected_date: str | None):
+    def __init__(self, site_meta: dict, expected_date: datetime.date | None) -> None:
         super().__init__()
         self.site_meta = site_meta
         self.expected_date = expected_date
@@ -95,7 +102,7 @@ class PollyXt(Ceilometer):
         default = 5
         self.data["zenith_angle"] = float(self.metadata.get("zenith_angle", default))
 
-    def fetch_data(self, input_folder: str) -> Epoch:
+    def fetch_data(self, input_folder: str | PathLike) -> datetime.datetime:
         """Read input data."""
         bsc_files = glob.glob(f"{input_folder}/*[0-9]_att*.nc")
         depol_files = glob.glob(f"{input_folder}/*[0-9]_vol*.nc")
@@ -114,7 +121,7 @@ class PollyXt(Ceilometer):
         self._fetch_attributes(bsc_files[0])
         with netCDF4.Dataset(bsc_files[0], "r") as nc:
             self.data["range"] = nc.variables["height"][:]
-        calibration_factors: np.ndarray = np.array([])
+        calibration_factors: npt.NDArray = np.array([])
         beta_channel = self._get_valid_beta_channel(bsc_files)
         bsc_key = f"attenuated_backscatter_{beta_channel}nm"
         for bsc_file, depol_file in zip(bsc_files, depol_files, strict=True):
@@ -197,7 +204,7 @@ class PollyXt(Ceilometer):
 def _fetch_files_with_same_range(
     bsc_files: list[str], depol_files: list[str]
 ) -> tuple[list[str], list[str]]:
-    def get_sum(file: str):
+    def get_sum(file: str) -> float:
         with netCDF4.Dataset(file, "r") as nc:
             return np.sum(np.round(nc.variables["height"][:]))
 
@@ -229,7 +236,7 @@ def _read_array_from_file_pair(
     nc_file1: netCDF4.Dataset,
     nc_file2: netCDF4.Dataset,
     key: str,
-) -> np.ndarray:
+) -> npt.NDArray:
     array1 = nc_file1.variables[key][:]
     array2 = nc_file2.variables[key][:]
     assert_almost_equal(

cloudnetpy/instruments/radiometrics.py

@@ -7,10 +7,13 @@ import math
 import os
 import re
 from operator import attrgetter
+from os import PathLike
 from pathlib import Path
 from typing import Any, NamedTuple
+from uuid import UUID
 
 import numpy as np
+import numpy.typing as npt
 from numpy import ma
 
 from cloudnetpy import output, utils
@@ -21,12 +24,12 @@ from cloudnetpy.metadata import MetaData
 
 
 def radiometrics2nc(
-    full_path: str | os.PathLike,
-    output_file: str | os.PathLike,
+    full_path: str | PathLike,
+    output_file: str | PathLike,
     site_meta: dict,
-    uuid: str | None = None,
+    uuid: str | UUID | None = None,
     date: str | datetime.date | None = None,
-) -> str:
+) -> UUID:
     """Converts Radiometrics .csv file into Cloudnet Level 1b netCDF file.
 
     Args:
@@ -49,6 +52,7 @@ def radiometrics2nc(
     """
     if isinstance(date, str):
         date = datetime.date.fromisoformat(date)
+    uuid = utils.get_uuid(uuid)
     if os.path.isdir(full_path):
         valid_filenames = list(Path(full_path).iterdir())
     else:
@@ -65,7 +69,8 @@ def radiometrics2nc(
         raise ValidTimeStampError(msg)
     attributes = output.add_time_attribute(ATTRIBUTES, radiometrics.date)
     output.update_attributes(radiometrics.data, attributes)
-    return output.save_level1b(radiometrics, output_file, uuid)
+    output.save_level1b(radiometrics, output_file, uuid)
+    return uuid
 
 
 class Record(NamedTuple):
@@ -85,7 +90,7 @@ class RadiometricsMP:
         MP-1500A, MP-183A.
     """
 
-    def __init__(self, filename: Path):
+    def __init__(self, filename: Path) -> None:
         self.filename = filename
         self.raw_data: list[Record] = []
         self.data: dict = {}
@@ -248,7 +253,7 @@ class RadiometricsWVR:
     radiometer.
     """
 
-    def __init__(self, filename: Path):
+    def __init__(self, filename: Path) -> None:
         self.filename = filename
         self.raw_data: dict = {}
         self.data: dict = {}
@@ -307,7 +312,9 @@ class RadiometricsCombined:
     date: datetime.date | None
     instrument: instruments.Instrument
 
-    def __init__(self, objs: list[RadiometricsMP | RadiometricsWVR], site_meta: dict):
+    def __init__(
+        self, objs: list[RadiometricsMP | RadiometricsWVR], site_meta: dict
+    ) -> None:
         self.site_meta = site_meta
         self.data = {}
         self.date = None
@@ -337,7 +344,7 @@ class RadiometricsCombined:
                 continue
             self.data[key] = self.data[key][valid_mask]
 
-    def sort_timestamps(self):
+    def sort_timestamps(self) -> None:
         ind = np.argsort(self.data["time"])
         for key in self.data:
             if key in ("range", "height"):
@@ -413,7 +420,7 @@ def _parse_datetime(text: str) -> datetime.datetime:
     )
 
 
-def _find_closest(x: np.ndarray, y: np.ndarray, x_new: np.ndarray) -> np.ndarray:
+def _find_closest(x: npt.NDArray, y: npt.NDArray, x_new: npt.NDArray) -> npt.NDArray:
     return y[np.argmin(np.abs(x_new - x[:, np.newaxis]), axis=0)]