eodag 3.0.0b3__py3-none-any.whl → 3.1.0__py3-none-any.whl

eodag/api/search_result.py

@@ -18,9 +18,10 @@
 from __future__ import annotations
 
 from collections import UserList
-from typing import TYPE_CHECKING, Any, Dict, List, Optional, Union
+from typing import TYPE_CHECKING, Annotated, Any, Iterable, Optional, Union
 
 from shapely.geometry import GeometryCollection, shape
+from typing_extensions import Doc
 
 from eodag.api.product import EOProduct
 from eodag.plugins.crunch.filter_date import FilterDate
@@ -45,13 +46,21 @@ class SearchResult(UserList):
     :ivar number_matched: Estimated total number of matching results
     """
 
-    data: List[EOProduct]
+    data: list[EOProduct]
+
+    errors: Annotated[
+        list[tuple[str, Exception]], Doc("Tuple of provider name, exception")
+    ]
 
     def __init__(
-        self, products: List[EOProduct], number_matched: Optional[int] = None
+        self,
+        products: list[EOProduct],
+        number_matched: Optional[int] = None,
+        errors: list[tuple[str, Exception]] = [],
     ) -> None:
-        super(SearchResult, self).__init__(products)
+        super().__init__(products)
         self.number_matched = number_matched
+        self.errors = errors
 
     def crunch(self, cruncher: Crunch, **search_params: Any) -> SearchResult:
         """Do some crunching with the underlying EO products.
@@ -73,7 +82,7 @@ class SearchResult(UserList):
         return self.crunch(FilterDate(dict(start=start, end=end)))
 
     def filter_latest_intersect(
-        self, geometry: Union[Dict[str, Any], BaseGeometry, Any]
+        self, geometry: Union[dict[str, Any], BaseGeometry, Any]
     ) -> SearchResult:
         """
         Apply :class:`~eodag.plugins.crunch.filter_latest_intersect.FilterLatestIntersect` crunch,
@@ -129,7 +138,7 @@ class SearchResult(UserList):
         return self.filter_property(storageStatus="ONLINE")
 
     @staticmethod
-    def from_geojson(feature_collection: Dict[str, Any]) -> SearchResult:
+    def from_geojson(feature_collection: dict[str, Any]) -> SearchResult:
         """Builds an :class:`~eodag.api.search_result.SearchResult` object from its representation as geojson
 
         :param feature_collection: A collection representing a search result.
@@ -142,7 +151,7 @@ class SearchResult(UserList):
             ]
         )
 
