ecmwf-datastores-client 0.2.0__tar.gz → 0.4.0__tar.gz

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/.cruft.json

@@ -1,6 +1,6 @@
 {
   "template": "https://github.com/ecmwf-projects/cookiecutter-conda-package",
-  "commit": "0b4d61da26c3aacfc1778716cb36749d16846c51",
+  "commit": "28eb7788868b278f924c6171a0dba603591b2f33",
   "checkout": null,
   "context": {
     "cookiecutter": {
@@ -13,7 +13,7 @@
       "integration_tests": "True",
       "pypi": true,
       "_template": "https://github.com/ecmwf-projects/cookiecutter-conda-package",
-      "_commit": "0b4d61da26c3aacfc1778716cb36749d16846c51"
+      "_commit": "28eb7788868b278f924c6171a0dba603591b2f33"
     }
   },
   "directory": null

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/.github/workflows/on-push.yml

@@ -145,7 +145,7 @@ jobs:
       env:
         ECMWF_DATASTORES_URL: ${{ secrets.ECMWF_DATASTORES_URL }}
         ECMWF_DATASTORES_KEY: ${{ secrets.ECMWF_DATASTORES_KEY }}
-        ECMWF_DATASTORES_ANON_KEY: ${{ secrets.ECMWF_DATASTORES_ANON_KEY }}
+        ANONYMOUS_PAT: ${{ secrets.ECMWF_DATASTORES_ANON_KEY }}
       run: |
         make docs-build
     - uses: rossjrw/pr-preview-action@v1
@@ -170,7 +170,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ['3.8', '3.13']
+        python-version: ['3.9', '3.13']
         extra: ['-ci']
 
     steps:
@@ -199,7 +199,7 @@ jobs:
       env:
         ECMWF_DATASTORES_URL: ${{ secrets.ECMWF_DATASTORES_URL }}
         ECMWF_DATASTORES_KEY: ${{ secrets.ECMWF_DATASTORES_KEY }}
-        ECMWF_DATASTORES_ANON_KEY: ${{ secrets.ECMWF_DATASTORES_ANON_KEY }}
+        ANONYMOUS_PAT: ${{ secrets.ECMWF_DATASTORES_ANON_KEY }}
       run: |
         make ci-integration-tests COV_REPORT=xml
 

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/.pre-commit-config.yaml

@@ -12,12 +12,12 @@ repos:
   - id: debug-statements
   - id: mixed-line-ending
 - repo: https://github.com/keewis/blackdoc
-  rev: v0.3.9
+  rev: v0.4.1
   hooks:
   - id: blackdoc
     additional_dependencies: [black==23.11.0]
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  rev: v0.11.12
+  rev: v0.12.5
   hooks:
   - id: ruff
     args: [--fix, --show-fixes]
@@ -27,14 +27,14 @@ repos:
   hooks:
   - id: mdformat
 - repo: https://github.com/macisamuele/language-formatters-pre-commit-hooks
-  rev: v2.14.0
+  rev: v2.15.0
   hooks:
   - id: pretty-format-yaml
     args: [--autofix, --preserve-quotes]
   - id: pretty-format-toml
     args: [--autofix]
 - repo: https://github.com/gitleaks/gitleaks
-  rev: v8.27.0
+  rev: v8.28.0
   hooks:
   - id: gitleaks
 - repo: https://github.com/kynan/nbstripout

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecmwf-datastores-client
-Version: 0.2.0
+Version: 0.4.0
 Summary: ECMWF Data Stores Service (DSS) API Python client
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -213,18 +213,17 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: attrs
-Requires-Dist: multiurl>=0.3.2
+Requires-Dist: multiurl>=0.3.7
 Requires-Dist: requests
 Requires-Dist: typing-extensions
 Provides-Extra: legacy
@@ -322,8 +321,8 @@ Retrieve data:
 ...     "time": ["00:00"],
 ...     "pressure_level": ["1000"],
 ...     "data_format": "grib",
-...     "download_format": "unarchived"
-...     }
+...     "download_format": "unarchived",
+... }
 
 >>> client.retrieve(collection_id, request, target="target_1.grib")  # blocks
 'target_1.grib'
