cloudnetpy 1.77.0__tar.gz → 1.77.2__tar.gz

{cloudnetpy-1.77.0/cloudnetpy.egg-info → cloudnetpy-1.77.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.77.0
+Version: 1.77.2
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License

{cloudnetpy-1.77.0 → cloudnetpy-1.77.2}/cloudnetpy/instruments/bowtie.py

@@ -1,5 +1,7 @@
 from os import PathLike
 
+import numpy as np
+
 from cloudnetpy import output
 from cloudnetpy.constants import G_TO_KG, MM_H_TO_M_S
 from cloudnetpy.exceptions import ValidTimeStampError
@@ -59,6 +61,7 @@ def bowtie2nc(
         bowtie.add_site_geolocation()
         bowtie.add_height()
         bowtie.convert_units()
+        bowtie.fix_chirp_start_indices()
         bowtie.test_if_all_masked()
     attributes = output.add_time_attribute(ATTRIBUTES, bowtie.date)
     output.update_attributes(bowtie.data, attributes)
@@ -76,6 +79,11 @@ class Bowtie(NcRadar):
         self.data["rainfall_rate"].data *= MM_H_TO_M_S
         self.data["relative_humidity"].data /= 100
 
+    def fix_chirp_start_indices(self) -> None:
+        ind = self.data["chirp_start_indices"].data
+        self.data["chirp_start_indices"].data = np.array([int(i) for i in ind])
+        self.data["chirp_start_indices"].data_type = "int32"
+
     def check_date(self, date: str):
         if "-".join(self.date) != date:
             raise ValidTimeStampError

{cloudnetpy-1.77.0 → cloudnetpy-1.77.2}/cloudnetpy/instruments/fd12p.py

@@ -1,5 +1,7 @@
 import datetime
+import logging
 import math
+import re
 from os import PathLike
 from uuid import UUID
 
@@ -78,20 +80,31 @@ class FD12P(CSVFile):
         # In Lindenberg, format is date and time followed by Message 2 without
         # non-printable characters.
         with open(filename) as file:
+            invalid_lines = 0
             for line in file:
-                columns = line.split()
-                date = _parse_date(columns[0])
-                time = _parse_time(columns[1])
-                self._data["time"].append(datetime.datetime.combine(date, time))
-                self._data["visibility"].append(_parse_int(columns[4]))
-                self._data["synop_WaWa"].append(_parse_int(columns[7]))
-                self._data["precipitation_rate"].append(
-                    _parse_float(columns[10])
-                )  # mm/h
-                self._data["precipitation_amount"].append(
-                    _parse_float(columns[11])
-                )  # mm
-                self._data["snowfall_amount"].append(_parse_int(columns[12]))  # mm
+                try:
+                    columns = line.split()
+                    if len(columns) != 13:
+                        msg = "Invalid column count"
+                        raise ValueError(msg)  # noqa: TRY301
+                    date = _parse_date(columns[0])
+                    time = _parse_time(columns[1])
+                    visibility = _parse_int(columns[4])
+                    synop = _parse_int(columns[7])
+                    p_rate = _parse_float(columns[10])  # mm/h
+                    p_amount = _parse_float(columns[11])  # mm
+                    s_amount = _parse_int(columns[12])  # mm
+                    self._data["time"].append(datetime.datetime.combine(date, time))
+                    self._data["visibility"].append(visibility)
+                    self._data["synop_WaWa"].append(synop)
+                    self._data["precipitation_rate"].append(p_rate)
+                    self._data["precipitation_amount"].append(p_amount)
+                    self._data["snowfall_amount"].append(s_amount)
+                except ValueError:
+                    invalid_lines += 1
+                    continue
+        if invalid_lines:
+            logging.info("Skipped %d lines", invalid_lines)
         for key in ("visibility", "synop_WaWa", "snowfall_amount"):
             values = np.array(
                 [0 if x is math.nan else x for x in self._data[key]], dtype=np.int32
@@ -124,14 +137,25 @@ class FD12P(CSVFile):
 
 
 def _parse_date(date: str) -> datetime.date:
-    day, month, year = map(int, date.split("."))
-    return datetime.date(year, month, day)
+    match = re.fullmatch(r"(?P<day>\d{2})\.(?P<month>\d{2})\.(?P<year>\d{4})", date)
+    if match is None:
+        msg = f"Invalid date: {date}"
+        raise ValueError(msg)
+    return datetime.date(int(match["year"]), int(match["month"]), int(match["day"]))
 
 
 def _parse_time(time: str) -> datetime.time:
-    hour, minute, *rest = [int(x) for x in time.split(":")]
-    second = rest[0] if rest else 0
-    return datetime.time(hour, minute, second)
+    match = re.fullmatch(
+        r"(?P<hour>\d{2}):(?P<minute>\d{2})(:(?P<second>\d{2}))?", time
+    )
+    if match is None:
+        msg = f"Invalid time: {time}"
+        raise ValueError(msg)
+    return datetime.time(
+        int(match["hour"]),
+        int(match["minute"]),
+        int(match["second"]) if match["second"] is not None else 0,
+    )
 
 
 def _parse_int(value: str) -> float:

{cloudnetpy-1.77.0 → cloudnetpy-1.77.2}/cloudnetpy/utils.py

@@ -826,6 +826,8 @@ def get_epoch(units: str) -> Epoch:
     except IndexError:
         return fallback
     date = date.replace(",", "")
+    if "T" in date:
+        date = date[: date.index("T")]
     try:
         date_components = [int(x) for x in date.split("-")]
     except ValueError:

{cloudnetpy-1.77.0 → cloudnetpy-1.77.2}/cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 77
-PATCH = 0
+PATCH = 2
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.77.0 → cloudnetpy-1.77.2/cloudnetpy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cloudnetpy
-Version: 1.77.0
+Version: 1.77.2
 Summary: Python package for Cloudnet processing
 Author: Simo Tukiainen
 License: MIT License