eodag 3.4.2__py3-none-any.whl → 3.4.3__py3-none-any.whl

eodag/plugins/download/s3rest.py

@@ -142,7 +142,7 @@ class S3RestDownload(Download):
             **kwargs: Unpack[DownloadConf],
         ):
             # check order status
-            if product.properties.get("orderStatusLink", None):
+            if product.properties.get("orderStatusLink"):
                 self.http_download_plugin._order_status(product=product, auth=auth)
 
             # get bucket urls
@@ -272,7 +272,7 @@ class S3RestDownload(Download):
 
             # total size for progress_callback
             size_list: list[int] = [
-                int(node.firstChild.nodeValue)  # type: ignore[attr-defined]
+                int(node.firstChild.nodeValue or 0)
                 for node in xmldoc.getElementsByTagName("Size")
                 if node.firstChild is not None
             ]
@@ -281,9 +281,13 @@ class S3RestDownload(Download):
 
             # download each node key
             for node_xml in nodes_xml_list:
-                node_key = unquote(
-                    node_xml.getElementsByTagName("Key")[0].firstChild.nodeValue  # type: ignore[union-attr]
-                )
+                node_key = node_xml.getElementsByTagName("Key")[0].firstChild.nodeValue  # type: ignore[union-attr]
+                if node_key is None:
+                    logger.debug(
+                        "Node key is None, skipping this node: %s", node_xml.toxml()
+                    )
+                    continue
+                node_key = unquote(node_key)
                 # As "Key", "Size" and "ETag" (md5 hash) can also be retrieved from node_xml
                 node_url = urljoin(bucket_url.strip("/") + "/", node_key.strip("/"))
                 # output file location

eodag/plugins/search/base.py

