pycontrails 0.53.0__cp312-cp312-macosx_11_0_arm64.whl → 0.53.1__cp312-cp312-macosx_11_0_arm64.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.53.1'
+__version_tuple__ = version_tuple = (0, 53, 1)

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()

pycontrails/datalib/ecmwf/common.py

@@ -63,7 +63,7 @@ class ECMWFAPI(metsource.MetDataSource):
             except KeyError as exc:
                 # this snippet shows the missing times for convenience
                 np_timesteps = {np.datetime64(t, "ns") for t in self.timesteps}
-                missing_times = sorted(np_timesteps.difference(ds["time"].values))
+                missing_times = sorted(np_timesteps.difference(ds["time"].values))  # type: ignore[type-var]
                 msg = f"Input dataset is missing time coordinates {[str(t) for t in missing_times]}"
                 raise KeyError(msg) from exc
 

pycontrails/datalib/ecmwf/era5.py

@@ -80,10 +80,17 @@ class ERA5(ECMWFAPI):
         Cache data store for staging ECMWF ERA5 files.
         Defaults to :class:`cache.DiskCacheStore`.
         If None, cache is turned off.
-    url : str
-        Override `cdsapi <https://github.com/ecmwf/cdsapi>`_ url
-    key : str
-        Override `cdsapi <https://github.com/ecmwf/cdsapi>`_ key
+    url : str | None
+        Override the default `cdsapi <https://github.com/ecmwf/cdsapi>`_ url.
+        As of August 2024, the url for the `CDS-Beta <https://cds-beta.climate.copernicus.eu>`_
+        is "https://cds-beta.climate.copernicus.eu/api", and the url for the legacy server is
+        "https://cds.climate.copernicus.eu/api/v2". If None, the url is set
+        by the ``CDSAPI_URL`` environment variable. If this is not defined, the
+        ``cdsapi`` package will determine the url.
+    key : str | None
+        Override default `cdsapi <https://github.com/ecmwf/cdsapi>`_ key. If None,
+        the key is set by the ``CDSAPI_KEY`` environment variable. If this is not defined,
+        the ``cdsapi`` package will determine the key.
 
     Notes
     -----
@@ -522,17 +529,21 @@ class ERA5(ECMWFAPI):
         xr.Dataset
             Processed :class:`xr.Dataset`
         """
-
         if "pycontrails_version" in ds.attrs:
             LOG.debug("Input dataset processed with pycontrails > 0.29")
             return ds
 
-        # not pre-processed source file from `download` or `paths`
-
-        # for "reanalysis-era5-single-levels" or if self.pressure_levels length == 1,
+        # For "reanalysis-era5-single-levels" or if self.pressure_levels length == 1,
         # then the netcdf file does not contain the dimension "level"
         if len(self.pressure_levels) == 1:
-            ds = ds.expand_dims({"level": self.pressure_levels})
+            ds = ds.expand_dims(level=self.pressure_levels)
+
+        # New CDS-Beta gives "valid_time" instead of "time"
+        # and "pressure_level" instead of "level"
+        if "valid_time" in ds:
+            ds = ds.rename(valid_time="time")
+        if "pressure_level" in ds:
+            ds = ds.rename(pressure_level="level")
 
         ds.attrs["pycontrails_version"] = pycontrails.__version__
         return ds

pycontrails/datalib/ecmwf/era5_model_level.py

@@ -54,8 +54,8 @@ ALL_ENSEMBLE_MEMBERS = list(range(10))
 class ERA5ModelLevel(ECMWFAPI):
     """Class to support model-level ERA5 data access, download, and organization.
 
-    The interface is similar to :class:`pycontrails.datalib.ecmwf.ERA5`, which downloads pressure-level
-    with much lower vertical resolution.
+    The interface is similar to :class:`pycontrails.datalib.ecmwf.ERA5`, which downloads
+    pressure-level with much lower vertical resolution.
 
     Requires account with
     `Copernicus Data Portal <https://cds.climate.copernicus.eu/cdsapp#!/home>`_
@@ -114,11 +114,18 @@ class ERA5ModelLevel(ECMWFAPI):
     cache_grib: bool, optional
         If True, cache downloaded GRIB files rather than storing them in a temporary file.
         By default, False.