@@ -359,6 +358,7 @@ List all collection IDs sorted by last update:
 >>> while collections is not None:  # Loop over pages
 ...     collection_ids.extend(collections.collection_ids)
 ...     collections = collections.next  # Move to the next page
+...
 
 >>> collection_ids
 [...]
@@ -425,6 +425,7 @@ List all successful jobs, sorted by newest first:
 >>> while jobs is not None:  # Loop over pages
 ...     request_ids.extend(jobs.request_ids)
 ...     jobs = jobs.next  # Move to the next page
+...
 
 >>> request_ids
 [...]

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/README.md

@@ -89,8 +89,8 @@ Retrieve data:
 ...     "time": ["00:00"],
 ...     "pressure_level": ["1000"],
 ...     "data_format": "grib",
-...     "download_format": "unarchived"
-...     }
+...     "download_format": "unarchived",
+... }
 
 >>> client.retrieve(collection_id, request, target="target_1.grib")  # blocks
 'target_1.grib'
@@ -126,6 +126,7 @@ List all collection IDs sorted by last update:
 >>> while collections is not None:  # Loop over pages
 ...     collection_ids.extend(collections.collection_ids)
 ...     collections = collections.next  # Move to the next page
+...
 
 >>> collection_ids
 [...]
@@ -192,6 +193,7 @@ List all successful jobs, sorted by newest first:
 >>> while jobs is not None:  # Loop over pages
 ...     request_ids.extend(jobs.request_ids)
 ...     jobs = jobs.next  # Move to the next page
+...
 
 >>> request_ids
 [...]

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/ci/environment-ci.yml

@@ -20,3 +20,4 @@ dependencies:
 - pip:
   - cdsapi >= 0.7.6
   - responses
+  - pytest_httpbin

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/ecmwf/datastores/client.py

@@ -28,6 +28,8 @@ from ecmwf.datastores.catalogue import Catalogue
 from ecmwf.datastores.processing import Processing, RequestKwargs
 from ecmwf.datastores.profile import Profile
 
+T_STATUS = Literal["accepted", "running", "successful", "failed", "rejected"]
+
 
 @attrs.define(slots=False)
 class Client:
@@ -179,6 +181,21 @@ class Client:
         """
         return self._profile_api.check_authentication()
 
+    def delete(self, *request_ids: str) -> dict[str, Any]:
+        """Delete requests.
+
+        Parameters
+        ----------
+        *request_ids: str
+            Request IDs.
+
+        Returns
+        -------
+        dict[str,Any]
+            Content of the response.
+        """
+        return self._retrieve_api.delete(*request_ids)
+
     def download_results(self, request_id: str, target: str | None = None) -> str:
         """Download the results of a request.
 
@@ -259,7 +276,7 @@ class Client:
         self,
         limit: int | None = None,
         sortby: Literal[None, "created", "-created"] = None,
