doppy 0.1.4__cp310-abi3-macosx_11_0_arm64.whl → 0.2.1__cp310-abi3-macosx_11_0_arm64.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

@@ -27,6 +27,7 @@ class Stare:
     radial_velocity: npt.NDArray[np.float64]
     mask: npt.NDArray[np.bool_]
     wavelength: float
+    system_id: str
 
     @classmethod
     def from_halo_data(
@@ -66,6 +67,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
         )
@@ -87,6 +90,7 @@ class Stare:
             radial_velocity=raw.radial_velocity,
             mask=mask,
             wavelength=wavelength,
+            system_id=raw.header.system_id,
         )
 
 

doppy/product/wind.py

@@ -26,6 +26,7 @@ class Wind:
     meridional_wind: npt.NDArray[np.float64]
     vertical_wind: npt.NDArray[np.float64]
     mask: npt.NDArray[np.bool_]
+    system_id: str
 
     @functools.cached_property
     def horizontal_wind_speed(self) -> npt.NDArray[np.float64]:
@@ -93,6 +94,7 @@ class Wind:
             meridional_wind=wind[:, :, 1],
             vertical_wind=wind[:, :, 2],
             mask=mask,
+            system_id=raw.header.system_id,
         )
 
     @classmethod
@@ -147,6 +149,40 @@ class Wind:
             meridional_wind=wind[:, :, 1],
             vertical_wind=wind[:, :, 2],
             mask=mask,
+            system_id=raw.system_id,
+        )
+
+    @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,
+            system_id=raw.system_id,
         )
 
 

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

@@ -8,7 +8,7 @@ from datetime import datetime, timedelta
 from io import BufferedIOBase
 from os.path import commonprefix
 from pathlib import Path
-from typing import Any, Sequence, TypeVar, cast
+from typing import Any, Sequence, cast
 
 import numpy as np
 import numpy.typing as npt
@@ -16,8 +16,7 @@ from numpy import datetime64, timedelta64
 
 import doppy
 from doppy import exceptions
-
-T = TypeVar("T")
+from doppy.utils import merge_all_equal
 
 
 @dataclass
@@ -258,18 +257,12 @@ class HaloHplHeader:
         )
 
 
-def _merger(key: str, lst: list[T]) -> T:
-    if len(set(lst)) != 1:
-        raise ValueError(f"Cannot merge header key {key} values {lst}")
-    return lst[0]
-
-
 def _merge_headers(headers: list[HaloHplHeader]) -> HaloHplHeader:
     return HaloHplHeader(
         filename=commonprefix([h.filename for h in headers]),
         start_time=np.min([h.start_time for h in headers]),
         **{
-            key: _merger(key, [getattr(h, key) for h in headers])
+            key: merge_all_equal(key, [getattr(h, key) for h in headers])
             for key in (
                 "gate_points",
                 "nrays",

doppy/raw/windcube.py

@@ -10,6 +10,8 @@ import numpy.typing as npt
 from netCDF4 import Dataset, num2date
 from numpy import datetime64
 
+from doppy.utils import merge_all_equal
+
 
 @dataclass
 class WindCube:
@@ -22,6 +24,7 @@ class WindCube:
     radial_velocity: npt.NDArray[np.float64]  # dim: (time, radial_distance)
     radial_velocity_confidence: npt.NDArray[np.float64]  # dim: (time, radial_distance)
     scan_index: npt.NDArray[np.int64]
+    system_id: str
 
     @classmethod
     def from_vad_srcs(
@@ -53,6 +56,7 @@ class WindCube:
                 [r.radial_velocity_confidence for r in raws]
             ),
             cnr=np.concatenate([r.cnr for r in raws]),
+            system_id=merge_all_equal("system_id", [r.system_id for r in raws]),
         )
 
     def __getitem__(
@@ -75,6 +79,7 @@ class WindCube:
                 radial_velocity_confidence=self.radial_velocity_confidence[index],
                 cnr=self.cnr[index],
                 scan_index=self.scan_index[index],
+                system_id=self.system_id,
             )
         raise TypeError
 
@@ -189,6 +194,7 @@ def _from_vad_src(nc: Dataset) -> WindCube:
         radial_velocity=np.concatenate(radial_wind_speed_list),
         radial_velocity_confidence=np.concatenate(radial_wind_speed_confidence_list),
         cnr=np.concatenate(cnr_list),
+        system_id=nc.instrument_name,
     )
 
 

doppy/raw/wls70.py

@@ -0,0 +1,192 @@
+from __future__ import annotations
+
+from dataclasses import dataclass
+from datetime import datetime
+from io import BufferedIOBase
+from pathlib import Path
+from typing import Any, Sequence
+
+import numpy as np
+import numpy.typing as npt
+from numpy import datetime64
+
+import doppy
+from doppy import exceptions
+from doppy.utils import merge_all_equal
+
+
+@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)
+    system_id: str
+
+    @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],
+                system_id=self.system_id,
+            )
+        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)),
+            system_id=merge_all_equal("system_id", [r.system_id 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, Any], list[str], npt.NDArray[np.float64]],
+) -> Wls70:
+    info, cols, data = raw_rs
+    altitude = info["altitude"]
+    system_id = info["system_id"]
+    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,
+        system_id=system_id,
+    )

doppy/utils.py

@@ -0,0 +1,9 @@
+from typing import TypeVar
+
+T = TypeVar("T")
+
+
+def merge_all_equal(key: str, lst: list[T]) -> T:
+    if len(set(lst)) != 1:
+        raise ValueError(f"Cannot merge header key {key} values {lst}")
+    return lst[0]

{doppy-0.1.4.dist-info → doppy-0.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: doppy
-Version: 0.1.4
+Version: 0.2.1
 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.4.dist-info → doppy-0.2.1.dist-info}/RECORD

@@ -1,27 +1,29 @@
-doppy-0.1.4.dist-info/METADATA,sha256=oKScpypbKzChDTyTJPUPYD4_zGhyRbsdpw7eGgCaDi4,1794
-doppy-0.1.4.dist-info/WHEEL,sha256=Eyff-rEDSOF0Q7IZpSwsYe3r6zR3sNi9c9VlO0C9EVo,103
-doppy-0.1.4.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
-doppy-0.1.4.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
-doppy-0.1.4.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
+doppy-0.2.1.dist-info/METADATA,sha256=0T7yh-b9uQUGEeBymLzElKfO6tw2QAlDqffDPUNda7k,1789
+doppy-0.2.1.dist-info/WHEEL,sha256=Eyff-rEDSOF0Q7IZpSwsYe3r6zR3sNi9c9VlO0C9EVo,103
+doppy-0.2.1.dist-info/entry_points.txt,sha256=9b_Ca7vJoh6AwL3W8qAPh_UmJ_1Pa6hi-TDfCTDjvSk,43
+doppy-0.2.1.dist-info/license_files/LICENSE,sha256=V-0iroMNMI8ctnLgUau1kdFvwhkYhr9vi-5kWKxw2wc,1089
+doppy-0.2.1.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=k9VACH3HoAhoDr6TrC65wmWer7_un_YDxoKph_XQnsE,11133
+doppy/product/wind.py,sha256=MAK-ZTx37gL7y-x3RbqN_QrZR9kjAiLxdIMn_c6M5UA,12151
 doppy/product/__init__.py,sha256=lyp88zs7GBk8uUzkj8lxaXPuYwPa52xXeTwf5qwFddU,103
-doppy/product/stare.py,sha256=LknHQLbilqjRohnrVmvZDEu4gV_gk2x3dBdCkHHTC8U,19733
+doppy/product/stare.py,sha256=aMhOA5yXjcnwgzAp4GvLF1HT1cD-Zuqg9sEQIPlxWa0,19907
 doppy/bench.py,sha256=iVNYveMVGGRES2oe3Orsn31jQFCKTXOmxRFuFiJ8_OA,248
 doppy/netcdf.py,sha256=uEiJfqxXxHwe5ghT6OpIu8xeY1HgWDW1ENTBlFLOGtE,3416
+doppy/utils.py,sha256=qPtIYBJPaKKTmRWwJI93TFUuhJg7CAoecpyHCm5ZyxI,214
 doppy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=paFT8PddRemtiDAXxkZVcMljCq_CFw1DHmxLHXY0ZhE,7008
 doppy/raw/halo_bg.py,sha256=kO03yGlKS-DpMMGHYuy_BuidyeUL38TxT5vMn8H_8lE,4809
-doppy/raw/halo_hpl.py,sha256=_hq0JCNPuZrt3yt4U2KphKvJVNx_Uh4bnGfKbVPRGoA,18625
-doppy/raw/windcube.py,sha256=TVqR3SwfUJYHtPJXnA_b6uUGo_ylVkGGEPob63Zcee0,9685
+doppy/raw/halo_hpl.py,sha256=VkWemJfGFu-tF-fkhjYwF6dCZPrNQanqL0NBFJVS-TQ,18485
+doppy/raw/windcube.py,sha256=ZaOswQJbVDPBYj5oU1pTYmsX8F-mKIbjJRZmLYEMXP0,9906
 doppy/__main__.py,sha256=zrKQJVj0k0ypBQCGK65Czt9G9FZ_qx3ussw6Q9VJ14g,346
-doppy/rs.abi3.so,sha256=xReLvr5yy-AY_AyKt80-Gix6iSF8CAz2TkINuTSYqNg,2587709
-doppy-0.1.4.dist-info/RECORD,,
+doppy/rs.abi3.so,sha256=ZL1C3AFu5SRDGfsmCXrJzL8yNxzDT4noGXkg7c1tlD0,2752832
+doppy-0.2.1.dist-info/RECORD,,