From 831e77a9bc37160da17b95f0c318db3016dc098e Mon Sep 17 00:00:00 2001 From: Maaike Date: Mon, 22 Jan 2024 11:59:55 +0100 Subject: [PATCH] implement minor changes requested --- docker_compose_test/docker-compose.yml | 1 - docker_compose_test/requirements.txt | 4 ++-- .../tests/integration/test_wis2box.py | 16 ++++++---------- wis2box_api/admin.py | 1 + wis2box_api/plugins/process/bufr2bufr.py | 3 +-- wis2box_api/plugins/process/bufr2geojson.py | 3 ++- wis2box_api/plugins/process/csv2bufr.py | 5 ++--- wis2box_api/wis2box/bufr4.py | 3 ++- wis2box_api/wis2box/station.py | 2 +- 9 files changed, 17 insertions(+), 21 deletions(-) diff --git a/docker_compose_test/docker-compose.yml b/docker_compose_test/docker-compose.yml index 622fb60..ce70de4 100644 --- a/docker_compose_test/docker-compose.yml +++ b/docker_compose_test/docker-compose.yml @@ -5,7 +5,6 @@ services: - test.env build: context: ./../ - dockerfile: Dockerfile depends_on: elasticsearch: condition: service_healthy diff --git a/docker_compose_test/requirements.txt b/docker_compose_test/requirements.txt index 1020bd8..77ef3a2 100644 --- a/docker_compose_test/requirements.txt +++ b/docker_compose_test/requirements.txt @@ -1,3 +1,3 @@ -requests paho-mqtt -pytest \ No newline at end of file +pytest +requests \ No newline at end of file diff --git a/docker_compose_test/tests/integration/test_wis2box.py b/docker_compose_test/tests/integration/test_wis2box.py index a16aaf8..9631909 100644 --- a/docker_compose_test/tests/integration/test_wis2box.py +++ b/docker_compose_test/tests/integration/test_wis2box.py @@ -23,9 +23,10 @@ # .github/workflows/wis2box_test.yml has been executed import json +import os import time + import requests -import os import paho.mqtt.client as mqtt @@ -90,11 +91,8 @@ def transform_to_bufr(process_name: str, response = requests.get(f'{job_location_url}/results?f=json', headers=headers) # noqa response_json = response.json() # print(response_json) - assert response_json['result'] == expected_response['result'] - assert response_json['messages transformed'] == expected_response['messages transformed'] # noqa - assert response_json['messages published'] == expected_response['messages published'] # noqa - assert response_json['errors'] == expected_response['errors'] - assert response_json['warnings'] == expected_response['warnings'] + for key in ['result', 'messages transformed', 'messages published', 'errors', 'warnings']: # noqa + assert response_json[key] == expected_response[key] filename = data['inputs']['channel'].replace('/', '_') + '.json' @@ -118,10 +116,8 @@ def transform_to_bufr(process_name: str, } # compare the received message with the expected message - assert message['channel'] == expected_message['channel'] - assert message['filename'] == expected_message['filename'] - assert message['data'] == expected_message['data'] - assert message['_meta'] == expected_message['_meta'] + for key in ['channel', 'filename', 'data', '_meta']: + assert message[key] == expected_message[key] def test_synop2bufr(): diff --git a/wis2box_api/admin.py b/wis2box_api/admin.py index e801ad9..8a54a47 100644 --- a/wis2box_api/admin.py +++ b/wis2box_api/admin.py @@ -22,6 +22,7 @@ from copy import deepcopy import os import json + import json_merge_patch from jsonschema.exceptions import ValidationError import logging diff --git a/wis2box_api/plugins/process/bufr2bufr.py b/wis2box_api/plugins/process/bufr2bufr.py index a6879f5..fe94694 100644 --- a/wis2box_api/plugins/process/bufr2bufr.py +++ b/wis2box_api/plugins/process/bufr2bufr.py @@ -19,14 +19,13 @@ # ############################################################################### -import logging import base64 +import logging from pygeoapi.process.base import BaseProcessor from wis2box_api.wis2box.handle import handle_error from wis2box_api.wis2box.handle import DataHandler - from wis2box_api.wis2box.bufr4 import ObservationDataBUFR LOGGER = logging.getLogger(__name__) diff --git a/wis2box_api/plugins/process/bufr2geojson.py b/wis2box_api/plugins/process/bufr2geojson.py index 70ab83e..cff6a56 100644 --- a/wis2box_api/plugins/process/bufr2geojson.py +++ b/wis2box_api/plugins/process/bufr2geojson.py @@ -19,9 +19,10 @@ # ############################################################################### +import base64 import logging + import requests -import base64 from pygeoapi.process.base import BaseProcessor from bufr2geojson import transform as as_geojson diff --git a/wis2box_api/plugins/process/csv2bufr.py b/wis2box_api/plugins/process/csv2bufr.py index fdc929c..9b02a26 100644 --- a/wis2box_api/plugins/process/csv2bufr.py +++ b/wis2box_api/plugins/process/csv2bufr.py @@ -19,7 +19,9 @@ # ############################################################################### +import json import logging +import os from pygeoapi.process.base import BaseProcessor @@ -31,9 +33,6 @@ from csv2bufr import transform as transform_csv -import json -import os - LOGGER = logging.getLogger(__name__) PROCESS_METADATA = { diff --git a/wis2box_api/wis2box/bufr4.py b/wis2box_api/wis2box/bufr4.py index 12e1cfa..4fe8da1 100644 --- a/wis2box_api/wis2box/bufr4.py +++ b/wis2box_api/wis2box/bufr4.py @@ -19,10 +19,11 @@ # ############################################################################### -from datetime import datetime import logging import tempfile +from datetime import datetime + from bufr2geojson import BUFRParser from eccodes import ( codes_bufr_copy_data, diff --git a/wis2box_api/wis2box/station.py b/wis2box_api/wis2box/station.py index 3eb0f67..09b95b5 100644 --- a/wis2box_api/wis2box/station.py +++ b/wis2box_api/wis2box/station.py @@ -18,8 +18,8 @@ # under the License. # ############################################################################### -import csv +import csv import io import logging