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

eodag/resources/providers.yml

@@ -49,6 +49,7 @@
       usgs:productId: '$.id'
     extract: True
     order_enabled: true
+    max_workers: 2
   products:
     # datasets list http://kapadia.github.io/usgs/_sources/reference/catalog/ee.txt may be outdated
     # see also https://dds.cr.usgs.gov/ee-data/coveragemaps/shp/ee/
@@ -589,9 +590,6 @@
       version: '$.properties.version'
       created: '$.properties.dhusIngestDate'
       updated: '$.properties.updated'
-      sar:instrument_mode:
-        - 'sensorMode'
-        - '$.properties.sensorMode'
 
       # OpenSearch Parameters for Acquistion Parameters Search (Table 6)
       start_datetime:
@@ -799,7 +797,7 @@
         - '$.Attributes.processingCenter'
       processing:version:
         - null
-        - '$.Attributes.processorVersion'
+        - '{$.Attributes.processorVersion#to_geojson}'
       _processor_name:
         - null
         - '$.Attributes.processorName'
@@ -1675,12 +1673,9 @@
     CAMS_SOLAR_RADIATION:
       dataset: cams-solar-radiation-timeseries
       metadata_mapping:
-        latitude:
-          - '{{"location": {{"latitude": {"latitude"}, "longitude": {"longitude"}}}}}'
-          - $."latitude"
-        longitude:
-          - '{{"location": {{"latitude": {"latitude"}, "longitude": {"longitude"}}}}}'
-          - $."longitude"
+        geometry:
+          - '{{"location": {{"longitude": {geometry#to_longitude_latitude}["lon"], "latitude": {geometry#to_longitude_latitude}["lat"]}}}}'
+          - $.geometry
     CAMS_GREENHOUSE_EGG4_MONTHLY:
       dataset: cams-global-ghg-reanalysis-egg4-monthly
       metadata_mapping:
@@ -2443,7 +2438,7 @@
         - '$.Attributes.processingCenter'
       processing:version:
         - null
-        - '$.Attributes.processorVersion'
+        - '{$.Attributes.processorVersion#to_geojson}'
       _processor_name:
         - null
         - '$.Attributes.processorName'
@@ -2558,6 +2553,7 @@
     extract: true
     order_enabled: false
     archive_depth: 2
+    max_workers: 4
     ssl_verify: true
   auth: !plugin
     type: KeycloakOIDCPasswordAuth
@@ -2970,8 +2966,8 @@
         platform: properties.platform
     metadata_mapping:
       grid:code:
-        - '{{"query":{{"s2:mgrs_tile":{{"eq":"{grid:code}"}}}}}}'
-        - '$.properties."s2:mgrs_tile"'
+        - '{{"query":{{"s2:mgrs_tile":{{"eq":"{grid:code#replace_str("MGRS-","")}"}}}}}}'
+        - '{$.properties."s2:mgrs_tile"#replace_str(r"^T?(.*)$",r"MGRS-\1")}'
   products:
     S1_SAR_GRD:
       _collection: sentinel-1-grd
@@ -3042,6 +3038,18 @@
       end_datetime:
         - '{{"query":{{"start_datetime":{{"lte":"{end_datetime#to_iso_utc_datetime}"}}}}}}'
         - '$.properties.end_datetime'
+      processing:software:
+        - '{{"query":{{"processing:software":{{"eq":{processing:software}}}}}}}'
+        - '$.properties.processing:software'
+      spatial:cycle_id:
+        - '{{"query":{{"spatial:cycle_id":{{"eq":{spatial:cycle_id}}}}}}}'
+        - '$.properties.spatial:cycle_id'
+      spatial:pass_id:
+        - '{{"query":{{"spatial:pass_id":{{"eq":{spatial:pass_id}}}}}}}'
+        - '$.properties.spatial:pass_id'
+      spatial:scene_id:
+        - '{{"query":{{"spatial:scene_id":{{"eq":{spatial:scene_id}}}}}}}'
+        - '$.properties.spatial:scene_id'
   products:
     GENERIC_COLLECTION:
       _collection: '{collection}'