@@ -224,7 +224,7 @@ class Search(PluginTopic):
         # it will complete the query string or body once metadata mapping will be done
         sort_by_arg_tmp = kwargs.pop("sort_by", None)
         sort_by_arg = sort_by_arg_tmp or getattr(self.config, "sort", {}).get(
-            "sort_by_default", None
+            "sort_by_default"
         )
         if not sort_by_arg_tmp and sort_by_arg:
             logger.info(
@@ -255,7 +255,7 @@ class Search(PluginTopic):
         for eodag_sort_by_tuple in sort_by_arg:
             eodag_sort_param = eodag_sort_by_tuple[0]
             provider_sort_param = self.config.sort["sort_param_mapping"].get(
-                eodag_sort_param, None
+                eodag_sort_param
             )
             if not provider_sort_param:
                 joined_eodag_params_to_map = ", ".join(
@@ -303,7 +303,7 @@ class Search(PluginTopic):
             # TODO: move this code block to the top of this method when search args model validation is embeded
             # check if the limit number of sorting parameter(s) is respected with this sorting parameter
             if (
-                self.config.sort.get("max_sort_params", None)
+                self.config.sort.get("max_sort_params")
                 and len(provider_sort_by_tuples_used)
                 > self.config.sort["max_sort_params"]
             ):

eodag/plugins/search/build_search_result.py

@@ -403,8 +403,7 @@ def ecmwf_temporal_to_eodag(
     if date := params.get("date"):
         start, end = parse_date(date, params.get("time"))
 
-    elif year := params.get("year") or params.get("hyear"):
-        year = params.get("year") or params.get("hyear")
+    elif year := (params.get("year") or params.get("hyear")):
         month = params.get("month") or params.get("hmonth")
         day = params.get("day") or params.get("hday")
         time = params.get("time")
@@ -499,7 +498,7 @@ class ECMWFSearch(PostJsonSearch):
         """
         product_type = prep.product_type
         if not product_type:
-            product_type = kwargs.get("productType", None)
+            product_type = kwargs.get("productType")
         kwargs = self._preprocess_search_params(kwargs, product_type)
         result, num_items = super().query(prep, **kwargs)
         if prep.count and not num_items:
@@ -547,7 +546,7 @@ class ECMWFSearch(PostJsonSearch):
         :param params: Search parameters to be preprocessed.
         :param product_type: (optional) product type id
         """
-        _dc_qs = params.get("_dc_qs", None)
+        _dc_qs = params.get("_dc_qs")
         if _dc_qs is not None:
             # if available, update search params using datacube query-string
             _dc_qp = geojson.loads(unquote_plus(unquote_plus(_dc_qs)))
@@ -557,7 +556,7 @@ class ECMWFSearch(PostJsonSearch):
                 (params[START], params[END],) = _dc_qp[
                     "date"
                 ].split("/")
-            elif _dc_qp.get("date", None):
+            elif _dc_qp.get("date"):
                 params[START] = params[END] = _dc_qp["date"]
 
             if "/" in _dc_qp.get("area", ""):

eodag/plugins/search/data_request_search.py

@@ -206,7 +206,7 @@ class DataRequestSearch(Search):
             and "next_page_url_key_path" in self.config.pagination
         ):
             self.config.pagination["next_page_url_key_path"] = string_to_jsonpath(
-                self.config.pagination.get("next_page_url_key_path", None)
+                self.config.pagination.get("next_page_url_key_path")
             )
         self.download_info: dict[str, Any] = {}
         self.data_request_id = None
@@ -234,7 +234,7 @@ class DataRequestSearch(Search):
         if kwargs.get("sort_by"):
             raise ValidationError(f"{self.provider} does not support sorting feature")
 
-        product_type = kwargs.get("productType", None)
+        product_type = kwargs.get("productType")
 
         if product_type is None:
             raise ValidationError("Required productType is missing")
@@ -288,11 +288,11 @@ class DataRequestSearch(Search):
 
         # update dates if needed
         if getattr(self.config, "dates_required", True) and "id" not in keywords:
-            if not keywords.get("startTimeFromAscendingNode", None):
+            if not keywords.get("startTimeFromAscendingNode"):
                 keywords["startTimeFromAscendingNode"] = getattr(
                     self.config, "product_type_config", {}
                 ).get("missionStartDate", DEFAULT_MISSION_START_DATE)
-            if not keywords.get("completionTimeFromAscendingNode", None):
+            if not keywords.get("completionTimeFromAscendingNode"):
                 keywords["completionTimeFromAscendingNode"] = getattr(
                     self.config, "product_type_config", {}
                 ).get("missionEndDate", datetime.now(timezone.utc).isoformat())

eodag/plugins/search/qssearch.py

@@ -315,31 +315,27 @@ class QueryStringSearch(Search):
             and "next_page_url_key_path" in self.config.pagination
         ):
             self.config.pagination["next_page_url_key_path"] = string_to_jsonpath(
-                self.config.pagination.get("next_page_url_key_path", None)
+                self.config.pagination.get("next_page_url_key_path")
             )
         if (
             self.config.result_type == "json"
             and "next_page_query_obj_key_path" in self.config.pagination
         ):
             self.config.pagination["next_page_query_obj_key_path"] = string_to_jsonpath(
-                self.config.pagination.get("next_page_query_obj_key_path", None)
+                self.config.pagination.get("next_page_query_obj_key_path")
             )
         if (
             self.config.result_type == "json"
             and "next_page_merge_key_path" in self.config.pagination
         ):
             self.config.pagination["next_page_merge_key_path"] = string_to_jsonpath(
-                self.config.pagination.get("next_page_merge_key_path", None)
+                self.config.pagination.get("next_page_merge_key_path")
             )
 
         # parse jsonpath on init: product types discovery
         if (
-            getattr(self.config, "discover_product_types", {}).get(
-                "results_entry", None
-            )
-            and getattr(self.config, "discover_product_types", {}).get(
-                "result_type", None
-            )
+            getattr(self.config, "discover_product_types", {}).get("results_entry")
+            and getattr(self.config, "discover_product_types", {}).get("result_type")
             == "json"
         ):
             self.config.discover_product_types["results_entry"] = string_to_jsonpath(
@@ -380,8 +376,8 @@ class QueryStringSearch(Search):
 
         # parse jsonpath on init: queryables discovery
         if (
-            getattr(self.config, "discover_queryables", {}).get("results_entry", None)
-            and getattr(self.config, "discover_queryables", {}).get("result_type", None)
+            getattr(self.config, "discover_queryables", {}).get("results_entry")
+            and getattr(self.config, "discover_queryables", {}).get("result_type")
             == "json"
         ):
             self.config.discover_queryables["results_entry"] = string_to_jsonpath(
@@ -731,7 +727,7 @@ class QueryStringSearch(Search):
         :param prep: Object collecting needed information for search.
         """
         count = prep.count
-        product_type = kwargs.get("productType", prep.product_type)
+        product_type = cast(str, kwargs.get("productType", prep.product_type))
         if product_type == GENERIC_PRODUCT_TYPE:
             logger.warning(
                 "GENERIC_PRODUCT_TYPE is not a real product_type and should only be used internally as a template"
@@ -930,13 +926,13 @@ class QueryStringSearch(Search):
             )
             response = self._request(single_search_prep)
             next_page_url_key_path = self.config.pagination.get(
-                "next_page_url_key_path", None
+                "next_page_url_key_path"
             )
             next_page_query_obj_key_path = self.config.pagination.get(
-                "next_page_query_obj_key_path", None
+                "next_page_query_obj_key_path"
             )
             next_page_merge_key_path = self.config.pagination.get(
-                "next_page_merge_key_path", None
+                "next_page_merge_key_path"
             )
             if self.config.result_type == "xml":
                 root_node = etree.fromstring(response.content)
@@ -1174,9 +1170,7 @@ class QueryStringSearch(Search):
 
         collection = getattr(self.config, "collection", None)
         if collection is None:
-            collection = (
-                prep.product_type_def_params.get("collection", None) or product_type
-            )
+            collection = prep.product_type_def_params.get("collection") or product_type
 
         if collection is None:
             return ()
@@ -1332,9 +1326,9 @@ class ODataV4Search(QueryStringSearch):
 
         # parse jsonpath on init
         metadata_pre_mapping = getattr(self.config, "metadata_pre_mapping", {})
-        metadata_path = metadata_pre_mapping.get("metadata_path", None)
-        metadata_path_id = metadata_pre_mapping.get("metadata_path_id", None)
-        metadata_path_value = metadata_pre_mapping.get("metadata_path_value", None)
+        metadata_path = metadata_pre_mapping.get("metadata_path")
+        metadata_path_id = metadata_pre_mapping.get("metadata_path_id")
+        metadata_path_value = metadata_pre_mapping.get("metadata_path_value")
         if metadata_path and metadata_path_id and metadata_path_value:
             self.config.metadata_pre_mapping["metadata_path"] = string_to_jsonpath(
                 metadata_path
@@ -1392,9 +1386,9 @@ class ODataV4Search(QueryStringSearch):
         For example, going from '$.Metadata[?(@.id="foo")].value' to '$.Metadata.foo.value'
         """
         metadata_pre_mapping = getattr(self.config, "metadata_pre_mapping", {})
-        metadata_path = metadata_pre_mapping.get("metadata_path", None)
-        metadata_path_id = metadata_pre_mapping.get("metadata_path_id", None)
-        metadata_path_value = metadata_pre_mapping.get("metadata_path_value", None)
+        metadata_path = metadata_pre_mapping.get("metadata_path")
+        metadata_path_id = metadata_pre_mapping.get("metadata_path_id")
+        metadata_path_value = metadata_pre_mapping.get("metadata_path_value")
 
         if metadata_path and metadata_path_id and metadata_path_value:
             # metadata_path already parsed on init
@@ -1516,10 +1510,10 @@ class PostJsonSearch(QueryStringSearch):
                 ]["results_entry"]
                 self.config.collection = self.config.products[product_type][
                     "specific_qssearch"
-                ].get("collection", None)
+                ].get("collection")
                 self.config.merge_responses = self.config.products[product_type][
                     "specific_qssearch"
-                ].get("merge_responses", None)
+                ].get("merge_responses")
 
                 def count_hits(self, *x, **y):
                     return 1
@@ -1814,7 +1808,7 @@ class StacSearch(PostJsonSearch):
         ):
             raise NotImplementedError()
 
-        product_type = kwargs.get("productType", None)
+        product_type = kwargs.get("productType")
         provider_product_type = (
             self.config.products.get(product_type, {}).get("productType", product_type)
             if product_type
@@ -1926,10 +1920,9 @@ class StacSearch(PostJsonSearch):
             python_queryables = create_model("m", **field_definitions).model_fields
             geom_queryable = python_queryables.pop("geometry", None)
             if geom_queryable:
-                python_queryables["geom"] = geom_queryable
+                python_queryables["geom"] = Queryables.model_fields["geom"]
 
             queryables_dict = model_fields_to_annotated(python_queryables)
-
             # append "datetime" as "start" & "end" if needed
             if "datetime" in json_queryables:
                 eodag_queryables = copy_deepcopy(