Fix API again, add 3.13 support.

Author: BSchilperoort

.github/workflows/test_and_build.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.9", "3.10", "3.11", "3.12"]
+        python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"]
     name: Run tests for ${{ matrix.python-version }}
     steps:
     - uses: actions/checkout@v3

README.md

@@ -14,10 +14,10 @@
 > The old Climate Data Store (CDS) has been shut down. All era5cli versions up to v1.4.2 will no longer work.
 > 
 > For more information see:
-> https://forum.ecmwf.int/t/the-new-climate-data-store-beta-cds-beta-is-now-live/3315
+> https://forum.ecmwf.int/t/goodbye-legacy-climate-data-store-hello-new-climate-data-store-cds/6380/14
 > 
 > To continue using era5cli, you will need to re-register at ECMWF and get a new API key,
-> and transition to the era5cli v2 beta. This can be installed with:
+> and transition to era5cli version 2. This can be installed with:
 > `pip install era5cli==2.0.0` 
 
 > [!WARNING]

docs/CHANGELOG.md

@@ -7,22 +7,22 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-# 2.0.0 - 2024-10-23
+# 2.0.0 - 2025-02-12
 
 Changes since v1.4.2:
 
 **Added:**
 
- - support for Python 3.12.
+ - support for Python 3.12, 3.13.
 
 **Changed:**
 
  - The `splitmonths` argument now defaults to `True` for hourly requests. To not split requests by year, add `--splitmonths False`.
+ - The 'cads-api-client' used in the 2.0 beta versions is already deprecated, the backend now uses the 'cdsapi' again, which uses ["datapi"](https://github.com/ecmwf-projects/datapi).
 
 **Fixed:**
 
  - Added support for the new climate data store.
- - For authentication, the new `cads-api-client` is used, instead of a dummy request. This should avoid the dummy requests appearing in the user's queue.
 
 **Removed:**
 

era5cli/fetch.py

@@ -4,7 +4,7 @@
 import logging
 import os
 import sys
-from cads_api_client import legacy_api_client
+import cdsapi
 from pathos.threading import ThreadPool as Pool
 import era5cli.inputref as ref
 import era5cli.utils
@@ -499,7 +499,7 @@ def _getdata(self, variables: list, years: list, outputfile: str, months=None):
                 "please do not kill this process in the meantime.",
                 os.linesep,
             )