@@ -3548,7 +3556,7 @@
             prefix: EO:ECMWF:DAT:CAMS
         discover_queryables:
           fetch_url: null
-          product_type_fetch_url: null
+          collection_fetch_url: null
           constraints_url: https://ads.atmosphere.copernicus.eu/api/catalogue/v1/collections/{dataset#wekeo_to_cop_collection(EO:ECMWF:DAT:)}/constraints.json
           form_url: https://ads.atmosphere.copernicus.eu/api/catalogue/v1/collections/{dataset#wekeo_to_cop_collection(EO:ECMWF:DAT:)}/form.json
       - collection_selector: # cop_cds
@@ -3574,7 +3582,7 @@
             prefix: EO:ECMWF:DAT:CEMS
         discover_queryables:
           fetch_url: null
-          product_type_fetch_url: null
+          collection_fetch_url: null
           constraints_url: https://ewds.climate.copernicus.eu/api/catalogue/v1/collections/{dataset#wekeo_to_cop_collection(EO:ECMWF:DAT:)}/constraints.json
           form_url: https://ewds.climate.copernicus.eu/api/catalogue/v1/collections/{dataset#wekeo_to_cop_collection(EO:ECMWF:DAT:)}/form.json
     metadata_mapping:
@@ -3585,7 +3593,8 @@
         - '{{"startdate": "{start_datetime#to_iso_utc_datetime}"}}'
         - $.properties.startdate
       end_datetime:
-        - '{{"enddate": "{end_datetime#to_iso_utc_datetime}"}}'
+        # map 'date' to validate request against copernicus queryables
+        - '{{"enddate": "{end_datetime#to_iso_utc_datetime}", "date": "{start_datetime#to_iso_date}/{end_datetime#to_iso_date}"}}'
         - $.properties.enddate
       product:type:
         - dataset_id
@@ -3760,7 +3769,8 @@
       dataset: EO:ECMWF:DAT:CAMS_SOLAR_RADIATION_TIMESERIES
       metadata_mapping:
         geometry:
-          - '{{"longitude": {geometry#to_longitude_latitude}["lon"], "latitude": {geometry#to_longitude_latitude}["lat"]}}'
+          # longitude/latitude to order from wekeo_ecmwf, location to validate against cop_ads constraints
+          - '{{"longitude": {geometry#to_longitude_latitude}["lon"], "latitude": {geometry#to_longitude_latitude}["lat"], "location": {{"longitude": {geometry#to_longitude_latitude}["lon"], "latitude": {geometry#to_longitude_latitude}["lat"]}}}}'
           - '$.null'
   auth: !plugin
     type: TokenAuth
@@ -4050,7 +4060,7 @@
         - '$.Attributes.processingCenter'
       processing:version:
         - null
-        - '$.Attributes.processorVersion'
+        - '{$.Attributes.processorVersion#to_geojson}'
       _processor_name:
         - null
         - '$.Attributes.processorName'
@@ -5465,7 +5475,7 @@
       product:type:
         - type
         - '$.properties.productInformation.productType'
-      constellation: '$.properties.acquisitionInformation[0].platform.platformShortName'
+      platform: '$.properties.acquisitionInformation[0].platform.platformShortName'
       instruments: '{$.properties.acquisitionInformation[0].instrument.instrumentShortName#split( )}'
       # INSPIRE obligated OpenSearch Parameters for Collection Search (Table 4)
       title: '{$.properties.title#sanitize}'
@@ -5628,6 +5638,15 @@
       metadata_mapping:
         <<: *orbit_zone_tile
         <<: *sentinel_params
