flake8 - remove unused imports and ensure they're always at the top of the file

app/__init__.py

@@ -3,7 +3,7 @@ import random
 import string
 import uuid
 
-from flask import Flask, _request_ctx_stack, request, g, jsonify
+from flask import _request_ctx_stack, request, g, jsonify
 from flask_sqlalchemy import SQLAlchemy
 from flask_marshmallow import Marshmallow
 from flask_migrate import Migrate
@@ -100,7 +100,7 @@ def register_blueprint(application):
     from app.notifications.receive_notifications import receive_notifications_blueprint
     from app.notifications.notifications_sms_callback import sms_callback_blueprint
     from app.notifications.notifications_letter_callback import letter_callback_blueprint
-    from app.authentication.auth import requires_admin_auth, requires_auth, requires_no_auth, restrict_ip_sms
+    from app.authentication.auth import requires_admin_auth, requires_auth, requires_no_auth
     from app.letters.rest import letter_job
     from app.billing.rest import billing_blueprint
 

app/authentication/auth.py

@@ -7,7 +7,6 @@ from sqlalchemy.exc import DataError
 from sqlalchemy.orm.exc import NoResultFound
 
 from app.dao.services_dao import dao_fetch_service_by_id_with_api_keys
-from flask import jsonify
 
 
 class AuthError(Exception):

app/billing/billing_schemas.py

