eodag 3.5.0__tar.gz → 3.5.1__tar.gz

{eodag-3.5.0 → eodag-3.5.1}/CHANGES.rst

@@ -3,6 +3,29 @@ Release history
 ===============
 
 
+v3.5.1 (2025-06-23)
+===================
+
+Bug Fixes
+---------
+
+* **core**: Enable count with search iterator (`#1700`_, `bbcc7ba`_)
+
+* **plugins**: Lru caching when fetching constraints with ECMWF (`#1698`_, `e23f47e`_)
+
+Refactoring
+-----------
+
+* **core**: Register downloader using manager from search to EOProduct (`#1699`_, `fd0c149`_)
+
+.. _#1698: https://github.com/CS-SI/eodag/pull/1698
+.. _#1699: https://github.com/CS-SI/eodag/pull/1699
+.. _#1700: https://github.com/CS-SI/eodag/pull/1700
+.. _bbcc7ba: https://github.com/CS-SI/eodag/commit/bbcc7ba311fcf25a0231203035166276e704ec8e
+.. _e23f47e: https://github.com/CS-SI/eodag/commit/e23f47ee97a50c0ba1d573801a17177c88f06eae
+.. _fd0c149: https://github.com/CS-SI/eodag/commit/fd0c149277735a3ecdc11588e8ac8e166b591ae8
+
+
 v3.5.0 (2025-06-20)
 ===================
 

