cloudnetpy 1.56.13__py3-none-any.whl → 1.56.14__py3-none-any.whl

cloudnetpy/instruments/disdrometer/parsivel.py

@@ -498,30 +498,58 @@ def _read_toa5(filename: str | PathLike) -> dict[str, list]:
         return data
 
 
-def _read_typ_op4a(filename: str | PathLike) -> dict[str, list]:
+def _read_typ_op4a(lines: list[str]) -> dict[str, list]:
     """Read output of "CS/PA" command. The output starts with line "TYP OP4A"
     followed by one line per measured variable in format: <number>:<value>.
     Output ends with characters: <ETX><CR><LF><NUL>. Lines are separated by
     <CR><LF>.
     """
     data = {}
-    with open(filename, encoding="latin1", errors="ignore") as file:
-        for line in file:
-            if ":" not in line:
-                continue
-            key, value = line.strip().split(":", maxsplit=1)
-            # Skip datetime and 16-bit values.
-            if key in ("19", "30", "31", "32", "33"):
-                continue
-            varname = TELEGRAM.get(int(key))
-            if varname is None:
-                continue
-            parser = PARSERS.get(varname, next)
-            tokens = value.split(";")
-            data[varname] = [parser(iter(tokens))]
+    for line in lines:
+        if ":" not in line:
+            continue
+        key, value = line.strip().split(":", maxsplit=1)
+        # Skip datetime and 16-bit values.
+        if key in ("19", "30", "31", "32", "33"):
+            continue
+        varname = TELEGRAM.get(int(key))
+        if varname is None:
+            continue
+        parser = PARSERS.get(varname, next)
+        tokens = value.split(";")
+        data[varname] = [parser(iter(tokens))]
     return data
 
 
