eodag 4.0.0a4__py3-none-any.whl → 4.0.0b1__py3-none-any.whl

eodag/api/product/drivers/sentinel1.py

@@ -38,12 +38,13 @@ class Sentinel1Driver(DatasetDriver):
         (re.compile(r"grd", re.IGNORECASE), ""),
         (re.compile(r"slc", re.IGNORECASE), ""),
         (re.compile(r"ocn", re.IGNORECASE), ""),
-        (re.compile(r"iw", re.IGNORECASE), ""),
-        (re.compile(r"ew", re.IGNORECASE), ""),
+        (re.compile(r"(?<![A-Za-z])iw(?![A-Za-z])", re.IGNORECASE), ""),
+        (re.compile(r"(?<![A-Za-z])ew(?![A-Za-z])", re.IGNORECASE), ""),
         (re.compile(r"wv", re.IGNORECASE), ""),
-        (re.compile(r"sm", re.IGNORECASE), ""),
-        (re.compile(r"raw([-_]s)?", re.IGNORECASE), ""),
+        (re.compile(r"(?<![A-Za-z])sm(?![A-Za-z])", re.IGNORECASE), ""),
+        (re.compile(r"(?<![A-Za-z])raw([-_]s)?(?![A-Za-z])", re.IGNORECASE), ""),
         (re.compile(r"[t?0-9]{3,}", re.IGNORECASE), ""),
+        (re.compile(r"\b[0-9A-F]{3,}\b", re.IGNORECASE), ""),
         (re.compile(r"-+"), "-"),
         (re.compile(r"-+\."), "."),
         (re.compile(r"_+"), "_"),
@@ -55,34 +56,38 @@ class Sentinel1Driver(DatasetDriver):
         # data
         {
             "pattern": re.compile(
-                r"^.*?([vh]{2}).*\.(?:jp2|tiff?|dat)$", re.IGNORECASE
+                r"^.*?([vh]{2}).*\.(?:jp2|tiff?|dat)(?:\?.*)?$", re.IGNORECASE
             ),
             "roles": ["data"],
         },
         # metadata
         {
             "pattern": re.compile(
-                r"^(?:.*[/\\])?([^/\\]+)(\.xml|\.xsd|\.safe|\.json)$", re.IGNORECASE
+                r"^(?:.*[/\\])?([^/\\]+)(\.xml|\.xsd|\.safe|\.json)(?:\?.*)?$",
+                re.IGNORECASE,
             ),
             "roles": ["metadata"],
         },
         # thumbnail
         {
             "pattern": re.compile(
-                r"^(?:.*[/\\])?(thumbnail)(\.jpe?g|\.png)$", re.IGNORECASE
+                r"^(?:.*[/\\])?(thumbnail)(\.jpe?g|\.png)(?:\?.*)?$", re.IGNORECASE
             ),
             "roles": ["thumbnail"],
         },
         # quicklook
         {
             "pattern": re.compile(
-                r"^(?:.*[/\\])?([^/\\]+-ql|preview|quick-?look)(\.jpe?g|\.png)$",
+                r"^(?:.*[/\\])?([^/\\]+-ql|preview|quick-?look)(\.jpe?g|\.png)(?:\?.*)?$",
                 re.IGNORECASE,
             ),
             "roles": ["overview"],
         },
         # default
-        {"pattern": re.compile(r"^(?:.*[/\\])?([^/\\]+)$"), "roles": ["auxiliary"]},
+        {
+            "pattern": re.compile(r"^(?:.*[/\\])?([^/\\?]+)(?:\?.*)?$"),
+            "roles": ["auxiliary"],
+        },
     ]
 
     def _normalize_key(self, key: str, eo_product: EOProduct) -> str:

eodag/api/product/drivers/sentinel2.py

