eodag 3.2.1__py3-none-any.whl → 3.3.0__py3-none-any.whl

eodag/resources/providers.yml

@@ -1602,7 +1602,6 @@
       - '{$.completionTimeFromAscendingNode#to_iso_date}'
   auth: !plugin
     type: HTTPHeaderAuth
-    matching_url: https://ads.atmosphere.copernicus.eu
     ssl_verify: true
     headers:
       PRIVATE-TOKEN: "{apikey}"
@@ -1616,13 +1615,19 @@
     order_on_response:
       metadata_mapping:
         orderId: $.json.jobID
-        orderStatusLink: https://ads.atmosphere.copernicus.eu/api/retrieve/v1/jobs/{orderId}
+        orderStatusLink: https://ads.atmosphere.copernicus.eu/api/retrieve/v1/jobs/{orderId}?request=true
         searchLink: https://ads.atmosphere.copernicus.eu/api/retrieve/v1/jobs/{orderId}/results
     order_status:
       request:
         method: GET
       metadata_mapping:
         status: $.json.status
+        order:date: $.json.created
+        creationDate: $.json.created
+        publicationDate: $.json.finished
+        modificationDate: $.json.updated
+        ecmwf:dataset: $.json.processID
+        request_params: $.json.metadata.request.ids
       error:
         status: failed
       success:
@@ -1633,7 +1638,9 @@
           downloadLink: $.json.asset.value.href
   search: !plugin
     type: ECMWFSearch
+    need_auth: true
     ssl_verify: true
+    timeout: 30
     end_date_excluded: false
     dates_required: true
     remove_from_query:
@@ -1782,7 +1789,7 @@
     - host
   url: https://cds.climate.copernicus.eu
   # anchors to avoid duplications
