doppy 0.1.3__cp310-abi3-macosx_10_12_x86_64.whl → 0.2.0__cp310-abi3-macosx_10_12_x86_64.whl

doppy/data/api.py

@@ -37,7 +37,13 @@ class Api:
         return self.get(
             "raw-files",
             params={
-                "instrument": ["halo-doppler-lidar", "wls100s", "wls200s", "wls400s"],
+                "instrument": [
+                    "halo-doppler-lidar",
+                    "wls100s",
+                    "wls200s",
+                    "wls400s",
+                    "wls70",
+                ],
                 "site": site,
                 "date": date,
             },

doppy/product/stare.py

@@ -50,6 +50,7 @@ class Stare:
             doppy.raw.HaloHpl.merge(_select_raws_for_stare(raws))
             .sorted_by_time()
             .non_strictly_increasing_timesteps_removed()
+            .nans_removed()
         )
 
         bgs = doppy.raw.HaloBg.from_srcs(data_bg)
@@ -65,6 +66,8 @@ class Stare:
             .non_strictly_increasing_timesteps_removed()
         )
         raw, intensity_bg_corrected = _correct_background(raw, bg, bg_correction_method)
+        if len(raw.time) == 0:
+            raise doppy.exceptions.NoDataError("No matching data and bg files")
         intensity_noise_bias_corrected = _correct_intensity_noise_bias(
             raw, intensity_bg_corrected
         )

doppy/product/wind.py

@@ -54,6 +54,7 @@ class Wind:
             doppy.raw.HaloHpl.merge(_select_raws_for_wind(raws))
             .sorted_by_time()
             .non_strictly_increasing_timesteps_removed()
+            .nans_removed()
         )
         if len(raw.time) == 0:
             raise doppy.exceptions.NoDataError("No suitable data for the wind product")
@@ -148,6 +149,38 @@ class Wind:
             mask=mask,
         )
 