@@ -40,47 +40,54 @@ class Sentinel2Driver(DatasetDriver):
     ASSET_KEYS_PATTERNS_ROLES: list[AssetPatterns] = [
         # masks
         {
-            "pattern": re.compile(r"^.*?(MSK_[^/\\]+)\.(?:jp2|tiff?)$", re.IGNORECASE),
+            "pattern": re.compile(
+                r"^.*?(MSK_[^/\\]+)\.(?:jp2|tiff?)(?:\?.*)?$", re.IGNORECASE
+            ),
             "roles": ["data-mask"],
         },
         # visual
         {
             "pattern": re.compile(
-                r"^.*?(TCI)(_[0-9]+m)?\.(?:jp2|tiff?)$", re.IGNORECASE
+                r"^.*?(TCI)(_[0-9]+m)?\.(?:jp2|tiff?)(?:\?.*)?$", re.IGNORECASE
             ),
             "roles": ["visual"],
         },
         # bands
         {
             "pattern": re.compile(
-                r"^.*?([A-Z]+[0-9]*[A-Z]?)(_[0-9]+m)?\.(?:jp2|tiff?)$", re.IGNORECASE
+                r"^.*?([A-Z]+[0-9]*[A-Z]?)(_[0-9]+m)?\.(?:jp2|tiff?)(?:\?.*)?$",
+                re.IGNORECASE,
             ),
             "roles": ["data"],
         },
         # metadata
         {
             "pattern": re.compile(
-                r"^(?:.*[/\\])?([^/\\]+)(\.xml|\.xsd|\.safe|\.json)$", re.IGNORECASE
+                r"^(?:.*[/\\])?([^/\\]+)(\.xml|\.xsd|\.safe|\.json)(?:\?.*)?$",
+                re.IGNORECASE,
             ),
             "roles": ["metadata"],
         },
         # thumbnail
         {
             "pattern": re.compile(
-                r"^(?:.*[/\\])?(thumbnail)(\.jpe?g|\.png)$", re.IGNORECASE
+                r"^(?:.*[/\\])?(thumbnail)(\.jpe?g|\.png)(?:\?.*)?$", re.IGNORECASE
             ),
             "roles": ["thumbnail"],
         },
         # quicklook
         {
             "pattern": re.compile(
-                r"^(?:.*[/\\])?[^/\\]+(-ql|preview|quick-?look)(\.jpe?g|\.png)$",
+                r"^(?:.*[/\\])?[^/\\]+(-ql|preview|quick-?look)(\.jpe?g|\.png)(?:\?.*)?$",
                 re.IGNORECASE,
             ),
             "roles": ["overview"],
         },
         # default
-        {"pattern": re.compile(r"^(?:.*[/\\])?([^/\\]+)$"), "roles": ["auxiliary"]},
+        {
+            "pattern": re.compile(r"^(?:.*[/\\])?([^/\\?]+)(?:\?.*)?$"),
+            "roles": ["auxiliary"],
+        },
     ]
 
     def _normalize_key(self, key: str, eo_product: EOProduct) -> str:

eodag/api/product/metadata_mapping.py

