From da8e471fae121aef642c427442f122c55c903085 Mon Sep 17 00:00:00 2001 From: malmans2 Date: Fri, 15 Nov 2024 08:13:27 +0100 Subject: [PATCH 1/3] migrate to datapi --- cads_processing_api_service/config.py | 13 +++++++++---- tests/test_10_translators.py | 12 ++++++++---- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/cads_processing_api_service/config.py b/cads_processing_api_service/config.py index 4b0414b..491460e 100644 --- a/cads_processing_api_service/config.py +++ b/cads_processing_api_service/config.py @@ -31,13 +31,18 @@ logger: structlog.stdlib.BoundLogger = structlog.get_logger(__name__) -API_REQUEST_TEMPLATE = """import cdsapi +API_REQUEST_TEMPLATE = """\ +import logging -dataset = "{process_id}" +import datapi + +logging.basicConfig(level="INFO") + +collection_id = "{process_id}" request = {api_request_kwargs} -client = cdsapi.Client() -client.retrieve(dataset, request).download() +client = datapi.ApiClient() +client.retrieve(collection_id, **request) """ API_REQUEST_MAX_LIST_LENGTH: dict[str, int] = { diff --git a/tests/test_10_translators.py b/tests/test_10_translators.py index 7c4a980..c347397 100644 --- a/tests/test_10_translators.py +++ b/tests/test_10_translators.py @@ -320,17 +320,21 @@ def test_format_api_request() -> None: } } exp_output = ( - "import cdsapi\n\n" - 'dataset = "test_process_id"\n' + "import logging\n\n" + "import datapi\n\n" + 'logging.basicConfig(level="INFO")\n\n' + 'collection_id = "test_process_id"\n' "request = {\n" ' "variable_1": "value_1",\n' ' "variable_2": [\n "value_1",\n "value_2"\n ],\n' ' "variable_3": 1\n' "}\n\n" - "client = cdsapi.Client()\n" - "client.retrieve(dataset, request).download()\n" + "client = datapi.ApiClient()\n" + "client.retrieve(collection_id, **request)\n" ) res_output = translators.format_api_request( test_api_request_template, test_process_id, test_request ) + print(res_output) + aaaa assert res_output == exp_output From 04d291e9338e12765c37c95d5e21e391c644a98a Mon Sep 17 00:00:00 2001 From: malmans2 Date: Fri, 15 Nov 2024 08:15:13 +0100 Subject: [PATCH 2/3] cleanup --- tests/test_10_translators.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_10_translators.py b/tests/test_10_translators.py index c347397..b994bed 100644 --- a/tests/test_10_translators.py +++ b/tests/test_10_translators.py @@ -335,6 +335,4 @@ def test_format_api_request() -> None: res_output = translators.format_api_request( test_api_request_template, test_process_id, test_request ) - print(res_output) - aaaa assert res_output == exp_output From 2dd6b6dfdc9faf1ca5dfd83f5148dc5e9b8f63b9 Mon Sep 17 00:00:00 2001 From: malmans2 Date: Thu, 30 Jan 2025 11:51:24 +0100 Subject: [PATCH 3/3] update API --- cads_processing_api_service/config.py | 2 +- tests/test_10_translators.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cads_processing_api_service/config.py b/cads_processing_api_service/config.py index 491460e..08af2b0 100644 --- a/cads_processing_api_service/config.py +++ b/cads_processing_api_service/config.py @@ -42,7 +42,7 @@ request = {api_request_kwargs} client = datapi.ApiClient() -client.retrieve(collection_id, **request) +client.retrieve(collection_id, request) """ API_REQUEST_MAX_LIST_LENGTH: dict[str, int] = { diff --git a/tests/test_10_translators.py b/tests/test_10_translators.py index b994bed..2c1c089 100644 --- a/tests/test_10_translators.py +++ b/tests/test_10_translators.py @@ -330,7 +330,7 @@ def test_format_api_request() -> None: ' "variable_3": 1\n' "}\n\n" "client = datapi.ApiClient()\n" - "client.retrieve(collection_id, **request)\n" + "client.retrieve(collection_id, request)\n" ) res_output = translators.format_api_request( test_api_request_template, test_process_id, test_request