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

eodag/resources/stac.yml

@@ -126,7 +126,6 @@ collection:
       interval:
         - - '$.product_type.missionStartDate'
           - '$.product_type.missionEndDate'
-  properties:
   crs: http://www.opengis.net/def/crs/OGC/1.3/CRS84
   stac_version: "{stac_version}"
   keywords:
@@ -144,7 +143,8 @@ collection:
       - '$.product_type.platformSerialIdentifier'
     intruments:
       - '$.product_type.instrument'
-    processing:level: '$.product_type.processingLevel'
+    processing:level:
+      - '$.product_type.processingLevel'
 
 # Data ------------------------------------------------------------------------
 
@@ -250,7 +250,7 @@ stac_extensions:
   view: 'https://stac-extensions.github.io/view/v1.0.0/schema.json'
   oseo: "{catalog[root]}/extensions/oseo/json-schema/schema.json"
 
-# Catalogs --------------------------------------------------------------------
+# Catalog --------------------------------------------------------------------
 
 catalog:
   parent_key: root
@@ -267,166 +267,6 @@ catalog:
     stac_version: "{stac_version}"
     stac_extensions: "{catalog[stac_extensions]}"
 
-
-# nested catalogs for filtering
-catalogs:
-
-  product_types_list:
-    parent_key: root
-    child_key: product_type
-    model:
-      id: "product_types"
-      description: Available product types
-
-  product_type:
-    parent_key: product_types_list
-    model:
-      id: "{collection[id]}"
-      title: "{collection[title]}"
-      description: "{collection[description]}"
-      extent:
-        spatial:
-          bbox:
-            - - "{collection[extent][spatial][bbox][0][0]}"
-              - "{collection[extent][spatial][bbox][0][1]}"
-              - "{collection[extent][spatial][bbox][0][2]}"
-              - "{collection[extent][spatial][bbox][0][3]}"
-        temporal:
-          interval:
-            - - "{collection[extent][temporal][interval][0][0]}"
-              - "{collection[extent][temporal][interval][0][1]}"
-      crs: http://www.opengis.net/def/crs/OGC/1.3/CRS84
-      keywords: "{collection[keywords]}"
-      license: "{collection[license]}"
-      properties: "{collection[properties]}"
-      providers: "{collection[providers]}"
-      summaries: "{collection[summaries]}"
-
-  years_list:
-    child_key: year
-    model:
-      id: year
-      title: "{parent_catalog[title]} / year"
-      description: "{parent_catalog[description]}\n\n- Filter by year"
-
-  year:
-    parent_key: years_list
-    model:
-      id: "{date[year]}"
-      title: "{catalog[title]}: {date[year]}"
-      description: "{catalog[description]}: {date[year]};"
-      extent:
-        spatial:
-          bbox:
-            - - "{catalog[extent][spatial][bbox][0][0]}"
-              - "{catalog[extent][spatial][bbox][0][1]}"
-              - "{catalog[extent][spatial][bbox][0][2]}"
-              - "{catalog[extent][spatial][bbox][0][3]}"
-        temporal:
-          interval:
-            - - "{date[min]}"
-              - "{date[max]}"
-
-  months_list:
-    child_key: month
-    parent_key: year
-    model:
-      id: month
-      title: "{parent_catalog[title]} / month"
-      description: "{parent_catalog[description]}\n\n- Filter by month"
-
-  month:
-    parent_key: months_list
-    model:
-      id: "{date[month]}"
-      title: "{catalog[title]}: {date[month]}"
-      description: "{catalog[description]}: {date[month]};"
-      extent:
-        spatial:
-          bbox:
-            - - "{catalog[extent][spatial][bbox][0][0]}"
-              - "{catalog[extent][spatial][bbox][0][1]}"
-              - "{catalog[extent][spatial][bbox][0][2]}"
-              - "{catalog[extent][spatial][bbox][0][3]}"
-        temporal:
-          interval:
-            - - "{date[min]}"
-              - "{date[max]}"
-
-  days_list:
-    child_key: day
-    parent_key: month
-    model:
-      id: day
-      title: "{parent_catalog[title]} / day"
-      description: "{parent_catalog[description]}\n\n- Filter by day"
-
-  day:
-    parent_key: days_list
-    model:
-      id: "{date[day]}"
-      title: "{catalog[title]}: {date[day]}"
-      description: "{catalog[description]}: {date[day]};"
-      extent:
-        spatial:
-          bbox:
-            - - "{catalog[extent][spatial][bbox][0][0]}"
-              - "{catalog[extent][spatial][bbox][0][1]}"
-              - "{catalog[extent][spatial][bbox][0][2]}"
-              - "{catalog[extent][spatial][bbox][0][3]}"
-        temporal:
-          interval:
-            - - "{date[min]}"
-              - "{date[max]}"
-
-  cloud_covers_list:
-    child_key: cloud_cover
-    model:
-      id: cloud_cover
-      title: "{parent_catalog[title]} / Max cloud cover"
-      description: "{parent_catalog[description]}\n\n- Filter by maximum cloud cover %"
-
-  cloud_cover:
-    parent_key: cloud_covers_list
-    model:
-      id: "{cloud_cover}"
-      title: "{catalog[title]}: {cloud_cover}%"
-      description: "{catalog[description]}: {cloud_cover}%;"
-
-
-locations_catalogs:
-
-  locations_list:
-    catalog_type: location_list
-    child_key: "$.shp_location.name"
-    path: "$.shp_location.path"
-    attr: "$.shp_location.attr"
-    parent_key: "$.shp_location.parent.name"
-    parent:
-      key: "$.shp_location.parent.name"
-      attr: "$.shp_location.parent.attr"
-    model:
-      id: "$.shp_location.name"
-      self_title: "$.shp_location.name"
-      title: "{parent_catalog[title]} / {catalog[self_title]}"
-      description: "{parent_catalog[description]}\n\n- Filter by {catalog[self_title]}"
-
-  location:
-    catalog_type: location
-    parent_key: "{locations_list}"
-    model:
-      id: "{feature[id]}"
-      title: "{catalog[title]}: {feature[id]}"
-      description: "{catalog[description]}: {feature[id]};"
-      extent:
-        spatial:
-          bbox: '{feature[geometry]#to_bounds_lists}'
-        temporal:
-          interval:
-            - - "{catalog[extent][temporal][interval][0][0]}"
-              - "{catalog[extent][temporal][interval][0][1]}"
-
-
 # Extensions ------------------------------------------------------------------
 extensions:
   oseo:

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