-    url : str
-        Override `cdsapi <https://github.com/ecmwf/cdsapi>`_ url
-    key : str
-        Override `cdsapi <https://github.com/ecmwf/cdsapi>`_ key
-    """  # noqa: E501
+    url : str | None
+        Override the default `cdsapi <https://github.com/ecmwf/cdsapi>`_ url.
+        As of August 2024, the url for the `CDS-Beta <https://cds-beta.climate.copernicus.eu>`_
+        is "https://cds-beta.climate.copernicus.eu/api", and the url for the legacy server is
+        "https://cds.climate.copernicus.eu/api/v2". If None, the url is set
+        by the ``CDSAPI_URL`` environment variable. If this is not defined, the
+        ``cdsapi`` package will determine the url.
+    key : str | None
+        Override default `cdsapi <https://github.com/ecmwf/cdsapi>`_ key. If None,
+        the key is set by the ``CDSAPI_KEY`` environment variable. If this is not defined,
+        the ``cdsapi`` package will determine the key.
+    """
 
     __marker = object()
 

pycontrails/models/cocipgrid/cocip_grid.py

@@ -322,7 +322,7 @@ class CocipGrid(models.Model):
 
         if met is None:
             # idx is the first index at which self.met.variables["time"].to_numpy() >= time_end
-            idx = np.searchsorted(self.met.indexes["time"].to_numpy(), time_end)
+            idx = np.searchsorted(self.met.indexes["time"].to_numpy(), time_end).item()
             sl = slice(max(0, idx - 1), idx + 1)
             logger.debug("Select met slice %s", sl)
             met = MetDataset(self.met.data.isel(time=sl), copy=False)
@@ -331,7 +331,7 @@ class CocipGrid(models.Model):
             current_times = met.indexes["time"].to_numpy()
             all_times = self.met.indexes["time"].to_numpy()
             # idx is the first index at which all_times >= time_end
-            idx = np.searchsorted(all_times, time_end)
+            idx = np.searchsorted(all_times, time_end).item()
             sl = slice(max(0, idx - 1), idx + 1)
 
             # case 1: cannot re-use end of current met as start of new met
@@ -353,7 +353,7 @@ class CocipGrid(models.Model):
 
         if rad is None:
             # idx is the first index at which self.rad.variables["time"].to_numpy() >= time_end
-            idx = np.searchsorted(self.rad.indexes["time"].to_numpy(), time_end)
+            idx = np.searchsorted(self.rad.indexes["time"].to_numpy(), time_end).item()
             sl = slice(max(0, idx - 1), idx + 1)
             logger.debug("Select rad slice %s", sl)
             rad = MetDataset(self.rad.data.isel(time=sl), copy=False)
@@ -362,7 +362,7 @@ class CocipGrid(models.Model):
             current_times = rad.indexes["time"].to_numpy()
             all_times = self.rad.indexes["time"].to_numpy()
             # idx is the first index at which all_times >= time_end
-            idx = np.searchsorted(all_times, time_end)
+            idx = np.searchsorted(all_times, time_end).item()
             sl = slice(max(0, idx - 1), idx + 1)
 
             # case 1: cannot re-use end of current rad as start of new rad

