refactor: simplify SES routing and fallback logic per review feedback

Author: nthriveni-sonata-ship-it

common/djangoapps/student/views/management.py

@@ -89,7 +89,6 @@
 from common.djangoapps.util.json_request import JsonResponse
 from common.djangoapps.student.signals import USER_EMAIL_CHANGED
 from xmodule.modulestore.django import modulestore  # lint-amnesty, pylint: disable=wrong-import-order
-from openedx.core.djangoapps.ace_common.utils import apply_ses_routing_if_enabled
 
 log = logging.getLogger("edx.student")
 
@@ -231,7 +230,6 @@ def compose_activation_email(
         user_context=message_context,
     )
 
-    msg = apply_ses_routing_if_enabled(msg)
     return msg
 
 

openedx/core/djangoapps/ace_common/utils.py

@@ -2,51 +2,10 @@
 Utility functions for edx-ace.
 """
 import logging
-from django.conf import settings
-from edx_toggles.toggles import WaffleFlag
-from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 
 
 log = logging.getLogger(__name__)
 
-# .. toggle_name: user_authn.enable_ses_for_account_activation
-# .. toggle_implementation: WaffleFlag
-# .. toggle_default: False
-# .. toggle_description: Route account activation emails via SES using ACE.
-# .. toggle_use_cases: opt_in, temporary
-# .. toggle_creation_date: 2026-03-31
-# .. toggle_target_removal_date: None
-# .. toggle_warning: Controls SES routing for account activation emails.
-
-ENABLE_SES_FOR_ACCOUNT_ACTIVATION = WaffleFlag(
-    'user_authn.enable_ses_for_account_activation',
-    __name__,
-)
-
-
-def apply_ses_routing_if_enabled(msg):
-    """
-    Apply SES routing to ACE message if flag is enabled.
-    """
-    if not ENABLE_SES_FOR_ACCOUNT_ACTIVATION.is_enabled():
-        return msg
-
-    if msg.options is None:
-        msg.options = {}
-
-    msg.options.update({
-        'transactional': True,
-        'override_default_channel': 'django_email',
-        'from_address': configuration_helpers.get_value(
-            'ACTIVATION_EMAIL_FROM_ADDRESS'
-        ) or configuration_helpers.get_value(
-            'email_from_address',
-            settings.DEFAULT_FROM_EMAIL
-        ),
-    })
-
-    return msg
-
 
 def setup_firebase_app(firebase_credentials, app_name='fcm-app'):
     """

openedx/core/djangoapps/user_authn/tasks.py

@@ -18,10 +18,24 @@
 from openedx.core.djangoapps.site_configuration import helpers as configuration_helpers
 from openedx.core.djangoapps.user_authn.utils import check_pwned_password
 from openedx.core.lib.celery.task_utils import emulate_http_request
-from openedx.core.djangoapps.ace_common.utils import ENABLE_SES_FOR_ACCOUNT_ACTIVATION
+from edx_toggles.toggles import WaffleFlag
 
 log = logging.getLogger('edx.celery.task')
 
+# .. toggle_name: user_authn.enable_ses_for_account_activation
+# .. toggle_implementation: WaffleFlag
+# .. toggle_default: False
+# .. toggle_description: Route account activation emails via SES using ACE.
+# .. toggle_use_cases: opt_in, temporary
+# .. toggle_creation_date: 2026-03-31
+# .. toggle_target_removal_date: None
+# .. toggle_warning: Controls SES routing for account activation emails.
+
+ENABLE_SES_FOR_ACCOUNT_ACTIVATION = WaffleFlag(
+    'user_authn.enable_ses_for_account_activation',
+    __name__,
+)
+
 
 @shared_task
 @set_code_owner_attribute
@@ -79,59 +93,28 @@ def send_activation_email(self, msg_string, from_address=None, site_id=None):
     sent_via_ses = False
 
     if route_via_ses:
-        msg.options.update({
-            'override_default_channel': 'django_email',
-            'transactional': True,
-            'from_address': configuration_helpers.get_value(
-                'ACTIVATION_EMAIL_FROM_ADDRESS'
-            ) or configuration_helpers.get_value(
-                'email_from_address',
-                settings.DEFAULT_FROM_EMAIL
-            ),
-        })
+        msg.options['override_default_channel'] = 'django_email'
 
     try:
         with emulate_http_request(site=site, user=user):
             ace.send(msg)
             sent_via_ses = route_via_ses
 
     except RecoverableChannelDeliveryError:
-        log.warning(
-            "SES send failed for %s, falling back to default ACE channel",
-            dest_addr,
-            exc_info=True,
-        )
-
-        if not route_via_ses:
-            log.info(
-                'Retrying sending email to user {dest_addr}, attempt # {attempt} of {max_attempts}'.format(
-                    dest_addr=dest_addr,
-                    attempt=retries,
-                    max_attempts=max_retries
-                )
+        if route_via_ses:
+            log.warning(
+                "SES send failed for %s, falling back to default ACE channel",
+                dest_addr,
+                exc_info=True,
             )
-            try:
-                self.retry(
-                    countdown=settings.RETRY_ACTIVATION_EMAIL_TIMEOUT,
-                    max_retries=max_retries
-                )
-            except MaxRetriesExceededError:
-                log.error(
-                    'Unable to send activation email to user from "%s" to "%s"',
-                    from_address,
-                    dest_addr,
-                    exc_info=True
-                )
-            return
 
-        _remove_ses_overrides(msg)
+            msg.options.pop('override_default_channel', None)
 
-        try:
             with emulate_http_request(site=site, user=user):
                 ace.send(msg)
                 sent_via_ses = False
 
-        except RecoverableChannelDeliveryError:
+        else:
             log.info(
                 'Retrying sending email to user {dest_addr}, attempt # {attempt} of {max_attempts}'.format(
                     dest_addr=dest_addr,
@@ -151,6 +134,8 @@ def send_activation_email(self, msg_string, from_address=None, site_id=None):
                     dest_addr,
                     exc_info=True
                 )
+            return
+
     except Exception:
         log.exception(
             'Unable to send activation email to user from "%s" to "%s"',
@@ -164,9 +149,3 @@ def send_activation_email(self, msg_string, from_address=None, site_id=None):
         dest_addr,
         'SES' if sent_via_ses else 'default ACE channel',
     )
-
-
-def _remove_ses_overrides(msg):
-    msg.options.pop('override_default_channel', None)
-    msg.options.pop('transactional', None)
-    msg.options.pop('from_address', None)