eodag 3.4.1.post1__py3-none-any.whl → 3.4.2__py3-none-any.whl

eodag/api/product/metadata_mapping.py

@@ -49,6 +49,7 @@ from eodag.utils import (
     get_timestamp,
     items_recursive_apply,
     nested_pairs2dict,
+    remove_str_array_quotes,
     sanitize,
     string_to_jsonpath,
     update_nested_dict,
@@ -1317,6 +1318,10 @@ def format_query_params(
                     # retrieve values from hashes where keys are given in the param
                     if "}[" in formatted_query_param:
                         formatted_query_param = _resolve_hashes(formatted_query_param)
+                    # remove quotes around arrays
+                    formatted_query_param = remove_str_array_quotes(
+                        formatted_query_param
+                    )
                     # json query string (for POST request)
                     update_nested_dict(
                         query_params,

eodag/plugins/search/base.py

@@ -369,6 +369,9 @@ class Search(PluginTopic):
             if not product_type
             else ""
         )
+        discover_metadata = getattr(self.config, "discover_metadata", {})
+        auto_discovery = discover_metadata.get("auto_discovery", False)
+
         if product_type or getattr(self.config, "discover_queryables", {}).get(
             "fetch_url", ""
         ):
@@ -376,6 +379,7 @@ class Search(PluginTopic):
                 self.config.product_type_config = product_type_configs[product_type]
             queryables = self._get_product_type_queryables(product_type, alias, filters)
             queryables.additional_information = additional_info
+            queryables.additional_properties = auto_discovery
 
             return queryables
         else:
@@ -390,7 +394,7 @@ class Search(PluginTopic):
                     Queryables.model_fields.get(k, Field(None)), "default", None
                 )
             return QueryablesDict(
-                additional_properties=True,
+                additional_properties=auto_discovery,
                 additional_information=additional_info,
                 **all_queryables,
             )

eodag/plugins/search/build_search_result.py

@@ -470,7 +470,7 @@ class ECMWFSearch(PostJsonSearch):
         self.config.__dict__.setdefault(
             "discover_metadata",
             {
-                "auto_discovery": True,
+                "auto_discovery": False,
                 "search_param": "{metadata}",
                 "metadata_pattern": "^[a-zA-Z0-9][a-zA-Z0-9_]*$",
             },
@@ -1179,6 +1179,9 @@ class ECMWFSearch(PostJsonSearch):
                 + "_ORDERABLE_"
                 + query_hash
             )
+            # use product_type_config as default properties
+            product_type_config = getattr(self.config, "product_type_config", {})
+            properties = dict(product_type_config, **properties)
 
         qs = geojson.dumps(sorted_unpaginated_qp)
 
@@ -1222,6 +1225,9 @@ def _check_id(product: EOProduct) -> EOProduct:
     if not (product_id := product.search_kwargs.get("id")):
         return product
 
+    if "ORDERABLE" in product_id:
+        return product
+
     on_response_mm = getattr(product.downloader.config, "order_on_response", {}).get(
         "metadata_mapping", {}
     )
@@ -1442,6 +1448,9 @@ class MeteoblueSearch(ECMWFSearch):
             productType=product_type,
             properties=properties,
         )
+        # use product_type_config as default properties
+        product_type_config = getattr(self.config, "product_type_config", {})
+        product.properties = dict(product_type_config, **product.properties)
 
         return [
             product,

eodag/plugins/search/cop_marine.py

@@ -285,6 +285,9 @@ class CopMarineSearch(StaticStacSearch):
             }
         }
         product = EOProduct(self.provider, properties, productType=product_type)
+        # use product_type_config as default properties
+        product_type_config = getattr(self.config, "product_type_config", {})
+        product.properties = dict(product_type_config, **product.properties)
         product.assets = AssetsDict(product, assets)
         return product