eodag 3.5.0__py3-none-any.whl → 3.6.0__py3-none-any.whl

eodag/plugins/search/build_search_result.py

@@ -17,7 +17,6 @@
 # limitations under the License.
 from __future__ import annotations
 
-import functools
 import hashlib
 import logging
 import re
@@ -61,6 +60,7 @@ from eodag.utils import (
     get_geometry_from_various,
     is_range_in_range,
 )
+from eodag.utils.cache import instance_cached_method
 from eodag.utils.exceptions import DownloadError, NotAvailableError, ValidationError
 from eodag.utils.requests import fetch_json
 
@@ -317,17 +317,17 @@ def append_time(input_date: date, time: Optional[str]) -> datetime:
 
 
 def parse_date(
-    date_str: str, time: Optional[Union[str, list[str]]]
+    date: str, time: Optional[Union[str, list[str]]]
 ) -> tuple[datetime, datetime]:
     """Parses a date string in formats YYYY-MM-DD, YYYMMDD, solo or in start/end or start/to/end intervals."""
-    if "to" in date_str:
-        start_date_str, end_date_str = date_str.split("/to/")
-    elif "/" in date_str:
-        dates = date_str.split("/")
+    if "to" in date:
+        start_date_str, end_date_str = date.split("/to/")
+    elif "/" in date:
+        dates = date.split("/")
         start_date_str = dates[0]
         end_date_str = dates[-1]
     else:
-        start_date_str = end_date_str = date_str
+        start_date_str = end_date_str = date
 
     # Update YYYYMMDD formatted dates
     if re.match(r"^\d{8}$", start_date_str):
@@ -401,6 +401,8 @@ def ecmwf_temporal_to_eodag(
     start = end = None
 
     if date := params.get("date"):
+        if isinstance(date, list):
+            date = "/".join(date)
         start, end = parse_date(date, params.get("time"))
 
     elif year := (params.get("year") or params.get("hyear")):
@@ -1099,6 +1101,7 @@ class ECMWFSearch(PostJsonSearch):
 
         return qp
 
+    @instance_cached_method()
     def _fetch_data(self, url: str) -> Any:
         """
         fetches from a provider elements like constraints or forms.
@@ -1115,7 +1118,7 @@ class ECMWFSearch(PostJsonSearch):
             else None
         )
         timeout = getattr(self.config, "timeout", DEFAULT_SEARCH_TIMEOUT)
-        return functools.lru_cache()(fetch_json)(url, auth=auth, timeout=timeout)
+        return fetch_json(url, auth=auth, timeout=timeout)
 
     def normalize_results(
         self, results: RawSearchResult, **kwargs: Any

eodag/plugins/search/qssearch.py

@@ -1173,7 +1173,10 @@ class QueryStringSearch(Search):
 
         collection = getattr(self.config, "collection", None)
         if collection is None:
-            collection = prep.product_type_def_params.get("collection") or product_type
+            collection = (
+                getattr(prep, "product_type_def_params", {}).get("collection")
+                or product_type
+            )
 
         if collection is None:
             return ()