-    def as_geojson_object(self) -> Dict[str, Any]:
+    def as_geojson_object(self) -> dict[str, Any]:
         """GeoJSON representation of SearchResult"""
         return {
             "type": "FeatureCollection",
@@ -163,7 +172,7 @@ class SearchResult(UserList):
         return self.as_shapely_geometry_object().wkt
 
     @property
-    def __geo_interface__(self) -> Dict[str, Any]:
+    def __geo_interface__(self) -> dict[str, Any]:
         """Implements the geo-interface protocol.
 
         See https://gist.github.com/sgillies/2217756
@@ -197,6 +206,13 @@ class SearchResult(UserList):
             + "</table>"
         )
 
+    def extend(self, other: Iterable) -> None:
+        """override extend method to include errors"""
+        if isinstance(other, SearchResult):
+            self.errors.extend(other.errors)
+
+        return super().extend(other)
+
 
 class RawSearchResult(UserList):
     """An object representing a collection of raw/unparsed search results obtained from a provider.
@@ -204,9 +220,9 @@ class RawSearchResult(UserList):
     :param results: A list of raw/unparsed search results
     """
 
-    data: List[Any]
-    query_params: Dict[str, Any]
-    product_type_def_params: Dict[str, Any]
+    data: list[Any]
+    query_params: dict[str, Any]
+    product_type_def_params: dict[str, Any]
 
-    def __init__(self, results: List[Any]) -> None:
+    def __init__(self, results: list[Any]) -> None:
         super(RawSearchResult, self).__init__(results)

eodag/cli.py

@@ -39,6 +39,7 @@ Commands:
 
   noqa: D103
 """
+
 from __future__ import annotations
 
 import json
@@ -47,7 +48,7 @@ import shutil
 import sys
 import textwrap
 from importlib.metadata import metadata
-from typing import TYPE_CHECKING, Any, Dict, List, Mapping, Set
+from typing import TYPE_CHECKING, Any, Mapping
 
 import click
 
@@ -56,6 +57,11 @@ from eodag.utils import DEFAULT_ITEMS_PER_PAGE, DEFAULT_PAGE, parse_qs
 from eodag.utils.exceptions import NoMatchingProductType, UnsupportedProvider
 from eodag.utils.logging import setup_logging
 
+try:
+    from eodag.rest.utils import LIVENESS_PROBE_PATH
+except ImportError:
+    pass
+
 if TYPE_CHECKING:
     from click import Context
 
@@ -69,6 +75,18 @@ CRUNCHERS = [
 ]
 
 
+class LivenessFilter:
+    """
+    Filter out requests to the liveness probe endpoint
+    """
+
+    def filter(self, record):
+        """
+        Filter method required by the Python logging API.
+        """
+        return LIVENESS_PROBE_PATH not in record.getMessage()
+
+
 class MutuallyExclusiveOption(click.Option):
     """Mutually Exclusive Options for Click
     from https://gist.github.com/jacobtolar/fb80d5552a9a9dfc32b12a829fa21c0c
@@ -86,7 +104,7 @@ class MutuallyExclusiveOption(click.Option):
         super(MutuallyExclusiveOption, self).__init__(*args, **kwargs)
 
     def handle_parse_result(
-        self, ctx: Context, opts: Mapping[str, Any], args: List[str]
+        self, ctx: Context, opts: Mapping[str, Any], args: list[str]
     ):
         """Raise error or use parent handle_parse_result()"""
         if self.mutually_exclusive.intersection(opts) and self.name in opts:
@@ -341,9 +359,9 @@ def search_crunch(ctx: Context, **kwargs: Any) -> None:
     count = kwargs.pop("count")
 
     # Process inputs for crunch
-    cruncher_names: Set[Any] = set(kwargs.pop("cruncher") or [])
+    cruncher_names: set[Any] = set(kwargs.pop("cruncher") or [])
     cruncher_args = kwargs.pop("cruncher_args")
-    cruncher_args_dict: Dict[str, Dict[str, Any]] = {}
+    cruncher_args_dict: dict[str, dict[str, Any]] = {}
     if cruncher_args:
         for cruncher, argname, argval in cruncher_args:
             cruncher_args_dict.setdefault(cruncher, {}).setdefault(argname, argval)
@@ -553,12 +571,13 @@ def download(ctx: Context, **kwargs: Any) -> None:
 
         for idx, product in enumerate(search_results):
             if product.downloader is None:
+                downloader = satim_api._plugins_manager.get_download_plugin(product)
                 auth = product.downloader_auth
                 if auth is None:
-                    auth = satim_api._plugins_manager.get_auth_plugin(product.provider)
-                search_results[idx].register_downloader(
-                    satim_api._plugins_manager.get_download_plugin(product), auth
-                )
+                    auth = satim_api._plugins_manager.get_auth_plugin(
+                        downloader, product
+                    )
+                search_results[idx].register_downloader(downloader, auth)
 
             downloaded_file = product.get_quicklook()
             if not downloaded_file:
@@ -573,12 +592,13 @@ def download(ctx: Context, **kwargs: Any) -> None:
         # register downloader
         for idx, product in enumerate(search_results):
             if product.downloader is None:
+                downloader = satim_api._plugins_manager.get_download_plugin(product)
                 auth = product.downloader_auth
                 if auth is None:
-                    auth = satim_api._plugins_manager.get_auth_plugin(product.provider)
-                search_results[idx].register_downloader(
-                    satim_api._plugins_manager.get_download_plugin(product), auth
-                )
+                    auth = satim_api._plugins_manager.get_auth_plugin(
+                        downloader, product
+                    )
+                search_results[idx].register_downloader(downloader, auth)
 
         downloaded_files = satim_api.download_all(search_results)
         if downloaded_files and len(downloaded_files) > 0:
@@ -676,7 +696,9 @@ def serve_rest(
         try:
             pid = os.fork()
         except OSError as e:
-            raise Exception("%s [%d]" % (e.strerror, e.errno))
+            raise Exception(
+                "%s [%d]" % (e.strerror, e.errno) if e.errno is not None else e.strerror
+            )
 
         if pid == 0:
             os.setsid()
@@ -684,19 +706,34 @@ def serve_rest(
         else:
             sys.exit(0)
     else:
+        import logging
+
         logging_config = uvicorn.config.LOGGING_CONFIG
-        if debug:
-            logging_config["loggers"]["uvicorn"]["level"] = "DEBUG"
-            logging_config["loggers"]["uvicorn.error"]["level"] = "DEBUG"
-            logging_config["loggers"]["uvicorn.access"]["level"] = "DEBUG"
-            logging_config["formatters"]["default"][
-                "fmt"
-            ] = "%(asctime)-15s %(name)-32s [%(levelname)-8s] (%(module)-17s) %(message)s"
-            logging_config["loggers"]["eodag"] = {
-                "handlers": ["default"],
-                "level": "DEBUG" if debug else "INFO",
-                "propagate": False,
+        uvicorn_fmt = "%(asctime)-15s %(name)-32s [%(levelname)-8s] %(message)s"
+        logging_config["filters"] = {"liveness": {"()": LivenessFilter}}
+        logging_config["formatters"]["access"]["fmt"] = uvicorn_fmt
+        logging_config["formatters"]["default"]["fmt"] = uvicorn_fmt
+        logging_config["loggers"]["uvicorn.access"]["filters"] = ["liveness"]
+
+        eodag_formatter = logging.Formatter(
+            "%(asctime)-15s %(name)-32s [%(levelname)-8s] (tid=%(thread)d) %(message)s"
+        )
+        logging.getLogger("eodag").handlers[0].setFormatter(eodag_formatter)
+
+        if ctx.obj["verbosity"] <= 1:
+            logging_config["handlers"]["null"] = {
+                "level": "DEBUG",
+                "class": "logging.NullHandler",
             }
+            logging_config["loggers"]["uvicorn"]["handlers"] = ["null"]
+            logging_config["loggers"]["uvicorn.error"]["handlers"] = ["null"]
+            logging_config["loggers"]["uvicorn.access"]["handlers"] = ["null"]
+        else:
+            log_level = "INFO" if ctx.obj["verbosity"] == 2 else "DEBUG"
+            logging_config["loggers"]["uvicorn"]["level"] = log_level
+            logging_config["loggers"]["uvicorn.error"]["level"] = log_level
+            logging_config["loggers"]["uvicorn.access"]["level"] = log_level
+
         uvicorn.run(
             "eodag.rest.server:app",
             host=bind_host,