eodag 3.9.1__py3-none-any.whl → 3.10.1__py3-none-any.whl

eodag/api/core.py

@@ -56,7 +56,7 @@ from eodag.plugins.search import PreparedSearch
 from eodag.plugins.search.build_search_result import MeteoblueSearch
 from eodag.plugins.search.qssearch import PostJsonSearch
 from eodag.types import model_fields_to_annotated
-from eodag.types.queryables import CommonQueryables, QueryablesDict
+from eodag.types.queryables import CommonQueryables, Queryables, QueryablesDict
 from eodag.utils import (
     DEFAULT_DOWNLOAD_TIMEOUT,
     DEFAULT_DOWNLOAD_WAIT,
@@ -2318,8 +2318,14 @@ class EODataAccessGateway:
                         plugin.provider,
                     )
 
+            # use queryables aliases
+            kwargs_alias = {**kwargs}
+            for search_param, field_info in Queryables.model_fields.items():
+                if search_param in kwargs and field_info.alias:
+                    kwargs_alias[field_info.alias] = kwargs_alias.pop(search_param)
+
             plugin_queryables = plugin.list_queryables(
-                kwargs,
+                kwargs_alias,
                 available_product_types,
                 product_type_configs,
                 product_type,

eodag/api/product/_product.py

@@ -48,6 +48,7 @@ from eodag.api.product.metadata_mapping import (
 from eodag.utils import (
     DEFAULT_DOWNLOAD_TIMEOUT,
     DEFAULT_DOWNLOAD_WAIT,
+    DEFAULT_SHAPELY_GEOMETRY,
     DEFAULT_STREAM_REQUESTS_TIMEOUT,
     USER_AGENT,
     ProgressCallback,
@@ -67,12 +68,6 @@ if TYPE_CHECKING:
     from eodag.types.download_args import DownloadConf
     from eodag.utils import Unpack
 
-try:
-    from shapely.errors import GEOSException
-except ImportError:
-    # shapely < 2.0 compatibility
-    from shapely.errors import TopologicalError as GEOSException
-
 
 logger = logging.getLogger("eodag.product")
 
@@ -136,6 +131,7 @@ class EOProduct:
             if key != "geometry"
             and value != NOT_MAPPED
             and NOT_AVAILABLE not in str(value)
+            and value is not None
         }
         if "geometry" not in properties or (
             (
@@ -144,17 +140,17 @@ class EOProduct:
             )
             and "defaultGeometry" not in properties
         ):
-            raise MisconfiguredError(
-                f"No geometry available to build EOProduct(id={properties.get('id')}, provider={provider})"
-            )
+            product_geometry = DEFAULT_SHAPELY_GEOMETRY
         elif not properties["geometry"] or properties["geometry"] == NOT_AVAILABLE:
             product_geometry = properties.pop("defaultGeometry", DEFAULT_GEOMETRY)
         else:
             product_geometry = properties["geometry"]
 
-        self.geometry = self.search_intersection = get_geometry_from_various(
-            geometry=product_geometry
-        )
+        geometry_obj = get_geometry_from_various(geometry=product_geometry)
+        # whole world as default geometry
+        if geometry_obj is None:
+            geometry_obj = DEFAULT_SHAPELY_GEOMETRY
+        self.geometry = self.search_intersection = geometry_obj
 
         self.search_kwargs = kwargs
         if self.search_kwargs.get("geometry") is not None:
@@ -163,7 +159,7 @@ class EOProduct:
             )
             try:
                 self.search_intersection = self.geometry.intersection(searched_geom)
-            except (GEOSException, ShapelyError):
+            except ShapelyError:
                 logger.warning(
                     "Unable to intersect the requested extent: %s with the product "
                     "geometry: %s",

eodag/api/product/metadata_mapping.py

@@ -42,6 +42,7 @@ from shapely.ops import transform
 from eodag.types.queryables import Queryables
 from eodag.utils import (
     DEFAULT_PROJ,
+    DEFAULT_SHAPELY_GEOMETRY,
     _deprecated,
     deepcopy,
     dict_items_recursive_apply,
@@ -340,14 +341,16 @@ def format_metadata(search_param: str, *args: Any, **kwargs: Any) -> str:
         @staticmethod
         def convert_to_bounds(input_geom_unformatted: Any) -> list[float]:
             input_geom = get_geometry_from_various(geometry=input_geom_unformatted)
+            if input_geom is None:
+                input_geom = DEFAULT_SHAPELY_GEOMETRY
             if isinstance(input_geom, MultiPolygon):
                 geoms = [geom for geom in input_geom.geoms]
                 # sort with larger one at first (stac-browser only plots first one)
                 geoms.sort(key=lambda x: x.area, reverse=True)
-                min_lon = 180
-                min_lat = 90
-                max_lon = -180
-                max_lat = -90
+                min_lon = 180.0
+                min_lat = 90.0
+                max_lon = -180.0
+                max_lat = -90.0
                 for geom in geoms:
                     min_lon = min(min_lon, geom.bounds[0])
                     min_lat = min(min_lat, geom.bounds[1])

eodag/plugins/authentication/aws_auth.py

@@ -24,9 +24,11 @@ import boto3
 from botocore.exceptions import ClientError, ProfileNotFound
 from botocore.handlers import disable_signing
 
+from eodag.api.product._assets import Asset
 from eodag.plugins.authentication.base import Authentication
 from eodag.types import S3SessionKwargs
-from eodag.utils.exceptions import AuthenticationError
+from eodag.utils import get_bucket_name_and_prefix
+from eodag.utils.exceptions import AuthenticationError, EodagError
 
 if TYPE_CHECKING:
     from mypy_boto3_s3 import S3Client, S3ServiceResource
@@ -283,3 +285,36 @@ class AwsAuth(Authentication):
             "session": self.s3_session,
             **rio_env_kwargs,
         }
+
+    def presign_url(
+        self,
+        asset: Asset,
+        expires_in: int = 3600,
+    ) -> str:
+        """This method is used to presign a url to download an asset from S3.
+
+        :param asset: asset for which the url shall be presigned
+        :param expires_in: expiration time of the presigned url in seconds
+        :returns: presigned url
+        :raises: :class:`~eodag.utils.exceptions.EodagError`
+        :raises: :class:`NotImplementedError`
+        """
+        if not getattr(self.config, "support_presign_url", True):
+            raise NotImplementedError(
+                f"presign_url is not supported for provider {self.provider}"
+            )
+
+        s3_client = self.get_s3_client()
+        bucket, prefix = get_bucket_name_and_prefix(asset["href"])
+        try:
+            presigned_url = s3_client.generate_presigned_url(
+                "get_object",
+                Params={
+                    "Bucket": bucket,
+                    "Key": prefix,
+                },
+                ExpiresIn=expires_in,
+            )
+            return presigned_url
+        except ClientError:
+            raise EodagError(f"Couldn't get a presigned URL for '{asset}'.")

eodag/plugins/authentication/base.py

@@ -19,6 +19,7 @@ from __future__ import annotations
 
 from typing import TYPE_CHECKING, Any, Optional, Union
 
+from eodag.api.product._assets import Asset
 from eodag.plugins.base import PluginTopic
 from eodag.utils.exceptions import MisconfiguredError
 
@@ -80,3 +81,19 @@ class Authentication(PluginTopic):
         Authenticates with s3 and retrieves the available objects
         """
         raise NotImplementedError
+
+    def presign_url(
+        self,
+        asset: Asset,
+        expires_in: int = 3600,
+    ) -> str:
+        """This method is used to presign a url to download an asset from S3.
+
+        :param asset: asset for which the url shall be presigned
+        :param expires_in: expiration time of the presigned url in seconds
+        :returns: presigned url
+        :raises: :class:`NotImplementedError`
+        """
+        raise NotImplementedError(
+            f"presign_url is not implemented for plugin {type(self).__name__}"
+        )

eodag/plugins/authentication/sas_auth.py

@@ -25,6 +25,7 @@ from typing import TYPE_CHECKING, Optional
 import requests
 from requests.auth import AuthBase
 
+from eodag.api.product._assets import Asset
 from eodag.plugins.authentication.base import Authentication
 from eodag.utils import HTTP_REQ_TIMEOUT, USER_AGENT, deepcopy, format_dict_items
 from eodag.utils.exceptions import AuthenticationError, TimeOutError
@@ -143,3 +144,17 @@ class SASAuth(Authentication):
             ssl_verify=ssl_verify,
             matching_url=matching_url,
         )
+
+    def presign_url(
+        self,
+        asset: Asset,
+        expires_in: int = 3600,
+    ) -> str:
+        """This method is used to presign a url to download an asset.
+
+        :param asset: asset for which the url shall be presigned
+        :param expires_in: expiration time of the presigned url in seconds
+        :returns: presigned url
+        """
+        url = asset["href"]
+        return self.config.auth_uri.format(url=url)

eodag/plugins/crunch/filter_latest_intersect.py

@@ -70,6 +70,7 @@ class FilterLatestIntersect(Crunch):
         # Warning: May crash if startTimeFromAscendingNode is not in the appropriate format
         products.sort(key=self.sort_product_by_start_date, reverse=True)
         filtered: list[EOProduct] = []
+        search_extent: BaseGeometry
         add_to_filtered = filtered.append
         footprint: Union[dict[str, Any], BaseGeometry, Any] = search_params.get(
             "geometry"

eodag/plugins/crunch/filter_overlap.py

@@ -20,15 +20,11 @@ from __future__ import annotations
 import logging
 from typing import TYPE_CHECKING, Any
 
+from shapely.errors import ShapelyError
+
 from eodag.plugins.crunch.base import Crunch
 from eodag.utils import get_geometry_from_various
 
-try:
-    from shapely.errors import GEOSException
-except ImportError:
-    # shapely < 2.0 compatibility
-    from shapely.errors import TopologicalError as GEOSException
-
 if TYPE_CHECKING:
     from eodag.api.product import EOProduct
 
@@ -108,7 +104,7 @@ class FilterOverlap(Crunch):
                         product_geometry = product.geometry.buffer(0)
                         try:
                             intersection = search_geom.intersection(product_geometry)
-                        except GEOSException:
+                        except ShapelyError:
                             logger.debug(
                                 "Product geometry still invalid. Overlap test restricted to containment"
                             )

eodag/plugins/download/aws.py

@@ -716,7 +716,7 @@ class AwsDownload(Download):
             ignore_assets,
             product,
         )
-        if auth and isinstance(auth, boto3.resources.base.ServiceResource):
+        if auth and isinstance(auth, boto3.resource("s3").__class__):
             s3_resource = auth
         else:
             s3_resource = boto3.resource(

eodag/plugins/download/creodias_s3.py

@@ -15,12 +15,19 @@
 # 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.
+from __future__ import annotations
+
 from typing import Optional
 
 from eodag import EOProduct
 from eodag.plugins.download.aws import AwsDownload
+from eodag.utils import _deprecated
 
 
+@_deprecated(
+    reason="Plugin that was used in creodias_s3 provider configuration, but not anymore",
+    version="3.10.0",
+)
 class CreodiasS3Download(AwsDownload):
     """
     Download on creodias s3 from their VMs (extension of :class:`~eodag.plugins.download.aws.AwsDownload`)

eodag/plugins/search/build_search_result.py

@@ -57,10 +57,16 @@ from eodag.utils import (
     DEFAULT_SEARCH_TIMEOUT,
     deepcopy,
     dict_items_recursive_sort,
+    get_geometry_from_ecmwf_area,
+    get_geometry_from_ecmwf_feature,
     get_geometry_from_various,
 )
 from eodag.utils.cache import instance_cached_method
-from eodag.utils.dates import is_range_in_range
+from eodag.utils.dates import (
+    COMPACT_DATE_RANGE_PATTERN,
+    DATE_RANGE_PATTERN,
+    is_range_in_range,
+)
 from eodag.utils.exceptions import DownloadError, NotAvailableError, ValidationError
 from eodag.utils.requests import fetch_json
 
@@ -145,6 +151,7 @@ COP_DS_KEYWORDS = {
     "aerosol_type",
     "altitude",
     "product_type",
+    "area",
     "band",
     "cdr_type",
     "data_format",
@@ -182,6 +189,7 @@ COP_DS_KEYWORDS = {
     "region",
     "release_version",
     "satellite",
+    "satellite_mission",
     "sensor",
     "sensor_and_algorithm",
     "soil_level",
@@ -189,6 +197,7 @@ COP_DS_KEYWORDS = {
     "statistic",
     "system_version",
     "temporal_aggregation",
+    "temporal_resolution",
     "time_aggregation",
     "time_reference",
     "time_step",
@@ -607,6 +616,14 @@ class ECMWFSearch(PostJsonSearch):
         # geometry
         if "geometry" in params:
             params["geometry"] = get_geometry_from_various(geometry=params["geometry"])
+        # ECMWF Polytope uses non-geojson structure for features
+        if "feature" in params:
+            params["geometry"] = get_geometry_from_ecmwf_feature(params["feature"])
+            params.pop("feature")
+        # bounding box in area format
+        if "area" in params:
+            params["geometry"] = get_geometry_from_ecmwf_area(params["area"])
+            params.pop("area")
 
         return params
 
@@ -696,10 +713,13 @@ class ECMWFSearch(PostJsonSearch):
         if "end" in filters:
             filters[END] = filters.pop("end")
 
-        # extract default datetime
-        processed_filters = self._preprocess_search_params(
-            deepcopy(filters), product_type
-        )
+        # extract default datetime and convert geometry
+        try:
+            processed_filters = self._preprocess_search_params(
+                deepcopy(filters), product_type
+            )
+        except Exception as e:
+            raise ValidationError(e.args[0]) from e
 
         constraints_url = format_metadata(
             getattr(self.config, "discover_queryables", {}).get("constraints_url", ""),
@@ -714,7 +734,7 @@ class ECMWFSearch(PostJsonSearch):
         form: list[dict[str, Any]] = self._fetch_data(form_url)
 
         formated_filters = self.format_as_provider_keyword(
-            product_type, processed_filters
+            product_type, deepcopy(processed_filters)
         )
         # we re-apply kwargs input to consider override of year, month, day and time.
         for k, v in {**default_values, **kwargs}.items():
@@ -723,7 +743,6 @@ class ECMWFSearch(PostJsonSearch):
             if key not in ALLOWED_KEYWORDS | {
                 START,
                 END,
-                "geom",
                 "geometry",
             }:
                 raise ValidationError(
@@ -772,7 +791,7 @@ class ECMWFSearch(PostJsonSearch):
         # To check if all keywords are queryable parameters, we check if they are in the
         # available values or the product type config (available values calculated from the
         # constraints might not include all queryables)
-        for keyword in filters:
+        for keyword in processed_filters:
             if (
                 keyword
                 not in available_values.keys()
@@ -780,7 +799,7 @@ class ECMWFSearch(PostJsonSearch):
                 | {
                     START,
                     END,
-                    "geom",
+                    "geometry",
                 }
                 and keyword not in [f["name"] for f in form]
                 and keyword.removeprefix(ECMWF_PREFIX)
@@ -880,13 +899,21 @@ class ECMWFSearch(PostJsonSearch):
                 )
 
             # We convert every single value to a list of string
-            filter_v = values if isinstance(values, (list, tuple)) else [values]
+            filter_v = list(values) if isinstance(values, tuple) else values
+            filter_v = filter_v if isinstance(filter_v, list) else [filter_v]
 
             # We strip values of superfluous quotes (added by mapping converter to_geojson).
-            # ECMWF accept values with /to/. We need to split it to an array
-            # ECMWF accept values in format val1/val2. We need to split it to an array
-            sep = re.compile(r"/to/|/")
-            filter_v = [i for v in filter_v for i in sep.split(str(v))]
+            # ECMWF accept date ranges with /to/. We need to split it to an array
+            # ECMWF accept date ranges in format val1/val2. We need to split it to an array
+            date_regex = [
+                re.compile(p) for p in (DATE_RANGE_PATTERN, COMPACT_DATE_RANGE_PATTERN)
+            ]
+            is_date = any(
+                any(r.match(v) is not None for r in date_regex) for v in filter_v
+            )
+            if is_date:
+                sep = re.compile(r"/to/|/")
+                filter_v = [i for v in filter_v for i in sep.split(str(v))]
 
             # special handling for time 0000 converted to 0 by pre-formating with metadata_mapping
             if keyword.split(":")[-1] == "time":

eodag/plugins/search/cop_marine.py

@@ -211,9 +211,12 @@ class CopMarineSearch(StaticStacSearch):
         dataset_item: dict[str, Any],
         collection_dict: dict[str, Any],
         use_dataset_dates: bool = False,
+        product_id: Optional[str] = None,
     ) -> Optional[EOProduct]:
 
         item_id = os.path.splitext(item_key.split("/")[-1])[0]
+        if product_id and product_id != item_id:
+            return None
         download_url = s3_url + "/" + item_key
         geometry = (
             get_geometry_from_various(**dataset_item)
@@ -377,9 +380,12 @@ class CopMarineSearch(StaticStacSearch):
                         dataset_item,
                         collection_dict,
                         True,
+                        kwargs.get("id"),
                     )
                     if product:
                         products.append(product)
+                    if product and kwargs.get("id"):
+                        break
                     continue
 
             s3_client = _get_s3_client(endpoint_url)