pycontrails 0.53.0__cp311-cp311-macosx_10_9_x86_64.whl → 0.54.0__cp311-cp311-macosx_10_9_x86_64.whl

pycontrails/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '0.53.0'
-__version_tuple__ = version_tuple = (0, 53, 0)
+__version__ = version = '0.54.0'
+__version_tuple__ = version_tuple = (0, 54, 0)

pycontrails/core/flight.py

@@ -1151,7 +1151,9 @@ class Flight(GeoVectorDataset):
         out.data.pop("level", None)  # avoid any ambiguity
         return out
 
-    def distance_to_coords(self: Flight, distance: ArrayOrFloat) -> tuple[
+    def distance_to_coords(
+        self: Flight, distance: ArrayOrFloat
+    ) -> tuple[
         ArrayOrFloat,
         ArrayOrFloat,
         np.intp | npt.NDArray[np.intp],

pycontrails/core/vector.py

@@ -1073,7 +1073,6 @@ class VectorDataset:
 
             # Convert numpy objects to python objects
             if isinstance(obj, np.ndarray | np.generic):
-
                 # round time to unix seconds
                 if key == "time":
                     return np_encoder.default(obj.astype("datetime64[s]").astype(int))

pycontrails/datalib/_met_utils/metsource.py

@@ -79,12 +79,12 @@ def parse_timesteps(time: TimeInput | None, freq: str | None = "1h") -> list[dat
     elif len(time) == 1:
         time = (time[0], time[0])
     elif len(time) != 2:
-        msg = f"Input time bounds must have length < 2 and > 0, got {len(time)}"
+        msg = f"Input time bounds must have length 1 or 2, got {len(time)}"
         raise ValueError(msg)
 
     # convert all to pandas Timestamp
     try:
-        timestamps = [pd.to_datetime(t) for t in time]
+        t0, t1 = (pd.to_datetime(t) for t in time)
     except ValueError as e:
         msg = (
             f"Failed to parse time input {time}. "
@@ -93,10 +93,13 @@ def parse_timesteps(time: TimeInput | None, freq: str | None = "1h") -> list[dat
         raise ValueError(msg) from e
 
     if freq is None:
-        daterange = pd.DatetimeIndex([timestamps[0], timestamps[1]])
+        daterange = pd.DatetimeIndex([t0, t1])
     else:
         # get date range that encompasses all whole hours
-        daterange = pd.date_range(timestamps[0].floor(freq), timestamps[1].ceil(freq), freq=freq)
+        daterange = pd.date_range(t0.floor(freq), t1.ceil(freq), freq=freq)
+        if len(daterange) == 0:
+            msg = f"Time range {t0} to {t1} with freq {freq} has no valid time steps."
+            raise ValueError(msg)
 
     # return list of datetimes
     return daterange.to_pydatetime().tolist()
@@ -638,7 +641,7 @@ class MetDataSource(abc.ABC):
 
                 - chunks: {"time": 1}
                 - engine: "netcdf4"
-                - parallel: True
+                - parallel: False
 
         Returns
         -------

pycontrails/datalib/ecmwf/__init__.py

@@ -2,12 +2,23 @@
 
 from __future__ import annotations
 
-from pycontrails.datalib.ecmwf.arco_era5 import ARCOERA5
+from pycontrails.datalib.ecmwf.arco_era5 import (
+    ARCOERA5,
+    open_arco_era5_model_level_data,
+    open_arco_era5_single_level,
+)
+from pycontrails.datalib.ecmwf.common import CDSCredentialsNotFound
 from pycontrails.datalib.ecmwf.era5 import ERA5
 from pycontrails.datalib.ecmwf.era5_model_level import ERA5ModelLevel
 from pycontrails.datalib.ecmwf.hres import HRES
 from pycontrails.datalib.ecmwf.hres_model_level import HRESModelLevel
 from pycontrails.datalib.ecmwf.ifs import IFS
+from pycontrails.datalib.ecmwf.model_levels import (
+    MODEL_LEVELS_PATH,
+    ml_to_pl,
+    model_level_pressure,
+    model_level_reference_pressure,
+)
 from pycontrails.datalib.ecmwf.variables import (
     ECMWF_VARIABLES,
     MODEL_LEVEL_VARIABLES,
@@ -16,6 +27,7 @@ from pycontrails.datalib.ecmwf.variables import (
     CloudAreaFraction,
     CloudAreaFractionInLayer,
     Divergence,
+    OzoneMassMixingRatio,
     PotentialVorticity,
     RelativeHumidity,
     RelativeVorticity,
@@ -29,14 +41,21 @@ from pycontrails.datalib.ecmwf.variables import (
 
 __all__ = [
     "ARCOERA5",
+    "CDSCredentialsNotFound",
     "ERA5",
     "ERA5ModelLevel",
     "HRES",
     "HRESModelLevel",
     "IFS",
+    "model_level_reference_pressure",
+    "model_level_pressure",
+    "ml_to_pl",
+    "open_arco_era5_model_level_data",
+    "open_arco_era5_single_level",
     "CloudAreaFraction",
     "CloudAreaFractionInLayer",
     "Divergence",
+    "OzoneMassMixingRatio",
     "PotentialVorticity",
     "RelativeHumidity",
     "RelativeVorticity",
@@ -47,7 +66,8 @@ __all__ = [
     "TopNetSolarRadiation",
     "TopNetThermalRadiation",
     "ECMWF_VARIABLES",
+    "MODEL_LEVELS_PATH",
+    "MODEL_LEVEL_VARIABLES",
     "PRESSURE_LEVEL_VARIABLES",
     "SURFACE_VARIABLES",
-    "MODEL_LEVEL_VARIABLES",
 ]