+    S3_OL_2_WFRBC003:
+      product:type: OL_2_WFR___
+      _collection: EO:EUM:DAT:0556
+      metadata_mapping:
+        <<: *orbit_zone_tile
+        <<: *sentinel_params
+        platform:
+          - sat
+          - '$.properties.acquisitionInformation[0].platform.platformShortName'
     # S3 SLSTR
     S3_SLSTR_L1RBT:
       product:type: SL_1_RBT___
@@ -5832,6 +5851,16 @@
       _collection: EO:EUM:DAT:0684
     MTG_FCI_OLR:
       _collection: EO:EUM:DAT:0685
+    MSG_SEVIRI_RSS_AMV_CDR_V1:
+      _collection: EO:EUM:DAT:1083
+    MSG_SEVIRI_RSS_HR_IMG_L1_5_V1:
+      _collection: EO:EUM:DAT:0962
+    MSG_SEVIRI_SARAH_CDR_V003:
+      _collection: EO:EUM:DAT:0863
+    MTG_FCI_ACTIVE_FIRE_L2_V1:
+      _collection: EO:EUM:DAT:0682
+    MULT_PMW_IR_GIRAFE_PRECIP_CDR_V001:
+      _collection: EO:EUM:DAT:0921
     GENERIC_COLLECTION:
       _collection: '{collection}'
   download: !plugin
@@ -6077,6 +6106,9 @@
       sat:absolute_orbit:
         - '{{"query":{{"sat:absolute_orbit":{{"eq":{sat:absolute_orbit}}}}}}}'
         - '$.properties."sat:absolute_orbit"'
+      sat:orbit_state:
+        - '{{"query":{{"sat:orbit_state":{{"eq":{sat:orbit_state}}}}}}}'
+        - '{$.properties.sat:orbit_state#to_lower}'
       sat:relative_orbit:
         - '{{"query":{{"sat:relative_orbit":{{"eq":{sat:relative_orbit}}}}}}}'
         - '$.properties."sat:relative_orbit"'
@@ -6104,6 +6136,7 @@
       grid:code:
         - '{{"query":{{"grid:code":{{"contains":"{grid:code#replace_str("MGRS-","T")}"}}}}}}'
         - '{$.properties."grid:code"#replace_str(r"^T?(.*)$",r"MGRS-\1")}'
+      sci:doi: '{$.properties.sci:doi#replace_str(r"^\[\]$","Not Available")}'
       published: '$.properties.datetime'
       eodag:download_link: '$.assets[?(@.roles[0] == "data") & (@.type != "application/xml")].href'
       eodag:quicklook: '$.assets[?(@.roles[0] == "overview")].href.`sub(/^(.*)$/, \\1?scope=gdh)`'
@@ -6129,11 +6162,11 @@
     S2_MSI_L1C:
       _collection: PEPS_S2_L1C
     S2_MSI_L2A_MAJA:
-      _collection: MUSCATE_SENTINEL2_SENTINEL2_L2A
+      _collection: THEIA_REFLECTANCE_SENTINEL2_L2A
     S2_MSI_L2B_MAJA_SNOW:
-      _collection: MUSCATE_Snow_SENTINEL2_L2B-SNOW
+      _collection: THEIA_SNOW_SENTINEL2_L2B
     S2_MSI_L2B_MAJA_WATER:
-      _collection: MUSCATE_WaterQual_SENTINEL2_L2B-WATER
+      _collection: THEIA_WATERQUAL_SENTINEL2_L2B
     GENERIC_COLLECTION:
       _collection: '{collection}'
   download: !plugin
@@ -6207,6 +6240,9 @@
       sat:absolute_orbit:
         - '{{"query":{{"sat:absolute_orbit":{{"eq":{sat:absolute_orbit}}}}}}}'
         - '$.properties."sat:absolute_orbit"'
+      sat:orbit_state:
+        - '{{"query":{{"sat:orbit_state":{{"eq":{sat:orbit_state}}}}}}}'
+        - '{$.properties.sat:orbit_state#to_lower}'
       sat:relative_orbit:
         - '{{"query":{{"sat:relative_orbit":{{"eq":{sat:relative_orbit}}}}}}}'
         - '$.properties."sat:relative_orbit"'