-            connection = legacy_api_client.LegacyApiClient(
+            connection = cdsapi.Client(
                 url=self.url,
                 key=self.key,
                 verify=True,

era5cli/key_management.py

@@ -2,15 +2,16 @@
 import sys
 from pathlib import Path
 from typing import Tuple
-import cads_api_client
+import cdsapi
 from requests.exceptions import ConnectionError  # pylint: disable=redefined-builtin
 
 
 ERA5CLI_CONFIG_PATH = Path.home() / ".config" / "era5cli" / "cds_key.txt"
 CDSAPI_CONFIG_PATH = Path.home() / ".cdsapirc"
-DEFAULT_CDS_URL = "https://cds-beta.climate.copernicus.eu/api"
+DEFAULT_CDS_URL = "https://cds.climate.copernicus.eu/api"
 
-AUTH_ERR_MSG = "401 Client Error"
+AUTH_ERR_MSG = "401"
+NO_DATA_ERR_MSG = "There is no data matching your request"
 
 
 class InvalidRequestError(Exception):
@@ -34,9 +35,23 @@ def attempt_cds_login(url: str, key: str) -> True:
         InvalidRequestError: If the test request failed, likely due to changes in the
             CDS API's variable naming.
     """
-    client = cads_api_client.ApiClient(key=key, url=url)
+    client = cdsapi.Client(key=key, url=url, verify=True)
     try:
-        client.check_authentication()
+        # Check the URL
+        client.status()  # pragma: no cover
+
+        # Checks if the authentication works, without downloading data
+        client.retrieve(  # pragma: no cover
+            "reanalysis-era5-single-levels",
+            {
+                "variable": "2t",
+                "product_type": "reanalysis",
+                "date": "2012-12-01",
+                "time": "14:00",
+                "format": "netcdf",
+            },
+        )
+        return True
     except ConnectionError as err:
         raise ConnectionError(
             f"{os.linesep}Failed to connect to CDS. Please check your internet "
@@ -54,6 +69,11 @@ def attempt_cds_login(url: str, key: str) -> True:
                 f"{ERA5CLI_CONFIG_PATH.resolve()}{os.linesep}"
                 "Or redefine your configuration with 'era5cli config'"
             ) from err
+        if NO_DATA_ERR_MSG in str(err):
+            raise InvalidRequestError(
+                f"{os.linesep}Something changed in the CDS API. Please raise an issue "
+                "on https://www.github.com/eWaterCycle/era5cli"
+            ) from err
         raise err  # pragma: no cover
 
 
@@ -123,7 +143,7 @@ def load_era5cli_config() -> Tuple[str, str]:
                 "Old config detected. In the new CDS API only a key is required.\n"
                 "Please look at the new CDS website, and reconfigure your login in "
                 "era5cli\n"
-                "    https://cds-beta.climate.copernicus.eu/"
+                "    https://cds.climate.copernicus.eu/"
             )
             raise InvalidLoginError(msg)
 
@@ -148,7 +168,7 @@ def load_cdsapi_config() -> Tuple[str, str]:
             msg = (
                 "Your CDS API configuration file contains a UID entry/incorrect URL.\n"
                 "Please look at the new CDS website, and reconfigure your key:\n"
-                "    https://cds-beta.climate.copernicus.eu/"
+                "    https://cds.climate.copernicus.eu/"
             )
             raise InvalidLoginError(msg)
     return url, key

pyproject.toml

@@ -13,7 +13,7 @@ name = "era5cli"
 description = "A command line interface to download ERA5 data from the Copernicus Climate Data Store. https://climate.copernicus.eu/.."
 readme = "README.md"
 license = { text = "Apache Software License" }
-requires-python = ">=3.9, <3.13"
+requires-python = ">=3.9"
 authors = [
     {name = "Ronald van Haren"},
     {name = "Jaro Camphuijsen"},
@@ -55,10 +55,10 @@ classifiers = [
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
   "Programming Language :: Python :: 3.12",
+  "Programming Language :: Python :: 3.13",
 ]
 dependencies = [
-  "cads-api-client>=1.4.6",
-  "cdsapi",
+  "cdsapi>=0.7.4",
   "pathos",
   "PTable",
   "netCDF4"
@@ -111,7 +111,7 @@ serve = ["mkdocs serve",]
 
 [tool.black]
 line-length = 88
-target-version = ['py39', 'py310', 'py311', 'py312']
+target-version = ['py39', 'py310', 'py311', 'py312', 'py313']
 include = '\.pyi?$'
 
 [tool.isort]

tests/test_config.py

@@ -122,29 +122,41 @@ class TestAttemptCdsLogin:
     expected.
     """
 
-    @pytest.mark.xfail(reason="broken by new cads-client api")
     def test_status_fail(self):
-        with patch(
-            "cads_api_client.ApiClient.check_authentication",
-            side_effect=rex.ConnectionError,
-        ):
+        with patch("cdsapi.Client.status", side_effect=rex.ConnectionError):
             with pytest.raises(rex.ConnectionError, match="Failed to connect to CDS"):
-                key_management.attempt_cds_login(
-                    url="https://www.github.com/", key="def"
-                )
+                key_management.attempt_cds_login(url="test", key="abc:def")
 
     def test_connection_fail(self):
-        mp = patch(
-            "cads_api_client.ApiClient.check_authentication",
-            side_effect=Exception("401 Client Error"),
+        mp1 = patch("cdsapi.Client.status")
+        mp2 = patch(
+            "cdsapi.Client.retrieve",
+            side_effect=Exception("401"),
         )
-        with mp:
+        with mp1, mp2:
             with pytest.raises(
                 key_management.InvalidLoginError,
                 match="Authorization with the CDS served failed",
+            ):
+                key_management.attempt_cds_login(
+                    url="https://www.github.com/", key="abc:def"
+                )
+
+    def test_retrieve_fail(self):
+        mp1 = patch("cdsapi.Client.status")
+        mp2 = patch(
+            "cdsapi.Client.retrieve",
+            side_effect=Exception("There is no data matching your request"),
+        )
+        with mp1, mp2:
+            with pytest.raises(
+                key_management.InvalidRequestError,
+                match="Something changed in the CDS API",
             ):
                 key_management.attempt_cds_login(url="test", key="abc:def")
 
     def test_all_pass(self):
-        with patch("cads_api_client.ApiClient.check_authentication"):
-            key_management.attempt_cds_login(url="test", key="abc:def")
+        mp1 = patch("cdsapi.Client.status")
+        mp2 = patch("cdsapi.Client.retrieve")
+        with mp1, mp2:
+            assert key_management.attempt_cds_login(url="test", key="abc:def") is True

tests/test_fetch.py

@@ -134,7 +134,7 @@ def test_init(mockpatch):
         )
 
 
-@mock.patch("cads_api_client.legacy_api_client.LegacyApiClient", autospec=True)
+@mock.patch("cdsapi.Client", autospec=True)
 @mock.patch("era5cli.utils.append_history", autospec=True)
 def test_fetch_nodryrun(cds, era5cli_utilsappend_history):
     """Test fetch function of Fetch class."""