Run auto-correct on app/ and tests/

app/notifications/notifications_letter_callback.py

@@ -1,19 +1,16 @@
 import json
-
 from functools import wraps
 
-from flask import (
-    Blueprint,
-    jsonify,
-    request,
-    current_app
-)
+from flask import Blueprint, current_app, jsonify, request
 
-from app.celery.tasks import update_letter_notifications_statuses, record_daily_sorted_counts
-from app.v2.errors import register_errors
+from app.celery.tasks import (
+    record_daily_sorted_counts,
+    update_letter_notifications_statuses,
+)
+from app.config import QueueNames
 from app.notifications.utils import autoconfirm_subscription
 from app.schema_validation import validate
-from app.config import QueueNames
+from app.v2.errors import register_errors
 
 letter_callback_blueprint = Blueprint('notifications_letter_callback', __name__)
 register_errors(letter_callback_blueprint)

app/notifications/notifications_ses_callback.py

@@ -1,18 +1,21 @@
 from flask import current_app
 
-from app.dao.complaint_dao import save_complaint
-from app.dao.notifications_dao import dao_get_notification_or_history_by_reference
-from app.dao.service_callback_api_dao import (
-    get_service_delivery_status_callback_api_for_service, get_service_complaint_callback_api_for_service
-)
-from app.models import Complaint
 from app.celery.service_callback_tasks import (
-    send_delivery_status_to_service,
-    send_complaint_to_service,
+    create_complaint_callback_data,
     create_delivery_status_callback_data,
-    create_complaint_callback_data
+    send_complaint_to_service,
+    send_delivery_status_to_service,
 )
 from app.config import QueueNames
+from app.dao.complaint_dao import save_complaint
+from app.dao.notifications_dao import (
+    dao_get_notification_or_history_by_reference,
+)
+from app.dao.service_callback_api_dao import (
+    get_service_complaint_callback_api_for_service,
+    get_service_delivery_status_callback_api_for_service,
+)
+from app.models import Complaint
 
 
 def determine_notification_bounce_type(notification_type, ses_message):

app/notifications/notifications_sms_callback.py

@@ -1,9 +1,8 @@
-from flask import Blueprint
-from flask import current_app
-from flask import json
-from flask import request, jsonify
+from flask import Blueprint, current_app, json, jsonify, request
 
-from app.celery.process_sms_client_response_tasks import process_sms_client_response
+from app.celery.process_sms_client_response_tasks import (
+    process_sms_client_response,
+)
 from app.config import QueueNames
 from app.errors import InvalidRequest, register_errors
 

app/notifications/process_notifications.py

@@ -2,43 +2,38 @@ import uuid
 from datetime import datetime
 
 from flask import current_app
-
+from gds_metrics import Histogram
 from notifications_utils.clients import redis
 from notifications_utils.recipients import (
+    format_email_address,
     get_international_phone_info,
     validate_and_format_phone_number,
-    format_email_address
 )
 from notifications_utils.template import (
+    LetterPrintTemplate,
     PlainTextEmailTemplate,
     SMSMessageTemplate,
-    LetterPrintTemplate,
 )
 
 from app import redis_store
 from app.celery import provider_tasks
 from app.celery.letters_pdf_tasks import get_pdf_for_templated_letter
 from app.config import QueueNames
-
-from app.models import (
-    EMAIL_TYPE,
-    KEY_TYPE_TEST,
-    SMS_TYPE,
-    LETTER_TYPE,
-    NOTIFICATION_CREATED,
-    Notification,
-    INTERNATIONAL_POSTAGE_TYPES)
 from app.dao.notifications_dao import (
     dao_create_notification,
     dao_delete_notifications_by_id,
 )
-
+from app.models import (
+    EMAIL_TYPE,
+    INTERNATIONAL_POSTAGE_TYPES,
+    KEY_TYPE_TEST,
+    LETTER_TYPE,
+    NOTIFICATION_CREATED,
+    SMS_TYPE,
+    Notification,
+)
 from app.v2.errors import BadRequestError
 