@@ -6234,6 +6270,7 @@
       grid:code:
         - '{{"query":{{"grid:code":{{"contains":"{grid:code#replace_str("MGRS-","T")}"}}}}}}'
         - '{$.properties."grid:code"#replace_str(r"^T?(.*)$",r"MGRS-\1")}'
+      sci:doi: '{$.properties.sci:doi#replace_str(r"^\[\]$","Not Available")}'
       published: '$.properties.datetime'
       eodag:download_link: '$.properties.endpoint_url'
       eodag:quicklook: '$.assets[?(@.roles[0] == "overview")].href.`sub(/^(.*)$/, \\1?scope=gdh)`'
@@ -6259,11 +6296,11 @@
     S2_MSI_L1C:
       _collection: PEPS_S2_L1C
     S2_MSI_L2A_MAJA:
-      _collection: MUSCATE_SENTINEL2_SENTINEL2_L2A
+      _collection: THEIA_REFLECTANCE_SENTINEL2_L2A
     S2_MSI_L2B_MAJA_SNOW:
-     _collection: MUSCATE_Snow_SENTINEL2_L2B-SNOW
+      _collection: THEIA_SNOW_SENTINEL2_L2B
     S2_MSI_L2B_MAJA_WATER:
-      _collection: MUSCATE_WaterQual_SENTINEL2_L2B-WATER
+      _collection: THEIA_WATERQUAL_SENTINEL2_L2B
     GENERIC_COLLECTION:
       _collection: '{collection}'
   download: !plugin

eodag/resources/user_conf_template.yml

@@ -152,6 +152,12 @@ eumetsat_ds:
             password:
     download:
         output_dir:
+fedeo_ceda:
+    priority: # Lower value means lower priority (Default: 0)
+    search: # Search parameters configuration
+    download:
+        extract:
+        output_dir:
 geodes:
     priority: # Lower value means lower priority (Default: 0)
     search: # Search parameters configuration

eodag/types/__init__.py

@@ -19,24 +19,15 @@
 
 from __future__ import annotations
 
-from typing import (
-    Annotated,
-    Any,
-    Literal,
-    Optional,
-    Type,
-    TypedDict,
-    Union,
-    get_args,
-    get_origin,
-)
+from typing import Annotated, Any, Literal, Optional, Type, Union, get_args, get_origin
 
 from annotated_types import Gt, Lt
-from pydantic import BaseModel, ConfigDict, Field, create_model
+from pydantic import AliasChoices, BaseModel, ConfigDict, Field, create_model
 from pydantic.annotated_handlers import GetJsonSchemaHandler
 from pydantic.fields import FieldInfo
 from pydantic.json_schema import JsonSchemaValue
 from pydantic_core import CoreSchema, PydanticUndefined
+from typing_extensions import TypedDict
 
 from eodag.utils import copy_deepcopy
 from eodag.utils.exceptions import ValidationError
@@ -153,7 +144,8 @@ def json_field_definition_to_python(
     json_field_definition: dict[str, Any],
     default_value: Optional[Any] = None,
     required: Optional[bool] = False,
-    alias: Optional[str] = None,
+    validation_alias: Optional[Union[str, AliasChoices]] = None,
+    serialization_alias: Optional[str] = None,
 ) -> Annotated[Any, FieldInfo]:
     """Get python field definition from json object
 
@@ -171,6 +163,8 @@ def json_field_definition_to_python(
     :param json_field_definition: the json field definition
     :param default_value: default value of the field
     :param required: if the field is required
+    :param validation_alias: validation alias
+    :param serialization_alias: serialization alias
     :returns: the python field definition
     """
     python_type = json_type_to_python(json_field_definition.get("type"))
