ecmwf-datastores-client 0.2.0__py3-none-any.whl → 0.4.0__py3-none-any.whl

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/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/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.dist-info → ecmwf_datastores_client-0.4.0.dist-info}/METADATA

@@ -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.dist-info → ecmwf_datastores_client-0.4.0.dist-info}/RECORD

@@ -1,15 +1,15 @@
 ecmwf/datastores/__init__.py,sha256=RQ5WNfEjLQ1qlZxyvGv3S6zPcFO35UcgN4iiz_Uh06I,1243
 ecmwf/datastores/catalogue.py,sha256=I-ON4lxI13Y5dR7joU1qeQrWTxYBQMFGYoOrLa2oLic,6257
-ecmwf/datastores/client.py,sha256=x0NGrtuVtlS3VmKzAkwUpnhvZAlz0zfL2nmzGsduUFM,12643
+ecmwf/datastores/client.py,sha256=bCXSb1q3T-kX7csOshi4z6qU54s8JrczPVbEPxa_UiA,13053
 ecmwf/datastores/config.py,sha256=45C4nvgk-uGucCAnN3bUtr_zv-_dm8IN_P5xl7LPqfs,1497
 ecmwf/datastores/legacy_client.py,sha256=UEkQNg9IA_zNnpZrc4I9O2X2h39NsaxYM0xpL2OKghA,9491
-ecmwf/datastores/processing.py,sha256=38rlgPnvQNfiyYxwa8NYU6er-qxDpofpp7_ppBwoPLM,21818
+ecmwf/datastores/processing.py,sha256=KDV2rwNdWZHaXNqorSO-BRg8fuqxv5or3Z8s4-rDSYY,22204
 ecmwf/datastores/profile.py,sha256=VjT6GSoSZZyaDHXZh0SQbrzxSX3Ug2DOWhq7VIu-QX8,2974
 ecmwf/datastores/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ecmwf/datastores/utils.py,sha256=fc6wma5qRpgAsX3dOmg0aoIc-qjWG6NY9PSHaWR8CpE,320
-ecmwf/datastores/version.py,sha256=Q6rYkA2w2NAZ1iqPYZyyi7rZkL-vTkoYSpVO5Rjzg4Q,72
-ecmwf_datastores_client-0.2.0.dist-info/licenses/LICENSE,sha256=e2Qp4JUZeHZZSYCADyp1B3siZB5aQE5MRCYRx7vqlNI,11346
-ecmwf_datastores_client-0.2.0.dist-info/METADATA,sha256=aL7FTRC3JA7guD1cnprBGKb1TaV7ZLK1GzPdXpKR6EE,21463
-ecmwf_datastores_client-0.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-ecmwf_datastores_client-0.2.0.dist-info/top_level.txt,sha256=gvA9-Z3hRaFzijz-mf8v2t84s25ptpWeqhyuUomJoJk,6
-ecmwf_datastores_client-0.2.0.dist-info/RECORD,,
+ecmwf/datastores/version.py,sha256=-UXII43tJWWG-Bw3-ObfEfbloOAVS2Clozd55E6zYvA,72
+ecmwf_datastores_client-0.4.0.dist-info/licenses/LICENSE,sha256=e2Qp4JUZeHZZSYCADyp1B3siZB5aQE5MRCYRx7vqlNI,11346
+ecmwf_datastores_client-0.4.0.dist-info/METADATA,sha256=6WXpiRL6szWCjZn8rHWa4OJkhhe0rAKXy_qZZioT64I,21418
+ecmwf_datastores_client-0.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+ecmwf_datastores_client-0.4.0.dist-info/top_level.txt,sha256=gvA9-Z3hRaFzijz-mf8v2t84s25ptpWeqhyuUomJoJk,6
+ecmwf_datastores_client-0.4.0.dist-info/RECORD,,