fix(plugins): dedl required queryables (#2241)

Author: cauriol

eodag/plugins/search/qssearch.py

@@ -2279,7 +2279,9 @@ def discover_queryables(
                 # convert provider json field definition to python
                 default = kwargs.get(param, json_mtd.get("default"))
                 annotated_def = json_field_definition_to_python(
-                    json_mtd, default_value=default
+                    json_mtd,
+                    default_value=default,
+                    required=json_param in resp_as_json.get("required", []),
                 )
                 field_definition = get_args(annotated_def)
 

eodag/types/__init__.py

@@ -252,15 +252,10 @@ def json_field_definition_to_python(
     else:
         field_default = default_value
 
-    metadata = [
-        python_type,
-        Field(field_default, **field_type_kwargs),
-    ]
-
+    field = Field(field_default, **field_type_kwargs)
     if required:
-        metadata.append("json_schema_required")
-
-    return Annotated[tuple(metadata)]
+        field.metadata.append("json_schema_required")
+    return Annotated[python_type, field]
 
 
 def python_field_definition_to_json(

tests/units/test_search_plugins.py

@@ -2436,12 +2436,14 @@ def test_plugins_search_dedl_discover_queryables(self, mock_request):
         self.assertEqual(get_origin(base_type), list)
         literal_args = get_args(base_type)
         self.assertEqual(literal_args, (Literal["00:00"],))
+        self.assertIn("json_schema_required", args[1].metadata)
 
         # Check that "start" has type Annotated[str, ...]
         self.assertIn("start", queryables_dedl)
         annotated_type = queryables_dedl["start"]
         args = get_args(annotated_type)
         self.assertEqual(args[0], str)
+        self.assertNotIn("json_schema_required", args[1].metadata)
 
         # Check that "geom" has type Annotated[Union[str, dict[str, float], BaseGeometry], ...]
         self.assertIn("geom", queryables_dedl)
@@ -2459,6 +2461,14 @@ def test_plugins_search_dedl_discover_queryables(self, mock_request):
                 if isinstance(arg, type)
             )
         )
+        self.assertTrue(args[1].is_required())
+
+        # Check that "bbox" has type fieldInfo with "required": "True" and json_schema_required in metadata
+        self.assertIn("bbox", queryables_dedl)
+        annotated_type = queryables_dedl["bbox"]
+        args = get_args(annotated_type)
+        self.assertTrue(args[1].is_required())
+        self.assertIn("json_schema_required", args[1].metadata)
 
     @mock.patch(
         "eodag.plugins.search.qssearch.QueryStringSearch._request", autospec=True