@@ -15,53 +15,63 @@
 # 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.
-peps:
-    priority: # Lower value means lower priority (Default: 1)
-    search:  # Search parameters configuration
+aws_eos:
+    priority: # Lower value means lower priority (Default: 0)
+    search: # Search parameters configuration
+    search_auth:
+        credentials:
+            api_key:
+    download_auth:
+        credentials:
+            aws_access_key_id:
+            aws_secret_access_key:
+            aws_profile:
     download:
-        extract:  # whether to extract the downloaded products, only applies to archived products (true or false, Default: true).
-        output_dir: # where to store downloaded products, as an absolute file path (Default: local temporary directory)
-        dl_url_params:  # additional parameters to pass over to the download url as an url parameter
-        delete_archive: # whether to delete the downloaded archives (true or false, Default: true).
+        output_dir:
+cop_ads:
+    priority: # Lower value means lower priority (Default: 0)
+    search: # Search parameters configuration
+    download:
+        extract:
+        output_dir:
     auth:
         credentials:
-            username:
-            password:
-theia:
+            apikey:
+cop_cds:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
     download:
         extract:
         output_dir:
-        dl_url_params:
     auth:
         credentials:
-            ident:
-            pass:
-usgs:
+            apikey:
+cop_dataspace:
     priority: # Lower value means lower priority (Default: 0)
-    api:
+    search: # Search parameters configuration
+    download:
         extract:
         output_dir:
-        dl_url_params:
-        product_location_scheme:
+    auth:
         credentials:
             username:
             password:
-aws_eos:
+cop_ewds:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    download:
+        output_dir:
     auth:
         credentials:
             apikey:
-            aws_access_key_id:
-            aws_secret_access_key:
-            aws_profile:
+cop_marine:
+    priority: # Lower value means lower priority (Default: 0)
+    search: # Search parameters configuration
     download:
+        extract:
         output_dir:
 creodias:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
     download:
         extract:
         output_dir:
@@ -70,39 +80,36 @@ creodias:
             username:
             password:
             totp: # set totp dynamically, see https://eodag.readthedocs.io/en/latest/getting_started_guide/configure.html#authenticate-using-an-otp-one-time-password-two-factor-authentication
-onda:
+creodias_s3:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
     download:
-        extract:
         output_dir:
-    auth:
-        credentials:
-            username:
-            password:
-astraea_eod:
-    priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
     auth:
         credentials:
             aws_access_key_id:
             aws_secret_access_key:
-            aws_profile:
+dedl:
+    priority: # Lower value means lower priority (Default: 0)
+    search: # Search parameters configuration
     download:
         output_dir:
-usgs_satapi_aws:
-    priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
     auth:
         credentials:
-            aws_access_key_id:
-            aws_secret_access_key:
-            aws_profile:
+            username:
+            password:
+dedt_lumi:
+    priority: # Lower value means lower priority (Default: 0)
+    search:
     download:
         output_dir:
