From 562a57bd859714a61858f36ff652521ef1d64479 Mon Sep 17 00:00:00 2001 From: Beverly Nguyen Date: Wed, 6 Aug 2025 13:40:11 -0700 Subject: [PATCH] formatting files --- .ds.baseline | 4 +-- app/__init__.py | 4 +-- app/config.py | 4 +-- notifications_python_client/base.py | 4 +-- tests/app/main/views/test_activity.py | 36 +++++++++++--------- tests/app/main/views/test_api_integration.py | 4 ++- tests/app/main/views/test_jobs_activity.py | 18 ++++------ tests/app/main/views/test_send.py | 12 ++----- 8 files changed, 37 insertions(+), 49 deletions(-) diff --git a/.ds.baseline b/.ds.baseline index 4f2a73d8c..e74f8928f 100644 --- a/.ds.baseline +++ b/.ds.baseline @@ -161,7 +161,7 @@ "filename": "app/config.py", "hashed_secret": "577a4c667e4af8682ca431857214b3a920883efc", "is_verified": false, - "line_number": 124, + "line_number": 122, "is_secret": false } ], @@ -634,5 +634,5 @@ } ] }, - "generated_at": "2025-07-31T11:53:28Z" + "generated_at": "2025-08-06T20:40:07Z" } diff --git a/app/__init__.py b/app/__init__.py index fe6ba515d..76a45ed9d 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -550,7 +550,7 @@ def register_errorhandlers(application): # noqa (C901 too complex) application.logger.warning( f"API {error_url} failed with status {error.status_code} message {error.message}", exc_info=sys.exc_info(), - stack_info=True + stack_info=True, ) error_code = error.status_code @@ -562,7 +562,7 @@ def register_errorhandlers(application): # noqa (C901 too complex) application.logger.exception( f"API {error_url} failed with status {error.status_code} message {error.message}", exc_info=sys.exc_info(), - stack_info=True + stack_info=True, ) error_code = 500 diff --git a/app/config.py b/app/config.py index 2e9bb45bf..68b780290 100644 --- a/app/config.py +++ b/app/config.py @@ -16,9 +16,7 @@ class Config(object): API_PUBLIC_WS_URL = getenv("API_PUBLIC_WS_URL", "localhost") ADMIN_BASE_URL = getenv("ADMIN_BASE_URL", "http://localhost:6012") - HEADER_COLOUR = ( - "#81878b" # mix of dark-grey and mid-grey - ) + HEADER_COLOUR = "#81878b" # mix of dark-grey and mid-grey LOGO_CDN_DOMAIN = ( "static-logos.notifications.service.gov.uk" # TODO use our own CDN ) diff --git a/notifications_python_client/base.py b/notifications_python_client/base.py index 6312416ea..9c010118a 100644 --- a/notifications_python_client/base.py +++ b/notifications_python_client/base.py @@ -22,9 +22,7 @@ class BaseAPIClient: This class is not thread-safe. """ - def __init__( - self, api_key, base_url=API_PUBLIC_URL, timeout=30 - ): + def __init__(self, api_key, base_url=API_PUBLIC_URL, timeout=30): """ Initialise the client Error if either of base_url or secret missing diff --git a/tests/app/main/views/test_activity.py b/tests/app/main/views/test_activity.py index b9dc3d94a..3f4e8264b 100644 --- a/tests/app/main/views/test_activity.py +++ b/tests/app/main/views/test_activity.py @@ -295,10 +295,12 @@ def test_download_links_show_when_data_available( mock_jobs_with_data = { "data": [{"id": "job1", "created_at": "2020-01-01T00:00:00.000000+00:00"}], "total": 1, - "page_size": 50 + "page_size": 50, } - mocker.patch("app.job_api_client.get_page_of_jobs", return_value=mock_jobs_with_data) + mocker.patch( + "app.job_api_client.get_page_of_jobs", return_value=mock_jobs_with_data + ) mocker.patch("app.job_api_client.get_immediate_jobs", return_value=[{"id": "job1"}]) page = client_request.get( @@ -323,7 +325,7 @@ def test_download_links_partial_data_available( mock_jobs_with_data = { "data": [{"id": "job1", "created_at": "2020-01-01T00:00:00.000000+00:00"}], "total": 1, - "page_size": 50 + "page_size": 50, } mock_jobs_empty = {"data": [], "total": 0, "page_size": 50} @@ -332,7 +334,9 @@ def test_download_links_partial_data_available( return mock_jobs_with_data return mock_jobs_empty - mocker.patch("app.job_api_client.get_page_of_jobs", side_effect=mock_get_page_of_jobs) + mocker.patch( + "app.job_api_client.get_page_of_jobs", side_effect=mock_get_page_of_jobs + ) mocker.patch("app.job_api_client.get_immediate_jobs", return_value=[]) page = client_request.get( @@ -369,7 +373,10 @@ def test_download_links_no_data_available( assert "Download all data last 3 days" not in page.text assert "Download all data last 5 days" not in page.text assert "Download all data last 7 days" not in page.text - assert "No recent activity to download. Download links will appear when jobs are available." in page.text + assert ( + "No recent activity to download. Download links will appear when jobs are available." + in page.text + ) def test_download_not_available_to_users_without_dashboard( @@ -560,9 +567,8 @@ def test_should_show_notifications_for_a_service_with_next_previous( ): mocker.patch( "app.notification_api_client.get_notifications_for_service", - return_value=notification_json( - service_one["id"], rows=50, with_links=True - ) | {"total": 150}, + return_value=notification_json(service_one["id"], rows=50, with_links=True) + | {"total": 150}, ) page = client_request.get( "main.view_notifications", @@ -608,9 +614,8 @@ def test_doesnt_show_next_button_on_last_page( ): mocker.patch( "app.notification_api_client.get_notifications_for_service", - return_value=notification_json( - service_one["id"], rows=50, with_links=True - ) | {"total": 100}, + return_value=notification_json(service_one["id"], rows=50, with_links=True) + | {"total": 100}, ) page = client_request.get( "main.view_notifications", @@ -637,9 +642,7 @@ def test_doesnt_show_pagination_when_50_or_fewer_items( ): mocker.patch( "app.notification_api_client.get_notifications_for_service", - return_value=notification_json( - service_one["id"], rows=50, with_links=False - ), + return_value=notification_json(service_one["id"], rows=50, with_links=False), ) page = client_request.get( "main.view_notifications", @@ -663,9 +666,8 @@ def test_doesnt_show_pagination_with_search_term( ): mocker.patch( "app.notification_api_client.get_notifications_for_service", - return_value=notification_json( - service_one["id"], rows=50, with_links=True - ) | {"total": 100}, + return_value=notification_json(service_one["id"], rows=50, with_links=True) + | {"total": 100}, ) page = client_request.post( "main.view_notifications", diff --git a/tests/app/main/views/test_api_integration.py b/tests/app/main/views/test_api_integration.py index 1bb371ab3..f482b1cce 100644 --- a/tests/app/main/views/test_api_integration.py +++ b/tests/app/main/views/test_api_integration.py @@ -185,7 +185,9 @@ def test_should_show_create_api_key_page( label = item.select_one(".usa-radio__label") hint = label.select_one(".usa-hint") # Get the label text without the hint text - label_text = label.text.replace(hint.text, "").strip() if hint else label.text + label_text = ( + label.text.replace(hint.text, "").strip() if hint else label.text + ) assert normalize_spaces(label_text) == option[0] assert normalize_spaces(hint.text) == option[1] else: diff --git a/tests/app/main/views/test_jobs_activity.py b/tests/app/main/views/test_jobs_activity.py index ff1e7080d..c2a6bcd3e 100644 --- a/tests/app/main/views/test_jobs_activity.py +++ b/tests/app/main/views/test_jobs_activity.py @@ -50,9 +50,7 @@ def test_all_activity( mock_get_page_of_jobs = mocker.patch( "app.job_api_client.get_page_of_jobs", return_value=MOCK_JOBS ) - mocker.patch( - "app.job_api_client.get_immediate_jobs", return_value=[] - ) + mocker.patch("app.job_api_client.get_immediate_jobs", return_value=[]) response = client_request.get_response( "main.all_jobs_activity", @@ -65,7 +63,7 @@ def test_all_activity( assert "All activity" in response.text assert any( - call[0][0] == SERVICE_ONE_ID and call[1].get('page') == current_page + call[0][0] == SERVICE_ONE_ID and call[1].get("page") == current_page for call in mock_get_page_of_jobs.call_args_list ) page = BeautifulSoup(response.data, "html.parser") @@ -139,9 +137,7 @@ def test_all_activity_no_jobs(client_request, mocker): "total": 0, }, ) - mocker.patch( - "app.job_api_client.get_immediate_jobs", return_value=[] - ) + mocker.patch("app.job_api_client.get_immediate_jobs", return_value=[]) response = client_request.get_response( "main.all_jobs_activity", service_id=SERVICE_ONE_ID, @@ -162,7 +158,7 @@ def test_all_activity_no_jobs(client_request, mocker): expected_message == actual_message ), f"Expected message '{expected_message}', but got '{actual_message}'" assert any( - call[0][0] == SERVICE_ONE_ID and call[1].get('page') == current_page + call[0][0] == SERVICE_ONE_ID and call[1].get("page") == current_page for call in mock_get_page_of_jobs.call_args_list ) @@ -194,9 +190,7 @@ def test_all_activity_pagination(client_request, mocker): "total": 100, }, ) - mocker.patch( - "app.job_api_client.get_immediate_jobs", return_value=[] - ) + mocker.patch("app.job_api_client.get_immediate_jobs", return_value=[]) response = client_request.get_response( "main.all_jobs_activity", @@ -204,7 +198,7 @@ def test_all_activity_pagination(client_request, mocker): page=current_page, ) assert any( - call[0][0] == SERVICE_ONE_ID and call[1].get('page') == current_page + call[0][0] == SERVICE_ONE_ID and call[1].get("page") == current_page for call in mock_get_page_of_jobs.call_args_list ) diff --git a/tests/app/main/views/test_send.py b/tests/app/main/views/test_send.py index 406853bbc..714bd4fd6 100644 --- a/tests/app/main/views/test_send.py +++ b/tests/app/main/views/test_send.py @@ -145,9 +145,7 @@ def test_default_email_sender_is_checked_and_has_hint( ) assert page.select(".usa-radio input")[0].has_attr("checked") - assert ( - normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)" - ) + assert normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)" assert not page.select(".usa-radio input")[1].has_attr("checked") @@ -162,9 +160,7 @@ def test_default_sms_sender_is_checked_and_has_hint( ) assert page.select(".usa-radio input")[0].has_attr("checked") - assert ( - normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)" - ) + assert normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)" assert not page.select(".usa-radio input")[1].has_attr("checked") @@ -179,9 +175,7 @@ def test_default_sms_sender_is_checked_and_has_hint_when_there_are_no_inbound_nu ) assert page.select(".usa-radio input")[0].has_attr("checked") - assert ( - normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)" - ) + assert normalize_spaces(page.select_one(".usa-radio .usa-hint").text) == "(Default)" assert not page.select(".usa-radio input")[1].has_attr("checked")