Merge pull request #186 from ecmwf-projects/COPDS-1706-normalise-request-exceptions

Implement exception handling for normalise_request

Author: mcucchi9

cads_processing_api_service/clients.py

@@ -21,6 +21,7 @@
 
 import attrs
 import cacholote.extra_encoders
+import cads_adaptors.exceptions
 import cads_broker.database
 import cads_catalogue.config
 import cads_catalogue.database
@@ -37,7 +38,17 @@
 import sqlalchemy.sql.selectable
 import structlog
 
-from . import adaptors, auth, config, db_utils, models, serializers, translators, utils
+from . import (
+    adaptors,
+    auth,
+    config,
+    db_utils,
+    exceptions,
+    models,
+    serializers,
+    translators,
+    utils,
+)
 from .metrics import handle_download_metrics
 
 logger: structlog.stdlib.BoundLogger = structlog.get_logger(__name__)
@@ -208,7 +219,10 @@ def post_process_execution(
         auth.verify_if_disabled(dataset.disabled_reason, user_role)
         adaptor_properties = adaptors.get_adaptor_properties(dataset)
         adaptor = adaptors.instantiate_adaptor(adaptor_properties=adaptor_properties)
-        request_inputs = adaptor.normalise_request(request.get("inputs", {}))
+        try:
+            request_inputs = adaptor.normalise_request(request.get("inputs", {}))
+        except 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/exceptions.py

@@ -48,6 +48,13 @@ class JobResultsExpired(ogc_api_processes_fastapi.exceptions.OGCAPIException):
     title: str = "results expired"
 
 
+@attrs.define
+class InvalidRequest(ogc_api_processes_fastapi.exceptions.OGCAPIException):
+    type: str = "invalid request"
+    status_code: int = fastapi.status.HTTP_400_BAD_REQUEST
+    title: str = "invalid request"
+
+
 def format_exception_content(
     exc: ogc_api_processes_fastapi.exceptions.OGCAPIException,
     request: fastapi.Request | None = None,
@@ -188,6 +195,7 @@ def include_exception_handlers(app: fastapi.FastAPI) -> fastapi.FastAPI:
     """
     app.add_exception_handler(PermissionDenied, exception_handler)  # type: ignore
     app.add_exception_handler(InvalidParameter, exception_handler)  # type: ignore
+    app.add_exception_handler(InvalidRequest, exception_handler)  # type: ignore
     app.add_exception_handler(JobResultsExpired, exception_handler)  # type: ignore
     app.add_exception_handler(requests.exceptions.ReadTimeout, exception_handler)  # type: ignore
     app.add_exception_handler(Exception, general_exception_handler)

cads_processing_api_service/utils.py

@@ -152,7 +152,7 @@ def get_resource_properties(
     if isinstance(properties, str):
         properties = (properties,)
     properties_values = tuple(getattr(table, property) for property in properties)
-    statement = sa.select(*properties_values).filter(table.resource_uid == resource_id)  # type: ignore
+    statement = sa.select(*properties_values).filter(table.resource_uid == resource_id)
     try:
         resource_properties = tuple(session.execute(statement).one())
     except sqlalchemy.exc.NoResultFound: