merge from main and reformat

app/dao/api_key_dao.py

@@ -35,8 +35,9 @@ def get_model_api_keys(service_id, id=None):
     seven_days_ago = datetime.utcnow() - timedelta(days=7)
     return ApiKey.query.filter(
         or_(
-            ApiKey.expiry_date == None, func.date(ApiKey.expiry_date) > seven_days_ago
-        ),  # noqa
+            ApiKey.expiry_date == None,  # noqa
+            func.date(ApiKey.expiry_date) > seven_days_ago,  # noqa
+        ),
         ApiKey.service_id == service_id,
     ).all()
 

app/dao/fact_billing_dao.py

@@ -6,10 +6,7 @@ from sqlalchemy.dialects.postgresql import insert
 from sqlalchemy.sql.expression import case, literal
 
 from app import db
-from app.dao.date_util import (
-    get_calendar_year_dates,
-    get_calendar_year_for_datetime,
-)
+from app.dao.date_util import get_calendar_year_dates, get_calendar_year_for_datetime
 from app.dao.organization_dao import dao_get_organization_live_services
 from app.models import (
     EMAIL_TYPE,

app/dao/notifications_dao.py

@@ -1,9 +1,7 @@
 from datetime import datetime, timedelta
 
 from flask import current_app
-from notifications_utils.international_billing_rates import (
-    INTERNATIONAL_BILLING_RATES,
-)
+from notifications_utils.international_billing_rates import INTERNATIONAL_BILLING_RATES
 from notifications_utils.recipients import (
     InvalidEmailError,
     try_validate_and_format_phone_number,