merge from main and reformat

tests/app/service/send_notification/test_send_notification.py

@@ -11,10 +11,7 @@ import app
 from app.dao import notifications_dao
 from app.dao.api_key_dao import save_model_api_key
 from app.dao.services_dao import dao_update_service
-from app.dao.templates_dao import (
-    dao_get_all_templates_for_service,
-    dao_update_template,
-)
+from app.dao.templates_dao import dao_get_all_templates_for_service, dao_update_template
 from app.errors import InvalidRequest
 from app.models import (
     EMAIL_TYPE,

tests/app/service/send_notification/test_send_one_off_notification.py

@@ -6,9 +6,7 @@ from notifications_utils import SMS_CHAR_COUNT_LIMIT
 from notifications_utils.recipients import InvalidPhoneError
 
 from app.config import QueueNames
-from app.dao.service_guest_list_dao import (
-    dao_add_and_commit_guest_list_contacts,
-)
+from app.dao.service_guest_list_dao import dao_add_and_commit_guest_list_contacts
 from app.models import (
     EMAIL_TYPE,
     KEY_TYPE_NORMAL,

tests/app/service/test_rest.py

@@ -11,10 +11,7 @@ from sqlalchemy.exc import SQLAlchemyError
 from app.dao.organization_dao import dao_add_service_to_organization
 from app.dao.service_sms_sender_dao import dao_get_sms_senders_by_service_id
 from app.dao.service_user_dao import dao_get_service_user
-from app.dao.services_dao import (
-    dao_add_user_to_service,
-    dao_remove_user_from_service,
-)
+from app.dao.services_dao import dao_add_user_to_service, dao_remove_user_from_service
 from app.dao.templates_dao import dao_redact_template
 from app.dao.users_dao import save_model_user
 from app.models import (
@@ -761,7 +758,6 @@ def test_update_service_flags(client, sample_service):
     json_resp = resp.json
     assert resp.status_code == 200
     assert json_resp["data"]["name"] == sample_service.name
-
     data = {"permissions": [INTERNATIONAL_SMS_TYPE]}
 
     auth_header = create_admin_authorization_header()

tests/app/service/test_schema.py

@@ -5,9 +5,7 @@ import pytest
 from jsonschema import ValidationError
 
 from app.schema_validation import validate
-from app.service.service_callback_api_schema import (
-    update_service_callback_api_schema,
-)
+from app.service.service_callback_api_schema import update_service_callback_api_schema
 
 
 def test_service_callback_api_schema_validates():

tests/app/service/test_service_guest_list.py

@@ -1,9 +1,7 @@
 import json
 import uuid
 
-from app.dao.service_guest_list_dao import (
-    dao_add_and_commit_guest_list_contacts,
-)
+from app.dao.service_guest_list_dao import dao_add_and_commit_guest_list_contacts
 from app.models import EMAIL_TYPE, MOBILE_TYPE, ServiceGuestList
 from tests import create_admin_authorization_header