-        status: Literal[None, "accepted", "running", "successful", "failed"] = None,
+        status: None | T_STATUS | list[T_STATUS] = None,
     ) -> datastores.Jobs:
         """Retrieve submitted jobs.
 
@@ -269,7 +286,7 @@ class Client:
             Number of jobs per page.
         sortby: {None, 'created', '-created'}
             Field to sort results by.
-        status: {None, 'accepted', 'running', 'successful', 'failed'}
+        status: None or {'accepted', 'running', 'successful', 'failed', 'rejected'} or list
             Status of the results.
 
         Returns

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/ecmwf/datastores/processing.py

@@ -21,7 +21,7 @@ import os
 import time
 import urllib.parse
 import warnings
-from typing import Any, Callable, Type, TypedDict, TypeVar
+from typing import Any, Callable, TypedDict, TypeVar
 
 try:
     from typing import Self
@@ -144,7 +144,7 @@ class ApiResponse:
 
     @classmethod
     def from_request(
-        cls: Type[T_ApiResponse],
+        cls: type[T_ApiResponse],
         method: str,
         url: str,
         headers: dict[str, str],
@@ -467,7 +467,7 @@ class Remote:
             return True
         if status in ("accepted", "running"):
             return False
-        if status == "failed":
+        if status in ("failed", "rejected"):
             results = self._make_results(wait=False)
             raise ProcessingFailedError(error_json_to_message(results._json_dict))
         if status in ("dismissed", "deleted"):
@@ -620,13 +620,16 @@ class Results(ApiResponse):
     def _download(self, url: str, target: str) -> requests.Response:
         download_options = {"stream": True, "resume_transfers": True}
         download_options.update(self.download_options)
-        multiurl.download(
-            url,
-            target=target,
-            **self.retry_options,
-            **self.request_options,
-            **download_options,
-        )
+        try:
+            multiurl.download(
+                url,
+                target=target,
+                maximum_retries=0,
+                **self.request_options,
+                **download_options,
+            )
+        except requests.HTTPError as exc:
+            return exc.response
         return requests.Response()  # mutliurl robust needs a response
 
     def download(
@@ -661,7 +664,7 @@ class Results(ApiResponse):
     @property
     def location(self) -> str:
         """File location."""
-        result_href = self.asset["href"]
+        result_href: str = self.asset["href"]
         return urllib.parse.urljoin(self.response.url, result_href)
 
     @property
@@ -705,6 +708,13 @@ class Processing:
             log_callback=self.log_callback,
         )
 
+    def delete(self, *job_ids: str) -> dict[str, Any]:
+        url = f"{self.url}/jobs/delete"
+        response = ApiResponse.from_request(
+            "post", url, json={"job_ids": job_ids}, **self._request_kwargs
+        )
+        return response._json_dict
+
     def get_processes(self, **params: Any) -> Processes:
         url = f"{self.url}/processes"
         return Processes.from_request("get", url, params=params, **self._request_kwargs)

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/ecmwf/datastores/version.py

@@ -1,2 +1,2 @@
 # Do not change! Do not track in version control!
-__version__ = "0.2.0"
+__version__ = "0.4.0"

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/ecmwf_datastores_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ecmwf-datastores-client
-Version: 0.2.0
+Version: 0.4.0
 Summary: ECMWF Data Stores Service (DSS) API Python client
 License:                                  Apache License
                                    Version 2.0, January 2004
@@ -213,18 +213,17 @@ Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering
-Requires-Python: >=3.8
+Requires-Python: >=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: attrs
-Requires-Dist: multiurl>=0.3.2
+Requires-Dist: multiurl>=0.3.7
 Requires-Dist: requests
 Requires-Dist: typing-extensions
 Provides-Extra: legacy
@@ -322,8 +321,8 @@ Retrieve data:
 ...     "time": ["00:00"],
 ...     "pressure_level": ["1000"],
 ...     "data_format": "grib",
-...     "download_format": "unarchived"
-...     }
+...     "download_format": "unarchived",
+... }
 
 >>> client.retrieve(collection_id, request, target="target_1.grib")  # blocks
 'target_1.grib'
@@ -359,6 +358,7 @@ List all collection IDs sorted by last update:
 >>> while collections is not None:  # Loop over pages
 ...     collection_ids.extend(collections.collection_ids)
 ...     collections = collections.next  # Move to the next page
+...
 
 >>> collection_ids
 [...]
@@ -425,6 +425,7 @@ List all successful jobs, sorted by newest first:
 >>> while jobs is not None:  # Loop over pages
 ...     request_ids.extend(jobs.request_ids)
 ...     jobs = jobs.next  # Move to the next page
+...
 
 >>> request_ids
 [...]

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/ecmwf_datastores_client.egg-info/SOURCES.txt

@@ -41,8 +41,8 @@ tests/integration_test_20_processing.py
 tests/integration_test_30_remote.py
 tests/integration_test_40_results.py
 tests/integration_test_50_profile.py
-tests/integration_test_60_api_client.py
-tests/integration_test_70_legacy_api_client.py
+tests/integration_test_60_client.py
+tests/integration_test_70_legacy_client.py
 tests/integration_test_80_adaptors.py
 tests/integration_test_90_features.py
 tests/test_00_version.py

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/ecmwf_datastores_client.egg-info/requires.txt

@@ -1,5 +1,5 @@
 attrs
-multiurl>=0.3.2
+multiurl>=0.3.7
 requests
 typing-extensions
 

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/environment.yml

@@ -9,6 +9,6 @@ channels:
 # DO NOT EDIT ABOVE THIS LINE, ADD DEPENDENCIES BELOW AS SHOWN IN THE EXAMPLE
 dependencies:
 - attrs
-- multiurl
+- multiurl >= 0.3.7
 - requests
 - typing-extensions

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/pyproject.toml

@@ -10,7 +10,6 @@ classifiers = [
   "Operating System :: OS Independent",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3",
-  "Programming Language :: Python :: 3.8",
   "Programming Language :: Python :: 3.9",
   "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: 3.11",
@@ -20,7 +19,7 @@ classifiers = [
 ]
 dependencies = [
   "attrs",
-  "multiurl >= 0.3.2",
+  "multiurl >= 0.3.7",
   "requests",
   "typing-extensions"
 ]
@@ -29,7 +28,7 @@ dynamic = ["version"]
 license = {file = "LICENSE"}
 name = "ecmwf-datastores-client"
 readme = "README.md"
-requires-python = ">=3.8"
+requires-python = ">=3.9"
 
 [project.optional-dependencies]
 legacy = ["cdsapi >= 0.7.6"]
@@ -48,7 +47,7 @@ strict = true
 
 [[tool.mypy.overrides]]
 ignore_missing_imports = true
-module = ["cdsapi.*", "multiurl.*"]
+module = ["cdsapi.*", "multiurl.*", "pytest_httpbin.*"]
 
 [tool.pytest.ini_options]
 markers = ["extra: additional tests skipped by CI"]
@@ -57,7 +56,7 @@ markers = ["extra: additional tests skipped by CI"]
 # Same as Black.
 indent-width = 4
 line-length = 88
-target-version = "py38"
+target-version = "py39"
 
 [tool.ruff.lint]
 ignore = [
@@ -75,7 +74,9 @@ select = [
   # pydocstyle
   "D",
   # flake8-future-annotations
-  "FA"
+  "FA",
+  # pyupgrade
+  "UP"
 ]
 
 [tool.ruff.lint.pycodestyle]

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/tests/conftest.py

@@ -21,10 +21,7 @@ def api_root_url() -> str:
 
 @pytest.fixture
 def api_anon_key() -> str:
-    return os.getenv(
-        "ECMWF_DATASTORES_ANON_KEY",
-        "00112233-4455-6677-c899-aabbccddeeff",  # gitleaks:allow
-    )
+    return os.getenv("ANONYMOUS_PAT", "00112233-4455-6677-c899-aabbccddeeff")
 
 
 @pytest.fixture

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/tests/integration_test_20_processing.py

@@ -73,3 +73,12 @@ def test_processing_get_jobs_sortby(api_anon_client: Client) -> None:
     ids = api_anon_client.get_jobs(sortby="-created").request_ids
     assert ids.index(id2) < ids.index(id1)
     assert [id2] != api_anon_client.get_jobs(sortby="created", limit=1).request_ids
+
+
+def test_processing_delete(api_anon_client: Client) -> None:
+    id1 = api_anon_client.submit("test-adaptor-dummy", {}).request_id
+    id2 = api_anon_client.submit("test-adaptor-dummy", {}).request_id
+    job1, job2 = api_anon_client.delete(id1, id2)["jobs"]
+    assert job1["status"] == job2["status"] == "dismissed"
+    assert job1["jobID"] == id1
+    assert job2["jobID"] == id2

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/tests/integration_test_40_results.py

@@ -2,11 +2,8 @@ from __future__ import annotations
 
 import contextlib
 import pathlib
-import random
-from typing import Any
 
 import pytest
-import requests
 
 from ecmwf.datastores import Client, Results
 
@@ -41,47 +38,6 @@ def test_results_progress(
     assert captured.err if progress else not captured.err
 
 
-@pytest.mark.parametrize(
-    "maximum_tries,raises",
-    [
-        (500, does_not_raise()),
-        (1, pytest.raises(requests.ConnectionError, match="Random error.")),
-    ],
-)
-def test_results_robust_download(
-    api_root_url: str,
-    api_anon_key: str,
-    monkeypatch: pytest.MonkeyPatch,
-    tmp_path: pathlib.Path,
-    maximum_tries: int,
-    raises: contextlib.nullcontext[Any],
-) -> None:
-    from multiurl.http import FullHTTPDownloader
-
-    def patched_iter_content(self, *args, **kwargs):  # type: ignore
-        for chunk in self.iter_content(chunk_size=1):
-            if random.choice([True, False]):
-                raise requests.ConnectionError("Random error.")
-            yield chunk
-
-    def make_stream(self):  # type: ignore
-        request = self.issue_request(self.range)
-        return request.patched_iter_content
-
-    client = Client(
-        url=api_root_url, key=api_anon_key, retry_after=0, maximum_tries=maximum_tries
-    )
-    results = client.submit_and_wait_on_results("test-adaptor-dummy", {"size": 10})
-    monkeypatch.setattr(
-        requests.Response, "patched_iter_content", patched_iter_content, raising=False
-    )
-    monkeypatch.setattr(FullHTTPDownloader, "make_stream", make_stream)
-
-    target = tmp_path / "test.grib"
-    with raises:
-        results.download(str(target))
-
-
 def test_results_override(api_anon_client: Client, tmp_path: pathlib.Path) -> None:
     target_1 = tmp_path / "tmp1.grib"
     api_anon_client.retrieve("test-adaptor-dummy", {"size": 1}, target=str(target_1))

ecmwf_datastores_client-0.2.0/tests/integration_test_60_api_client.py → ecmwf_datastores_client-0.4.0/tests/integration_test_60_client.py

@@ -9,7 +9,7 @@ from urllib3.exceptions import InsecureRequestWarning
 from ecmwf.datastores import Client, Remote, Results, processing
 
 
-def test_api_client_download_results(
+def test_client_download_results(
     api_anon_client: Client, tmp_path: pathlib.Path
 ) -> None:
     remote = api_anon_client.submit("test-adaptor-dummy", {})
@@ -20,27 +20,27 @@ def test_api_client_download_results(
     assert os.path.exists(result)
 
 
-def test_api_client_get_process(api_anon_client: Client) -> None:
+def test_client_get_process(api_anon_client: Client) -> None:
     process = api_anon_client.get_process("test-adaptor-dummy")
     assert isinstance(process, processing.Process)
     assert process.id == "test-adaptor-dummy"
     assert set(process.headers) == {"User-Agent", "PRIVATE-TOKEN"}
 
 
-def test_api_client_get_remote(api_anon_client: Client) -> None:
+def test_client_get_remote(api_anon_client: Client) -> None:
     request_id = api_anon_client.submit("test-adaptor-dummy", {}).request_id
     remote = api_anon_client.get_remote(request_id)
     assert remote.request_id == request_id
     assert set(remote.headers) == {"User-Agent", "PRIVATE-TOKEN"}
 
 
-def test_api_client_get_results(api_anon_client: Client) -> None:
+def test_client_get_results(api_anon_client: Client) -> None:
     request_id = api_anon_client.submit("test-adaptor-dummy", {}).request_id
     results = api_anon_client.get_results(request_id)
     assert isinstance(results, Results)
 
 
-def test_api_client_retrieve(
+def test_client_retrieve(
     api_anon_client: Client,
     tmp_path: pathlib.Path,
 ) -> None:
@@ -54,24 +54,24 @@ def test_api_client_retrieve(
     assert os.path.getsize(actual_target) == 1
 
 
-def test_api_client_submit(api_anon_client: Client) -> None:
+def test_client_submit(api_anon_client: Client) -> None:
     remote = api_anon_client.submit("test-adaptor-dummy", {})
     assert isinstance(remote, Remote)
 
 
-def test_api_client_submit_and_wait_on_results(api_anon_client: Client) -> None:
+def test_client_submit_and_wait_on_results(api_anon_client: Client) -> None:
     results = api_anon_client.submit_and_wait_on_results("test-adaptor-dummy", {})
     assert isinstance(results, Results)
 
 
-def test_api_client_verify(api_root_url: str, api_anon_key: str) -> None:
+def test_client_verify(api_root_url: str, api_anon_key: str) -> None:
     if not api_root_url.startswith("https"):
         pytest.skip(f"{api_root_url=} does not use https protocol")
     with pytest.warns(InsecureRequestWarning):
         Client(url=api_root_url, key=api_anon_key, verify=False, maximum_tries=0)
 
 
-def test_api_client_timeout(
+def test_client_timeout(
     api_root_url: str,
     api_anon_key: str,
     tmp_path: pathlib.Path,

ecmwf_datastores_client-0.2.0/tests/integration_test_70_legacy_api_client.py → ecmwf_datastores_client-0.4.0/tests/integration_test_70_legacy_client.py

@@ -29,7 +29,7 @@ def legacy_update(remote: processing.Remote) -> None:
             remote.update()
 
         reply = remote.reply
-        remote.info("Request ID: %s, state: %s" % (reply["request_id"], reply["state"]))
+        remote.info(f"Request ID: {reply['request_id']!s}, state: {reply['state']!s}")
 
         if reply["state"] == "completed":
             break
@@ -49,12 +49,11 @@ def legacy_update(remote: processing.Remote) -> None:
                     break
                 remote.error("  %s", n)
             raise Exception(
-                "%s. %s."
-                % (reply["error"].get("message"), reply["error"].get("reason"))
+                f"{reply['error'].get('message')!s}. {reply['error'].get('reason')!s}."
             )
 
 
-def test_legacy_api_client_retrieve(
+def test_legacy_client_retrieve(
     tmp_path: pathlib.Path, legacy_client: LegacyClient
 ) -> None:
     collection_id = "test-adaptor-dummy"
@@ -65,7 +64,7 @@ def test_legacy_api_client_retrieve(
     assert os.path.getsize(target) == 1
 
 
-def test_legacy_api_client_result(
+def test_legacy_client_result(
     monkeypatch: pytest.MonkeyPatch,
     tmp_path: pathlib.Path,
     legacy_client: LegacyClient,
@@ -92,7 +91,7 @@ def test_legacy_api_client_result(
 
 
 @pytest.mark.parametrize("quiet", [True, False])
-def test_legacy_api_client_quiet(
+def test_legacy_client_quiet(
     caplog: pytest.LogCaptureFixture,
     api_root_url: str,
     api_anon_key: str,
@@ -105,7 +104,7 @@ def test_legacy_api_client_quiet(
 
 
 @pytest.mark.parametrize("debug", [True, False])
-def test_legacy_api_client_debug(
+def test_legacy_client_debug(
     caplog: pytest.LogCaptureFixture,
     api_root_url: str,
     api_anon_key: str,
@@ -120,7 +119,7 @@ def test_legacy_api_client_debug(
     "wait_until_complete,expected_type",
     [(True, processing.Results), (False, processing.Remote)],
 )
-def test_legacy_api_client_wait_until_complete(
+def test_legacy_client_wait_until_complete(
     tmp_path: pathlib.Path,
     api_root_url: str,
     api_anon_key: str,
@@ -156,7 +155,7 @@ def test_legacy_api_client_wait_until_complete(
         ),
     ],
 )
-def test_legacy_api_client_update(
+def test_legacy_client_update(
     api_root_url: str,
     api_anon_key: str,
     collection_id: str,
@@ -173,7 +172,7 @@ def test_legacy_api_client_update(
 
 
 @pytest.mark.filterwarnings("ignore:Unverified HTTPS")
-def test_legacy_api_client_kwargs(api_root_url: str, api_anon_key: str) -> None:
+def test_legacy_client_kwargs(api_root_url: str, api_anon_key: str) -> None:
     session = requests.Session()
     client = LegacyClient(
         url=api_root_url,
@@ -198,7 +197,7 @@ def test_legacy_api_client_kwargs(api_root_url: str, api_anon_key: str) -> None:
     assert client.client.session is session
 
 
-def test_legacy_api_client_logging(
+def test_legacy_client_logging(
     caplog: pytest.LogCaptureFixture,
     api_root_url: str,
     api_anon_key: str,
@@ -226,7 +225,7 @@ def test_legacy_api_client_logging(
         ]
 
 
-def test_legacy_api_client_download(
+def test_legacy_client_download(
     tmp_path: pathlib.Path,
     monkeypatch: pytest.MonkeyPatch,
     api_root_url: str,
@@ -258,7 +257,7 @@ def test_legacy_api_client_download(
     assert all(os.path.getsize(target) == 1 for target in targets)
 
 
-def test_legacy_api_client_status(legacy_client: LegacyClient) -> None:
+def test_legacy_client_status(legacy_client: LegacyClient) -> None:
     status = legacy_client.status()
     assert set(status) <= {
         "critical",
@@ -277,7 +276,7 @@ def test_legacy_api_client_status(legacy_client: LegacyClient) -> None:
     )
 
 
-def test_legacy_api_client_remote(
+def test_legacy_client_remote(
     legacy_client: LegacyClient, tmp_path: pathlib.Path
 ) -> None:
     results = legacy_client.retrieve("test-adaptor-dummy", {"size": 1})
@@ -288,7 +287,7 @@ def test_legacy_api_client_remote(
     assert os.path.getsize(target) == 1
 
 
-def test_legacy_api_client_warning(
+def test_legacy_client_warning(
     api_root_url: str,
     api_anon_key: str,
 ) -> None:
@@ -305,7 +304,7 @@ def test_legacy_api_client_warning(
         )
 
 
-def test_legacy_api_client_toolbox(legacy_client: LegacyClient) -> None:
+def test_legacy_client_toolbox(legacy_client: LegacyClient) -> None:
     with pytest.raises(NotImplementedError):
         legacy_client.service("service")
     with pytest.raises(NotImplementedError):

{ecmwf_datastores_client-0.2.0 → ecmwf_datastores_client-0.4.0}/tests/test_20_processing.py

@@ -411,8 +411,12 @@ def test_wait_on_result(cat: catalogue.Catalogue) -> None:
     remote._wait_on_results()
 
 
+@pytest.mark.parametrize("status", ["failed", "rejected"])
 @responses.activate
-def test_wait_on_result_failed(cat: catalogue.Catalogue) -> None:
+def test_wait_on_result_failed(
+    cat: catalogue.Catalogue, status: str, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    monkeypatch.setitem(JOB_FAILED_JSON, "status", status)
     responses_add()
 
     collection = cat.get_collection(COLLECTION_ID)
@@ -424,6 +428,7 @@ def test_wait_on_result_failed(cat: catalogue.Catalogue) -> None:
     ):
         remote._wait_on_results()
 
+    assert remote.status == status
     assert remote.created_at.isoformat() == "2022-09-02T17:30:48.201213+00:00"
     assert remote.started_at is not None
     assert remote.started_at.isoformat() == "2022-09-02T17:32:43.890617+00:00"

ecmwf_datastores_client-0.4.0/tests/test_40_results.py

@@ -0,0 +1,143 @@
+from __future__ import annotations
+
+import contextlib
+import os
+import pathlib
+import random
+from typing import Any
+
+import pytest
+import pytest_httpbin.serve
+import requests
+import responses
+
+from ecmwf.datastores import Results
+
+does_not_raise = contextlib.nullcontext
+
+RESULTS_URL = "http://localhost:8080/api/retrieve/v1/jobs/9bfc1362-2832-48e1-a235-359267420bb2/results"
+
+
+@pytest.fixture
+def results_json(httpbin: pytest_httpbin.serve.Server) -> dict[str, Any]:
+    return {
+        "asset": {
+            "value": {
+                "type": "application/x-grib",
+                "href": f"{httpbin.url}/range/10",
+                "file:size": 10,
+            }
+        }
+    }
+
+
+@pytest.fixture
+@responses.activate
+def results(results_json: dict[str, Any]) -> Results:
+    responses.add(
+        responses.GET,
+        RESULTS_URL,
+        json=results_json,
+        status=200,
+        content_type="application/json",
+    )
+    return Results.from_request(
+        "get",
+        RESULTS_URL,
+        headers={},
+        session=None,
+        retry_options={"maximum_tries": 1, "retry_after": 0},
+        request_options={},
+        download_options={},
+        sleep_max=120,
+        cleanup=False,
+        log_callback=None,
+    )
+
+
+@pytest.mark.parametrize(
+    "target,expected",
+    [
+        ("dummy.grib", "dummy.grib"),
+        (None, "10"),
+    ],
+)
+def test_results_download(
+    monkeypatch: pytest.MonkeyPatch,
+    results: Results,
+    tmp_path: pathlib.Path,
+    target: str | None,
+    expected: str,
+) -> None:
+    monkeypatch.chdir(tmp_path)
+    actual = results.download(target=target)
+    assert actual == expected
+    assert os.path.getsize(actual) == 10
+
+
+def test_results_asset(httpbin: pytest_httpbin.serve.Server, results: Results) -> None:
+    assert results.asset == {
+        "file:size": 10,
+        "href": f"{httpbin.url}/range/10",
+        "type": "application/x-grib",
+    }
+
+
+def test_results_content_length(results: Results) -> None:
+    assert results.content_length == 10
+
+
+def test_results_content_type(results: Results) -> None:
+    assert results.content_type == "application/x-grib"
+
+
+def test_results_json(results: Results, results_json: dict[str, Any]) -> None:
+    assert results.json == results_json
+
+
+def test_results_location(
+    httpbin: pytest_httpbin.serve.Server, results: Results
+) -> None:
+    assert results.location == f"{httpbin.url}/range/10"
+
+
+def test_results_url(results: Results) -> None:
+    assert results.url == RESULTS_URL
+
+
+@pytest.mark.parametrize(
+    "maximum_tries,raises",
+    [
+        (500, does_not_raise()),
+        (1, pytest.raises(requests.ConnectionError, match="Random error.")),
+    ],
+)
+def test_results_robust_download(
+    results: Results,
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path: pathlib.Path,
+    maximum_tries: int,
+    raises: contextlib.nullcontext[Any],
+) -> None:
+    from multiurl.http import FullHTTPDownloader
+
+    def patched_iter_content(self, *args, **kwargs):  # type: ignore
+        for chunk in self.iter_content(chunk_size=1):
+            if random.choice([True, False]):
+                raise requests.ConnectionError("Random error.")
+            yield chunk
+
+    def make_stream(self):  # type: ignore
+        request = self.issue_request(self.range)
+        return request.patched_iter_content
+
+    monkeypatch.setattr(
+        requests.Response, "patched_iter_content", patched_iter_content, raising=False
+    )
+    monkeypatch.setattr(FullHTTPDownloader, "make_stream", make_stream)
+    monkeypatch.setitem(results.retry_options, "maximum_tries", maximum_tries)
+
+    target = tmp_path / "test.txt"
+    with raises:
+        results.download(str(target))
+        assert target.stat().st_size == 10

ecmwf_datastores_client-0.2.0/tests/test_40_results.py

@@ -1,92 +0,0 @@
-from __future__ import annotations
-
-import os
-import pathlib
-
-import pytest
-import responses
-
-from ecmwf.datastores import Results
-
-RESULTS_URL = "http://localhost:8080/api/retrieve/v1/jobs/9bfc1362-2832-48e1-a235-359267420bb2/results"
-RESULTS_JSON = {
-    "asset": {
-        "value": {
-            "type": "application/x-grib",
-            "href": "http://httpbin.org/bytes/1",
-            "file:size": 1,
-        }
-    }
-}
-
-
-@pytest.fixture
-@responses.activate
-def results() -> Results:
-    responses.add(
-        responses.GET,
-        RESULTS_URL,
-        json=RESULTS_JSON,
-        status=200,
-        content_type="application/json",
-    )
-    return Results.from_request(
-        "get",
-        RESULTS_URL,
-        headers={},
-        session=None,
-        retry_options={"maximum_tries": 1},
-        request_options={},
-        download_options={},
-        sleep_max=120,
-        cleanup=False,
-        log_callback=None,
-    )
-
-
-@pytest.mark.parametrize(
-    "target,expected",
-    [
-        ("dummy.grib", "dummy.grib"),
-        (None, "1"),
-    ],
-)
-def test_results_download(
-    monkeypatch: pytest.MonkeyPatch,
-    results: Results,
-    tmp_path: pathlib.Path,
-    target: str | None,
-    expected: str,
-) -> None:
-    monkeypatch.chdir(tmp_path)
-    actual = results.download(target=target)
-    assert actual == expected
-    assert os.path.getsize(actual) == 1
-
-
-def test_results_asset(results: Results) -> None:
-    assert results.asset == {
-        "file:size": 1,
-        "href": "http://httpbin.org/bytes/1",
-        "type": "application/x-grib",
-    }
-
-
-def test_results_content_length(results: Results) -> None:
-    assert results.content_length == 1
-
-
-def test_results_content_type(results: Results) -> None:
-    assert results.content_type == "application/x-grib"
-
-
-def test_results_json(results: Results) -> None:
-    assert results.json == RESULTS_JSON
-
-
-def test_results_location(results: Results) -> None:
-    assert results.location == "http://httpbin.org/bytes/1"
-
-
-def test_results_url(results: Results) -> None:
-    assert results.url == RESULTS_URL