{pycontrails-0.53.0.dist-info → pycontrails-0.53.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pycontrails
-Version: 0.53.0
+Version: 0.53.1
 Summary: Python library for modeling aviation climate impacts
 Author-email: Breakthrough Energy <py@contrails.org>
 License: Apache-2.0

{pycontrails-0.53.0.dist-info → pycontrails-0.53.1.dist-info}/RECORD

@@ -1,10 +1,10 @@
-pycontrails-0.53.0.dist-info/RECORD,,
-pycontrails-0.53.0.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
-pycontrails-0.53.0.dist-info/WHEEL,sha256=GFhZtRx5RQ7RB8S-E6GWJ9NAN3fNeAjsYFA5fnUcPq0,109
-pycontrails-0.53.0.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
-pycontrails-0.53.0.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
-pycontrails-0.53.0.dist-info/METADATA,sha256=KawffeH5dt3zqz-uONsaZA0CW71sETwVoMZlr-o_mbY,9173
-pycontrails/_version.py,sha256=HgHkwbsDGIaPCk8iUguKYMfK_2lWI-gqCUMPeRc5ptw,413
+pycontrails-0.53.1.dist-info/RECORD,,
+pycontrails-0.53.1.dist-info/LICENSE,sha256=gJ-h7SFFD1mCfR6a7HILvEtodDT6Iig8bLXdgqR6ucA,10175
+pycontrails-0.53.1.dist-info/WHEEL,sha256=stdCwhyjiC6LzHI-fEibiHQtTULEgvfCFF-5kawH9Pw,109
+pycontrails-0.53.1.dist-info/NOTICE,sha256=gKI8DcN1WhiXB2SFRKDogcjONldGubTvBxiOYdC4CXU,1926
+pycontrails-0.53.1.dist-info/top_level.txt,sha256=Z8J1R_AiBAyCVjNw6jYLdrA68PrQqTg0t3_Yek_IZ0Q,29
+pycontrails-0.53.1.dist-info/METADATA,sha256=zCTO7zFOkvqI0JzbmFthdOuZs7Mdt5vl66qd3z7_x0Q,9173
+pycontrails/_version.py,sha256=vV71ixZB5LSC5mFURNjkJpZgkyEImidyN2Ez0p0YzQk,413
 pycontrails/__init__.py,sha256=O2T9kXCMhcELcMZz7HEnwiBhh4Gfcj-yG1HtrotOKHQ,2001
 pycontrails/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pycontrails/core/vector.py,sha256=v_oO7if8SbNPMRci0TR8hLGSdAZ_fGZOVIT47e4hA58,71541
@@ -21,22 +21,22 @@ pycontrails/core/met.py,sha256=0lGZqGu-_EnulU9Df05xo0I-IYX2MRQXvJ7PgCjU6p0,10134
 pycontrails/core/aircraft_performance.py,sha256=4KnLj0zK-mk8Oo3As1CXUkQWBQGMeDdrKi5TeOhOmUA,26107
 pycontrails/core/airports.py,sha256=aeyAXVkioIRomrP79UtNrxindL4f1DJyXFaojZCuBBw,6758
 pycontrails/core/met_var.py,sha256=GC5ijw4oGuIefmFOSz4vmxMEBj_SVs5Z75IMhDP56Cw,9183
-pycontrails/core/rgi_cython.cpython-312-darwin.so,sha256=Met7-YnYWAvUgtGuMvT0X4-aZfbDWqTeBbFUGz4Cpn0,312000
+pycontrails/core/rgi_cython.cpython-312-darwin.so,sha256=LLaqjHrtuEDFPhmQGRwfBHSyd6ZU6lgzq38-wFPCpwU,312000
 pycontrails/core/coordinates.py,sha256=0ySsHtqTon7GMbuwmmxMbI92j3ueMteJZh4xxNm5zto,5391
 pycontrails/datalib/goes.py,sha256=Muh_pqAXSqUlM4ssStUT9QmPxGPEKK21LHFroaqTq7k,26533
 pycontrails/datalib/landsat.py,sha256=WBOXcVgkoWmEM1jeUnOX1IKBOzzUbHWFU3lL3pJ8rfE,19682
 pycontrails/datalib/spire.py,sha256=66SnMdA8KOS69USjKmqrJmTKPK08Ehih9tnlsCt-AJw,25331
 pycontrails/datalib/__init__.py,sha256=hW9NWdFPC3y_2vHMteQ7GgQdop3917MkDaf5ZhU2RBY,369
 pycontrails/datalib/sentinel.py,sha256=Rzsp5Hv6Rh3XVEfvFeofmClId4Eq2KhdYiEhIqFPE3U,17222
-pycontrails/datalib/_met_utils/metsource.py,sha256=lNQrNKwyQqXROZ4FqsF8VhRdoLf0nEeOsjMgWGMUyWE,23865
+pycontrails/datalib/_met_utils/metsource.py,sha256=1MLLnMDHlzXgRD-oeuZObgOoY8sGde81hluTm8oILPg,23965
 pycontrails/datalib/ecmwf/arco_era5.py,sha256=YuoPmPlP9TpZ6qhUPLbb30y3D3dTNDasTLZqP5MAWtw,18624
-pycontrails/datalib/ecmwf/era5.py,sha256=ibkOew_-9UU-UdQRgMgX0LlTURMW0-Q3qT4OsvDRUfQ,18228
-pycontrails/datalib/ecmwf/era5_model_level.py,sha256=s4PFFwNrRcfXiMQ1Ln7VfCaXrYgviU_SxSqtEU_E2tA,18945
+pycontrails/datalib/ecmwf/era5.py,sha256=MvL8TgC8Wg-Q3pZSGVsvGRNL-HT_ndQT7CRdv2bGK7k,19016
+pycontrails/datalib/ecmwf/era5_model_level.py,sha256=8ewGjs0LU_sySPMCk0B1xcAeMGydDx31AOXao9vrbNE,19519
 pycontrails/datalib/ecmwf/hres.py,sha256=p_l0ytCEEWGam7G7aVynpLmH4H4LQNeVe0Ay7Tw6fp8,28240
 pycontrails/datalib/ecmwf/variables.py,sha256=jsyHxQ8YTjLA_28DrKvplFn7pOC4T6SrO4j9d2wpkic,9563
 pycontrails/datalib/ecmwf/hres_model_level.py,sha256=-xh6BIEvsyddqJjuV7tygV85H5J8k4gCUKjj2kdkJkY,19147
 pycontrails/datalib/ecmwf/__init__.py,sha256=kwgk9P4RYdLgOYcBLXX5rWz1T_yL7aO8nt2Eb1PB-eE,1455
-pycontrails/datalib/ecmwf/common.py,sha256=p6zTQcojmTNF2FYGztxhX7cYEg9d29JH6_v2mrKteW0,3878
+pycontrails/datalib/ecmwf/common.py,sha256=PIkEdYEmlmwxQ7v4TenW_BaHX7mslnmdJW3iZYXb7Kg,3904
 pycontrails/datalib/ecmwf/model_levels.py,sha256=x83WJtjC6OnHcUsiNgvYIrVX4lY-pkXR-YlvUo9vYis,2712
 pycontrails/datalib/ecmwf/ifs.py,sha256=2heema398PoEVCfiTZSBawN25PXAa_CpWm_pGLZ1GuY,10662
 pycontrails/datalib/ecmwf/static/model_level_dataframe_v20240418.csv,sha256=PmvGLRzn6uuCKSwiasSuVcehvvmSaqP7cnLuN6hhCQQ,9788
@@ -100,7 +100,7 @@ pycontrails/models/ps_model/static/ps-synonym-list-20240524.csv,sha256=ksrpQTHkx
 pycontrails/models/ps_model/static/ps-aircraft-params-20240524.csv,sha256=3eNhSwzut0gon04k2EYKKaXRvQSUlau3yBAbHS0EBao,25784
 pycontrails/models/cocipgrid/cocip_grid_params.py,sha256=l4vBPrOKCJDz5Y1uMjmOGVyUcSWgfZtFWbjW968OPz8,5875
 pycontrails/models/cocipgrid/__init__.py,sha256=ar6bF_8Pusbb-myujz_q5ntFylQTNH8yiM8fxP7Zk30,262
-pycontrails/models/cocipgrid/cocip_grid.py,sha256=RuKEnhAddGcxKkm1lH6A1b_lC8DsOCI0iw19fKxZnVY,94319
+pycontrails/models/cocipgrid/cocip_grid.py,sha256=B1-f3D62fg3OeLp7xnxANAsneg9JRiiRVMqs-REFaII,94347
 pycontrails/physics/geo.py,sha256=9ZWIXyEEgrBNqsoeBBlYLTA-8GUTgyc-jgeVgchxXa8,30288
 pycontrails/physics/units.py,sha256=j-G5AC9eWIvv2MTOq9lUOoOQKFNJJuHzWLanHRji2tE,12272
 pycontrails/physics/constants.py,sha256=pHQQmccMUwuNnY4hFtm3L8G2rnUQcfJnroyQr8HAVeM,3146

{pycontrails-0.53.0.dist-info → pycontrails-0.53.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (72.2.0)
+Generator: setuptools (73.0.1)
 Root-Is-Purelib: false
 Tag: cp312-cp312-macosx_11_0_arm64