issue693 replace default by unset and combine enum options

Author: ElienVandermaesenVITO

openeo/internal/processes/parse.py

@@ -5,6 +5,7 @@
 
 from __future__ import annotations
 
+import copy
 import json
 import re
 import typing
@@ -49,9 +50,9 @@ def get_enum_options(self):
             for item in self.schema:
                 if "enum" in item:
                     if result is None:
-                        result = item["enum"]
+                        result = copy.deepcopy(item["enum"])
                     else:
-                        raise ValueError("Multiple entries found for enum options.")
+                        result += item["enum"]
         elif isinstance(self.schema,dict):
             if "enum" in self.schema:
                 result = self.schema["enum"]

openeo/rest/datacube.py

@@ -2726,7 +2726,7 @@ def ard_normalized_radar_backscatter(
     @openeo_process
     def sar_backscatter(
         self,
-        coefficient: Union[str, None] = "default",
+        coefficient: Union[str, None] = _UNSET,
         elevation_model: Union[str, None] = None,
         mask: bool = False,
         contributing_area: bool = False,
@@ -2774,7 +2774,7 @@ def sar_backscatter(
             )
             schema = parameter.schema
             coefficient_options = schema.get_enum_options() + [None]
-            if coefficient == "default":
+            if coefficient == _UNSET:
                 coefficient = parameter.default
         except Exception as e:
             log.warning(f"Failed to extract coefficient options for process `sar_backscatter`: {e}")
@@ -2786,7 +2786,7 @@ def sar_backscatter(
                 "gamma0-terrain",
                 None,
             ]
-            if coefficient == "default":
+            if coefficient == _UNSET:
                 coefficient = "gamma0-terrain"
         if coefficient not in coefficient_options:
             raise OpenEoClientException("Invalid `sar_backscatter` coefficient {c!r}. Should be one of {o}".format(

tests/internal/processes/test_parse.py

@@ -63,24 +63,21 @@ def test_schema_accepts_geojson(schema, expected):
             Schema([{"type": "string", "enum": ["replicate", "reflect", "reflect_pixel", "wrap"]}, {"type": "number"}]),
             ["replicate", "reflect", "reflect_pixel", "wrap"],
         ),
+        (
+            Schema(
+                [
+                    {"type": "string", "enum": ["replicate", "reflect"]},
+                    {"type": "number", "enum": ["reflect_pixel", "wrap"]},
+                ]
+            ),
+            ["replicate", "reflect", "reflect_pixel", "wrap"],
+        ),
     ],
 )
 def test_get_enum_options(schema, expected):
-    schema.get_enum_options()
     assert schema.get_enum_options() == expected
 
 
-def test_get_enum_options_error():
-    schema = Schema(
-        [
-            {"type": "string", "enum": ["replicate", "reflect", "reflect_pixel", "wrap"]},
-            {"type": "number", "enum": ["replicate", "reflect", "reflect_pixel", "wrap"]},
-        ]
-    )
-    with pytest.raises(ValueError):
-        schema.get_enum_options()
-
-
 def test_parameter():
     p = Parameter.from_dict({
         "name": "foo",