{eodag-3.5.0/eodag.egg-info → eodag-3.5.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eodag
-Version: 3.5.0
+Version: 3.5.1
 Summary: Earth Observation Data Access Gateway
 Home-page: https://github.com/CS-SI/eodag
 Author: CS GROUP - France
@@ -317,7 +317,7 @@ An eodag instance can be exposed through a STAC compliant REST api from the comm
 
 .. code-block:: bash
 
-    docker run -p 5000:5000 --rm csspace/eodag-server:3.5.0
+    docker run -p 5000:5000 --rm csspace/eodag-server:3.5.1
 
 You can also browse over your STAC API server using `STAC Browser <https://github.com/radiantearth/stac-browser>`_.
 Simply run:

{eodag-3.5.0 → eodag-3.5.1}/README.rst

@@ -187,7 +187,7 @@ An eodag instance can be exposed through a STAC compliant REST api from the comm
 
 .. code-block:: bash
 
-    docker run -p 5000:5000 --rm csspace/eodag-server:3.5.0
+    docker run -p 5000:5000 --rm csspace/eodag-server:3.5.1
 
 You can also browse over your STAC API server using `STAC Browser <https://github.com/radiantearth/stac-browser>`_.
 Simply run:

{eodag-3.5.0 → eodag-3.5.1}/charts/eodag-server/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v2
-appVersion: 3.5.0
+appVersion: 3.5.1
 dependencies:
 - name: common
   repository:  oci://registry-1.docker.io/bitnamicharts
@@ -15,4 +15,4 @@ name: eodag-server
 sources:
 - https://github.com/CS-SI/eodag
 type: application
-version: 3.5.0
+version: 3.5.1

{eodag-3.5.0 → eodag-3.5.1}/docs/stac_rest.rst

@@ -115,7 +115,7 @@ available on `https://hub.docker.com/r/csspace/eodag-server <https://hub.docker.
 
 .. code-block:: bash
 
-    $ docker run -p 5000:5000 --rm csspace/eodag-server:3.5.0
+    $ docker run -p 5000:5000 --rm csspace/eodag-server:3.5.1
 
 Example
 -------

{eodag-3.5.0 → eodag-3.5.1}/eodag/api/core.py

@@ -37,7 +37,6 @@ from whoosh.qparser import QueryParser
 
 from eodag.api.product.metadata_mapping import (
     NOT_AVAILABLE,
-    ONLINE_STATUS,
     mtd_cfg_as_conversion_and_querypath,
 )
 from eodag.api.search_result import SearchResult
@@ -1395,7 +1394,11 @@ class EODataAccessGateway:
         prev_product = None
         next_page_url = None
         next_page_query_obj = None
+        number_matched = None
         while True:
+            # if count is enabled, it will only be performed on 1st iteration
+            if iteration == 2:
+                kwargs["count"] = False
             if iteration > 1 and next_page_url:
                 pagination_config["next_page_url_tpl"] = next_page_url
             if iteration > 1 and next_page_query_obj:
@@ -1403,11 +1406,13 @@ class EODataAccessGateway:
             logger.info("Iterate search over multiple pages: page #%s", iteration)
             try:
                 # remove unwanted kwargs for _do_search
-                kwargs.pop("count", None)
                 kwargs.pop("raise_errors", None)
                 search_result = self._do_search(
-                    search_plugin, count=False, raise_errors=True, **kwargs
+                    search_plugin, raise_errors=True, **kwargs
                 )
+                # if count is enabled, it will only be performed on 1st iteration
+                if iteration == 1:
+                    number_matched = search_result.number_matched
             except Exception:
                 logger.warning(
                     "error at retrieval of data from %s, for params: %s",
@@ -1462,6 +1467,8 @@ class EODataAccessGateway:
                     )
                     last_page_with_products = iteration - 1
                     break
+                # use count got from 1st iteration
+                search_result.number_matched = number_matched
                 yield search_result
                 prev_product = product
                 # Prevent a last search if the current one returned less than the
@@ -1549,6 +1556,9 @@ class EODataAccessGateway:
                 )
                 self.fetch_product_types_list()
 
+        # remove unwanted count
+        kwargs.pop("count", None)
+
         search_plugins, search_kwargs = self._prepare_search(
             start=start, end=end, geom=geom, locations=locations, **kwargs
         )
@@ -1571,6 +1581,7 @@ class EODataAccessGateway:
                 for page_results in self.search_iter_page_plugin(
                     items_per_page=itp,
                     search_plugin=search_plugin,
+                    count=False,
                     **search_kwargs,
                 ):
                     all_results.data.extend(page_results.data)
@@ -1981,29 +1992,7 @@ class EODataAccessGateway:
                     logger.debug("product type %s not found", eo_product.product_type)
 
                 if eo_product.search_intersection is not None:
-                    download_plugin = self._plugins_manager.get_download_plugin(
-                        eo_product
-                    )
-                    if len(eo_product.assets) > 0:
-                        matching_url = next(iter(eo_product.assets.values()))["href"]
-                    elif eo_product.properties.get("storageStatus") != ONLINE_STATUS:
-                        matching_url = eo_product.properties.get(
-                            "orderLink"
-                        ) or eo_product.properties.get("downloadLink")
-                    else:
-                        matching_url = eo_product.properties.get("downloadLink")
-
-                    try:
-                        auth_plugin = next(
-                            self._plugins_manager.get_auth_plugins(
-                                search_plugin.provider,
-                                matching_url=matching_url,
-                                matching_conf=download_plugin.config,
-                            )
-                        )
-                    except StopIteration:
-                        auth_plugin = None
-                    eo_product.register_downloader(download_plugin, auth_plugin)
+                    eo_product._register_downloader_from_manager(self._plugins_manager)
 
             results.extend(res)
             total_results = (

{eodag-3.5.0 → eodag-3.5.1}/eodag/api/product/_product.py

@@ -43,6 +43,7 @@ from eodag.api.product.metadata_mapping import (
     DEFAULT_GEOMETRY,
     NOT_AVAILABLE,
     NOT_MAPPED,
+    ONLINE_STATUS,
 )
 from eodag.utils import (
     DEFAULT_DOWNLOAD_TIMEOUT,
@@ -62,6 +63,7 @@ if TYPE_CHECKING:
     from eodag.plugins.apis.base import Api
     from eodag.plugins.authentication.base import Authentication
     from eodag.plugins.download.base import Download
+    from eodag.plugins.manager import PluginManager
     from eodag.types.download_args import DownloadConf
     from eodag.utils import Unpack
 
@@ -238,6 +240,37 @@ class EOProduct:
                 f"Unable to get {e.args[0]} key from EOProduct.properties"
             )
 
+    def _register_downloader_from_manager(self, plugins_manager: PluginManager) -> None:
+        """Register the downloader and authenticator for this EOProduct using the
+        provided plugins manager.
+        This method is typically called after the EOProduct has been created and
+        before any download operation is performed.
+
+        :param plugins_manager: The plugins manager instance to use for retrieving
+                                the download and authentication plugins.
+        """
+        download_plugin = plugins_manager.get_download_plugin(self)
+        if len(self.assets) > 0:
+            matching_url = next(iter(self.assets.values()))["href"]
+        elif self.properties.get("storageStatus") != ONLINE_STATUS:
+            matching_url = self.properties.get("orderLink") or self.properties.get(
+                "downloadLink"
+            )
+        else:
+            matching_url = self.properties.get("downloadLink")
+
+        try:
+            auth_plugin = next(
+                plugins_manager.get_auth_plugins(
+                    self.provider,
+                    matching_url=matching_url,
+                    matching_conf=download_plugin.config,
+                )
+            )
+        except StopIteration:
+            auth_plugin = None
+        self.register_downloader(download_plugin, auth_plugin)
+
     def register_downloader(
         self, downloader: Union[Api, Download], authenticator: Optional[Authentication]
     ) -> None:

{eodag-3.5.0 → eodag-3.5.1}/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
 
@@ -1099,6 +1099,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 +1116,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-3.5.1/eodag/utils/cache.py

@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+# Copyright 2025, CS GROUP - France, https://www.cs-soprasteria.com/
+#
+# This file is part of EODAG project
+#     https://www.github.com/CS-SI/EODAG
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+import functools
+import logging
+from typing import Any, Callable, TypeVar
+
+logger = logging.getLogger("eodag.cache")
+
+R = TypeVar("R")
+
+
+def instance_cached_method(
+    maxsize: int = 128,
+) -> Callable[[Callable[..., R]], Callable[..., R]]:
+    """
+    Decorator to cache an instance method using functools.lru_cache on a per-instance basis.
+
+    This decorator creates a separate LRU cache for each instance of the class,
+    ensuring that cached results are not shared across instances.
+
+    The cache stores up to `maxsize` entries (default 128), which matches the
+    default cache size of functools.lru_cache. This default provides a good balance
+    between memory consumption and cache hit rate for most use cases.
+
+    :param maxsize: Maximum number of cached calls to store per instance.
+                    Defaults to 128, consistent with functools.lru_cache.
+    :return: Decorated method with per-instance caching enabled.
+    """
+
+    def decorator(method: Callable[..., R]) -> Callable[..., R]:
+        @functools.wraps(method)
+        def wrapper(self: Any, *args: Any, **kwargs: Any) -> R:
+            cache_name = f"_cached_{method.__name__}"
+            if not hasattr(self, cache_name):
+                cached = functools.lru_cache(maxsize=maxsize)(
+                    method.__get__(self, type(self))
+                )
+                setattr(self, cache_name, cached)
+
+            cached_func = getattr(self, cache_name)
+            before_hits = cached_func.cache_info().hits
+            result = cached_func(*args, **kwargs)
+            after_hits = cached_func.cache_info().hits
+
+            if after_hits > before_hits:
+                logger.debug(
+                    f"Cache hit for {method.__qualname__} with args={args}, kwargs={kwargs}"
+                )
+            return result
+
+        return wrapper
+
+    return decorator

{eodag-3.5.0 → eodag-3.5.1/eodag.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eodag
-Version: 3.5.0
+Version: 3.5.1
 Summary: Earth Observation Data Access Gateway
 Home-page: https://github.com/CS-SI/eodag
 Author: CS GROUP - France
@@ -317,7 +317,7 @@ An eodag instance can be exposed through a STAC compliant REST api from the comm
 
 .. code-block:: bash
 
-    docker run -p 5000:5000 --rm csspace/eodag-server:3.5.0
+    docker run -p 5000:5000 --rm csspace/eodag-server:3.5.1
 
 You can also browse over your STAC API server using `STAC Browser <https://github.com/radiantearth/stac-browser>`_.
 Simply run:

{eodag-3.5.0 → eodag-3.5.1}/eodag.egg-info/SOURCES.txt

@@ -247,6 +247,7 @@ eodag/types/queryables.py
 eodag/types/search_args.py
 eodag/types/whoosh.py
 eodag/utils/__init__.py
+eodag/utils/cache.py
 eodag/utils/env.py
 eodag/utils/exceptions.py
 eodag/utils/import_system.py

{eodag-3.5.0 → eodag-3.5.1}/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools>=45", "setuptools_scm[toml]>=6.2"]
 build-backend = "setuptools.build_meta"
 
 [tool.setuptools_scm]
-fallback_version = "3.5.1.dev0"
+fallback_version = "3.5.2.dev0"
 
 [tool.coverage.report]
 exclude_lines = [