Merge pull request #232 from ecmwf-projects/COPDS-2318-fix-processes-response

Fix get processes bugs

Author: mcucchi9

cads_processing_api_service/translators.py

@@ -71,21 +71,29 @@ def translate_string_list_array(
 
 def translate_string_choice(input_cds_schema: dict[str, Any]) -> dict[str, Any]:
     labels = extract_labels(input_cds_schema)
+    default = input_cds_schema["details"].get("default", None)
+    if type(default) is not str:
+        if type(default) is list:
+            default = default[0]
     input_ogc_schema = {
         "type": "string",
         "enum": list(labels.keys()),
-        "default": input_cds_schema["details"].get("default", None),
+        "default": default,
     }
     return input_ogc_schema
 
 
 def translate_geographic_extent_map(input_cds_schema: dict[str, Any]) -> dict[str, Any]:
+    default = input_cds_schema["details"].get("default", None)
+    if type(default) is not list:
+        if type(default) is dict and "e" in default:
+            default = [default["n"], default["w"], default["s"], default["e"]]
     input_ogc_schema = {
         "type": "array",
         "minItems": 4,
         "maxItems": 4,
         "items": {"type": "number"},
-        "default": input_cds_schema["details"].get("default", None),
+        "default": default,
     }
     return input_ogc_schema
 

tests/test_10_translators.py

@@ -47,12 +47,27 @@
         },
         "type": "StringChoiceWidget",
     },
+    "string_choice_default_list": {
+        "name": "string_choice",
+        "label": "String Choice",
+        "details": {
+            "labels": {"val1": "Val1", "val2": "Val2", "val3": "Val3"},
+            "default": ["val1"],
+        },
+        "type": "StringChoiceWidget",
+    },
     "geographic_extent_map": {
         "name": "geographic_extent_map",
         "label": "Geographic Extent Map",
         "details": {"default": [1, 2, 3, 4]},
         "type": "GeographicExtentMapWidget",
     },
+    "geographic_extent_map_default_dict": {
+        "name": "geographic_extent_map",
+        "label": "Geographic Extent Map",
+        "details": {"default": {"n": 1, "w": 2, "s": 3, "e": 4}},
+        "type": "GeographicExtentMapWidget",
+    },
     "geographic_location": {
         "name": "geographic_location",
         "label": "Geographic Location",
@@ -194,6 +209,11 @@ def test_translate_string_choice() -> None:
     res_output = translators.translate_string_choice(test_input)
     assert res_output == exp_ouput
 
+    test_input = TEST_INPUT_CDS_SCHEMAS["string_choice_default_list"]
+    exp_ouput = {"type": "string", "enum": ["val1", "val2", "val3"], "default": "val1"}
+    res_output = translators.translate_string_choice(test_input)
+    assert res_output == exp_ouput
+
 
 def test_translate_geographic_extent_map() -> None:
     test_input = TEST_INPUT_CDS_SCHEMAS["geographic_extent_map"]
@@ -207,6 +227,17 @@ def test_translate_geographic_extent_map() -> None:
     res_output = translators.translate_geographic_extent_map(test_input)
     assert res_output == exp_ouput
 
+    test_input = TEST_INPUT_CDS_SCHEMAS["geographic_extent_map_default_dict"]
+    exp_ouput = {
+        "type": "array",
+        "minItems": 4,
+        "maxItems": 4,
+        "items": {"type": "number"},
+        "default": [1, 2, 3, 4],
+    }
+    res_output = translators.translate_geographic_extent_map(test_input)
+    assert res_output == exp_ouput
+
 
 def test_make_request_labels() -> None:
     test_input_value_ids = ["1", "1", "1", "1"]