Merge pull request #205 from ecmwf-projects/fix-deleted-requests

Fix issue with get jobs and deleted requests
ecmwf-projects · Aug 29, 2024 · 4960972 · 4960972
2 parents 926020d + 4d198bb
commit 4960972
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/cads_processing_api_service/clients.py b/cads_processing_api_service/clients.py
@@ -279,9 +279,14 @@ def post_process_execution(
     def get_jobs(
         self,
         processID: list[str] | None = fastapi.Query(None),
-        status: (
-            list[ogc_api_processes_fastapi.models.StatusCode] | None
-        ) = fastapi.Query(None),
+        status: list[models.StatusCode] | None = fastapi.Query(
+            [
+                ogc_api_processes_fastapi.models.StatusCode.accepted,
+                ogc_api_processes_fastapi.models.StatusCode.running,
+                ogc_api_processes_fastapi.models.StatusCode.successful,
+                ogc_api_processes_fastapi.models.StatusCode.failed,
+            ]
+        ),
         limit: int | None = fastapi.Query(10, ge=1, le=10000),
         sortby: utils.JobSortCriterion | None = fastapi.Query(
             utils.JobSortCriterion.created_at_desc

diff --git a/cads_processing_api_service/models.py b/cads_processing_api_service/models.py
@@ -15,12 +15,20 @@
 # limitations under the License
 
 import datetime
+import enum
 from typing import Any
 
 import ogc_api_processes_fastapi.models
 import pydantic
 
 
+class StatusCode(str, enum.Enum):
+    accepted: str = "accepted"
+    running: str = "running"
+    successful: str = "successful"
+    failed: str = "failed"
+
+
 class StatusInfoMetadata(pydantic.BaseModel):
     request: dict[str, Any] | None = None
     results: dict[str, Any] | None = None

diff --git a/cads_processing_api_service/serializers.py b/cads_processing_api_service/serializers.py
@@ -70,7 +70,7 @@ def serialize_process_description(
     cds_form = db_model.resource_data.form_data  # type: ignore
     process_inputs = {}
     if cds_form:
-        process_inputs = translators.translate_cds_form(cds_form)  # type: ignore
+        process_inputs = translators.translate_cds_form(cds_form)
     retval = ogc_api_processes_fastapi.models.ProcessDescription(
         **process_summary.model_dump(),
         inputs=process_inputs,

diff --git a/cads_processing_api_service/utils.py b/cads_processing_api_service/utils.py
@@ -232,7 +232,6 @@ def apply_job_filters(
             statement = statement.where(
                 getattr(resource, filter_key).in_(filter_values)
             )
-    statement = statement.where(resource.status != "dismissed")
     return statement
 
 

diff --git a/tests/test_30_utils.py b/tests/test_30_utils.py
@@ -96,7 +96,6 @@ def test_apply_job_filters() -> None:
     exp_params = {
         "process_id_1": ["process"],
         "status_1": ["successful", "failed"],
-        "status_2": "dismissed",
     }
     exp_substatement = (
         "WHERE system_requests.process_id IN (__[POSTCOMPILE_process_id_1]) "