@@ -1,6 +1,3 @@
-from app.schema_validation.definitions import uuid, https_url
-
-
 create_or_update_free_sms_fragment_limit_schema = {
     "$schema": "http://json-schema.org/draft-04/schema#",
     "description": "POST annual billing schema",

app/celery/provider_tasks.py

@@ -1,4 +1,4 @@
-from celery.signals import worker_process_init, worker_process_shutdown, worker_shutdown
+from celery.signals import worker_process_shutdown
 from flask import current_app
 from notifications_utils.recipients import InvalidEmailError
 from sqlalchemy.orm.exc import NoResultFound

app/dao/api_key_dao.py

@@ -1,7 +1,7 @@
 import uuid
 from datetime import datetime
 
-from app import db, encryption
+from app import db
 from app.models import ApiKey
 
 from app.dao.dao_utils import (

app/dao/notification_usage_dao.py

@@ -9,7 +9,6 @@ from app.dao.date_util import get_financial_year
 from app.models import (
     NotificationHistory,
     Rate,
-    Service,
     NOTIFICATION_STATUS_TYPES_BILLABLE,
     KEY_TYPE_TEST,
     SMS_TYPE,

app/dao/permissions_dao.py

@@ -1,10 +1,7 @@
 from app import db
-from werkzeug.datastructures import MultiDict
 from app.dao import DAOClass
 from app.models import (
     Permission,
-    Service,
-    User,
     MANAGE_USERS,
     MANAGE_TEMPLATES,
     MANAGE_SETTINGS,

app/dao/service_permissions_dao.py

@@ -1,6 +1,6 @@
 from app import db
 from app.dao.dao_utils import transactional
-from app.models import ServicePermission, SERVICE_PERMISSION_TYPES
+from app.models import ServicePermission
 
 
 def dao_fetch_service_permissions(service_id):

app/dao/service_whitelist_dao.py

@@ -1,5 +1,5 @@
 from app import db
-from app.models import Service, ServiceWhitelist
+from app.models import ServiceWhitelist
 
 
 def dao_fetch_service_whitelist(service_id):

app/dao/services_dao.py

@@ -39,7 +39,6 @@ from app.models import (
     SMS_TYPE,
     TEMPLATE_TYPES
 )
-from app.service.statistics import format_monthly_template_notification_stats
 from app.statsd_decorators import statsd
 from app.utils import get_london_month_from_utc_column, get_london_midnight_in_utc
 from app.dao.annual_billing_dao import dao_insert_annual_billing

app/delivery/rest.py

@@ -1,15 +1,14 @@
-from flask import Blueprint, jsonify
+from flask import Blueprint, jsonify, current_app
 
 from app.config import QueueNames
 from app.delivery import send_to_providers
 from app.models import EMAIL_TYPE
 from app.celery import provider_tasks
 from app.dao import notifications_dao
-from flask import current_app
+from app.errors import register_errors
 
 delivery_blueprint = Blueprint('delivery', __name__)
 
-from app.errors import register_errors
 
 register_errors(delivery_blueprint)
 

app/invite/rest.py

@@ -14,11 +14,10 @@ from app.dao.templates_dao import dao_get_template_by_id
 from app.models import EMAIL_TYPE, KEY_TYPE_NORMAL, Service
 from app.notifications.process_notifications import persist_notification, send_notification_to_queue
 from app.schemas import invited_user_schema
+from app.errors import register_errors
 
 invite = Blueprint('invite', __name__, url_prefix='/service/<service_id>/invite')
 
-from app.errors import register_errors
-
 register_errors(invite)
 
 

app/job/rest.py

@@ -15,36 +15,28 @@ from app.dao.jobs_dao import (
     dao_get_notification_outcomes_for_job,
     dao_get_job_stats_for_service,
     dao_get_job_statistics_for_job)
-
-from app.dao.services_dao import (
-    dao_fetch_service_by_id
-)
-
-from app.dao.templates_dao import (dao_get_template_by_id)
+from app.dao.services_dao import dao_fetch_service_by_id
+from app.dao.templates_dao import dao_get_template_by_id
 from app.dao.notifications_dao import get_notifications_for_job
-
 from app.schemas import (
     job_schema,
     unarchived_template_schema,
     notifications_filter_schema,
     notification_with_template_schema
 )
-
 from app.celery.tasks import process_job
-
 from app.models import JOB_STATUS_SCHEDULED, JOB_STATUS_PENDING, JOB_STATUS_CANCELLED, LETTER_TYPE
-
 from app.utils import pagination_links
-
 from app.config import QueueNames
-
-job_blueprint = Blueprint('job', __name__, url_prefix='/service/<uuid:service_id>/job')
-
 from app.errors import (
     register_errors,
     InvalidRequest
 )
 
+
+job_blueprint = Blueprint('job', __name__, url_prefix='/service/<uuid:service_id>/job')
+
+
 register_errors(job_blueprint)
 
 

app/models.py

@@ -10,8 +10,7 @@ from sqlalchemy.dialects.postgresql import (
     UUID,
     JSON
 )
-from sqlalchemy import UniqueConstraint, CheckConstraint, and_
-from sqlalchemy.orm import foreign, remote
+from sqlalchemy import UniqueConstraint, CheckConstraint
 from notifications_utils.recipients import (
     validate_email_address,
     validate_phone_number,

app/notifications/receive_notifications.py

@@ -4,7 +4,7 @@ import iso8601
 from flask import jsonify, Blueprint, current_app, request, abort
 from notifications_utils.recipients import try_validate_and_format_phone_number
 
-from app import statsd_client, firetext_client, mmg_client
+from app import statsd_client
 from app.celery import tasks
 from app.config import QueueNames
 from app.dao.services_dao import dao_fetch_service_by_inbound_number

app/service/statistics.py

@@ -1,5 +1,4 @@
-import itertools
-from datetime import datetime, timedelta
+from datetime import datetime
 
 from app.models import NOTIFICATION_STATUS_TYPES, TEMPLATE_TYPES
 

app/service/utils.py

@@ -1,15 +1,12 @@
 import itertools
 
-from app.dao.date_util import get_financial_year
+from notifications_utils.recipients import allowed_to_send_to
+
 from app.models import (
     ServiceWhitelist,
     MOBILE_TYPE, EMAIL_TYPE,
     KEY_TYPE_TEST, KEY_TYPE_TEAM, KEY_TYPE_NORMAL)
 
-from notifications_utils.recipients import allowed_to_send_to
-
-from datetime import datetime
-
 
 def get_recipients_from_request(request_json, key, type):
     return [(type, recipient) for recipient in request_json.get(key)]

app/template/rest.py

@@ -15,19 +15,18 @@ from app.dao.templates_dao import (
 )
 from notifications_utils.template import SMSMessageTemplate
 from app.dao.services_dao import dao_fetch_service_by_id
-from app.dao.service_permissions_dao import dao_fetch_service_permissions
-from app.models import SMS_TYPE, EMAIL_TYPE
+from app.models import SMS_TYPE
 from app.notifications.validators import service_has_permission
 from app.schemas import (template_schema, template_history_schema)
-
-template_blueprint = Blueprint('template', __name__, url_prefix='/service/<uuid:service_id>/template')
-
 from app.errors import (
     register_errors,
     InvalidRequest
 )
 from app.utils import get_template_instance, get_public_notify_type_text
 
+template_blueprint = Blueprint('template', __name__, url_prefix='/service/<uuid:service_id>/template')
+
+
 register_errors(template_blueprint)
 
 

app/template_statistics/rest.py

@@ -16,13 +16,12 @@ from app.dao.templates_dao import (
 
 from app.schemas import notification_with_template_schema
 from app.utils import cache_key_for_service_template_counter
+from app.errors import register_errors, InvalidRequest
 
 template_statistics = Blueprint('template-statistics',
                                 __name__,
                                 url_prefix='/service/<service_id>/template-statistics')
 
-from app.errors import register_errors, InvalidRequest
-
 register_errors(template_statistics)
 
 

app/user/rest.py

@@ -33,7 +33,6 @@ from app.schemas import (
     email_data_request_schema,
     user_schema,
     permission_schema,
-    user_schema_load_json,
     user_update_schema_load_json,
     user_update_password_schema_load_json
 )

app/v2/inbound_sms/get_inbound_sms.py

@@ -1,8 +1,5 @@
 from flask import jsonify, request, url_for, current_app
 
-from notifications_utils.recipients import validate_and_format_phone_number
-from notifications_utils.recipients import InvalidPhoneError
-
 from app import authenticated_service
 from app.dao import inbound_sms_dao
 from app.schema_validation import validate

run_celery.py

@@ -1,8 +1,8 @@
 #!/usr/bin/env python
-# notify_celery is referenced from manifest_delivery_base.yml, and cannot be removed
 from flask import Flask
 
-from app import notify_celery, create_app
+# notify_celery is referenced from manifest_delivery_base.yml, and cannot be removed
+from app import notify_celery, create_app  # noqa
 
 
 application = Flask('delivery')