+    @classmethod
+    def from_wls70_data(
+        cls,
+        data: Sequence[str]
+        | Sequence[Path]
+        | Sequence[bytes]
+        | Sequence[BufferedIOBase],
+    ) -> Wind:
+        raws = doppy.raw.Wls70.from_srcs(data)
+
+        if len(raws) == 0:
+            raise doppy.exceptions.NoDataError("Wls70 data missing")
+
+        raw = (
+            doppy.raw.Wls70.merge(raws)
+            .sorted_by_time()
+            .non_strictly_increasing_timesteps_removed()
+        )
+        mask = (
+            np.isnan(raw.meridional_wind)
+            | np.isnan(raw.zonal_wind)
+            | np.isnan(raw.vertical_wind)
+        )
+        return Wind(
+            time=raw.time,
+            height=raw.altitude,
+            zonal_wind=raw.zonal_wind,
+            meridional_wind=raw.meridional_wind,
+            vertical_wind=raw.vertical_wind,
+            mask=mask,
+        )
+
 
 def _compute_wind(
     raw: doppy.raw.HaloHpl | doppy.raw.WindCube,

doppy/raw/__init__.py

@@ -2,5 +2,6 @@ from .halo_bg import HaloBg
 from .halo_hpl import HaloHpl
 from .halo_sys_params import HaloSysParams
 from .windcube import WindCube
+from .wls70 import Wls70
 
-__all__ = ["HaloHpl", "HaloBg", "HaloSysParams", "WindCube"]
+__all__ = ["HaloHpl", "HaloBg", "HaloSysParams", "WindCube", "Wls70"]

doppy/raw/halo_hpl.py

@@ -187,6 +187,10 @@ class HaloHpl:
                 latest_time = t
         return self[mask]
 
+    def nans_removed(self) -> HaloHpl:
+        is_ok = ~np.isnan(self.intensity).any(axis=1)
+        return self[is_ok]
+
 
 @dataclass(slots=True)
 class HaloHplHeader:

doppy/raw/wls70.py

@@ -0,0 +1,188 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import datetime
+from io import BufferedIOBase
+from pathlib import Path
+from typing import Sequence
+
+import numpy as np
+import numpy.typing as npt
+from numpy import datetime64
+
+import doppy
+from doppy import exceptions
+
+
+@dataclass
+class Wls70:
+    time: npt.NDArray[datetime64]  # dim: (time, )
+    altitude: npt.NDArray[np.float64]  # dim: (altitude, )
+    position: npt.NDArray[np.float64]  # dim: (time, )
+    temperature: npt.NDArray[np.float64]  # dim: (time, )
+    wiper: npt.NDArray[np.bool_]  # dim: (time, )
+    cnr: npt.NDArray[np.float64]  # dim: (time, altitude)
+    radial_velocity: npt.NDArray[np.float64]  # dim: (time, altitude)
+    radial_velocity_deviation: npt.NDArray[np.float64]  # dim: (time, altitude)
+    vh: npt.NDArray[np.float64]  # dim: (time, altitude)
+    wind_direction: npt.NDArray[np.float64]  # dim: (time, altitude)
+    zonal_wind: npt.NDArray[np.float64]  # u := zonal wind?, dim: (time, altitude)
+    meridional_wind: npt.NDArray[
+        np.float64
+    ]  # v := meridional wind?, dim: (time, altitude)
+    vertical_wind: npt.NDArray[np.float64]  # w := vertical wind?, dim: (time, altitude)
+
+    @classmethod
+    def from_srcs(
+        cls,
+        data: Sequence[str]
+        | Sequence[Path]
+        | Sequence[bytes]
+        | Sequence[BufferedIOBase],
+    ) -> list[Wls70]:
+        if not isinstance(data, (list, tuple)):
+            raise TypeError("data should be list or tuple")
+        if all(isinstance(src, bytes) for src in data):
+            data_bytes = data
+        elif all(isinstance(src, str) for src in data):
+            data_bytes = []
+            for src in data:
+                with Path(src).open("rb") as f:
+                    data_bytes.append(f.read())
+        elif all(isinstance(src, Path) for src in data):
+            data_bytes = []
+            for src in data:
+                with src.open("rb") as f:
+                    data_bytes.append(f.read())
+        elif all(isinstance(src, BufferedIOBase) for src in data):
+            data_bytes = [src.read() for src in data]
+        else:
+            raise TypeError("Unexpected types in data")
+        raws = doppy.rs.raw.wls70.from_bytes_srcs(data_bytes)
+        try:
+            return [_raw_rs_to_wls70(r) for r in raws]
+        except RuntimeError as err:
+            raise exceptions.RawParsingError(err) from err
+
+    @classmethod
+    def from_src(cls, data: str | Path | bytes | BufferedIOBase) -> Wls70:
+        if isinstance(data, str):
+            path = Path(data)
+            with path.open("rb") as f:
+                data_bytes = f.read()
+        elif isinstance(data, Path):
+            with data.open("rb") as f:
+                data_bytes = f.read()
+        elif isinstance(data, bytes):
+            data_bytes = data
+        elif isinstance(data, BufferedIOBase):
+            data_bytes = data.read()
+        else:
+            raise TypeError("Unsupported data type")
+        try:
+            return _raw_rs_to_wls70(doppy.rs.raw.wls70.from_bytes_src(data_bytes))
+        except RuntimeError as err:
+            raise exceptions.RawParsingError(err) from err
+
+    def __getitem__(
+        self,
+        index: int
+        | slice
+        | list[int]
+        | npt.NDArray[np.int64]
+        | npt.NDArray[np.bool_]
+        | tuple[slice, slice],
+    ) -> Wls70:
+        if isinstance(index, (int, slice, list, np.ndarray)):
+            return Wls70(
+                time=self.time[index],
+                altitude=self.altitude,
+                position=self.position[index],
+                temperature=self.temperature[index],
+                wiper=self.wiper[index],
+                cnr=self.cnr[index],
+                radial_velocity=self.radial_velocity[index],
+                radial_velocity_deviation=self.radial_velocity_deviation[index],
+                vh=self.vh[index],
+                wind_direction=self.wind_direction[index],
+                zonal_wind=self.zonal_wind[index],
+                meridional_wind=self.meridional_wind[index],
+                vertical_wind=self.vertical_wind[index],
+            )
+        raise TypeError
+
+    def sorted_by_time(self) -> Wls70:
+        sort_indices = np.argsort(self.time)
+        return self[sort_indices]
+
+    @classmethod
+    def merge(cls, raws: Sequence[Wls70]) -> Wls70:
+        return cls(
+            time=np.concatenate(tuple(r.time for r in raws)),
+            altitude=raws[0].altitude,
+            position=np.concatenate(tuple(r.position for r in raws)),
+            temperature=np.concatenate(tuple(r.temperature for r in raws)),
+            wiper=np.concatenate(tuple(r.wiper for r in raws)),
+            cnr=np.concatenate(tuple(r.cnr for r in raws)),
+            radial_velocity=np.concatenate(tuple(r.radial_velocity for r in raws)),
+            radial_velocity_deviation=np.concatenate(
+                tuple(r.radial_velocity_deviation for r in raws)
+            ),
+            vh=np.concatenate(tuple(r.vh for r in raws)),
+            wind_direction=np.concatenate(tuple(r.wind_direction for r in raws)),
+            zonal_wind=np.concatenate(tuple(r.zonal_wind for r in raws)),
+            meridional_wind=np.concatenate(tuple(r.meridional_wind for r in raws)),
+            vertical_wind=np.concatenate(tuple(r.vertical_wind for r in raws)),
+        )
+
+    def non_strictly_increasing_timesteps_removed(self) -> Wls70:
+        if len(self.time) == 0:
+            return self
+        mask = np.ones_like(self.time, dtype=np.bool_)
+        latest_time = self.time[0]
+        for i, t in enumerate(self.time[1:], start=1):
+            if t <= latest_time:
+                mask[i] = False
+            else:
+                latest_time = t
+        return self[mask]
+
+
+def _raw_rs_to_wls70(
+    raw_rs: tuple[
+        dict[str, npt.NDArray[np.float64]], list[str], npt.NDArray[np.float64]
+    ],
+) -> Wls70:
+    info, cols, data = raw_rs
+    altitude = info["altitude"]
+    data = data.reshape(-1, len(cols))
+    time_ts = data[:, 0]
+    time = np.array([datetime64(datetime.utcfromtimestamp(ts)) for ts in time_ts])
+
+    position = data[:, 1]
+    temperature = data[:, 2]
+    wiper = np.array(np.isclose(data[:, 3], 1), dtype=np.bool_)
+    cnr = data[:, 4::8]
+    rws = data[:, 5::8]
+    rwsd = data[:, 6::8]
+    vh = data[:, 7::8]
+    direction = data[:, 8::8]
+    u = data[:, 9::8]
+    v = data[:, 10::8]
+    w = data[:, 11::8]
+
+    return Wls70(
+        time=time,
+        altitude=altitude,
+        position=position,
+        temperature=temperature,
+        wiper=wiper,
+        cnr=cnr,
+        radial_velocity=rws,
+        radial_velocity_deviation=rwsd,
+        vh=vh,
+        wind_direction=direction,
+        zonal_wind=u,
+        meridional_wind=v,
+        vertical_wind=w,
+    )

{doppy-0.1.3.dist-info → doppy-0.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: doppy
-Version: 0.1.3
+Version: 0.2.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Programming Language :: Python :: 3
 Classifier: Programming Language :: Python :: 3.10
@@ -13,7 +13,7 @@ Requires-Dist: requests
 Requires-Dist: urllib3
 Requires-Dist: numpy
 Requires-Dist: netcdf4
-Requires-Dist: typer[all]
+Requires-Dist: typer
 Requires-Dist: matplotlib
 Requires-Dist: scikit-learn
 Requires-Dist: scipy

{doppy-0.1.3.dist-info → doppy-0.2.0.dist-info}/RECORD

@@ -1,13 +1,13 @@
-doppy-0.1.3.dist-info/METADATA,sha256=L9HXEcPUlPmiZzDYjo7LGO6nhCdFibvcx12IupNG8EU,1794
-doppy-0.1.3.dist-info/WHEEL,sha256=V2VnYS0Z_2v18J65tisMAzW36GHSI5stkpxW52CkvJE,105
-doppy-0.1.3.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
-doppy-0.1.3.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
-doppy-0.1.3.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
+doppy-0.2.0.dist-info/METADATA,sha256=gCEKLklhaVBhxondzo0x-pLTJ48yuiV3O9krrKSBGZw,1789
+doppy-0.2.0.dist-info/WHEEL,sha256=HYZ_jUi0IGqtX7pjBFQby7ex6mkgDnUsBYfR-onY1Fw,105
+doppy-0.2.0.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
+doppy-0.2.0.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
+doppy-0.2.0.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
 doppy/options.py,sha256=73BDODO4OYHn2qOshhwz6u6G3J1kNd3uj6P0a3V4HBE,205
 doppy/__init__.py,sha256=Z9aEUlbPRWRUAoB8_-djkgrJuS4-6pjem4-mVSB6Z9I,191
-doppy/product/wind.py,sha256=H4IJI1l_pxfbmI8R_RzAZSZzLWKQ8IUpRkq-m3fm3_E,11105
+doppy/product/wind.py,sha256=t7P6lTp_Nu9HSwFAhCeVFQ0KGxULbT_0J4BuYACp_tE,12014
 doppy/product/__init__.py,sha256=lyp88zs7GBk8uUzkj8lxaXPuYwPa52xXeTwf5qwFddU,103
-doppy/product/stare.py,sha256=ehwK1dcNBnuVsjbdmNYNGfNiOMannSZVNHJAs7e4x_M,19705
+doppy/product/stare.py,sha256=_z1qdw756AkGHnzAj401ncq0n_azppzVcR8drb9parw,19844
 doppy/bench.py,sha256=iVNYveMVGGRES2oe3Orsn31jQFCKTXOmxRFuFiJ8_OA,248
 doppy/netcdf.py,sha256=uEiJfqxXxHwe5ghT6OpIu8xeY1HgWDW1ENTBlFLOGtE,3416
 doppy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -15,13 +15,14 @@ doppy/exceptions.py,sha256=1tljrtzp0McQhB6INFXj4yfLjxj6mXor5jLF9HZjp1A,138
 doppy/defaults.py,sha256=-il4DWU1HPttlGFoVQTPC7R4pDZERoPvt3kw6xwMKrw,38
 doppy/data/cache.py,sha256=2rxmkWFn-FPy2LNGuCW2Vu4KKLBwIV9sb2gPBA-Jfck,996
 doppy/data/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-doppy/data/api.py,sha256=QKKP-TYHjve-O3GNFKfjyAMYTcVLOTRPCSEg4D7Ax3k,1735
+doppy/data/api.py,sha256=QaVKj304OPcu8OF5xgtduQzDis8Srn-I6UgR9qb2u9E,1863
 doppy/data/exceptions.py,sha256=6CS6OHIWq8CqlxiceEvC1j0EfWUYoIfM7dW88apQVn4,89
 doppy/raw/halo_sys_params.py,sha256=IXH40xBHyXCGX0ZE79KnSeXRj1wbqoqL0RYUQyBJqdE,3937
-doppy/raw/__init__.py,sha256=bIUObQPtOGStVoZRrDYyCVrWbGto0IGjm0s7JRY-E7Y,194
+doppy/raw/__init__.py,sha256=AMHyONuH0aUJUQz20EhlANaq9UjWJtSZf7kWUVx3ZjA,228
+doppy/raw/wls70.py,sha256=APuo6dSd7NFo7WORw7Uo1kI0JROCNAkDUwmHU653U1g,6792
 doppy/raw/halo_bg.py,sha256=kO03yGlKS-DpMMGHYuy_BuidyeUL38TxT5vMn8H_8lE,4809
-doppy/raw/halo_hpl.py,sha256=mYCE8JWgRbk6CfV4hSKQvChbnE7xXUArpatRez8EsFk,18504
+doppy/raw/halo_hpl.py,sha256=_hq0JCNPuZrt3yt4U2KphKvJVNx_Uh4bnGfKbVPRGoA,18625
 doppy/raw/windcube.py,sha256=TVqR3SwfUJYHtPJXnA_b6uUGo_ylVkGGEPob63Zcee0,9685
 doppy/__main__.py,sha256=zrKQJVj0k0ypBQCGK65Czt9G9FZ_qx3ussw6Q9VJ14g,346
-doppy/rs.abi3.so,sha256=6IV_0ULG6Kb6Dx_unJRmSfs6GxkyYRPHQCNmxTJD_NI,2716480
-doppy-0.1.3.dist-info/RECORD,,
+doppy/rs.abi3.so,sha256=1_5Q7_kGJYsXWOWeyk1jkPDysEzGllJhaOpG5zKrx7E,2876456
+doppy-0.2.0.dist-info/RECORD,,

{doppy-0.1.3.dist-info → doppy-0.2.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: maturin (1.5.0)
+Generator: maturin (1.5.1)
 Root-Is-Purelib: false
 Tag: cp310-abi3-macosx_10_12_x86_64