Merge pull request #153 from ecmwf-projects/reformat-show-api-request

Reformat show api request

Author: mcucchi9

cads_processing_api_service/config.py

@@ -39,9 +39,11 @@ class Settings(pydantic_settings.BaseSettings):
     cache_resources_ttl: int = 10
 
     api_request_template: str = (
-        "import cads_api_client\n\nclient = cads_api_client.ApiClient()\n\nclient.retrieve("
-        "\n\tcollection_id='{process_id}',"
-        "\n\t{api_request_kwargs}\n)\n"
+        "import cads_api_client\n\n"
+        "collection_id = '{process_id}'\n"
+        "request = {api_request_kwargs}\n\n"
+        "client = cads_api_client.ApiClient()\n"
+        "client.retrieve(collection_id, **request)\n"
     )
 
     @property

cads_processing_api_service/translators.py

@@ -232,14 +232,14 @@ def format_api_request(
     """
     request_inputs: dict[str, Any] = request["inputs"]
     api_request_kwargs = (
-        "**{"
-        + ", ".join(
+        "{"
+        + ",".join(
             [
-                f"'{key}': {format_request_value(value)}"
+                f"\n    '{key}': {format_request_value(value)}"
                 for key, value in request_inputs.items()
             ]
         )
-        + "}"
+        + "\n}"
     )
     api_request = api_request_template.format(
         process_id=process_id, api_request_kwargs=api_request_kwargs

tests/test_10_translators.py

@@ -201,9 +201,13 @@ def test_format_request_value() -> None:
 
 def test_format_api_request() -> None:
     test_api_request_template = (
-        "import cads_api_client\n\nclient = cads_api_client.ApiClient()\n\nclient.retrieve("
-        "\n\tcollection_id='{process_id}',"
-        "\n\t{api_request_kwargs}\n)\n"
+        "import cads_api_client\n\n"
+        "request = {api_request_kwargs}\n\n"
+        "client = cads_api_client.ApiClient()\n"
+        "client.retrieve(\n\t"
+        "collection_id='{process_id}',\n\t"
+        "**request\n"
+        ")\n"
     )
     test_process_id = "test_process_id"
     test_request = {
@@ -213,9 +217,16 @@ def test_format_api_request() -> None:
         }
     }
     exp_output = (
-        "import cads_api_client\n\nclient = cads_api_client.ApiClient()\n\nclient.retrieve(\n\t"
+        "import cads_api_client\n\n"
+        "request = {\n"
+        "    'variable': 'test_variable_1',\n"
+        "    'year': ['2000', '2001']\n"
+        "}\n\n"
+        "client = cads_api_client.ApiClient()\n"
+        "client.retrieve(\n\t"
         "collection_id='test_process_id',\n\t"
-        "**{'variable': 'test_variable_1', 'year': ['2000', '2001']}\n)\n"
+        "**request\n"
+        ")\n"
     )
     res_output = cads_processing_api_service.translators.format_api_request(
         test_api_request_template, test_process_id, test_request