+    auth:
+        credentials:
+            username:
+            password:
 earth_search:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
     auth:
         credentials:
             aws_access_key_id:
@@ -112,12 +119,12 @@ earth_search:
         output_dir:
 earth_search_cog:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
     download:
         output_dir:
 earth_search_gcs:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
     auth:
         credentials:
             aws_access_key_id:
@@ -131,99 +138,115 @@ ecmwf:
         credentials:
             username:
             password:
-cop_ads:
+eumetsat_ds:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
-    download:
-        extract:
+    search: # Search parameters configuration
         output_dir:
     auth:
         credentials:
             username:
             password:
-cop_cds:
+    download:
+        output_dir:
+geodes:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
+    auth:
+        credentials:
+            apikey:
     download:
         extract:
         output_dir:
+geodes_s3:
+    priority: # Lower value means lower priority (Default: 0)
+    search: # Search parameters configuration
     auth:
         credentials:
-            username:
-            password:
-sara:
-    priority: # Lower value means lower priority (Default: 0)
-    search:  # Search parameters configuration
+            aws_access_key_id:
+            aws_secret_access_key:
+            aws_session_token:
     download:
         extract:
         output_dir:
-        delete_archive:
+hydroweb_next:
+    priority: # Lower value means lower priority (Default: 0)
+    search: # Search parameters configuration
     auth:
         credentials:
-            username:
-            password:
+            apikey:
+    download:
+        output_dir:
 meteoblue:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
     auth:
         credentials:
             apikey:
     download:
         output_dir:
-cop_dataspace:
-    priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+peps:
+    priority: # Lower value means lower priority (Default: 1)
+    search: # Search parameters configuration
     download:
-        extract:
-        output_dir:
+        extract: # whether to extract the downloaded products, only applies to archived products (true or false, Default: true).
+        output_dir: # where to store downloaded products, as an absolute file path (Default: local temporary directory)
+        dl_url_params: # additional parameters to pass over to the download url as an url parameter
+        delete_archive: # whether to delete the downloaded archives (true or false, Default: true).
     auth:
         credentials:
             username:
             password:
 planetary_computer:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
-    auth:
-        credentials:
-            apikey:
-    download:
-        output_dir:
-hydroweb_next:
-    priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
     auth:
         credentials:
             apikey:
     download:
         output_dir:
-wekeo:
+sara:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
     download:
+        extract:
         output_dir:
+        delete_archive:
     auth:
         credentials:
             username:
             password:
-wekeo_cmems:
+theia:
     priority: # Lower value means lower priority (Default: 0)
-    search:
+    search: # Search parameters configuration
     download:
+        extract:
         output_dir:
+        dl_url_params:
     auth:
+        credentials:
+            ident:
+            pass:
+usgs:
+    priority: # Lower value means lower priority (Default: 0)
+    api:
+        extract:
+        output_dir:
+        dl_url_params:
+        product_location_scheme:
         credentials:
             username:
             password:
-creodias_s3:
+usgs_satapi_aws:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
-    download:
-        output_dir:
+    search: # Search parameters configuration
     auth:
         credentials:
-          aws_access_key_id:
-          aws_secret_access_key:
-dedt_lumi:
+            aws_access_key_id:
+            aws_secret_access_key:
+            aws_profile:
+    download:
+        output_dir:
+wekeo_cmems:
     priority: # Lower value means lower priority (Default: 0)
     search:
     download:
@@ -232,28 +255,21 @@ dedt_lumi:
         credentials:
             username:
             password:
-dedl:
+wekeo_ecmwf:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
     download:
         output_dir:
-    auth:
-      credentials:
-        username:
-        password:
-eumetsat_ds:
-    priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
-        output_dir:
     auth:
         credentials:
             username:
             password:
-    download:
-        output_dir:
-cop_marine:
+wekeo_main:
     priority: # Lower value means lower priority (Default: 0)
-    search:   # Search parameters configuration
+    search: # Search parameters configuration
     download:
-        extract:
         output_dir:
+    auth:
+        credentials:
+            username:
+            password:

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 List, Union
+from typing import Annotated, Union
 
 from pydantic import Field
 from pydantic.functional_validators import BeforeValidator
@@ -26,10 +26,9 @@ from pydantic_settings import BaseSettings, SettingsConfigDict
 from typing_extensions import Doc
 
 from eodag.rest.constants import DEFAULT_MAXSIZE, DEFAULT_TTL
-from eodag.utils import Annotated
 
 
-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
@@ -50,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/constants.py

@@ -24,4 +24,3 @@ CACHE_KEY_COLLECTIONS = "collections"
 CACHE_KEY_COLLECTION = "collection"
 CACHE_KEY_SEARCH = "search"
 CACHE_KEY_QUERYABLES = "queryables"
-CACHE_KEY_CATALOGS = "catalogs"