Run auto-correct on app/ and tests/

app/v2/broadcast/__init__.py

@@ -1,4 +1,5 @@
 from flask import Blueprint
+
 from app.v2.errors import register_errors
 
 v2_broadcast_blueprint = Blueprint(

app/v2/broadcast/post_broadcast.py

@@ -1,12 +1,14 @@
 from itertools import chain
+
 from flask import current_app, jsonify, request
 from notifications_utils.polygons import Polygons
 from notifications_utils.template import BroadcastMessageTemplate
-from app import authenticated_service, api_user
+
+from app import api_user, authenticated_service
 from app.broadcast_message.translators import cap_xml_to_dict
 from app.dao.dao_utils import dao_save_object
-from app.notifications.validators import check_service_has_permission
 from app.models import BROADCAST_TYPE, BroadcastMessage, BroadcastStatusType
+from app.notifications.validators import check_service_has_permission
 from app.schema_validation import validate
 from app.v2.broadcast import v2_broadcast_blueprint
 from app.v2.broadcast.broadcast_schemas import post_broadcast_schema

app/v2/errors.py

@@ -1,6 +1,6 @@
 import json
 
-from flask import jsonify, current_app, request
+from flask import current_app, jsonify, request
 from jsonschema import ValidationError as JsonSchemaValidationError
 from notifications_utils.recipients import InvalidEmailError
 from sqlalchemy.exc import DataError

app/v2/inbound_sms/__init__.py

@@ -1,4 +1,5 @@
 from flask import Blueprint
+
 from app.v2.errors import register_errors
 
 v2_inbound_sms_blueprint = Blueprint("v2_inbound_sms", __name__, url_prefix='/v2/received-text-messages')

app/v2/inbound_sms/get_inbound_sms.py

@@ -1,4 +1,4 @@
-from flask import jsonify, request, url_for, current_app
+from flask import current_app, jsonify, request, url_for
 
 from app import authenticated_service
 from app.dao import inbound_sms_dao

app/v2/inbound_sms/inbound_sms_schemas.py

@@ -1,6 +1,5 @@
 from app.schema_validation.definitions import uuid
 
-
 get_inbound_sms_request = {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "description": "schema for query parameters allowed when getting list of received text messages",

app/v2/notifications/__init__.py

@@ -1,4 +1,5 @@
 from flask import Blueprint
+
 from app.v2.errors import register_errors
 
 v2_notification_blueprint = Blueprint("v2_notifications", __name__, url_prefix='/v2/notifications')

app/v2/notifications/get_notifications.py

@@ -1,19 +1,22 @@
 from io import BytesIO
 
-from flask import jsonify, request, url_for, current_app, send_file
+from flask import current_app, jsonify, request, send_file, url_for
 
 from app import api_user, authenticated_service
 from app.dao import notifications_dao
 from app.letters.utils import get_letter_pdf_and_metadata
+from app.models import (
+    LETTER_TYPE,
+    NOTIFICATION_PENDING_VIRUS_CHECK,
+    NOTIFICATION_TECHNICAL_FAILURE,
+    NOTIFICATION_VIRUS_SCAN_FAILED,
+)
 from app.schema_validation import validate
 from app.v2.errors import BadRequestError, PDFNotReadyError
 from app.v2.notifications import v2_notification_blueprint
-from app.v2.notifications.notification_schemas import get_notifications_request, notification_by_id
-from app.models import (
-    NOTIFICATION_PENDING_VIRUS_CHECK,
-    NOTIFICATION_VIRUS_SCAN_FAILED,
-    NOTIFICATION_TECHNICAL_FAILURE,
-    LETTER_TYPE,
+from app.v2.notifications.notification_schemas import (
+    get_notifications_request,
+    notification_by_id,
 )
 
 

app/v2/notifications/notification_schemas.py

@@ -1,11 +1,10 @@
 from app.models import (
-    NOTIFICATION_STATUS_TYPES,
     NOTIFICATION_STATUS_LETTER_ACCEPTED,
     NOTIFICATION_STATUS_LETTER_RECEIVED,
+    NOTIFICATION_STATUS_TYPES,
     NOTIFICATION_TYPES,
 )
-from app.schema_validation.definitions import (uuid, personalisation)
-
+from app.schema_validation.definitions import personalisation, uuid
 
 template = {
     "$schema": "http://json-schema.org/draft-04/schema#",

app/v2/notifications/post_notifications.py

@@ -4,18 +4,21 @@ import uuid
 from datetime import datetime
 
 from boto.exception import SQSError
-from flask import request, jsonify, current_app, abort
-from notifications_utils.recipients import try_validate_and_format_phone_number
+from flask import abort, current_app, jsonify, request
 from gds_metrics import Histogram
+from notifications_utils.recipients import try_validate_and_format_phone_number
 
 from app import (
     api_user,
     authenticated_service,
-    notify_celery,
     document_download_client,
     encryption,
+    notify_celery,
+)
+from app.celery.letters_pdf_tasks import (
+    get_pdf_for_templated_letter,
+    sanitise_letter,
 )
-from app.celery.letters_pdf_tasks import get_pdf_for_templated_letter, sanitise_letter
 from app.celery.research_mode_tasks import create_fake_letter_response_file
 from app.celery.tasks import save_api_email, save_api_sms
 from app.clients.document_download import DocumentDownloadError
@@ -23,27 +26,30 @@ from app.config import QueueNames, TaskNames
 from app.dao.templates_dao import get_precompiled_letter_template
 from app.letters.utils import upload_letter_pdf
 from app.models import (
-    SMS_TYPE,
     EMAIL_TYPE,
-    LETTER_TYPE,
-    PRIORITY,
     KEY_TYPE_NORMAL,
-    KEY_TYPE_TEST,
     KEY_TYPE_TEAM,
+    KEY_TYPE_TEST,
+    LETTER_TYPE,
     NOTIFICATION_CREATED,
-    NOTIFICATION_SENDING,
     NOTIFICATION_DELIVERED,
     NOTIFICATION_PENDING_VIRUS_CHECK,
-    Notification)
+    NOTIFICATION_SENDING,
+    PRIORITY,
+    SMS_TYPE,
+    Notification,
+)
 from app.notifications.process_letter_notifications import (
-    create_letter_notification
+    create_letter_notification,
 )
 from app.notifications.process_notifications import (
     persist_notification,
+    send_notification_to_queue_detached,
     simulated_recipient,
-    send_notification_to_queue_detached)
+)
 from app.notifications.validators import (
     check_if_service_can_send_files_by_email,
+    check_is_message_too_long,
     check_rate_limiting,
     check_service_email_reply_to_id,
     check_service_has_permission,
@@ -51,21 +57,21 @@ from app.notifications.validators import (
     validate_address,
     validate_and_format_recipient,
     validate_template,
-    check_is_message_too_long)
+)
 from app.schema_validation import validate
 from app.utils import DATETIME_FORMAT
 from app.v2.errors import BadRequestError
+from app.v2.notifications import v2_notification_blueprint
 from app.v2.notifications.create_response import (
     create_post_email_response_from_notification,
+    create_post_letter_response_from_notification,
     create_post_sms_response_from_notification,
-    create_post_letter_response_from_notification
 )
-from app.v2.notifications import v2_notification_blueprint
 from app.v2.notifications.notification_schemas import (
-    post_sms_request,
     post_email_request,
     post_letter_request,
-    post_precompiled_letter_request
+    post_precompiled_letter_request,
+    post_sms_request,
 )
 from app.v2.utils import get_valid_json
 

app/v2/template/post_template.py

@@ -6,8 +6,8 @@ from app.schema_validation import validate
 from app.v2.errors import BadRequestError
 from app.v2.template import v2_template_blueprint
 from app.v2.template.template_schemas import (
+    create_post_template_preview_response,
     post_template_preview_request,
-    create_post_template_preview_response
 )
 from app.v2.utils import get_valid_json
 

app/v2/template/template_schemas.py

@@ -1,6 +1,5 @@
 from app.models import TEMPLATE_TYPES
-from app.schema_validation.definitions import uuid, personalisation
-
+from app.schema_validation.definitions import personalisation, uuid
 
 get_template_by_id_request = {
     "$schema": "http://json-schema.org/draft-04/schema#",

app/v2/templates/templates_schemas.py

@@ -1,6 +1,7 @@
 from app.models import TEMPLATE_TYPES
-from app.v2.template.template_schemas import get_template_by_id_response as template
-
+from app.v2.template.template_schemas import (
+    get_template_by_id_response as template,
+)
 
 get_all_template_request = {
     "$schema": "http://json-schema.org/draft-04/schema#",

app/v2/utils.py

@@ -1,7 +1,7 @@
 from flask import request
+from werkzeug.exceptions import BadRequest
 
 from app.v2.errors import BadRequestError
-from werkzeug.exceptions import BadRequest
 
 
 def get_valid_json():