-
-from gds_metrics import Histogram
-
-
 REDIS_GET_AND_INCR_DAILY_LIMIT_DURATION_SECONDS = Histogram(
     'redis_get_and_incr_daily_limit_duration_seconds',
     'Time taken to get and possibly incremement the daily limit cache key',

app/notifications/receive_notifications.py

@@ -2,16 +2,16 @@ from datetime import datetime
 from urllib.parse import unquote
 
 import iso8601
-from flask import jsonify, Blueprint, current_app, request, abort
+from flask import Blueprint, abort, current_app, jsonify, request
 from gds_metrics.metrics import Counter
 from notifications_utils.recipients import try_validate_and_format_phone_number
 
 from app.celery import tasks
 from app.config import QueueNames
-from app.dao.services_dao import dao_fetch_service_by_inbound_number
 from app.dao.inbound_sms_dao import dao_create_inbound_sms
-from app.models import InboundSms, INBOUND_SMS_TYPE, SMS_TYPE
+from app.dao.services_dao import dao_fetch_service_by_inbound_number
 from app.errors import register_errors
+from app.models import INBOUND_SMS_TYPE, SMS_TYPE, InboundSms
 
 receive_notifications_blueprint = Blueprint('receive_notifications', __name__)
 register_errors(receive_notifications_blueprint)

app/notifications/rest.py

@@ -1,27 +1,21 @@
-from flask import (
-    Blueprint,
-    jsonify,
-    request,
-    current_app
-)
+from flask import Blueprint, current_app, jsonify, request
+from notifications_utils import SMS_CHAR_COUNT_LIMIT
 
 from app import api_user, authenticated_service
 from app.config import QueueNames
-from app.dao import (
-    notifications_dao
-)
-from app.errors import (
-    register_errors,
-    InvalidRequest
-)
+from app.dao import notifications_dao
+from app.errors import InvalidRequest, register_errors
 from app.models import (
-    EMAIL_TYPE, SMS_TYPE,
-    KEY_TYPE_TEAM, PRIORITY,
-    LETTER_TYPE)
+    EMAIL_TYPE,
+    KEY_TYPE_TEAM,
+    LETTER_TYPE,
+    PRIORITY,
+    SMS_TYPE,
+)
 from app.notifications.process_notifications import (
     persist_notification,
     send_notification_to_queue,
-    simulated_recipient
+    simulated_recipient,
 )
 from app.notifications.validators import (
     check_if_service_can_send_to_number,
@@ -31,14 +25,12 @@ from app.notifications.validators import (
 )
 from app.schemas import (
     email_notification_schema,
-    sms_template_notification_schema,
     notification_with_personalisation_schema,
-    notifications_filter_schema
+    notifications_filter_schema,
+    sms_template_notification_schema,
 )
 from app.service.utils import service_allowed_to_send_to
-from app.utils import pagination_links, get_public_notify_type_text
-
-from notifications_utils import SMS_CHAR_COUNT_LIMIT
+from app.utils import get_public_notify_type_text, pagination_links
 
 notifications = Blueprint('notifications', __name__)
 

app/notifications/utils.py

@@ -1,5 +1,5 @@
-from flask import current_app
 import requests
+from flask import current_app
 
 
 def confirm_subscription(confirmation_request):

app/notifications/validators.py

@@ -1,31 +1,45 @@
-from notifications_utils.postal_address import PostalAddress
-from sqlalchemy.orm.exc import NoResultFound
 from flask import current_app
+from gds_metrics.metrics import Histogram
 from notifications_utils import SMS_CHAR_COUNT_LIMIT
-from notifications_utils.recipients import (
-    validate_and_format_phone_number,
-    validate_and_format_email_address,
-    get_international_phone_info
+from notifications_utils.clients.redis import (
+    daily_limit_cache_key,
+    rate_limit_cache_key,
 )
-from notifications_utils.clients.redis import rate_limit_cache_key, daily_limit_cache_key
+from notifications_utils.postal_address import PostalAddress
+from notifications_utils.recipients import (
+    get_international_phone_info,
+    validate_and_format_email_address,
+    validate_and_format_phone_number,
+)
+from sqlalchemy.orm.exc import NoResultFound
 
-from app.dao import services_dao
-from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id
-from app.models import (
-    INTERNATIONAL_SMS_TYPE, SMS_TYPE, EMAIL_TYPE, LETTER_TYPE,
-    KEY_TYPE_TEST, KEY_TYPE_TEAM,
-    ServicePermission,
-    INTERNATIONAL_LETTERS)
-from app.service.utils import service_allowed_to_send_to
-from app.v2.errors import TooManyRequestsError, BadRequestError, RateLimitError, ValidationError
 from app import redis_store
-from app.notifications.process_notifications import create_content_for_notification
-from app.utils import get_public_notify_type_text
+from app.dao import services_dao
 from app.dao.service_email_reply_to_dao import dao_get_reply_to_by_id
 from app.dao.service_letter_contact_dao import dao_get_letter_contact_by_id
+from app.dao.service_sms_sender_dao import dao_get_service_sms_senders_by_id
+from app.models import (
+    EMAIL_TYPE,
+    INTERNATIONAL_LETTERS,
+    INTERNATIONAL_SMS_TYPE,
+    KEY_TYPE_TEAM,
+    KEY_TYPE_TEST,
+    LETTER_TYPE,
+    SMS_TYPE,
+    ServicePermission,
+)
+from app.notifications.process_notifications import (
+    create_content_for_notification,
+)
 from app.serialised_models import SerialisedTemplate
-
-from gds_metrics.metrics import Histogram
+from app.service.utils import service_allowed_to_send_to
+from app.utils import get_public_notify_type_text
+from app.v2.errors import (
+    BadRequestError,
+    RateLimitError,
+    TooManyRequestsError,
+    ValidationError,
+)
 
 REDIS_EXCEEDED_RATE_LIMIT_DURATION_SECONDS = Histogram(
     'redis_exceeded_rate_limit_duration_seconds',