Use FormatUnsuitable instead of FileTypeInvalid

Open-EO/openeo-api#505

Author: soxofaan

openeo_driver/ProcessGraphDeserializer.py

@@ -45,9 +45,15 @@
 from openeo_driver.datastructs import SarBackscatterArgs, ResolutionMergeArgs
 from openeo_driver.delayed_vector import DelayedVector
 from openeo_driver.dry_run import DryRunDataTracer, SourceConstraint
-from openeo_driver.errors import ProcessParameterRequiredException, ProcessParameterInvalidException, \
-    FeatureUnsupportedException, OpenEOApiException, ProcessGraphInvalidException, FileTypeInvalidException, \
-    ProcessUnsupportedException, CollectionNotFoundException
+from openeo_driver.errors import (
+    ProcessParameterRequiredException,
+    ProcessParameterInvalidException,
+    FeatureUnsupportedException,
+    OpenEOApiException,
+    ProcessGraphInvalidException,
+    ProcessUnsupportedException,
+    CollectionNotFoundException,
+)
 from openeo_driver.processes import ProcessRegistry, ProcessSpec, DEFAULT_NAMESPACE, ProcessArgs
 from openeo_driver.save_result import JSONResult, SaveResult, AggregatePolygonResult, NullResult, \
     to_save_result, AggregatePolygonSpatialResult, MlModelResult

openeo_driver/processes.py

@@ -6,7 +6,6 @@
 from typing import Any, Callable, Collection, Dict, List, Optional, Tuple, Union
 
 from openeo_driver.errors import (
-    FileTypeInvalidException,
     OpenEOApiException,
     ProcessParameterInvalidException,
     ProcessParameterRequiredException,
@@ -458,7 +457,11 @@ def validator_file_format(formats: Union[List[str], Dict[str, dict]]):
 
         def validator(value: str):
             if value.lower() not in options:
-                raise FileTypeInvalidException(type=value, types=", ".join(formats))
+                raise OpenEOApiException(
+                    message=f"Invalid file format {value!r}. Allowed formats: {', '.join(formats)}",
+                    code="FormatUnsuitable",
+                    status_code=400,
+                )
             return True
 
         return validator

openeo_driver/util/ioformats.py

@@ -4,8 +4,6 @@
 """
 from typing import Optional, Iterable, Dict
 
-from openeo_driver.errors import FileTypeInvalidException
-
 
 class FormatInfo:
     """Simple container of input/output format information: format code, mimetype, ..."""

tests/test_processes.py

@@ -5,6 +5,7 @@
 from openeo_driver.datacube import DriverDataCube
 from openeo_driver.errors import (
     FileTypeInvalidException,
+    OpenEOApiException,
     ProcessParameterInvalidException,
     ProcessParameterRequiredException,
     ProcessUnsupportedException,
@@ -656,7 +657,9 @@ def test_validator_file_format(self, formats):
         assert args.get_required("format2", validator=validator) == "geojson"
 
         with pytest.raises(
-            FileTypeInvalidException,
-            match=re.escape("File format TooExotic not allowed. Allowed file formats: GeoJSON, CSV"),
-        ):
+            OpenEOApiException,
+            match=re.escape("Invalid file format 'TooExotic'. Allowed formats: GeoJSON, CSV"),
+        ) as exc_info:
             _ = args.get_required("format3", validator=validator)
+
+        assert exc_info.value.code == "FormatUnsuitable"