cloudnetpy 1.66.6__py3-none-any.whl → 1.66.8__py3-none-any.whl

cloudnetpy/cli.py

@@ -5,7 +5,6 @@ import logging
 import os
 import re
 import shutil
-from collections.abc import Generator
 from concurrent.futures import ThreadPoolExecutor, as_completed
 from dataclasses import dataclass
 from pathlib import Path
@@ -531,15 +530,17 @@ def _fetch_cloudnet_sites() -> list[str]:
     return [site["id"] for site in res.json()]
 
 
-def _parse_products(product_argument: str) -> Generator:
+def _parse_products(product_argument: str) -> list[str]:
     products = product_argument.split(",")
     res = requests.get(f"{cloudnet_api_url}products", timeout=60)
     res.raise_for_status()
     valid_options = [p["id"] for p in res.json()]
+    valid_products = []
     for product in products:
         prod, _ = _parse_instrument(product)
         if prod in valid_options:
-            yield product
+            valid_products.append(product)
+    return valid_products
 
 
 def main():
@@ -553,6 +554,7 @@ def main():
         help="Site",
         required=True,
         choices=_fetch_cloudnet_sites(),
+        metavar="SITE",
     )
     parser.add_argument(
         "-d", "--date", type=str, help="Date in YYYY-MM-DD", required=True

cloudnetpy/concat_lib.py

@@ -2,6 +2,7 @@
 
 import shutil
 from os import PathLike
+from typing import Literal
 
 import netCDF4
 import numpy as np
@@ -210,7 +211,7 @@ class _Concat:
                     self.concatenated_file.variables[key][ind0:ind1, :] = array
 
     def _init_output_file(self, output_file: str) -> netCDF4.Dataset:
-        data_model = (
+        data_model: Literal["NETCDF4", "NETCDF4_CLASSIC"] = (
             "NETCDF4" if self.first_file.data_model == "NETCDF4" else "NETCDF4_CLASSIC"
         )
         nc = netCDF4.Dataset(output_file, "w", format=data_model)
@@ -234,7 +235,10 @@ class _Concat:
         self._close()
 
 
-def _copy_attributes(source: netCDF4.Dataset, target: netCDF4.Dataset) -> None:
+def _copy_attributes(
+    source: netCDF4.Dataset | netCDF4.Variable,
+    target: netCDF4.Dataset | netCDF4.Variable,
+) -> None:
     for attr in source.ncattrs():
         if attr != "_FillValue":
             value = getattr(source, attr)

cloudnetpy/datasource.py

@@ -221,7 +221,7 @@ class DataSource:
         """
         for name in possible_names:
             if name in self.dataset.variables:
-                array = self.dataset.variables[name]
+                array: netCDF4.Variable | np.ndarray = self.dataset.variables[name]
                 if ignore_mask is True:
                     array = np.array(array)
                 self.append_data(array, key, units=units)

cloudnetpy/instruments/cloudnet_instrument.py

@@ -6,11 +6,12 @@ from numpy import ma
 
 from cloudnetpy import utils
 from cloudnetpy.cloudnetarray import CloudnetArray
+from cloudnetpy.exceptions import ValidTimeStampError
 
 
 class CloudnetInstrument:
     def __init__(self):
-        self.dataset: netCDF4.Dataset | None = None
+        self.dataset: netCDF4.Dataset
         self.time: np.ndarray = np.array([])
         self.site_meta: dict = {}
         self.data: dict = {}
@@ -23,14 +24,19 @@ class CloudnetInstrument:
             if key in self.site_meta:
                 value = self.site_meta[key]
             # From source global attributes (MIRA):
-            elif isinstance(self.dataset, netCDF4.Dataset) and hasattr(
-                self.dataset,
-                key.capitalize(),
+            elif (
+                hasattr(self, "dataset")
+                and isinstance(self.dataset, netCDF4.Dataset)
+                and hasattr(
+                    self.dataset,
+                    key.capitalize(),
+                )
             ):
                 value = self.parse_global_attribute_numeral(key.capitalize())
             # From source data (BASTA / RPG):
             elif (
-                isinstance(self.dataset, netCDF4.Dataset)
+                hasattr(self, "dataset")
+                and isinstance(self.dataset, netCDF4.Dataset)
                 and key in self.dataset.variables
             ):
                 value = self.dataset.variables[key][:]
@@ -72,6 +78,9 @@ class CloudnetInstrument:
         self.screen_time_indices(ind)
 
     def screen_time_indices(self, valid_indices: list | np.ndarray) -> None:
+        if len(valid_indices) == 0:
+            msg = "All timestamps screened"
+            raise ValidTimeStampError(msg)
         time = self._get_time()
         n_time = len(time)
         for cloudnet_array in self.data.values():

cloudnetpy/instruments/mira.py

@@ -8,7 +8,6 @@ from tempfile import NamedTemporaryFile, TemporaryDirectory
 from numpy import ma
 
 from cloudnetpy import concat_lib, output, utils
-from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments.instruments import MIRA35
 from cloudnetpy.instruments.nc_radar import NcRadar
 from cloudnetpy.metadata import MetaData
@@ -109,8 +108,6 @@ class Mira(NcRadar):
             date = "-".join(utils.seconds2date(timestamp, self.epoch)[:3])
             if date == expected_date:
                 valid_indices.append(ind)
-        if not valid_indices:
-            raise ValidTimeStampError
         self.screen_time_indices(valid_indices)
 
     def _init_mira_date(self) -> list[str]:

cloudnetpy/instruments/mrr.py

@@ -10,7 +10,6 @@ from uuid import UUID
 import netCDF4
 
 from cloudnetpy import concat_lib, output, utils
-from cloudnetpy.exceptions import ValidTimeStampError
 from cloudnetpy.instruments import instruments
 from cloudnetpy.instruments.nc_radar import NcRadar
 from cloudnetpy.metadata import MetaData
@@ -160,8 +159,6 @@ class MrrPro(NcRadar):
             date = "-".join(utils.seconds2date(timestamp, self.epoch)[:3])
             if date == expected_date.isoformat():
                 valid_indices.append(ind)
-        if not valid_indices:
-            raise ValidTimeStampError
         self.screen_time_indices(valid_indices)
 
 

cloudnetpy/instruments/nc_radar.py

@@ -136,7 +136,8 @@ class NcRadar(DataSource, CloudnetInstrument):
             msg = "Instrument not defined"
             raise RuntimeError(msg)
         key = "radar_frequency"
-        self.data[key] = CloudnetArray(self.instrument.frequency, key)
+        if self.instrument.frequency is not None:
+            self.data[key] = CloudnetArray(self.instrument.frequency, key)
         try:
             possible_nyquist_names = ("ambiguous_velocity", "NyquistVelocity")
             data = self.getvar(*possible_nyquist_names)

cloudnetpy/utils.py

@@ -650,7 +650,7 @@ def n_elements(array: np.ndarray, dist: float, var: str | None = None) -> int:
     return int(np.round(n))
 
 
-def isscalar(array: np.ndarray | float | list) -> bool:
+def isscalar(array: np.ndarray | float | list | netCDF4.Variable) -> bool:
     """Tests if input is scalar.
 
     By "scalar" we mean that array has a single value.

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 66
-PATCH = 6
+PATCH = 8
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.66.6.dist-info → cloudnetpy-1.66.8.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cloudnetpy
-Version: 1.66.6
+Version: 1.66.8
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.66.6.dist-info → cloudnetpy-1.66.8.dist-info}/RECORD

@@ -1,15 +1,15 @@
 cloudnetpy/__init__.py,sha256=X_FqY-4yg5GUj5Edo14SToLEos6JIsC3fN-v1FUgQoA,43
-cloudnetpy/cli.py,sha256=KXFguR4nnVXRr4VV8htI2IKcqqQ7LZ7eZwSHj-uG_3w,20729
+cloudnetpy/cli.py,sha256=lHkeAErmAijI-Ugpd4DHRHfbZP4SXOake0LIY5Ovv_Q,20782
 cloudnetpy/cloudnetarray.py,sha256=Ol1ha4RPAmFZANL__U5CaMKX4oYMXYR6OnjoCZ9w3eo,7077
-cloudnetpy/concat_lib.py,sha256=QxGWGsA_6el3Ma5-1y2MtrgFCC9Ohpe3yo6EzrPAiRI,11773
+cloudnetpy/concat_lib.py,sha256=RiL6fgaKjX2YyXl0BonbCjLXV2voIKPcQcdR9ZkQ8QA,11888
 cloudnetpy/constants.py,sha256=RDB9aqpBRztk3QVCFgsmi9fwhtLuit_0WJrt0D6sDcc,736
-cloudnetpy/datasource.py,sha256=j7N4g59HPvOBWle-W9bOUF0BfRLgvR4zwOi_B50cI7Q,7921
+cloudnetpy/datasource.py,sha256=FcWS77jz56gIzwnbafDLdj-HjAyu0P_VtY7gkeVZThU,7952
 cloudnetpy/exceptions.py,sha256=ns48useL9RN3mPh7CqIiLA19VI9OmVbyRsKTkwbThF8,1760
 cloudnetpy/metadata.py,sha256=v_VDo2vbdTxB0zIsfP69IcrwSKiRlLpsGdq6JPI4CoA,5306
 cloudnetpy/output.py,sha256=YrWRBEZg0QNZRVnd9ziAziH-eJSh7O5JuWiH4ZxM0_s,15584
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-cloudnetpy/utils.py,sha256=uhSdfx1ha6AqYl-Rlvlf053lIF-UnzcIAjjnh3fbS6U,29725
-cloudnetpy/version.py,sha256=FiFGNpvgmpe5OMB-IflyE51XCkEqV1mD8JLRmF514Hg,72
+cloudnetpy/utils.py,sha256=JksYOwf9ORiR_QpoKrTe1JJwXpPYJj-wlwaZKCHoh3o,29744
+cloudnetpy/version.py,sha256=_HpTDfNRU86QUkp683KtI0kEE_sns9m5_9nnN3CEWVM,72
 cloudnetpy/categorize/__init__.py,sha256=s-SJaysvVpVVo5kidiruWQO6p3gv2TXwY1wEHYO5D6I,44
 cloudnetpy/categorize/atmos_utils.py,sha256=9-ymI6i1xASf-XAFyO87FaTfvq6bF89N1i_27OkUp-M,10104
 cloudnetpy/categorize/attenuation.py,sha256=Y_-fzmQTltWTqIZTulJhovC7a6ifpMcaAazDJcnMIOc,990
@@ -38,16 +38,16 @@ cloudnetpy/instruments/campbell_scientific.py,sha256=2WHfBKQjtRSl0AqvtPeX7G8Hdi3
 cloudnetpy/instruments/ceilo.py,sha256=xrI7iYNftKvGZf-3C_ESUNsu-QhXV43iWkDuKp3biZU,9552
 cloudnetpy/instruments/ceilometer.py,sha256=pdmLVljsuciyKpaGxWxJ_f1IrJK-UrkBC0lSeuirLlU,12095
 cloudnetpy/instruments/cl61d.py,sha256=g6DNBFju3wYhLFl32DKmC8pUup7y-EupXoUU0fuoGGA,1990
-cloudnetpy/instruments/cloudnet_instrument.py,sha256=RG5HJxGM6p0F-IGyr85fvOizcMmgx48OeD_XeIsrgSU,3367
+cloudnetpy/instruments/cloudnet_instrument.py,sha256=r4xurc6jegbHBmIe_JEpvPmV4Ga0GhPiv1ff4MjcNZs,3680
 cloudnetpy/instruments/copernicus.py,sha256=nmgqGOjVQFngj7BNbpcuCwA-W3yksvBbqn__iq7MyDk,6469
 cloudnetpy/instruments/galileo.py,sha256=yQBedd7dmDnwuWi1MtXOsg4-RyRx0uRAXumCY4YuH9k,4686
 cloudnetpy/instruments/hatpro.py,sha256=DzCWzTJxTc5BSOgoeyM8RjYkSXX6NDi3QXgKRp0uxlI,8759
 cloudnetpy/instruments/instruments.py,sha256=jG5TYnZ8bdCZXnI303ZsaJBEdSKaIjKMbkGtnq6kQX0,3261
 cloudnetpy/instruments/lufft.py,sha256=ugXF6pssHAAz1Y_hqPdpKuluAjxxHSR88xBmQuS6RlI,3705
-cloudnetpy/instruments/mira.py,sha256=s1gexccWoYeQ8qX0IFiKjmoVPqN4hOT5RNVLo5ODSx0,9534
-cloudnetpy/instruments/mrr.py,sha256=efxqsxy0G-qj4uCWVZztgNwGxYooSxIpI6K2tYF36GA,5833
+cloudnetpy/instruments/mira.py,sha256=f679zjmIxLVVtUVSMeO5IWbEdaj6qOJu5Gf9MKQJSL8,9412
+cloudnetpy/instruments/mrr.py,sha256=eeAzCp3CiHGauywjwvMUAFwZ4vBOZMcd3IlF8KsrLQo,5711
 cloudnetpy/instruments/nc_lidar.py,sha256=5gQG9PApnNPrHmS9_zanl8HEYIQuGRpbnzC3wfTcOyQ,1705
-cloudnetpy/instruments/nc_radar.py,sha256=7bKwIZZHM-RagW9AEdgldweaulfy9n61N3RH5fopTqo,6936
+cloudnetpy/instruments/nc_radar.py,sha256=ctmb0tJHkRoz-Ic8UAw4_v4VfS27r22_4X_1s4mUAas,6990
 cloudnetpy/instruments/pollyxt.py,sha256=YuVEHr-BX31rtVOFsWGU-SQFAmcxpXL26eyCVMz_9hw,8933
 cloudnetpy/instruments/radiometrics.py,sha256=ECN_bSfcV8Evdgfho9-Dl8RThXkAhHzIEj4DPOawSTc,7626
 cloudnetpy/instruments/rpg.py,sha256=IozvBJ8_qXTPqtp58FQwRsoI5_aI3-kycpXugZkS0d4,17462
@@ -115,9 +115,9 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=rd7UC67O4fsIE5SaHVZ4qWvUJTj41ZGwgQWPwZzOM14,5377
 cloudnetpy/products/product_tools.py,sha256=01Zc6xV8CSuYcIcLpchFf5POL3_c629-YMNDZJ51udA,10853
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.66.6.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.66.6.dist-info/METADATA,sha256=20TMauFPuw3zoVxRuuqG5sjtL5Sh1VUiO96s_4M4bro,5784
-cloudnetpy-1.66.6.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-cloudnetpy-1.66.6.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
-cloudnetpy-1.66.6.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.66.6.dist-info/RECORD,,
+cloudnetpy-1.66.8.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.66.8.dist-info/METADATA,sha256=HptVJMJeTubhD5gtb1l1ZCmrDsvgOLI_dSWdt-HIujo,5784
+cloudnetpy-1.66.8.dist-info/WHEEL,sha256=P9jw-gEje8ByB7_hXoICnHtVCrEwMQh-630tKvQWehc,91
+cloudnetpy-1.66.8.dist-info/entry_points.txt,sha256=HhY7LwCFk4qFgDlXx_Fy983ZTd831WlhtdPIzV-Y3dY,51
+cloudnetpy-1.66.8.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.66.8.dist-info/RECORD,,

{cloudnetpy-1.66.6.dist-info → cloudnetpy-1.66.8.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: setuptools (75.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any