Run auto-correct on app/ and tests/

app/celery/broadcast_message_tasks.py

@@ -6,15 +6,21 @@ from notifications_utils.statsd_decorators import statsd
 from sqlalchemy.schema import Sequence
 
 from app import cbc_proxy_client, db, notify_celery
-from app.clients.cbc_proxy import CBCProxyFatalException, CBCProxyRetryableException
-from app.config import QueueNames
-from app.models import BroadcastEventMessageType, BroadcastProvider, BroadcastProviderMessageStatus
-from app.dao.broadcast_message_dao import (
-    dao_get_broadcast_event_by_id,
-    create_broadcast_provider_message,
-    update_broadcast_provider_message_status
+from app.clients.cbc_proxy import (
+    CBCProxyFatalException,
+    CBCProxyRetryableException,
+)
+from app.config import QueueNames
+from app.dao.broadcast_message_dao import (
+    create_broadcast_provider_message,
+    dao_get_broadcast_event_by_id,
+    update_broadcast_provider_message_status,
+)
+from app.models import (
+    BroadcastEventMessageType,
+    BroadcastProvider,
+    BroadcastProviderMessageStatus,
 )
-
 from app.utils import format_sequential_number
 
 

app/celery/celery.py

@@ -1,9 +1,10 @@
 import time
-from gds_metrics.metrics import Histogram
+
 from celery import Celery, Task
 from celery.signals import worker_process_shutdown
 from flask import g, request
-from flask.ctx import has_request_context, has_app_context
+from flask.ctx import has_app_context, has_request_context
+from gds_metrics.metrics import Histogram
 
 
 @worker_process_shutdown.connect

app/celery/letters_pdf_tasks.py

@@ -1,18 +1,18 @@
+from base64 import urlsafe_b64encode
 from datetime import datetime, timedelta
 from hashlib import sha512
-from base64 import urlsafe_b64encode
 
 from botocore.exceptions import ClientError as BotoClientError
 from flask import current_app
-from notifications_utils.postal_address import PostalAddress
-
-from notifications_utils.statsd_decorators import statsd
 from notifications_utils.letter_timings import LETTER_PROCESSING_DEADLINE
+from notifications_utils.postal_address import PostalAddress
+from notifications_utils.statsd_decorators import statsd
 from notifications_utils.timezones import convert_utc_to_bst
 
 from app import encryption, notify_celery
 from app.aws import s3
 from app.config import QueueNames, TaskNames
+from app.cronitor import cronitor
 from app.dao.notifications_dao import (
     dao_get_letters_and_sheets_volume_by_postage,
     dao_get_letters_to_be_printed,
@@ -23,18 +23,18 @@ from app.dao.notifications_dao import (
     update_notification_status_by_id,
 )
 from app.dao.templates_dao import dao_get_template_by_id
-from app.letters.utils import get_letter_pdf_filename
 from app.errors import VirusScanError
 from app.exceptions import NotificationTechnicalFailureException
 from app.letters.utils import (
-    get_billable_units_for_letter_page_count,
-    get_reference_from_filename,
     ScanErrorType,
+    get_billable_units_for_letter_page_count,
+    get_file_names_from_error_bucket,
+    get_letter_pdf_filename,
+    get_reference_from_filename,
+    move_error_pdf_to_scan_bucket,
     move_failed_pdf,
     move_sanitised_letter_to_test_or_live_pdf_bucket,
     move_scan_to_invalid_pdf_bucket,
-    move_error_pdf_to_scan_bucket,
-    get_file_names_from_error_bucket,
 )
 from app.models import (
     INTERNATIONAL_LETTERS,
@@ -52,8 +52,6 @@ from app.models import (
     Service,
 )
 
-from app.cronitor import cronitor
-
 
 @notify_celery.task(bind=True, name="get-pdf-for-templated-letter", max_retries=15, default_retry_delay=300)
 @statsd(namespace="tasks")
@@ -214,7 +212,7 @@ def send_letters_volume_email_to_dvla(letters_volumes, date):
     # avoid circular imports:
     from app.notifications.process_notifications import (
         persist_notification,
-        send_notification_to_queue
+        send_notification_to_queue,
     )
     for recipient in recipients:
         saved_notification = persist_notification(

app/celery/nightly_tasks.py

@@ -1,7 +1,4 @@
-from datetime import (
-    datetime,
-    timedelta
-)
+from datetime import datetime, timedelta
 
 import pytz
 from flask import current_app
@@ -12,31 +9,33 @@ from sqlalchemy.exc import SQLAlchemyError
 from app import notify_celery, performance_platform_client, zendesk_client
 from app.aws import s3
 from app.celery.service_callback_tasks import (
-    send_delivery_status_to_service,
     create_delivery_status_callback_data,
+    send_delivery_status_to_service,
 )
 from app.config import QueueNames
+from app.cronitor import cronitor
 from app.dao.inbound_sms_dao import delete_inbound_sms_older_than_retention
 from app.dao.jobs_dao import (
+    dao_archive_job,
     dao_get_jobs_older_than_data_retention,
-    dao_archive_job
 )
 from app.dao.notifications_dao import (
     dao_timeout_notifications,
     delete_notifications_older_than_retention_by_type,
 )
-from app.dao.service_callback_api_dao import get_service_delivery_status_callback_api_for_service
+from app.dao.service_callback_api_dao import (
+    get_service_delivery_status_callback_api_for_service,
+)
 from app.exceptions import NotificationTechnicalFailureException
 from app.models import (
-    Notification,
-    NOTIFICATION_SENDING,
     EMAIL_TYPE,
-    SMS_TYPE,
+    KEY_TYPE_NORMAL,
     LETTER_TYPE,
-    KEY_TYPE_NORMAL
+    NOTIFICATION_SENDING,
+    SMS_TYPE,
+    Notification,
 )
-from app.performance_platform import total_sent_notifications, processing_time
-from app.cronitor import cronitor
+from app.performance_platform import processing_time, total_sent_notifications
 from app.utils import get_london_midnight_in_utc
 
 

app/celery/process_ses_receipts_tasks.py

@@ -7,16 +7,15 @@ from notifications_utils.statsd_decorators import statsd
 from sqlalchemy.orm.exc import NoResultFound
 
 from app import notify_celery, statsd_client
-from app.config import QueueNames
 from app.clients.email.aws_ses import get_aws_responses
+from app.config import QueueNames
 from app.dao import notifications_dao
-from app.models import NOTIFICATION_SENDING, NOTIFICATION_PENDING
-
+from app.models import NOTIFICATION_PENDING, NOTIFICATION_SENDING
 from app.notifications.notifications_ses_callback import (
+    _check_and_queue_callback_task,
+    _check_and_queue_complaint_callback_task,
     determine_notification_bounce_type,
     handle_complaint,
-    _check_and_queue_complaint_callback_task,
-    _check_and_queue_callback_task,
 )
 
 

app/celery/process_sms_client_response_tasks.py

@@ -6,13 +6,18 @@ from notifications_utils.statsd_decorators import statsd
 from notifications_utils.template import SMSMessageTemplate
 
 from app import notify_celery, statsd_client
+from app.celery.service_callback_tasks import (
+    create_delivery_status_callback_data,
+    send_delivery_status_to_service,
+)
 from app.clients import ClientException
 from app.clients.sms.firetext import get_firetext_responses
 from app.clients.sms.mmg import get_mmg_responses
-from app.celery.service_callback_tasks import send_delivery_status_to_service, create_delivery_status_callback_data
 from app.config import QueueNames
 from app.dao import notifications_dao
-from app.dao.service_callback_api_dao import get_service_delivery_status_callback_api_for_service
+from app.dao.service_callback_api_dao import (
+    get_service_delivery_status_callback_api_for_service,
+)
 from app.dao.templates_dao import dao_get_template_by_id
 from app.models import NOTIFICATION_PENDING
 

app/celery/provider_tasks.py

@@ -3,10 +3,10 @@ from notifications_utils.statsd_decorators import statsd
 from sqlalchemy.orm.exc import NoResultFound
 
 from app import notify_celery
-from app.config import QueueNames
 from app.clients.email import EmailClientNonRetryableException
 from app.clients.email.aws_ses import AwsSesClientThrottlingSendRateException
 from app.clients.sms import SmsClientResponseException
+from app.config import QueueNames
 from app.dao import notifications_dao
 from app.dao.notifications_dao import update_notification_status_by_id
 from app.delivery import send_to_providers

app/celery/reporting_tasks.py

@@ -9,14 +9,13 @@ from app.config import QueueNames
 from app.cronitor import cronitor
 from app.dao.fact_billing_dao import (
     fetch_billing_data_for_day,
-    update_fact_billing
+    update_fact_billing,
 )
-from app.dao.fact_notification_status_dao import fetch_notification_status_for_day, update_fact_notification_status
-from app.models import (
-    SMS_TYPE,
-    EMAIL_TYPE,
-    LETTER_TYPE,
+from app.dao.fact_notification_status_dao import (
+    fetch_notification_status_for_day,
+    update_fact_notification_status,
 )
+from app.models import EMAIL_TYPE, LETTER_TYPE, SMS_TYPE
 
 
 @notify_celery.task(name="create-nightly-billing")

app/celery/research_mode_tasks.py

@@ -1,17 +1,16 @@
+import json
 import random
 from datetime import datetime, timedelta
-import json
 
 from flask import current_app
-from requests import request, HTTPError
-
 from notifications_utils.s3 import s3upload
+from requests import HTTPError, request
 
 from app import notify_celery
 from app.aws.s3 import file_exists
-from app.models import SMS_TYPE
-from app.config import QueueNames
 from app.celery.process_ses_receipts_tasks import process_ses_results
+from app.config import QueueNames
+from app.models import SMS_TYPE
 
 temp_fail = "7700900003"
 perm_fail = "7700900002"

app/celery/scheduled_tasks.py

@@ -1,9 +1,5 @@
 import uuid
-
-from datetime import (
-    datetime,
-    timedelta
-)
+from datetime import datetime, timedelta
 
 from flask import current_app
 from notifications_utils.statsd_decorators import statsd
@@ -11,41 +7,49 @@ from sqlalchemy import and_
 from sqlalchemy.exc import SQLAlchemyError
 
 from app import cbc_proxy_client, notify_celery, zendesk_client
-from app.celery.tasks import (
-    process_job,
-    get_recipient_csv_and_template_and_sender_id,
-    process_row,
-    process_incomplete_jobs)
-from app.celery.letters_pdf_tasks import get_pdf_for_templated_letter
 from app.celery.broadcast_message_tasks import trigger_link_test
+from app.celery.letters_pdf_tasks import get_pdf_for_templated_letter
+from app.celery.tasks import (
+    get_recipient_csv_and_template_and_sender_id,
+    process_incomplete_jobs,
+    process_job,
+    process_row,
+)
 from app.config import QueueNames
-from app.dao.invited_org_user_dao import delete_org_invitations_created_more_than_two_days_ago
-from app.dao.invited_user_dao import delete_invitations_created_more_than_two_days_ago
+from app.dao.invited_org_user_dao import (
+    delete_org_invitations_created_more_than_two_days_ago,
+)
+from app.dao.invited_user_dao import (
+    delete_invitations_created_more_than_two_days_ago,
+)
 from app.dao.jobs_dao import (
     dao_set_scheduled_jobs_to_pending,
+    dao_update_job,
     find_jobs_with_missing_rows,
-    find_missing_row_for_job
+    find_missing_row_for_job,
 )
-from app.dao.jobs_dao import dao_update_job
 from app.dao.notifications_dao import (
-    notifications_not_yet_sent,
-    dao_precompiled_letters_still_pending_virus_check,
     dao_old_letters_with_created_status,
-    letters_missing_from_sending_bucket,
+    dao_precompiled_letters_still_pending_virus_check,
     is_delivery_slow_for_providers,
+    letters_missing_from_sending_bucket,
+    notifications_not_yet_sent,
 )
 from app.dao.provider_details_dao import (
+    dao_adjust_provider_priority_back_to_resting_points,
     dao_reduce_sms_provider_priority,
-    dao_adjust_provider_priority_back_to_resting_points
+)
+from app.dao.services_dao import (
+    dao_find_services_sending_to_tv_numbers,
+    dao_find_services_with_high_failure_rates,
 )
 from app.dao.users_dao import delete_codes_older_created_more_than_a_day_ago
-from app.dao.services_dao import dao_find_services_sending_to_tv_numbers, dao_find_services_with_high_failure_rates
 from app.models import (
-    Job,
-    JOB_STATUS_IN_PROGRESS,
-    JOB_STATUS_ERROR,
-    SMS_TYPE,
     EMAIL_TYPE,
+    JOB_STATUS_ERROR,
+    JOB_STATUS_IN_PROGRESS,
+    SMS_TYPE,
+    Job,
 )
 from app.notifications.process_notifications import send_notification_to_queue
 

app/celery/service_callback_tasks.py

@@ -2,11 +2,7 @@ import json
 
 from flask import current_app
 from notifications_utils.statsd_decorators import statsd
-from requests import (
-    HTTPError,
-    request,
-    RequestException
-)
+from requests import HTTPError, RequestException, request
 
 from app import encryption, notify_celery
 from app.config import QueueNames

app/celery/tasks.py

@@ -1,6 +1,6 @@
 import json
+from collections import defaultdict, namedtuple
 from datetime import datetime
-from collections import namedtuple, defaultdict
 
 from flask import current_app
 from notifications_utils.columns import Columns
@@ -8,36 +8,28 @@ from notifications_utils.postal_address import PostalAddress
 from notifications_utils.recipients import RecipientCSV
 from notifications_utils.statsd_decorators import statsd
 from notifications_utils.timezones import convert_utc_to_bst
-from requests import (
-    HTTPError,
-    request,
-    RequestException
-)
-from sqlalchemy.exc import SQLAlchemyError, IntegrityError
+from requests import HTTPError, RequestException, request
+from sqlalchemy.exc import IntegrityError, SQLAlchemyError
 
-from app import (
-    create_uuid,
-    create_random_identifier,
-    encryption,
-    notify_celery,
-)
+from app import create_random_identifier, create_uuid, encryption, notify_celery
 from app.aws import s3
-from app.celery import provider_tasks, letters_pdf_tasks, research_mode_tasks
+from app.celery import letters_pdf_tasks, provider_tasks, research_mode_tasks
 from app.config import QueueNames
-from app.dao.daily_sorted_letter_dao import dao_create_or_update_daily_sorted_letter
+from app.dao.daily_sorted_letter_dao import (
+    dao_create_or_update_daily_sorted_letter,
+)
 from app.dao.inbound_sms_dao import dao_get_inbound_sms_by_id
-from app.dao.jobs_dao import (
-    dao_update_job,
-    dao_get_job_by_id,
-)
+from app.dao.jobs_dao import dao_get_job_by_id, dao_update_job
 from app.dao.notifications_dao import (
-    get_notification_by_id,
-    dao_update_notifications_by_reference,
     dao_get_last_notification_added_for_job_id,
-    update_notification_status_by_reference,
     dao_get_notification_or_history_by_reference,
+    dao_update_notifications_by_reference,
+    get_notification_by_id,
+    update_notification_status_by_reference,
+)
+from app.dao.provider_details_dao import (
+    get_provider_details_by_notification_type,
 )
-from app.dao.provider_details_dao import get_provider_details_by_notification_type
 from app.dao.returned_letters_dao import insert_or_update_returned_letters
 from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id
 from app.dao.service_inbound_api_dao import get_service_inbound_api_for_service
@@ -56,16 +48,16 @@ from app.models import (
     LETTER_TYPE,
     NOTIFICATION_CREATED,
     NOTIFICATION_DELIVERED,
-    NOTIFICATION_SENDING,
-    NOTIFICATION_TEMPORARY_FAILURE,
-    NOTIFICATION_TECHNICAL_FAILURE,
     NOTIFICATION_RETURNED_LETTER,
+    NOTIFICATION_SENDING,
+    NOTIFICATION_TECHNICAL_FAILURE,
+    NOTIFICATION_TEMPORARY_FAILURE,
     SMS_TYPE,
     DailySortedLetter,
 )
 from app.notifications.process_notifications import persist_notification
-from app.service.utils import service_allowed_to_send_to
 from app.serialised_models import SerialisedService, SerialisedTemplate
+from app.service.utils import service_allowed_to_send_to
 from app.utils import DATETIME_FORMAT