Merge branch 'master' of github.com:alphagov/notifications-api

app/celery/tasks.py

@@ -597,11 +597,8 @@ def send_inbound_sms_to_service(self, inbound_sms_id, service_id):
                 self.retry(queue=QueueNames.RETRY)
             except self.MaxRetriesExceededError:
                 current_app.logger.error(
-                    """Retry: send_inbound_sms_to_service has retried the max number of
-                     times for service: {} and  inbound_sms {}""".format(
-                        service_id,
-                        inbound_sms_id
-                    )
+                    f"Retry: send_inbound_sms_to_service has retried the max number of" +
+                    f"times for service: {service_id} and inbound_sms {inbound_sms_id}"
                 )
 
 

app/serialised_models.py

@@ -9,7 +9,6 @@ from werkzeug.utils import cached_property
 
 from app import db, redis_store
 
-from app.dao import templates_dao
 from app.dao.api_key_dao import get_model_api_keys
 from app.dao.services_dao import dao_fetch_service_by_id
 
@@ -101,6 +100,7 @@ class SerialisedTemplate(SerialisedModel):
     @staticmethod
     @redis_cache.set('template-{template_id}-version-None')
     def get_dict(template_id, service_id):
+        from app.dao import templates_dao
         from app.schemas import template_schema
 
         fetched_template = templates_dao.dao_get_template_by_id_and_service_id(