@@ -1731,16 +1731,19 @@ def get_queryable_from_provider(
     mapping_values = [
         v[0] if isinstance(v, list) else "" for v in metadata_mapping.values()
     ]
+    StacQueryables = Queryables.from_stac_models()
     if provider_queryable in mapping_values:
         ind = mapping_values.index(provider_queryable)
-        return Queryables.get_queryable_from_alias(list(metadata_mapping.keys())[ind])
+        return StacQueryables.get_queryable_from_alias(
+            list(metadata_mapping.keys())[ind]
+        )
     for param, param_conf in metadata_mapping.items():
         if (
             isinstance(param_conf, list)
             and param_conf[0]
             and re.search(pattern, param_conf[0])
         ):
-            return Queryables.get_queryable_from_alias(param)
+            return StacQueryables.get_queryable_from_alias(param)
     return None
 
 

eodag/api/provider.py

@@ -451,6 +451,7 @@ class Provider:
                         getattr(
                             self.config, key
                         ).credentials = conf_with_creds.credentials
+                        return
 
     def delete_collection(self, name: str) -> None:
         """Remove a collection from this provider.

eodag/api/search_result.py

@@ -32,7 +32,7 @@ from eodag.plugins.crunch.filter_latest_intersect import FilterLatestIntersect
 from eodag.plugins.crunch.filter_latest_tpl_name import FilterLatestByName
 from eodag.plugins.crunch.filter_overlap import FilterOverlap
 from eodag.plugins.crunch.filter_property import FilterProperty
-from eodag.utils import GENERIC_STAC_PROVIDER, STAC_SEARCH_PLUGINS
+from eodag.utils import GENERIC_STAC_PROVIDER, STAC_SEARCH_PLUGINS, STAC_VERSION
 from eodag.utils.exceptions import MisconfiguredError
 
 if TYPE_CHECKING:
@@ -206,6 +206,9 @@ class SearchResult(UserList[EOProduct]):
                 "eodag:search_params": geojson_search_params or None,
                 "eodag:raise_errors": self.raise_errors,
             },
+            "links": [],
+            "stac_extensions": [],
+            "stac_version": STAC_VERSION,
         }
 
     def as_shapely_geometry_object(self) -> GeometryCollection:

eodag/cli.py

@@ -48,6 +48,7 @@ from typing import TYPE_CHECKING, Any, Callable, Mapping, Optional
 from urllib.parse import parse_qs
 
 import click
+from concurrent.futures import ThreadPoolExecutor
 
 from eodag.api.collection import CollectionsList
 from eodag.api.core import EODataAccessGateway, SearchResult
@@ -122,14 +123,14 @@ def _deprecated_cli(message: str, version: Optional[str] = None) -> Callable[...
     help="Control the verbosity of the logs. For maximum verbosity, type -vvv",
 )
 @click.pass_context
-def eodag(ctx: Context, verbose: int) -> None:
+def eodag_cli(ctx: Context, verbose: int) -> None:
     """Earth Observation Data Access Gateway: work on EO products from any provider"""
     if ctx.obj is None:
         ctx.obj = {}
     ctx.obj["verbosity"] = verbose
 
 
-@eodag.command(name="version", help="Print eodag version and exit")
+@eodag_cli.command(name="version", help="Print eodag version and exit")
 def version() -> None:
     """Print eodag version and exit"""
     click.echo(
@@ -141,7 +142,7 @@ def version() -> None:
     )
 
 
-@eodag.command(
+@eodag_cli.command(
     name="search",
     help="Search satellite images by their collections, instruments, constellation, "
     "platform, processing level or sensor type. It is mandatory to provide "
@@ -406,7 +407,7 @@ def search_crunch(ctx: Context, **kwargs: Any) -> None:
     ctx.obj["search_results"] = results
 
 
-@eodag.command(name="list", help="List supported collections")
+@eodag_cli.command(name="list", help="List supported collections")
 @click.option("-p", "--provider", help="List collections supported by this provider")
 @click.option(
     "--instruments", help="List collections originating from these instruments"
@@ -488,7 +489,7 @@ def list_col(ctx: Context, **kwargs: Any) -> None:
         sys.exit(1)
 
 
-@eodag.command(name="discover", help="Fetch providers to discover collections")
+@eodag_cli.command(name="discover", help="Fetch providers to discover collections")
 @click.option("-p", "--provider", help="Fetch only the given provider")
 @click.option(
     "--storage",
@@ -519,7 +520,7 @@ def discover_col(ctx: Context, **kwargs: Any) -> None:
     click.echo("Results stored at '{}'".format(storage_filepath))
 
 
-@eodag.command(
+@eodag_cli.command(
     help="""Download a list of products from a serialized search result or STAC items URLs/paths
 
 Examples:
@@ -556,6 +557,11 @@ Examples:
     type=click.Path(dir_okay=True, file_okay=False),
     help="Products or quicklooks download directory (Default: local temporary directory)",
 )
+@click.option(
+    "--max-workers",
+    type=int,
+    help="The maximum number of workers to use for downloading products and assets in parallel",
+)
 @click.pass_context
 def download(ctx: Context, **kwargs: Any) -> None:
     """Download a bunch of products from a serialized search result"""
@@ -601,7 +607,10 @@ def download(ctx: Context, **kwargs: Any) -> None:
 
     else:
         # Download products
-        downloaded_files = satim_api.download_all(search_results, output_dir=output_dir)
+        executor = ThreadPoolExecutor(max_workers=kwargs.pop("max_workers"))
+        downloaded_files = satim_api.download_all(
+            search_results, output_dir=output_dir, executor=executor
+        )
         if downloaded_files and len(downloaded_files) > 0:
             for downloaded_file in downloaded_files:
                 if downloaded_file is None:
@@ -617,4 +626,4 @@ def download(ctx: Context, **kwargs: Any) -> None:
 
 
 if __name__ == "__main__":
-    eodag(obj={})
+    eodag_cli(obj={})

eodag/config.py

@@ -20,7 +20,7 @@ from __future__ import annotations
 import logging
 import os
 from importlib.resources import files as res_files
-from typing import TYPE_CHECKING, Annotated, Any, Literal, Optional, TypedDict, Union
+from typing import TYPE_CHECKING, Annotated, Any, Literal, Optional, Union
 
 import orjson
 import requests
@@ -28,6 +28,7 @@ import yaml
 import yaml.parser
 from annotated_types import Gt
 from jsonpath_ng import JSONPath
+from typing_extensions import TypedDict
 
 from eodag.utils import (
     HTTP_REQ_TIMEOUT,
@@ -635,12 +636,29 @@ class PluginConfig(yaml.YAMLObject):
         matching_conf = getattr(self, "matching_conf", {})
         matching_url = getattr(self, "matching_url", None)
 
-        if target_matching_conf and sort_dict(target_matching_conf) == sort_dict(
-            matching_conf
+        # both match
+        if (
+            target_matching_conf
+            and sort_dict(target_matching_conf) == sort_dict(matching_conf)
+            and target_matching_url
+            and target_matching_url == matching_url
         ):
             return True
 
-        if target_matching_url and target_matching_url == matching_url:
+        # conf matches and no matching_url expected
+        if (
+            target_matching_conf
+            and sort_dict(target_matching_conf) == sort_dict(matching_conf)
+            and not target_matching_url
+        ):
+            return True
+
+        # url matches and no matching_conf expected
+        if (
+            target_matching_url
+            and target_matching_url == matching_url
+            and not target_matching_conf
+        ):
             return True
 
         return False

eodag/plugins/apis/ecmwf.py

@@ -48,6 +48,7 @@ from eodag.utils.logging import get_logging_verbose
 if TYPE_CHECKING:
     from typing import Any, Optional, Union
 
+    from concurrent.futures import ThreadPoolExecutor
     from mypy_boto3_s3 import S3ServiceResource
     from requests.auth import AuthBase
 
@@ -55,7 +56,7 @@ if TYPE_CHECKING:
     from eodag.api.search_result import SearchResult
     from eodag.config import PluginConfig
     from eodag.types.download_args import DownloadConf
-    from eodag.utils import DownloadedCallback, ProgressCallback, Unpack
+    from eodag.utils import ProgressCallback, Unpack
 
 
 logger = logging.getLogger("eodag.apis.ecmwf")
@@ -185,6 +186,7 @@ class EcmwfApi(Api, ECMWFSearch):
         product: EOProduct,
         auth: Optional[Union[AuthBase, S3ServiceResource]] = None,
         progress_callback: Optional[ProgressCallback] = None,
+        executor: Optional[ThreadPoolExecutor] = None,
         wait: float = DEFAULT_DOWNLOAD_WAIT,
         timeout: float = DEFAULT_DOWNLOAD_TIMEOUT,
         **kwargs: Unpack[DownloadConf],
@@ -269,29 +271,6 @@ class EcmwfApi(Api, ECMWFSearch):
         product.location = path_to_uri(product_path)
         return product_path
 
-    def download_all(
-        self,
-        products: SearchResult,
-        auth: Optional[Union[AuthBase, S3ServiceResource]] = None,
-        downloaded_callback: Optional[DownloadedCallback] = None,
-        progress_callback: Optional[ProgressCallback] = None,
-        wait: float = DEFAULT_DOWNLOAD_WAIT,
-        timeout: float = DEFAULT_DOWNLOAD_TIMEOUT,
-        **kwargs: Unpack[DownloadConf],
-    ) -> list[str]:
-        """
-        Download all using parent (base plugin) method
-        """
-        return super(EcmwfApi, self).download_all(
-            products,
-            auth=auth,
-            downloaded_callback=downloaded_callback,
-            progress_callback=progress_callback,
-            wait=wait,
-            timeout=timeout,
-            **kwargs,
-        )
-
     def clear(self) -> None:
         """Clear search context"""
         pass

eodag/plugins/apis/usgs.py

@@ -57,12 +57,13 @@ from eodag.utils.exceptions import (
 )
 
 if TYPE_CHECKING:
+    from concurrent.futures import ThreadPoolExecutor
     from mypy_boto3_s3 import S3ServiceResource
     from requests.auth import AuthBase
 
     from eodag.config import PluginConfig
     from eodag.types.download_args import DownloadConf
-    from eodag.utils import DownloadedCallback, Unpack
+    from eodag.utils import Unpack
 
 logger = logging.getLogger("eodag.apis.usgs")
 
@@ -312,6 +313,7 @@ class UsgsApi(Api):
         product: EOProduct,
         auth: Optional[Union[AuthBase, S3ServiceResource]] = None,
         progress_callback: Optional[ProgressCallback] = None,
+        executor: Optional[ThreadPoolExecutor] = None,
         wait: float = DEFAULT_DOWNLOAD_WAIT,
         timeout: float = DEFAULT_DOWNLOAD_TIMEOUT,
         **kwargs: Unpack[DownloadConf],
@@ -477,26 +479,3 @@ class UsgsApi(Api):
             shutil.move(fs_path, new_fs_path)
             product.location = path_to_uri(new_fs_path)
             return new_fs_path
-
-    def download_all(
-        self,
-        products: SearchResult,
-        auth: Optional[Union[AuthBase, S3ServiceResource]] = None,
-        downloaded_callback: Optional[DownloadedCallback] = None,
-        progress_callback: Optional[ProgressCallback] = None,
-        wait: float = DEFAULT_DOWNLOAD_WAIT,
-        timeout: float = DEFAULT_DOWNLOAD_TIMEOUT,
-        **kwargs: Unpack[DownloadConf],
-    ) -> list[str]:
-        """
-        Download all using parent (base plugin) method
-        """
-        return super(UsgsApi, self).download_all(
-            products,
-            auth=auth,
-            downloaded_callback=downloaded_callback,
-            progress_callback=progress_callback,
-            wait=wait,
-            timeout=timeout,
-            **kwargs,
-        )

eodag/plugins/download/aws.py

@@ -25,7 +25,9 @@ from typing import TYPE_CHECKING, Any, Literal, Optional, Union, cast
 
 import boto3
 import requests
+from boto3.s3.transfer import TransferConfig
 from botocore.exceptions import ClientError
+from concurrent.futures import ThreadPoolExecutor, as_completed
 from lxml import etree
 from requests.auth import AuthBase
 
@@ -34,7 +36,7 @@ from eodag.api.product.metadata_mapping import (
     properties_from_json,
     properties_from_xml,
 )
-from eodag.plugins.authentication.aws_auth import raise_if_auth_error
+from eodag.plugins.authentication.aws_auth import AwsAuth, raise_if_auth_error
 from eodag.plugins.download.base import Download
 from eodag.utils import (
     DEFAULT_DOWNLOAD_TIMEOUT,
@@ -65,10 +67,9 @@ if TYPE_CHECKING:
     from mypy_boto3_s3.client import S3Client
 
     from eodag.api.product import EOProduct
-    from eodag.api.search_result import SearchResult
     from eodag.config import PluginConfig
     from eodag.types.download_args import DownloadConf
-    from eodag.utils import DownloadedCallback, Unpack
+    from eodag.utils import Unpack
 
 
 logger = logging.getLogger("eodag.download.aws")
@@ -227,6 +228,7 @@ class AwsDownload(Download):
         product: EOProduct,
         auth: Optional[Union[AuthBase, S3ServiceResource]] = None,
         progress_callback: Optional[ProgressCallback] = None,
+        executor: Optional[ThreadPoolExecutor] = None,
         wait: float = DEFAULT_DOWNLOAD_WAIT,
         timeout: float = DEFAULT_DOWNLOAD_TIMEOUT,
         **kwargs: Unpack[DownloadConf],
@@ -246,6 +248,7 @@ class AwsDownload(Download):
                                   size as inputs and handle progress bar
                                   creation and update to give the user a
                                   feedback on the download progress
+        :param executor: (optional) An executor to download assets of ``product`` in parallel if it has any
         :param kwargs: `output_dir` (str), `extract` (bool), `delete_archive` (bool)
                         and `dl_url_params` (dict) can be provided as additional kwargs
                         and will override any other values defined in a configuration
@@ -293,7 +296,7 @@ class AwsDownload(Download):
         )
 
         # authenticate
-        if product.downloader_auth:
+        if product.downloader_auth and isinstance(product.downloader_auth, AwsAuth):
             authenticated_objects = product.downloader_auth.authenticate_objects(
                 bucket_names_and_prefixes
             )
@@ -302,9 +305,19 @@ class AwsDownload(Download):
                 "Authentication plugin (AwsAuth) has to be configured if AwsDownload is used"
             )
 
+        # create an executor if not given and anticipate the possible need to shut it down
+        executor, shutdown_executor = (
+            (ThreadPoolExecutor(), True) if executor is None else (executor, False)
+        )
+        self._config_executor(executor)
+
         # files in zip
         updated_bucket_names_and_prefixes = self._download_file_in_zip(
-            product, bucket_names_and_prefixes, product_local_path, progress_callback
+            product.downloader_auth,
+            bucket_names_and_prefixes,
+            product_local_path,
+            progress_callback,
+            executor,
         )
         # prevent nothing-to-download errors if download was performed in zip
         raise_error = (
@@ -329,7 +342,8 @@ class AwsDownload(Download):
         if len(unique_product_chunks) > 0:
             progress_callback.reset(total=total_size)
         try:
-            for product_chunk in unique_product_chunks:
+
+            def download_chunk(product_chunk: Any) -> None:
                 try:
                     chunk_rel_path = self.get_chunk_dest_path(
                         product,
@@ -339,11 +353,11 @@ class AwsDownload(Download):
                 except NotAvailableError as e:
                     # out of SAFE format chunk
                     logger.warning(e)
-                    continue
+                    return
+
                 chunk_abs_path = os.path.join(product_local_path, chunk_rel_path)
                 chunk_abs_path_dir = os.path.dirname(chunk_abs_path)
-                if not os.path.isdir(chunk_abs_path_dir):
-                    os.makedirs(chunk_abs_path_dir)
+                os.makedirs(chunk_abs_path_dir, exist_ok=True)
 
                 bucket_objects = authenticated_objects.get(product_chunk.bucket_name)
                 extra_args = (
@@ -352,12 +366,31 @@ class AwsDownload(Download):
                     else {}
                 )
                 if not os.path.isfile(chunk_abs_path):
+                    transfer_config = TransferConfig(use_threads=False)
                     product_chunk.Bucket().download_file(
                         product_chunk.key,
                         chunk_abs_path,
                         ExtraArgs=extra_args,
                         Callback=progress_callback,
+                        Config=transfer_config,
                     )
+                return
+
+            # use parallelization if possible.
+            # when products are already downloaded in parallel but the executor has only one worker,
+            # we avoid submitting nested tasks to the executor to prevent deadlocks
+            if (
+                executor._thread_name_prefix == "eodag-download-all"
+                and executor._max_workers == 1
+            ):
+                for product_chunk in unique_product_chunks:
+                    download_chunk(product_chunk)
+            else:
+                futures = (
+                    executor.submit(download_chunk, product_chunk)
+                    for product_chunk in unique_product_chunks
+                )
+                [f.result() for f in as_completed(futures)]
 
         except AuthenticationError as e:
             logger.warning("Unexpected error: %s" % e)
@@ -365,6 +398,9 @@ class AwsDownload(Download):
             raise_if_auth_error(e, self.provider)
             logger.warning("Unexpected error: %s" % e)
 
+        if shutdown_executor:
+            executor.shutdown(wait=True)
+
         # finalize safe product
         if build_safe and product.collection and "S2_MSI" in product.collection:
             self.finalize_s2_safe_product(product_local_path)
@@ -386,31 +422,33 @@ class AwsDownload(Download):
         return product_local_path
 
     def _download_file_in_zip(
-        self, product, bucket_names_and_prefixes, product_local_path, progress_callback
+        self,
+        downloader_auth: AwsAuth,
+        bucket_names_and_prefixes: list[tuple[str, Optional[str]]],
+        product_local_path: str,
+        progress_callback: ProgressCallback,
+        executor: ThreadPoolExecutor,
     ):
         """
         Download file in zip from a prefix like `foo/bar.zip!file.txt`
         """
-        if (
-            not getattr(product, "downloader_auth", None)
-            or product.downloader_auth.s3_resource is None
-        ):
+        if downloader_auth.s3_resource is None:
             logger.debug("Cannot check files in s3 zip without s3 resource")
             return bucket_names_and_prefixes
 
-        s3_client = product.downloader_auth.get_s3_client()
+        s3_client = downloader_auth.get_s3_client()
 
         downloaded = []
-        for i, pack in enumerate(bucket_names_and_prefixes):
+
+        def process_zip_file(i: int, pack: tuple[str, Optional[str]]) -> Optional[int]:
             bucket_name, prefix = pack
-            if ".zip!" in prefix:
+            if prefix is not None and ".zip!" in prefix:
                 splitted_path = prefix.split(".zip!")
                 zip_prefix = f"{splitted_path[0]}.zip"
                 rel_path = splitted_path[-1]
                 dest_file = os.path.join(product_local_path, rel_path)
                 dest_abs_path_dir = os.path.dirname(dest_file)
-                if not os.path.isdir(dest_abs_path_dir):
-                    os.makedirs(dest_abs_path_dir)
+                os.makedirs(dest_abs_path_dir, exist_ok=True)
 
                 zip_file, _ = open_s3_zipped_object(
                     bucket_name, zip_prefix, s3_client, partial=False
@@ -428,7 +466,30 @@ class AwsDownload(Download):
                             output_file.write(zchunk)
                             progress_callback(len(zchunk))
 
-                downloaded.append(i)
+                return i
+            return None
+
+        # use parallelization if possible
+        # when products are already downloaded in parallel but the executor has only one worker,
+        # we avoid submitting nested tasks to the executor to prevent deadlocks
+        if (
+            executor._thread_name_prefix == "eodag-download-all"
+            and executor._max_workers == 1
+        ):
+            for i, pack in enumerate(bucket_names_and_prefixes):
+                result = process_zip_file(i, pack)
+                if result is not None:
+                    downloaded.append(result)
+        else:
+            futures = (
+                executor.submit(process_zip_file, i, pack)
+                for i, pack in enumerate(bucket_names_and_prefixes)
+            )
+
+            for future in as_completed(futures):
+                result = future.result()
+                if result is not None:
+                    downloaded.append(result)
 
         return [
             pack
@@ -710,7 +771,9 @@ class AwsDownload(Download):
             ignore_assets,
             product,
         )
-        if auth and isinstance(auth, boto3.resources.base.ServiceResource):
+
+        # check if auth is a S3 resource by verifying it has the meta.client attribute.
+        if auth and hasattr(auth, "meta") and hasattr(auth.meta, "client"):
             s3_resource = auth
         else:
             s3_resource = boto3.resource(
@@ -773,6 +836,7 @@ class AwsDownload(Download):
             byte_range,
             compress,
             zip_filename,
+            provider_max_workers=getattr(self.config, "max_workers", None),
         )
 
     def _get_commonpath(
@@ -1112,26 +1176,3 @@ class AwsDownload(Download):
 
         logger.debug(f"Downloading {chunk.key} to {product_path}")
         return product_path
-
-    def download_all(
-        self,
-        products: SearchResult,
-        auth: Optional[Union[AuthBase, S3ServiceResource]] = None,
-        downloaded_callback: Optional[DownloadedCallback] = None,
-        progress_callback: Optional[ProgressCallback] = None,
-        wait: float = DEFAULT_DOWNLOAD_WAIT,
-        timeout: float = DEFAULT_DOWNLOAD_TIMEOUT,
-        **kwargs: Unpack[DownloadConf],
-    ) -> list[str]:
-        """
-        download_all using parent (base plugin) method
-        """
-        return super(AwsDownload, self).download_all(
-            products,
-            auth=auth,
-            downloaded_callback=downloaded_callback,
-            progress_callback=progress_callback,
-            wait=wait,
-            timeout=timeout,
-            **kwargs,
-        )