@@ -181,7 +175,8 @@ def json_field_definition_to_python(
         pattern=json_field_definition.get("pattern", PydanticUndefined),
         le=json_field_definition.get("maximum", PydanticUndefined),
         ge=json_field_definition.get("minimum", PydanticUndefined),
-        alias=alias or PydanticUndefined,
+        validation_alias=validation_alias or PydanticUndefined,
+        serialization_alias=serialization_alias or PydanticUndefined,
     )
 
     enum = json_field_definition.get("enum")
@@ -202,6 +197,14 @@ def json_field_definition_to_python(
                 enum = items.get("enum")
             elif "const" in items:
                 const = items.get("const")
+    elif python_type is dict:
+        properties = json_field_definition.get("properties")
+        if isinstance(properties, dict):
+            fields_type: dict = {
+                k: json_field_definition_to_python(v, required=required)
+                for k, v in properties.items()
+            }
+            python_type = TypedDict("dictionary", fields_type)  # type: ignore
 
     if enum:
         literal = Literal[tuple(sorted(enum))]  # type: ignore
@@ -386,7 +389,9 @@ class BaseModelCustomJsonSchema(BaseModel):
 
 
 def annotated_dict_to_model(
-    model_name: str, annotated_fields: dict[str, Annotated[Any, FieldInfo]]
+    model_name: str,
+    annotated_fields: dict[str, Annotated[Any, FieldInfo]],
+    model_class: Optional[type[BaseModel]] = BaseModelCustomJsonSchema,
 ) -> BaseModel:
     """Convert a dictionary of Annotated values to a Pydantic BaseModel.
 
@@ -411,6 +416,7 @@ def annotated_dict_to_model(
     :param model_name: name of the model to be created
     :param annotated_fields: dict containing the parameters and annotated values that should become
                              the properties of the model
+    :param model_class: (optiional) base class of the returned model
     :returns: pydantic model
     """
     fields = {}
@@ -423,7 +429,7 @@ def annotated_dict_to_model(
 
     custom_model = create_model(
         model_name,
-        __base__=BaseModelCustomJsonSchema,
+        __base__=model_class,
         **fields,  # type: ignore
     )
 

eodag/types/download_args.py

@@ -17,7 +17,9 @@
 # limitations under the License.
 from __future__ import annotations
 
-from typing import Optional, TypedDict, Union
+from typing import Optional, Union
+
+from typing_extensions import TypedDict
 
 
 class DownloadConf(TypedDict, total=False):

eodag/types/queryables.py

@@ -1,22 +1,61 @@
+# -*- coding: utf-8 -*-
+# Copyright 2025, CS GROUP - France, https://www.csgroup.eu/
+#
+# This file is part of EODAG project
+#     https://www.github.com/CS-SI/EODAG
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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
 
+import re
 from collections import UserDict
-from typing import Annotated, Any, Optional, Union
+from typing import TYPE_CHECKING, Annotated, Any, Optional, Union, cast
 
 from annotated_types import Lt
-from pydantic import BaseModel, ConfigDict, Field
+from pydantic import BaseModel, ConfigDict, Field, field_validator
 from pydantic.fields import FieldInfo
 from pydantic.types import PositiveInt
 from pydantic_core import PydanticUndefined
 from shapely.geometry.base import BaseGeometry
+from typing_extensions import get_args
 
-from eodag.types import annotated_dict_to_model, model_fields_to_annotated
+from eodag.types import (
+    BaseModelCustomJsonSchema,
+    annotated_dict_to_model,
+    model_fields_to_annotated,
+)
+from eodag.types.stac_extensions import STAC_EXTENSIONS
+from eodag.types.stac_metadata import CommonStacMetadata, create_stac_metadata_model
+from eodag.utils.dates import (
+    COMPACT_DATE_PATTERN,
+    COMPACT_DATE_RANGE_PATTERN,
+    DATE_PATTERN,
+    DATE_RANGE_PATTERN,
+    datetime_range,
+    format_date,
+    format_date_range,
+    is_range_in_range,
+    parse_date,
+)
 from eodag.utils.repr import remove_class_repr, shorter_type_repr
 
+if TYPE_CHECKING:
+    from eodag.types.stac_extensions import BaseStacExtension
+
 Percentage = Annotated[PositiveInt, Lt(100)]
 
 
-class CommonQueryables(BaseModel):
+class CommonQueryables(BaseModelCustomJsonSchema):
     """A class representing search common queryable properties."""
 
     collection: Annotated[str, Field()]
@@ -47,11 +86,33 @@ class CommonQueryables(BaseModel):
         f.__metadata__[0].default = default
         return f
 
+    @classmethod
+    def from_stac_models(
+        cls,
+        extensions: list[BaseStacExtension] = STAC_EXTENSIONS,
+        base_model: type[BaseModel] = CommonStacMetadata,
+    ) -> type[Queryables]:
+        """Creates Queryables from STAC models.
+
+        :param extensions: list of STAC extensions to include in the model
+        :param base_model: base STAC model to use
+        :return: Queryables model
+        """
+        return cast(
+            type[Queryables],
+            create_stac_metadata_model(
+                base_models=[cls, base_model],
+                extensions=extensions,
+                class_name="Queryables",
+            ),
+        )
+
 
 class Queryables(CommonQueryables):
     """A class representing all search queryable properties.
 
     Parameters default value is set to ``None`` to have them not required.
+    Fields described here are queryables-specific and complete StacMetadata fields.
     """
 
     start: Annotated[
@@ -78,60 +139,69 @@ class Queryables(CommonQueryables):
             description="Read EODAG documentation for all supported geometry format.",
         ),
     ]
-    # common metadata
-    constellation: Annotated[str, Field(None)]
-    created: Annotated[str, Field(None)]
-    description: Annotated[str, Field(None)]
-    gsd: Annotated[int, Field(None)]
     id: Annotated[str, Field(None)]
-    instruments: Annotated[str, Field(None)]
-    keywords: Annotated[str, Field(None)]
-    license: Annotated[str, Field(None)]
-    platform: Annotated[str, Field(None)]
-    providers: Annotated[str, Field(None)]
-    title: Annotated[str, Field(None)]
-    uid: Annotated[str, Field(None)]
-    updated: Annotated[str, Field(None)]
-    # eo extension
-    eo_cloud_cover: Annotated[Percentage, Field(None, alias="eo:cloud_cover")]
-    eo_snow_cover: Annotated[Percentage, Field(None, alias="eo:snow_cover")]
-    # grid extension
-    grid_code: Annotated[
-        str, Field(None, alias="grid:code", pattern=r"^[A-Z0-9]+-[-_.A-Za-z0-9]+$")
-    ]
-    # mgrs extension
-    mgrs_grid_square: Annotated[str, Field(None, alias="mgrs:grid_square")]
-    mgrs_latitude_band: Annotated[str, Field(None, alias="mgrs:latitude_band")]
-    mgrs_utm_zone: Annotated[str, Field(None, alias="mgrs:utm_zone")]
-    # order extension
-    order_status: Annotated[str, Field(None, alias="order:status")]
-    # processing extension
-    processing_level: Annotated[str, Field(None, alias="processing:level")]
-    # product extension
-    product_acquisition_type: Annotated[
-        str, Field(None, alias="product:acquisition_type")
-    ]
-    product_timeliness: Annotated[str, Field(None, alias="product:timeliness")]
-    product_type: Annotated[str, Field(None, alias="product:type")]
-    # sar extension
-    sar_beam_ids: Annotated[str, Field(None, alias="sar:beam_ids")]
-    sar_frequency_band: Annotated[float, Field(None, alias="sar:frequency_band")]
-    sar_instrument_mode: Annotated[str, Field(None, alias="sar:instrument_mode")]
-    sar_polarizations: Annotated[list[str], Field(None, alias="sar:polarizations")]
-    # sat extension
-    sat_absolute_orbit: Annotated[int, Field(None, alias="sat:absolute_orbit")]
-    sat_orbit_cycle: Annotated[int, Field(None, alias="sat:orbit_cycle")]
-    sat_orbit_state: Annotated[str, Field(None, alias="sat:orbit_state")]
-    sat_relative_orbit: Annotated[int, Field(None, alias="sat:relative_orbit")]
-    # sci extension
-    sci_doi: Annotated[str, Field(None, alias="sci:doi")]
-    # view extension
-    view_incidence_angle: Annotated[str, Field(None, alias="view:incidence_angle")]
-    view_sun_azimuth: Annotated[str, Field(None, alias="view:sun_azimuth")]
-    view_sun_elevation: Annotated[str, Field(None, alias="view:sun_elevation")]
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
 
+    @field_validator("ecmwf_date", mode="plain", check_fields=False)
+    @classmethod
+    def check_date_range(cls, v: str) -> str:
+        """Validate date ranges"""
+        if not isinstance(v, str):
+            raise ValueError(
+                "date must be a string formatted as single date ('yyyy-mm-dd') or range ('yyyy-mm-dd/yyyy-mm-dd')"
+            )
+        date_regex = [
+            re.compile(p)
+            for p in (
+                DATE_PATTERN,
+                COMPACT_DATE_PATTERN,
+                DATE_RANGE_PATTERN,
+                COMPACT_DATE_RANGE_PATTERN,
+            )
+        ]
+        if not any(r.match(v) is not None for r in date_regex):
+            raise ValueError(
+                "date must be a string formatted as single date ('yyyy-mm-dd') or range ('yyyy-mm-dd/yyyy-mm-dd')"
+            )
+        try:
+            start, end = parse_date(v)
+        except ValueError as e:
+            raise ValueError("date must follow 'yyyy-mm-dd' format") from e
+        if end < start:
+            raise ValueError("date range end must be after start")
+        # enumerate dates in range
+        v_set: set[str] = {format_date(d) for d in datetime_range(start, end)}
+        # is_range_in_range() support only ranges (no single date allowed) in the format 'yyyy-mm-dd/yyyy-mm-dd'
+        v_range: str = format_date_range(start, end)
+
+        field_info = cls.model_fields["ecmwf_date"]
+        literals = get_args(field_info.annotation)
+
+        # Collect missing values to report errors
+        missing_values = set(v_set)
+
+        # date constraint may be intervals. We identify intervals with a "/" in the value.
+        # date constraint can be a mixed list of single values (e.g "2023-06-27")
+        # and intervals (e.g. "2024-11-12/2025-11-20")
+        # collections with mixed values: CAMS_GAC_FORECAST, CAMS_EU_AIR_QUALITY_FORECAST
+        for literal in literals:
+            literal_start, literal_end = parse_date(literal)
+            if "/" in literal:
+                # range with separator / or /to/
+                literal_range: str = format_date_range(literal_start, literal_end)
+                if is_range_in_range(literal_range, v_range):
+                    return v
+            else:
+                # convert literal to the format 'yyyy-mm-dd'
+                literal_start_str = format_date(literal_start)
+                if literal_start_str in v_set:
+                    missing_values.remove(literal_start_str)
+                if not missing_values:
+                    return v
+
+        raise ValueError("date not allowed")
+
 
 class QueryablesDict(UserDict[str, Any]):
     """Class inheriting from UserDict which contains queryables with their annotated type;
@@ -232,4 +302,4 @@ class QueryablesDict(UserDict[str, Any]):
         :param model_name: name used for :class:`pydantic.BaseModel` creation
         :return: pydantic BaseModel of the queryables dict
         """
-        return annotated_dict_to_model(model_name, self.data)
+        return annotated_dict_to_model(model_name, self.data, Queryables)