Merge pull request #187 from ecmwf-projects/COPDS-1717-constraints-enforcing

Implement constraints enforcing

Author: mcucchi9

cads_processing_api_service/clients.py

@@ -223,6 +223,14 @@ def post_process_execution(
             request_inputs = adaptor.normalise_request(request.get("inputs", {}))
         except cads_adaptors.exceptions.InvalidRequest as exc:
             raise exceptions.InvalidRequest(detail=str(exc)) from exc
+        if dataset.api_enforce_constraints:
+            try:
+                _ = adaptor.apply_constraints(request_inputs)
+            except (
+                cads_adaptors.exceptions.ParameterError,
+                cads_adaptors.exceptions.InvalidRequest,
+            ) as exc:
+                raise exceptions.InvalidRequest(detail=str(exc)) from exc
         auth.verify_cost(request_inputs, adaptor_properties)
         licences = adaptor.get_licences(request_inputs)
         auth.validate_licences(accepted_licences, licences)

cads_processing_api_service/constraints.py

@@ -2,16 +2,18 @@
 
 import cads_adaptors
 import cads_adaptors.constraints
+import cads_adaptors.exceptions
 import cads_catalogue
 import fastapi
 
-from . import adaptors, db_utils, exceptions, utils
+from . import adaptors, db_utils, exceptions, models, utils
 
 
 def apply_constraints(
     process_id: str = fastapi.Path(...),
-    request: dict[str, Any] = fastapi.Body(...),
+    execution_content: models.Execute = fastapi.Body(...),
 ) -> dict[str, Any]:
+    request = execution_content.model_dump()
     table = cads_catalogue.database.Resource
     catalogue_sessionmaker = db_utils.get_catalogue_sessionmaker(
         db_utils.ConnectionMode.read
@@ -22,8 +24,13 @@ def apply_constraints(
         )
     adaptor: cads_adaptors.AbstractAdaptor = adaptors.instantiate_adaptor(dataset)
     try:
-        constraints: dict[str, Any] = adaptor.apply_constraints(request=request)
-    except cads_adaptors.constraints.ParameterError as exc:
-        raise exceptions.InvalidParameter(detail=str(exc))
+        constraints: dict[str, Any] = adaptor.apply_constraints(
+            request.get("inputs", {})
+        )
+    except (
+        cads_adaptors.exceptions.ParameterError,
+        cads_adaptors.exceptions.InvalidRequest,
+    ) as exc:
+        raise exceptions.InvalidParameter(detail=str(exc)) from exc
 
     return constraints

cads_processing_api_service/costing.py

@@ -25,8 +25,9 @@
 
 def estimate_costs(
     process_id: str = fastapi.Path(...),
-    request: models.Execute = fastapi.Body(...),
+    execution_content: models.Execute = fastapi.Body(...),
 ) -> models.Costing:
+    request = execution_content.model_dump()
     table = cads_catalogue.database.Resource
     catalogue_sessionmaker = db_utils.get_catalogue_sessionmaker(
         db_utils.ConnectionMode.read
@@ -37,7 +38,7 @@ def estimate_costs(
         )
     adaptor_properties = adaptors.get_adaptor_properties(dataset)
     costing_info = costing.compute_costing(
-        request.model_dump()["inputs"], adaptor_properties
+        request.get("inputs", {}), adaptor_properties
     )
     return costing_info