-  anchor_day_month_year: &nday_month_year
+  anchor_nday_month_year: &nday_month_year
     completionTimeFromAscendingNode:
       - |
         {{
@@ -1829,7 +1836,6 @@
       - '{$.completionTimeFromAscendingNode#to_iso_date}'
   auth: !plugin
     type: HTTPHeaderAuth
-    matching_url: https://cds.climate.copernicus.eu
     ssl_verify: true
     headers:
       PRIVATE-TOKEN: "{apikey}"
@@ -1837,19 +1843,25 @@
     type: HTTPDownload
     timeout: 30
     ssl_verify: true
-    auth_error_code: 401
     order_enabled: true
+    auth_error_code: 401
     order_method: POST
     order_on_response:
       metadata_mapping:
         orderId: $.json.jobID
-        orderStatusLink: https://cds.climate.copernicus.eu/api/retrieve/v1/jobs/{orderId}
+        orderStatusLink: https://cds.climate.copernicus.eu/api/retrieve/v1/jobs/{orderId}?request=true
         searchLink: https://cds.climate.copernicus.eu/api/retrieve/v1/jobs/{orderId}/results
     order_status:
       request:
         method: GET
       metadata_mapping:
         status: $.json.status
+        order:date: $.json.created
+        creationDate: $.json.created
+        publicationDate: $.json.finished
+        modificationDate: $.json.updated
+        ecmwf:dataset: $.json.processID
+        request_params: $.json.metadata.request.ids
       error:
         status: failed
       success:
@@ -1860,7 +1872,9 @@
           downloadLink: $.json.asset.value.href
   search: !plugin
     type: ECMWFSearch
+    need_auth: true
     ssl_verify: true
+    timeout: 30
     end_date_excluded: false
     dates_required: true
     remove_from_query:
@@ -3442,6 +3456,7 @@
     token_type: json
     token_key: access_token
     refresh_token_key: refresh_token
+    token_expiration_key: expires_in
   download: !plugin
     type: HTTPDownload
     base_uri: https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess
@@ -3513,6 +3528,7 @@
   search: !plugin
     type: WekeoECMWFSearch
     api_endpoint: https://gateway.prod.wekeo2.eu/hda-broker/api/v1/dataaccess/search
+    need_auth: true
     timeout: 60
     need_auth: true
     auth_error_code: 401
@@ -3535,6 +3551,9 @@
       completionTimeFromAscendingNode:
         - '{{"enddate": "{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}'
         - $.properties.enddate
+      productType:
+        - dataset_id
+        - $.dataset
       downloadLink: $.properties.location
       dataset:
         - dataset_id
@@ -3907,12 +3926,12 @@
           - '$.null'
   auth: !plugin
     type: TokenAuth
-    matching_url: https://[-\w\.]+.wekeo2.eu
     auth_uri: 'https://gateway.prod.wekeo2.eu/hda-broker/gettoken'
     refresh_uri: 'https://gateway.prod.wekeo2.eu/hda-broker/refreshtoken'
     token_type: json
     token_key: access_token
     refresh_token_key: refresh_token
+    token_expiration_key: expires_in
   download: !plugin
     type: HTTPDownload
     auth_error_code: 401
@@ -3927,7 +3946,11 @@
         method: GET
       metadata_mapping:
         status: $.json.features[0].status
+        order:date: $.json.features[0].started_at
+        creationDate: $.json.features[0].started_at
         message: $.json.features[0].message
+        orderId: $.json.features[0]._id
+        ecmwf:dataset: $.json.features[0].dataset_id
       error:
         status: Error
       success:
@@ -4427,6 +4450,7 @@
   url: https://polytope.lumi.apps.dte.destination-earth.eu/openapi
   search: !plugin
     type: ECMWFSearch
+    need_auth: true
     ssl_verify: true
     dates_required: True
     discover_queryables:
@@ -4438,6 +4462,9 @@
       completionTimeFromAscendingNode:
         - '{{"date": "{startTimeFromAscendingNode#to_non_separated_date}/to/{completionTimeFromAscendingNode#to_non_separated_date}"}}'
         - '{$.completionTimeFromAscendingNode#to_iso_utc_datetime}'
+      productType:
+        - dataset
+        - $.dataset
       qs: $.qs
       orderLink: 'https://polytope.lumi.apps.dte.destination-earth.eu/api/v1/requests/destination-earth?{{"verb": "retrieve", "request": {qs#to_geojson} }}'
   products:
@@ -4500,7 +4527,6 @@
       DT_CLIMATE_ADAPTATION:
   auth: !plugin
     type: OIDCAuthorizationCodeFlowAuth
-    matching_url: https://[-\w\.]+.dte.destination-earth.eu
     oidc_config_url: https://auth.destine.eu/realms/desp/.well-known/openid-configuration
     redirect_uri: https://polytope.lumi.apps.dte.destination-earth.eu/
     client_id: polytope-api-public
@@ -5503,6 +5529,7 @@
       grant_type: client_credentials
     token_type: json
     token_key: access_token
+    token_expiration_key: expires_in
     ssl_verify: true
 
 ---
@@ -5735,6 +5762,13 @@
       cloudCover:
       - '{{"query":{{"eo:cloud_cover":{{"lte":{cloudCover}}}}}}}'
       - '$.properties."eo:cloud_cover"'
+      # OpenSearch Parameters for Acquistion Parameters Search (Table 6)
+      startTimeFromAscendingNode:
+        - '{{"query":{{"end_datetime":{{"gte":"{startTimeFromAscendingNode#to_iso_utc_datetime}"}}}}}}'
+        - '$.properties.start_datetime'
+      completionTimeFromAscendingNode:
+        - '{{"query":{{"start_datetime":{{"lte":"{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}}}}}'
+        - '$.properties.end_datetime'
       swathIdentifier:
         - '{{"query":{{"swath":{{"eq":"{swathIdentifier}"}}}}}}'
         - '$.properties.swath'
@@ -5851,6 +5885,13 @@
       cloudCover:
       - '{{"query":{{"eo:cloud_cover":{{"lte":{cloudCover}}}}}}}'
       - '$.properties."eo:cloud_cover"'
+      # OpenSearch Parameters for Acquistion Parameters Search (Table 6)
+      startTimeFromAscendingNode:
+        - '{{"query":{{"end_datetime":{{"gte":"{startTimeFromAscendingNode#to_iso_utc_datetime}"}}}}}}'
+        - '$.properties.start_datetime'
+      completionTimeFromAscendingNode:
+        - '{{"query":{{"start_datetime":{{"lte":"{completionTimeFromAscendingNode#to_iso_utc_datetime}"}}}}}}'
+        - '$.properties.end_datetime'
       swathIdentifier:
         - '{{"query":{{"swath":{{"eq":"{swathIdentifier}"}}}}}}'
         - '$.properties.swath'
@@ -5965,7 +6006,6 @@
       - '{$.completionTimeFromAscendingNode#to_iso_date}'
   auth: !plugin
     type: HTTPHeaderAuth
-    matching_url: https://ewds.climate.copernicus.eu
     ssl_verify: true
     headers:
       PRIVATE-TOKEN: "{apikey}"
@@ -5980,13 +6020,19 @@
     order_on_response:
       metadata_mapping:
         orderId: $.json.jobID
-        orderStatusLink: https://ewds.climate.copernicus.eu/api/retrieve/v1/jobs/{orderId}
+        orderStatusLink: https://ewds.climate.copernicus.eu/api/retrieve/v1/jobs/{orderId}?request=true
         searchLink: https://ewds.climate.copernicus.eu/api/retrieve/v1/jobs/{orderId}/results
     order_status:
       request:
         method: GET
       metadata_mapping:
         status: $.json.status
+        order:date: $.json.created
+        creationDate: $.json.created
+        publicationDate: $.json.finished
+        modificationDate: $.json.updated
+        ecmwf:dataset: $.json.processID
+        request_params: $.json.metadata.request.ids
       error:
         status: failed
       success:
@@ -5997,6 +6043,7 @@
           downloadLink: $.json.asset.value.href
   search: !plugin
     type: ECMWFSearch
+    need_auth: true
     ssl_verify: true
     end_date_excluded: false
     dates_required: True

eodag/utils/__init__.py

@@ -1192,10 +1192,16 @@ def get_geometry_from_various(
 class MockResponse:
     """Fake requests response"""
 
-    def __init__(self, json_data: Any = None, status_code: int = 200) -> None:
+    def __init__(
+        self,
+        json_data: Any = None,
+        status_code: int = 200,
+        headers: Optional[dict[str, Any]] = None,
+    ) -> None:
         self.json_data = json_data
         self.status_code = status_code
         self.content = json_data
+        self.headers = headers
 
     def json(self) -> Any:
         """Return json data"""

{eodag-3.2.1.dist-info → eodag-3.3.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: eodag
-Version: 3.2.1
+Version: 3.3.0
 Summary: Earth Observation Data Access Gateway
 Home-page: https://github.com/CS-SI/eodag
 Author: CS GROUP - France
@@ -317,7 +317,7 @@ An eodag instance can be exposed through a STAC compliant REST api from the comm
 
 .. code-block:: bash
 
-    docker run -p 5000:5000 --rm csspace/eodag-server:3.2.0
+    docker run -p 5000:5000 --rm csspace/eodag-server:3.3.0
 
 You can also browse over your STAC API server using `STAC Browser <https://github.com/radiantearth/stac-browser>`_.
 Simply run:

{eodag-3.2.1.dist-info → eodag-3.3.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
 eodag/__init__.py,sha256=qADIO6H3KR0CMs0qePdJROjSzcGnHaYpv-RFIk18WGQ,1608
 eodag/cli.py,sha256=63QvLzyZEf6dsTB1jK_80lOTtp6fbjoSJROqKIL-mR4,29959
-eodag/config.py,sha256=WUL9yLwVXyXArnZ8RYI8Dnf7Ujnd04dl3M0dc9UTwWE,45837
+eodag/config.py,sha256=W2cKC2Br00Nh8-_-LHWF4gpcjhQpj51w0my7f1niI60,45980
 eodag/crunch.py,sha256=fLVAPGVPw31N_DrnFk4gkCpQZLMY8oBhK6NUSYmdr24,1099
 eodag/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 eodag/api/__init__.py,sha256=ytr30NUVmEtmJTsp3QCwkCIhS1nF6UlFCv0vmySHN7g,735
-eodag/api/core.py,sha256=tGMdrgJnm_7D5b2VoMCt-QeMOnOOfnhYiOwufDxpF6k,109426
-eodag/api/search_result.py,sha256=ri3-5Jxr1Ik8V0uQtuXvnd3L3tSGS_niqpmHeaI2Obw,8176
+eodag/api/core.py,sha256=L0xuyoxnbbu3ZdvGcO5Yj6q8-ezzkX35kZ3wJkdupkw,109502
+eodag/api/search_result.py,sha256=Qj3-2ru7lo3VHQZ9SMMRxykVU5PtEbW_dkgMp1HEe8U,8164
 eodag/api/product/__init__.py,sha256=klSKudmnHHeXvcwIX6Y30UTiP39tMfTwLNexSnAZnx0,1154
 eodag/api/product/_assets.py,sha256=9bWIe_SYvsQO-q_lQFd7SxhUIWv7feze2-wnXOe8hhs,7570
 eodag/api/product/_product.py,sha256=1Jz-oPg65Njc7DOWw4ADT9QmNXReiD1LeXFDosnXsOA,23458
@@ -32,7 +32,7 @@ eodag/plugins/authentication/oauth.py,sha256=fCMx7OxS3JNO9lLZhQNnL9lsBB9nFwZJLEY
 eodag/plugins/authentication/openid_connect.py,sha256=LbpQzekxin_bLrKfk7bzU3LGxlfaABSm1fwx7S1O58M,24913
 eodag/plugins/authentication/qsauth.py,sha256=bkepO_sFRIhYm3Dzecx3VJP0Ap37vUuJSRmEY8HrV1U,3947
 eodag/plugins/authentication/sas_auth.py,sha256=gZp5UDeAi6iEi-IXv_RjrmAVpQCD5s9A0b3V7HV6KnU,4773
-eodag/plugins/authentication/token.py,sha256=5mipX9SuNSNJtLntLRLm8KS7kqwylurvzkQq57fxWg0,12879
+eodag/plugins/authentication/token.py,sha256=1aQ_R1PMo47VUU93AQiC0oV5Dh5-xsMhDwP1ilgmZCQ,13645
 eodag/plugins/authentication/token_exchange.py,sha256=m0KHc4KOhlw0YYXCWEAwB7n7cJLScq3pXa6M6fiXNAQ,4902
 eodag/plugins/crunch/__init__.py,sha256=58D7kJhEpHJWobIKaNFPynfbSqAWgS90BiHzitqS5Ds,746
 eodag/plugins/crunch/base.py,sha256=XW4HISgR0UswiEZmE4t42HxnSxknZBtVpuK8XVLYHzU,1415
@@ -45,11 +45,11 @@ eodag/plugins/download/__init__.py,sha256=zqszaeNgYP0YHlZDkLMf6odcwNw0KrAahGpcA-
 eodag/plugins/download/aws.py,sha256=SwyiF1j2MBvUJi-LwVT8NmQfxZYRfi7kk5Uxd8vFVW8,58623
 eodag/plugins/download/base.py,sha256=ulkGfiY2qMtzyEPdUlP8CZ6w5Bqi2hckuX-sGqpkVeQ,29994
 eodag/plugins/download/creodias_s3.py,sha256=RoEhYHtsPDbfrZhBllYoek0r7YzP8Upf5CPgc-PnlZM,4151
-eodag/plugins/download/http.py,sha256=FhvkCVxj_ENV31Nm2ulT3DRlPQYBM6eQtf2of9M0T2o,56707
+eodag/plugins/download/http.py,sha256=Rg6NOcxKHSoDOzqi_nY9rzb_pJ-RrnVuevs4AqsS5uw,58110
 eodag/plugins/download/s3rest.py,sha256=BYkKglGhTVyR0A-8ls5gLhWOPwc_DgB4aydj79wpqoM,14825
 eodag/plugins/search/__init__.py,sha256=bBrl3TffoU1wVpaeXmTEIailoh9W6fla4IP-8SWqA9U,2019
 eodag/plugins/search/base.py,sha256=b9zAPLQITBSOJ9n5zBxtiHlPkQwACjjJkD894oYZ7L8,18555
-eodag/plugins/search/build_search_result.py,sha256=ZovCC2t8CpQuycXX8Tc6oY4v7VSzqFaGjbfkmB5XxXM,49777
+eodag/plugins/search/build_search_result.py,sha256=ZWd87uPrbzAZTfSUA9-OMvBbsaZtJ0fAADzrojp-3FI,56808
 eodag/plugins/search/cop_marine.py,sha256=pRWNY9MXY-XzlpQjqOI8ImOiNUehv9pwNl6oR9r171w,19720
 eodag/plugins/search/creodias_s3.py,sha256=rBZf3Uza7z3VuBdoUJQ9kuufGgACKVsEvK3phUo7C7M,3379
 eodag/plugins/search/csw.py,sha256=de8CNjz4bjEny27V0RXC7V8LRz0Ik3yqQVjTAc_JlyA,12548
@@ -57,10 +57,10 @@ eodag/plugins/search/data_request_search.py,sha256=yrKu3EXhn6Utyai3qv5NPnH-V4EuG
 eodag/plugins/search/qssearch.py,sha256=WZYKd0cySgbcF6RKObz-Sc55c3gXRZQCKJXM1sdtR84,91586
 eodag/plugins/search/stac_list_assets.py,sha256=OOCMyjD8XD-m39k0SyKMrRi4K8Ii5mOQsA6zSAeQDGI,3435
 eodag/plugins/search/static_stac_search.py,sha256=rfcKBD-0-gDFg6jbR_XCsVH1t9Yf9HIlnFE_Drr0BAs,9259
-eodag/resources/ext_product_types.json,sha256=bXZ3hzLAUgHac5yxff0fQD2hD0KYBu_VoiH5Jpu1EfA,3160813
+eodag/resources/ext_product_types.json,sha256=868xoClXO9yhlpJ0RDQeLw2QtfDbw8albP92nsol5TM,3166884
 eodag/resources/locations_conf_template.yml,sha256=_eBv-QKHYMIKhY0b0kp4Ee33RsayxN8LWH3kDXxfFSk,986
 eodag/resources/product_types.yml,sha256=vN-VNxKmRbMmRfdjMI3Tc3vs66yhU3Oep8_v2AXWH9Y,409966
-eodag/resources/providers.yml,sha256=3c6aQy3rSUuKt6E6vFUt9i7dn2bh-anbcRuf_i2-beg,221252
+eodag/resources/providers.yml,sha256=pf_96hfc_22I0YXzHZJ5PhA6mv6Ek3n9ujeKx6ggTPY,223198
 eodag/resources/stac.yml,sha256=XgQFkJEfu_f2ZiVM5L1flkew7wq55p_PJmDuVkOG3fs,10442
 eodag/resources/stac_api.yml,sha256=2FdQL_qBTIUlu6KH836T4CXBKO9AvVxA_Ub3J1RP81A,68881
 eodag/resources/stac_provider.yml,sha256=2yfdnuhJYV1f5el3aFkunoPqHAcD8oCDzvASbmldIvY,6703
@@ -95,7 +95,7 @@ eodag/types/download_args.py,sha256=urSl5KbLRN1XetMa2XzxYltny8CCFmHpjxU3j3BEGO8,
 eodag/types/queryables.py,sha256=9Jllvoq0SgCKQUmnhVNqj55_xdMq2Yw49-1SWFh_nI8,9880
 eodag/types/search_args.py,sha256=EtG8nXnApBnYrFo5FVvsvvEqRlqTxJ0lrmIem9Wtg8c,5649
 eodag/types/whoosh.py,sha256=VXpWAZaXLR_RRnI9gh5iwkqn1n63krVGj2SX0rB2mQo,7225
-eodag/utils/__init__.py,sha256=-IjKfvuAgTSiRC8aCMp9xAcdrwNB_J9XDQuAvafKE4s,52783
+eodag/utils/__init__.py,sha256=FFkJK6apDqYi3XOpXuyqS7DGMfUJkVQTBM7YaSK104I,52895
 eodag/utils/exceptions.py,sha256=hYeq5GzMqW50o6mSUUlvOpsfU0eRjwhpqXTSE5MFv9Q,4452
 eodag/utils/import_system.py,sha256=1vwcSRlsZwuaP8ssrpRBP5jldZ54eLv2ttNCdLf0TtA,3901
 eodag/utils/logging.py,sha256=KoMsyS1f6O1hr_SMDOIxvt842mOJgmu_yLUk0-0EKFs,3507
@@ -105,9 +105,9 @@ eodag/utils/requests.py,sha256=avNHKrOZ7Kp6lUA7u4kqupIth9MoirLzDsMrrmQDt4s,4560
 eodag/utils/rest.py,sha256=a9tlG_Y9iQXLeyeLyecxFNbopGHV-8URecMSRs0UXu0,3348
 eodag/utils/s3.py,sha256=2mspYgEYGA1IDbruMMDdJ2DoxyX3riSlV7PDIu7carg,7989
 eodag/utils/stac_reader.py,sha256=d1tv82_E5dEmK9Vlw3TQfU1ndXg_iUGatxMeWMnIWPo,9236
-eodag-3.2.1.dist-info/licenses/LICENSE,sha256=4MAecetnRTQw5DlHtiikDSzKWO1xVLwzM5_DsPMYlnE,10172
-eodag-3.2.1.dist-info/METADATA,sha256=xsfi9gG8iD7y-PyDarM0qEsLHvf3FXxtmS8RMPqUnNI,15476
-eodag-3.2.1.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-eodag-3.2.1.dist-info/entry_points.txt,sha256=krdrBOQso6kAcSekV9ItEYAkE8syTC4Ev75bI781VgE,2561
-eodag-3.2.1.dist-info/top_level.txt,sha256=025IMTmVe5eDjIPP4KEFQKespOPMQdne4U4jOy8nftM,6
-eodag-3.2.1.dist-info/RECORD,,
+eodag-3.3.0.dist-info/licenses/LICENSE,sha256=4MAecetnRTQw5DlHtiikDSzKWO1xVLwzM5_DsPMYlnE,10172
+eodag-3.3.0.dist-info/METADATA,sha256=BqJyA46-XwzYUiGpN3bWb6FE4s79Jwbv2QtJWG9GlWk,15476
+eodag-3.3.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+eodag-3.3.0.dist-info/entry_points.txt,sha256=krdrBOQso6kAcSekV9ItEYAkE8syTC4Ev75bI781VgE,2561
+eodag-3.3.0.dist-info/top_level.txt,sha256=025IMTmVe5eDjIPP4KEFQKespOPMQdne4U4jOy8nftM,6
+eodag-3.3.0.dist-info/RECORD,,