eodag 3.1.0b1__py3-none-any.whl → 3.2.0__py3-none-any.whl

eodag/resources/stac_api.yml

@@ -799,7 +799,7 @@ components:
         description: |
           Sentinel-2 is a wide-swath, high-resolution, multi-spectral
           imaging mission...
-        license: proprietary
+        license: other
         keywords:
           - copernicus
           - esa
@@ -1416,7 +1416,7 @@ components:
       description: |-
         License(s) of the data as a SPDX
         [License identifier](https://spdx.org/licenses/). Alternatively, use
-        `proprietary` if the license is not on the SPDX license list or
+        `other` if the license is not on the SPDX license list or
         `various` if multiple licenses apply. In these two cases links to the
         license texts SHOULD be added, see the `license` link relation type.
 

eodag/resources/user_conf_template.yml

@@ -157,15 +157,18 @@ geodes:
     download:
         extract:
         output_dir:
-hydroweb_next:
+geodes_s3:
     priority: # Lower value means lower priority (Default: 0)
     search: # Search parameters configuration
     auth:
         credentials:
-            apikey:
+            aws_access_key_id:
+            aws_secret_access_key:
+            aws_session_token:
     download:
+        extract:
         output_dir:
-meteoblue:
+hydroweb_next:
     priority: # Lower value means lower priority (Default: 0)
     search: # Search parameters configuration
     auth:
@@ -173,16 +176,14 @@ meteoblue:
             apikey:
     download:
         output_dir:
-onda:
+meteoblue:
     priority: # Lower value means lower priority (Default: 0)
     search: # Search parameters configuration
-    download:
-        extract:
-        output_dir:
     auth:
         credentials:
-            username:
-            password:
+            apikey:
+    download:
+        output_dir:
 peps:
     priority: # Lower value means lower priority (Default: 1)
     search: # Search parameters configuration

eodag/rest/cache.py

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
-from typing import Any, Callable, Coroutine, Dict, TypeVar, cast
+from typing import Any, Callable, Coroutine, TypeVar, cast
 
 import orjson
 from cachetools import LRUCache
@@ -48,7 +48,7 @@ async def cached(
     host_cache_key = f"{cache_key}:{host}"
 
     try:
-        c: Dict[str, Any] = request.app.state.cache
+        c: dict[str, Any] = request.app.state.cache
 
         if cached := c.get(host_cache_key):
             logger.debug("Cache result hit")

eodag/rest/config.py

@@ -18,7 +18,7 @@
 from __future__ import annotations
 
 from functools import lru_cache
-from typing import Annotated, List, Union
+from typing import Annotated, Union
 
 from pydantic import Field
 from pydantic.functional_validators import BeforeValidator
@@ -28,7 +28,7 @@ from typing_extensions import Doc
 from eodag.rest.constants import DEFAULT_MAXSIZE, DEFAULT_TTL
 
 
-def str2liststr(raw: Union[str, List[str]]) -> List[str]:
+def str2liststr(raw: Union[str, list[str]]) -> list[str]:
     """Convert str to list[str]"""
     if isinstance(raw, list):
         return raw
@@ -49,7 +49,7 @@ class Settings(BaseSettings):
     stac_api_landing_id: str = "eodag-stac-api"
 
     origin_url_blacklist: Annotated[
-        Union[str, List[str]],
+        Union[str, list[str]],
         BeforeValidator(str2liststr),
         Doc(
             "Hide from clients items assets' alternative URLs starting with URLs from the list"

eodag/rest/core.py

@@ -77,7 +77,7 @@ from eodag.utils.exceptions import (
 )
 
 if TYPE_CHECKING:
-    from typing import Any, Dict, List, Optional, Union
+    from typing import Any, Optional, Union
 
     from fastapi import Request
     from requests.auth import AuthBase
@@ -116,12 +116,12 @@ def get_home_page_content(base_url: str, ipp: Optional[int] = None) -> str:
     reason="Function internally used by get_home_page_content, also deprecated",
     version="2.6.1",
 )
-def format_product_types(product_types: List[Dict[str, Any]]) -> str:
+def format_product_types(product_types: list[dict[str, Any]]) -> str:
     """Format product_types
 
     :param product_types: A list of EODAG product types as returned by the core api
     """
-    result: List[str] = []
+    result: list[str] = []
     for pt in product_types:
         result.append(f'* *__{pt["ID"]}__*: {pt["abstract"]}')
     return "\n".join(sorted(result))
@@ -130,7 +130,7 @@ def format_product_types(product_types: List[Dict[str, Any]]) -> str:
 def search_stac_items(
     request: Request,
     search_request: SearchPostRequest,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     """
     Search and retrieve STAC items based on the given search request.
 
@@ -309,8 +309,8 @@ def download_stac_item(
 
 def _order_and_update(
     product: EOProduct,
-    auth: Union[AuthBase, Dict[str, str], None],
-    query_args: Dict[str, Any],
+    auth: Union[AuthBase, dict[str, str], None],
+    query_args: dict[str, Any],
 ) -> None:
     """Order product if needed and update given kwargs with order-status-dict"""
     if product.properties.get("storageStatus") != ONLINE_STATUS and hasattr(
@@ -353,7 +353,7 @@ def _order_and_update(
 
 
 @lru_cache(maxsize=1)
-def get_detailled_collections_list() -> List[Dict[str, Any]]:
+def get_detailled_collections_list() -> list[dict[str, Any]]:
     """Returns detailled collections / product_types list as a list of
     config dicts
 
@@ -370,7 +370,7 @@ async def all_collections(
     instrument: Optional[str] = None,
     constellation: Optional[str] = None,
     datetime: Optional[str] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     """Build STAC collections
 
     :param url: Requested URL
@@ -380,7 +380,7 @@ async def all_collections(
     :returns: Collections dictionary
     """
 
-    async def _fetch() -> Dict[str, Any]:
+    async def _fetch() -> dict[str, Any]:
         stac_collection = StacCollection(
             url=request.state.url,
             stac_config=stac_config,
@@ -422,7 +422,7 @@ async def all_collections(
 
 async def get_collection(
     request: Request, collection_id: str, provider: Optional[str] = None
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     """Build STAC collection by id
 
     :param url: Requested URL
@@ -432,7 +432,7 @@ async def get_collection(
     :returns: Collection dictionary
     """
 
-    async def _fetch() -> Dict[str, Any]:
+    async def _fetch() -> dict[str, Any]:
         stac_collection = StacCollection(
             url=request.state.url,
             stac_config=stac_config,
@@ -455,7 +455,7 @@ async def get_stac_catalogs(
     request: Request,
     url: str,
     provider: Optional[str] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     """Build STAC catalog
 
     :param url: Requested URL
@@ -464,7 +464,7 @@ async def get_stac_catalogs(
     :returns: Catalog dictionary
     """
 
-    async def _fetch() -> Dict[str, Any]:
+    async def _fetch() -> dict[str, Any]:
         return StacCatalog(
             url=url,
             stac_config=stac_config,
@@ -523,7 +523,7 @@ def time_interval_overlap(eodag_args: EODAGSearch, catalog: StacCatalog) -> bool
 
 
 @lru_cache(maxsize=1)
-def get_stac_conformance() -> Dict[str, str]:
+def get_stac_conformance() -> dict[str, str]:
     """Build STAC conformance
 
     :returns: conformance dictionary
@@ -540,7 +540,7 @@ def get_stac_api_version() -> str:
 
 
 @lru_cache(maxsize=1)
-def get_stac_extension_oseo(url: str) -> Dict[str, str]:
+def get_stac_extension_oseo(url: str) -> dict[str, str]:
     """Build STAC OGC / OpenSearch Extension for EO
 
     :param url: Requested URL
@@ -571,14 +571,14 @@ async def get_queryables(
     request: Request,
     params: QueryablesGetParams,
     provider: Optional[str] = None,
-) -> Dict[str, Any]:
+) -> dict[str, Any]:
     """Fetch the queryable properties for a collection.
 
     :param collection_id: The ID of the collection.
     :returns: A set containing the STAC standardized queryable properties for a collection.
     """
 
-    async def _fetch() -> Dict[str, Any]:
+    async def _fetch() -> dict[str, Any]:
         python_queryables = eodag_api.list_queryables(
             provider=provider,
             fetch_providers=False,
@@ -589,8 +589,8 @@ async def get_queryables(
             by_alias=True
         )
 
-        properties: Dict[str, Any] = python_queryables_json["properties"]
-        required: List[str] = python_queryables_json.get("required") or []
+        properties: dict[str, Any] = python_queryables_json["properties"]
+        required: list[str] = python_queryables_json.get("required") or []
 
         # productType is either simply removed or replaced by collection later.
         if "productType" in properties:
@@ -598,7 +598,7 @@ async def get_queryables(
         if "productType" in required:
             required.remove("productType")
 
-        stac_properties: Dict[str, Any] = {}
+        stac_properties: dict[str, Any] = {}
 
         # get stac default properties to set prefixes
         stac_item_properties = list(stac_config["item"]["properties"].values())
@@ -687,7 +687,7 @@ def crunch_products(
             f'Unknown crunch name. Use one of: {", ".join(crunchers.keys())}'
         )
 
-    cruncher_config: Dict[str, Any] = {}
+    cruncher_config: dict[str, Any] = {}
     for config_param in cruncher.config_params:
         config_param_value = kwargs.get(config_param)
         if not config_param_value:
@@ -720,13 +720,13 @@ def eodag_api_init() -> None:
             ext_col = StacCollection.ext_stac_collections.get(key)
             if not ext_col:
                 continue
-            platform: Union[str, List[str]] = ext_col.get("summaries", {}).get(
+            platform: Union[str, list[str]] = ext_col.get("summaries", {}).get(
                 "platform"
             )
-            constellation: Union[str, List[str]] = ext_col.get("summaries", {}).get(
+            constellation: Union[str, list[str]] = ext_col.get("summaries", {}).get(
                 "constellation"
             )
-            processing_level: Union[str, List[str]] = ext_col.get("summaries", {}).get(
+            processing_level: Union[str, list[str]] = ext_col.get("summaries", {}).get(
                 "processing:level"
             )
             # Check if platform or constellation are lists and join them into a string if they are

eodag/rest/errors.py

@@ -16,7 +16,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 import logging
-from typing import Dict, List, Tuple, Union
+from typing import Union
 
 from fastapi import FastAPI, Request
 from fastapi.responses import ORJSONResponse
@@ -56,16 +56,16 @@ logger = logging.getLogger("eodag.rest.server")
 class ResponseSearchError(Exception):
     """Represent a EODAG search error response"""
 
-    def __init__(self, errors: List[Tuple[str, Exception]]) -> None:
+    def __init__(self, errors: list[tuple[str, Exception]]) -> None:
         self._errors = errors
 
     @property
-    def errors(self) -> List[Dict[str, Union[str, int]]]:
+    def errors(self) -> list[dict[str, Union[str, int]]]:
         """return errors as a list of dict"""
-        error_list: List[Dict[str, Union[str, int]]] = []
+        error_list: list[dict[str, Union[str, int]]] = []
         for name, exception in self._errors:
 
-            error_dict: Dict[str, Union[str, int]] = {
+            error_dict: dict[str, Union[str, int]] = {
                 "provider": name,
                 "error": exception.__class__.__name__,
             }

eodag/rest/server.py

@@ -23,15 +23,7 @@ import re
 from contextlib import asynccontextmanager
 from importlib.metadata import version
 from json import JSONDecodeError
-from typing import (
-    TYPE_CHECKING,
-    Any,
-    AsyncGenerator,
-    Awaitable,
-    Callable,
-    Dict,
-    Optional,
-)
+from typing import TYPE_CHECKING, Any, AsyncGenerator, Awaitable, Callable, Optional
 
 from fastapi import APIRouter as FastAPIRouter
 from fastapi import FastAPI, HTTPException, Request
@@ -131,7 +123,7 @@ stac_api_config = load_stac_api_config()
     include_in_schema=False,
     status_code=200,
 )
-async def liveness_probe(request: Request) -> Dict[str, bool]:
+async def liveness_probe(request: Request) -> dict[str, bool]:
     "Endpoint meant to be used as liveness probe by deployment platforms"
     return {"success": True}
 
@@ -139,7 +131,7 @@ async def liveness_probe(request: Request) -> Dict[str, bool]:
 @router.api_route(
     methods=["GET", "HEAD"], path="/api", tags=["Capabilities"], include_in_schema=False
 )
-async def eodag_openapi(request: Request) -> Dict[str, Any]:
+async def eodag_openapi(request: Request) -> dict[str, Any]:
     """Customized openapi"""
     logger.debug("URL: /api")
     if app.openapi_schema:

eodag/rest/stac.py

@@ -21,7 +21,7 @@ import logging
 import os
 from collections import defaultdict
 from datetime import datetime, timezone
-from typing import TYPE_CHECKING, Any, Dict, List, Optional
+from typing import TYPE_CHECKING, Any, Optional
 from urllib.parse import (
     parse_qs,
     quote,
@@ -82,6 +82,8 @@ COLLECTION_PROPERTIES = [
     "missionEndDate",
     "keywords",
     "stacCollection",
+    "alias",
+    "productType",
 ]
 IGNORED_ITEM_PROPERTIES = [
     "_id",
@@ -95,6 +97,7 @@ IGNORED_ITEM_PROPERTIES = [
     "qs",
     "defaultGeometry",
     "_date",
+    "productType",
 ]
 
 
@@ -118,7 +121,7 @@ class StacCommon:
     def __init__(
         self,
         url: str,
-        stac_config: Dict[str, Any],
+        stac_config: dict[str, Any],
         provider: Optional[str],
         eodag_api: EODataAccessGateway,
         root: str = "/",
@@ -129,9 +132,9 @@ class StacCommon:
         self.eodag_api = eodag_api
         self.root = root.rstrip("/") if len(root) > 1 else root
 
-        self.data: Dict[str, Any] = {}
+        self.data: dict[str, Any] = {}
 
-    def update_data(self, data: Dict[str, Any]) -> None:
+    def update_data(self, data: dict[str, Any]) -> None:
         """Updates data using given input STAC dict data
 
         :param data: Catalog data (parsed STAC dict)
@@ -165,8 +168,8 @@ class StacCommon:
 
     @staticmethod
     def get_stac_extension(
-        url: str, stac_config: Dict[str, Any], extension: str, **kwargs: Any
-    ) -> Dict[str, str]:
+        url: str, stac_config: dict[str, Any], extension: str, **kwargs: Any
+    ) -> dict[str, str]:
         """Parse STAC extension from config and return as dict
 
         :param url: Requested URL
@@ -185,7 +188,7 @@ class StacCommon:
         }
         return format_dict_items(extension_model, **format_args)
 
-    def get_provider_dict(self, provider: str) -> Dict[str, Any]:
+    def get_provider_dict(self, provider: str) -> dict[str, Any]:
         """Generate STAC provider dict"""
         provider_config = next(
             p
@@ -214,7 +217,7 @@ class StacItem(StacCommon):
     def __init__(
         self,
         url: str,
-        stac_config: Dict[str, Any],
+        stac_config: dict[str, Any],
         provider: Optional[str],
         eodag_api: EODataAccessGateway,
         root: str = "/",
@@ -228,8 +231,8 @@ class StacItem(StacCommon):
         )
 
     def __get_item_list(
-        self, search_results: SearchResult, catalog: Dict[str, Any]
-    ) -> List[Dict[str, Any]]:
+        self, search_results: SearchResult, catalog: dict[str, Any]
+    ) -> list[dict[str, Any]]:
         """Build STAC items list from EODAG search results
 
         :param search_results: EODAG search results
@@ -244,7 +247,7 @@ class StacItem(StacCommon):
         )
 
         # check if some items need to be converted
-        need_conversion: Dict[str, Any] = {}
+        need_conversion: dict[str, Any] = {}
         for k, v in item_model["properties"].items():
             if isinstance(v, str):
                 conversion, item_model["properties"][k] = get_metadata_path(
@@ -264,11 +267,11 @@ class StacItem(StacCommon):
         ]
         ignored_props = COLLECTION_PROPERTIES + item_props + IGNORED_ITEM_PROPERTIES
 
-        item_list: List[Dict[str, Any]] = []
+        item_list: list[dict[str, Any]] = []
         for product in search_results:
             product_dict = deepcopy(product.__dict__)
 
-            product_item: Dict[str, Any] = jsonpath_parse_dict_items(
+            product_item: dict[str, Any] = jsonpath_parse_dict_items(
                 item_model,
                 {
                     "product": product_dict,
@@ -370,10 +373,10 @@ class StacItem(StacCommon):
         product: EOProduct,
         downloadlink_href: str,
         without_arg_url: str,
-        query_dict: Optional[Dict[str, Any]] = None,
+        query_dict: Optional[dict[str, Any]] = None,
         _dc_qs: Optional[str] = None,
-    ) -> Dict[str, Any]:
-        assets: Dict[str, Any] = {}
+    ) -> dict[str, Any]:
+        assets: dict[str, Any] = {}
         settings = Settings.from_environment()
 
         if _dc_qs:
@@ -452,9 +455,9 @@ class StacItem(StacCommon):
         self,
         search_results: SearchResult,
         total: int,
-        catalog: Dict[str, Any],
-        next_link: Optional[Dict[str, Any]],
-    ) -> Dict[str, Any]:
+        catalog: dict[str, Any],
+        next_link: Optional[dict[str, Any]],
+    ) -> dict[str, Any]:
         """Build STAC items from EODAG search results
 
         :param search_results: EODAG search results
@@ -503,8 +506,8 @@ class StacItem(StacCommon):
         return self.data
 
     def __filter_item_model_properties(
-        self, item_model: Dict[str, Any], product_type: str
-    ) -> Dict[str, Any]:
+        self, item_model: dict[str, Any], product_type: str
+    ) -> dict[str, Any]:
         """Filter item model depending on product type metadata and its extensions.
         Removes not needed parameters, and adds supplementary ones as
         part of oseo extension.
@@ -568,13 +571,13 @@ class StacItem(StacCommon):
 
         return result_item_model
 
-    def __filter_item_properties_values(self, item: Dict[str, Any]) -> Dict[str, Any]:
+    def __filter_item_properties_values(self, item: dict[str, Any]) -> dict[str, Any]:
         """Removes empty properties, unused extensions, and add missing extensions
 
         :param item: STAC item data
         :returns: Filtered item model
         """
-        all_extensions_dict: Dict[str, str] = deepcopy(
+        all_extensions_dict: dict[str, str] = deepcopy(
             self.stac_config["stac_extensions"]
         )
         # parse f-strings with root
@@ -599,7 +602,7 @@ class StacItem(StacCommon):
 
         return item
 
-    def get_stac_item_from_product(self, product: EOProduct) -> Dict[str, Any]:
+    def get_stac_item_from_product(self, product: EOProduct) -> dict[str, Any]:
         """Build STAC item from EODAG product
 
         :param product: EODAG product
@@ -659,7 +662,7 @@ class StacCollection(StacCommon):
     """
 
     # External STAC collections
-    ext_stac_collections: Dict[str, Dict[str, Any]] = dict()
+    ext_stac_collections: dict[str, dict[str, Any]] = dict()
 
     @classmethod
     def fetch_external_stac_collections(cls, eodag_api: EODataAccessGateway) -> None:
@@ -688,7 +691,7 @@ class StacCollection(StacCommon):
     def __init__(
         self,
         url: str,
-        stac_config: Dict[str, Any],
+        stac_config: dict[str, Any],
         provider: Optional[str],
         eodag_api: EODataAccessGateway,
         root: str = "/",
@@ -701,7 +704,7 @@ class StacCollection(StacCommon):
             root=root,
         )
 
-    def __list_product_type_providers(self, product_type: Dict[str, Any]) -> List[str]:
+    def __list_product_type_providers(self, product_type: dict[str, Any]) -> list[str]:
         """Retrieve a list of providers for a given product type.
 
         :param product_type: Dictionary containing information about the product type.
@@ -718,8 +721,8 @@ class StacCollection(StacCommon):
         ]
 
     def __generate_stac_collection(
-        self, collection_model: Any, product_type: Dict[str, Any]
-    ) -> Dict[str, Any]:
+        self, collection_model: Any, product_type: dict[str, Any]
+    ) -> dict[str, Any]:
         """Generate a STAC collection dictionary for a given product type.
 
         :param collection_model: The base model for the STAC collection.
@@ -728,7 +731,7 @@ class StacCollection(StacCommon):
         """
         providers = self.__list_product_type_providers(product_type)
 
-        providers_dict: Dict[str, Dict[str, Any]] = {}
+        providers_dict: dict[str, dict[str, Any]] = {}
         for provider in providers:
             p_dict = self.get_provider_dict(provider)
             providers_dict.setdefault(p_dict["name"], p_dict)
@@ -815,7 +818,7 @@ class StacCollection(StacCommon):
         instrument: Optional[str] = None,
         constellation: Optional[str] = None,
         datetime: Optional[str] = None,
-    ) -> List[Dict[str, Any]]:
+    ) -> list[dict[str, Any]]:
         """Build STAC collections list
 
         :param filters: (optional) Additional filters for collections search
@@ -850,7 +853,7 @@ class StacCollection(StacCommon):
             product_types = all_pt
 
         # list product types with all metadata using guessed ids
-        collection_list: List[Dict[str, Any]] = []
+        collection_list: list[dict[str, Any]] = []
         for product_type in product_types:
             stac_collection = self.__generate_stac_collection(
                 collection_model, product_type
@@ -874,7 +877,7 @@ class StacCatalog(StacCommon):
     def __init__(
         self,
         url: str,
-        stac_config: Dict[str, Any],
+        stac_config: dict[str, Any],
         provider: Optional[str],
         eodag_api: EODataAccessGateway,
         root: str = "/",
@@ -890,8 +893,8 @@ class StacCatalog(StacCommon):
         self.data = {}
 
         self.shp_location_config = eodag_api.locations_config
-        self.search_args: Dict[str, Any] = {}
-        self.children: List[Dict[str, Any]] = []
+        self.search_args: dict[str, Any] = {}
+        self.children: list[dict[str, Any]] = []
 
         self.catalog_config = deepcopy(stac_config["catalog"])
 
@@ -907,7 +910,7 @@ class StacCatalog(StacCommon):
         # build catalog
         self.__build_stac_catalog(collection)
 
-    def __update_data_from_catalog_config(self, catalog_config: Dict[str, Any]) -> bool:
+    def __update_data_from_catalog_config(self, catalog_config: dict[str, Any]) -> bool:
         """Updates configuration and data using given input catalog config
 
         :param catalog_config: Catalog config, from yml stac_config[catalogs]
@@ -959,7 +962,7 @@ class StacCatalog(StacCommon):
 
     def set_stac_product_type_by_id(
         self, product_type: str, **_: Any
-    ) -> Dict[str, Any]:
+    ) -> dict[str, Any]:
         """Updates catalog with given product_type
 
         :param product_type: Product type
@@ -991,7 +994,7 @@ class StacCatalog(StacCommon):
         format_args["catalog"] = defaultdict(str, **self.data)
         format_args["collection"] = collections[0]
         try:
-            parsed_dict: Dict[str, Any] = format_dict_items(cat_model, **format_args)
+            parsed_dict: dict[str, Any] = format_dict_items(cat_model, **format_args)
         except Exception:
             logger.error("Could not format product_type catalog")
             raise

eodag/rest/types/collections_search.py

@@ -15,7 +15,7 @@
 # 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 typing import Any, Dict, Optional
+from typing import Any, Optional
 
 from pydantic import (
     BaseModel,
@@ -39,6 +39,6 @@ class CollectionsSearchRequest(BaseModel):
     constellation: Optional[str] = Field(default=None)
 
     @model_serializer(mode="wrap")
-    def _serialize(self, handler: SerializerFunctionWrapHandler) -> Dict[str, Any]:
-        dumped: Dict[str, Any] = handler(self)
+    def _serialize(self, handler: SerializerFunctionWrapHandler) -> dict[str, Any]:
+        dumped: dict[str, Any] = handler(self)
         return {EODAGSearch.to_eodag(k): v for k, v in dumped.items()}