issue693 use default option from backend in datacube.sar_backscatter

Author: ElienVandermaesenVITO

openeo/internal/processes/parse.py

@@ -43,18 +43,18 @@ def is_geojson_schema(schema) -> bool:
             return any(is_geojson_schema(s) for s in self.schema)
         return False
 
-    def get_enum_options(self,name):
+    def get_enum_options(self):
         result = None
         if isinstance(self.schema,list):
             for item in self.schema:
-                if name in item:
+                if "enum" in item:
                     if result is None:
-                        result = item[name]
+                        result = item["enum"]
                     else:
-                        raise ValueError("Multiple entries found with name {v}.".format(v=name))
+                        raise ValueError("Multiple entries found for enum options.")
         elif isinstance(self.schema,dict):
-            if name in self.schema:
-                result = self.schema[name]
+            if "enum" in self.schema:
+                result = self.schema["enum"]
         return result
 
 

openeo/rest/datacube.py

@@ -2725,15 +2725,15 @@ def ard_normalized_radar_backscatter(
 
     @openeo_process
     def sar_backscatter(
-            self,
-            coefficient: Union[str, None] = "gamma0-terrain",
-            elevation_model: Union[str, None] = None,
-            mask: bool = False,
-            contributing_area: bool = False,
-            local_incidence_angle: bool = False,
-            ellipsoid_incidence_angle: bool = False,
-            noise_removal: bool = True,
-            options: Optional[dict] = None
+        self,
+        coefficient: Union[str, None] = "default",
+        elevation_model: Union[str, None] = None,
+        mask: bool = False,
+        contributing_area: bool = False,
+        local_incidence_angle: bool = False,
+        ellipsoid_incidence_angle: bool = False,
+        noise_removal: bool = True,
+        options: Optional[dict] = None,
     ) -> DataCube:
         """
         Computes backscatter from SAR input.
@@ -2769,8 +2769,13 @@ def sar_backscatter(
         .. versionchanged:: 0.4.10 replace `orthorectify` and `rtc` arguments with `coefficient`.
         """
         try:
-            schema = Process.from_dict(self.connection.describe_process("sar_backscatter")).get_parameter("coefficient").schema
-            coefficient_options = schema.get_enum_options("enum") + [None]
+            parameter = Process.from_dict(self.connection.describe_process("sar_backscatter")).get_parameter(
+                "coefficient"
+            )
+            schema = parameter.schema
+            coefficient_options = schema.get_enum_options() + [None]
+            if coefficient == "default":
+                coefficient = parameter.default
         except Exception as e:
             log.warning(f"Failed to extract coefficient options for process `sar_backscatter`: {e}")
             coefficient_options = [
@@ -2781,6 +2786,8 @@ def sar_backscatter(
                 "gamma0-terrain",
                 None,
             ]
+            if coefficient == "default":
+                coefficient = "gamma0-terrain"
         if coefficient not in coefficient_options:
             raise OpenEoClientException("Invalid `sar_backscatter` coefficient {c!r}. Should be one of {o}".format(
                 c=coefficient, o=coefficient_options

tests/internal/processes/test_parse.py

@@ -37,32 +37,48 @@ def test_schema_accepts_geojson(schema, expected):
 
 
 @pytest.mark.parametrize(
-        "schema",
+    ("schema", "expected"),
+    [
+        (
+            Schema(
+                {
+                    "type": "string",
+                    "enum": [
+                        "average",
+                        "bilinear",
+                        "cubic",
+                        "cubicspline",
+                        "lanczos",
+                        "max",
+                        "med",
+                        "min",
+                        "mode",
+                        "near",
+                    ],
+                }
+            ),
+            ["average", "bilinear", "cubic", "cubicspline", "lanczos", "max", "med", "min", "mode", "near"],
+        ),
+        (
+            Schema([{"type": "string", "enum": ["replicate", "reflect", "reflect_pixel", "wrap"]}, {"type": "number"}]),
+            ["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(
         [
-            Schema([
-                {"x1": "y1"},
-                {"x2": "y2"},
-                {"x3": "y3"},
-                {"x5": "y3"},
-            ]),
-            Schema({"x1":"y1","x2":"y2","x3": "y3","x5": "y3"})
-        ],
+            {"type": "string", "enum": ["replicate", "reflect", "reflect_pixel", "wrap"]},
+            {"type": "number", "enum": ["replicate", "reflect", "reflect_pixel", "wrap"]},
+        ]
     )
-@pytest.mark.parametrize(("key", "expected"), [("x1", "y1"), ("x2", "y2"), ("x4", None)])
-def test_get_enum_options(schema, key, expected):
-    assert schema.get_enum_options(key) == expected
-
-@pytest.mark.parametrize("key",["x2","x3",])
-def test_get_enum_options_error(key):
-    schema = Schema([
-                {"x1": "y1"},
-                {"x2": "y2"},
-                {"x3": "y3"},
-                {"x3": "y4"},
-                {"x2": "y1"},
-            ])
     with pytest.raises(ValueError):
-        schema.get_enum_options(key)
+        schema.get_enum_options()
 
 
 def test_parameter():

tests/rest/datacube/test_datacube100.py

@@ -2837,7 +2837,7 @@ def test_sar_backscatter_check_coefficient_backend(con100, requests_mock):
             "summary": "Computes backscatter from SAR input",
             "parameters": [
                 {
-                    "default": "gamma0-terrain",
+                    "default": "gamma0-ellipsoid",
                     "description": "Select the radiometric correction coefficient.",
                     "name": "coefficient",
                     "schema": [
@@ -2863,7 +2863,7 @@ def test_sar_backscatter_check_coefficient_backend(con100, requests_mock):
         "process_id": "sar_backscatter",
         "arguments": {
             "data": {"from_node": "loadcollection1"},
-            "coefficient": "gamma0-terrain",
+            "coefficient": "gamma0-ellipsoid",
             "elevation_model": None,
             "mask": False,
             "contributing_area": False,