+def _read_fmi(content: str):
+    """Read format used by Finnish Meteorological Institute and University of
+    Helsinki:
+    - "[YYYY-MM-DD HH:MM:SS\n"
+    - output of "CS/PA" command without non-printable characters at the end
+    - "]\n"
+    """
+    output: dict[str, Any] = defaultdict(list)
+    for m in re.finditer(
+        r"\[(?P<year>\d+)-(?P<month>\d+)-(?P<day>\d+) "
+        r"(?P<hour>\d+):(?P<minute>\d+):(?P<second>\d+)"
+        r"(?P<output>[^\]]*)\]",
+        content,
+    ):
+        for key, value in _read_typ_op4a(m["output"].splitlines()).items():
+            output[key].append(value)
+        output["_datetime"].append(
+            datetime.datetime(
+                int(m["year"]),
+                int(m["month"]),
+                int(m["day"]),
+                int(m["hour"]),
+                int(m["minute"]),
+                int(m["second"]),
+            )
+        )
+    return output
+
+
 def _read_parsivel(
     filenames: Iterable[str | PathLike],
     telegram: Sequence[int | None] | None = None,
@@ -530,17 +558,20 @@ def _read_parsivel(
     combined_data = defaultdict(list)
     for filename in filenames:
         with open(filename, encoding="latin1", errors="ignore") as file:
-            lines = file.read().splitlines()
+            content = file.read()
+            lines = content.splitlines()
         if not lines:
             msg = f"File '{filename}' is empty"
             raise DisdrometerDataError(msg)
         if "TOA5" in lines[0]:
             data = _read_toa5(filename)
         elif "TYP OP4A" in lines[0]:
-            data = _read_typ_op4a(filename)
+            data = _read_typ_op4a(lines)
         elif "Date" in lines[0]:
             headers = _parse_headers(lines[0])
             data = _read_rows(headers, lines[1:])
+        elif "[" in lines[0]:
+            data = _read_fmi(content)
         elif telegram is not None:
             headers = _parse_telegram(telegram)
             data = _read_rows(headers, lines)

cloudnetpy/products/classification.py

@@ -166,7 +166,7 @@ DEFINITIONS = {
         "Value 5: Good radar echo only.\n"
         "Value 6: No radar echo but known attenuation.\n"
         "Value 7: Radar echo corrected for liquid attenuation using microwave\n"
-        "         radiometer data."
+        "         radiometer data.\n"
         "Value 8: Radar ground clutter.\n"
         "Value 9: Lidar clear-air molecular scattering."
     ),

cloudnetpy/version.py

@@ -1,4 +1,4 @@
 MAJOR = 1
 MINOR = 56
-PATCH = 13
+PATCH = 14
 __version__ = f"{MAJOR}.{MINOR}.{PATCH}"

{cloudnetpy-1.56.13.dist-info → cloudnetpy-1.56.14.dist-info}/METADATA

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

{cloudnetpy-1.56.13.dist-info → cloudnetpy-1.56.14.dist-info}/RECORD

@@ -8,7 +8,7 @@ cloudnetpy/metadata.py,sha256=Bcu1a9UyUq61jomuZ0_6hYIOzf61e5qCXeiwLm46ikw,5040
 cloudnetpy/output.py,sha256=jD1pfBb4OQhVOrlhPEk-8FAi4bUW7zjAL468r6BPkJg,14586
 cloudnetpy/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/utils.py,sha256=yY5a5HLuAks2uzA4XbbqsGFEmXoyqECn_TjD3sMa0lI,27193
-cloudnetpy/version.py,sha256=bpWyAessbgr5f46ROxR4dNxoCHjQ47qyZBv3TvLVaEU,73
+cloudnetpy/version.py,sha256=Fa0L-CaTgGkRxlnKqX3a-6es2Ei1Q8LSXzXmGmFXq7w,73
 cloudnetpy/categorize/__init__.py,sha256=gP5q3Vis1y9u9OWgA_idlbjfWXYN_S0IBSWdwBhL_uU,69
 cloudnetpy/categorize/atmos.py,sha256=cax3iRmvr7S-VkUZqz0JCfAN3WEsUVbGfH4zSHy1APo,12384
 cloudnetpy/categorize/atmos_utils.py,sha256=wndpwJxc2-QnNTkV8tc8I11Vs_WkNz9sVMX1fuGgUC4,3777
@@ -48,7 +48,7 @@ cloudnetpy/instruments/vaisala.py,sha256=E6PaK26lHprqOJUCEDZPZQu83Qan9n_THudTFQM
 cloudnetpy/instruments/weather_station.py,sha256=IMJHGXfMhb4jJw_i66oGDCkeeRn3_eko8zVehu6Fte0,5970
 cloudnetpy/instruments/disdrometer/__init__.py,sha256=lyjwttWvFvuwYxEkusoAvgRcbBmglmOp5HJOpXUqLWo,93
 cloudnetpy/instruments/disdrometer/common.py,sha256=nWlVqwvlxei4wJaubBN6NoNsAOpnEqDHvKCPjrAb6Go,15701
-cloudnetpy/instruments/disdrometer/parsivel.py,sha256=QVd5DTDWvBIAEfXgo_3gbjoU8yL2co2e5Z5BqoqNkjc,19887
+cloudnetpy/instruments/disdrometer/parsivel.py,sha256=7clC_RS1vbHQ9xY5kHp0pShSRk9mnRwnWHMx42MJJSU,20766
 cloudnetpy/instruments/disdrometer/thies.py,sha256=h7EwZ9tn47UUMiYqDQ68vkXv4q0rEqX1ZeFXd7XJYNg,5050
 cloudnetpy/model_evaluation/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cloudnetpy/model_evaluation/file_handler.py,sha256=oUGIblcEWLLv16YKUch-M5KA-dGRAcuHa-9anP3xtX4,6447
@@ -94,7 +94,7 @@ cloudnetpy/plotting/__init__.py,sha256=lg9Smn4BI0dVBgnDLC3JVJ4GmwoSnO-qoSd4ApvwV
 cloudnetpy/plotting/plot_meta.py,sha256=NWI8ECKMypN5YyM9XKCAp1WEthbFlKMvilxqXmYSEK4,14631
 cloudnetpy/plotting/plotting.py,sha256=2NhSl_4gcLxOSlUEGPnwBNc0mUCmPracaguHo9kL51A,30714
 cloudnetpy/products/__init__.py,sha256=2hRb5HG9hNrxH1if5laJkLeFeaZCd5W1q3hh4ewsX0E,273
-cloudnetpy/products/classification.py,sha256=J_FOMUSyxvFaT-hvdKVVcKPtuQ0u3V9PsV5xaIKzMjg,7843
+cloudnetpy/products/classification.py,sha256=0E9OUGR3uLCsS1nORwQu0SqW0_8uX7n6LlRcVhtzKw4,7845
 cloudnetpy/products/der.py,sha256=HAdPvbJySEqkIwDrdZDPnli_wnN2qwm72_D1a82ZWIs,12398
 cloudnetpy/products/drizzle.py,sha256=BY2HvJeWt_ps6KKCGXwUUNRTy78q0cQM8bOCCoj8TWA,10803
 cloudnetpy/products/drizzle_error.py,sha256=4GwlHRtNbk9ks7bGtXCco-wXbcDOKeAQwKmbhzut6Qk,6132
@@ -106,8 +106,8 @@ cloudnetpy/products/mie_lu_tables.nc,sha256=It4fYpqJXlqOgL8jeZ-PxGzP08PMrELIDVe5
 cloudnetpy/products/mwr_tools.py,sha256=PRm5aCULccUehU-Byk55wYhhEHseMjoAjGBu5TSyHao,4621
 cloudnetpy/products/product_tools.py,sha256=E8CSijBY8cr70BH2JFa0lGQ-RzI9EcHQ0Fzt8CQ8rY4,10442
 docs/source/conf.py,sha256=IKiFWw6xhUd8NrCg0q7l596Ck1d61XWeVjIFHVSG9Og,1490
-cloudnetpy-1.56.13.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
-cloudnetpy-1.56.13.dist-info/METADATA,sha256=U0Jsf1FLCoaqvQag9FAToXdPB7YD6EGBNEMPHb4h0_4,5734
-cloudnetpy-1.56.13.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-cloudnetpy-1.56.13.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
-cloudnetpy-1.56.13.dist-info/RECORD,,
+cloudnetpy-1.56.14.dist-info/LICENSE,sha256=wcZF72bdaoG9XugpyE95Juo7lBQOwLuTKBOhhtANZMM,1094
+cloudnetpy-1.56.14.dist-info/METADATA,sha256=nSphTgk88JFpj2s5KJX9SLUFuHkKBIcLvUcm0ZC2w8E,5734
+cloudnetpy-1.56.14.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+cloudnetpy-1.56.14.dist-info/top_level.txt,sha256=ibSPWRr6ojS1i11rtBFz2_gkIe68mggj7aeswYfaOo0,16
+cloudnetpy-1.56.14.dist-info/RECORD,,