clean-up celery worker by moving to base dir

Johnetordoff · Johnetordoff · commit 725d79d6f75b · 2025-08-09T13:36:36.000-04:00
diff --git a/addons/base/views.py b/addons/base/views.py
@@ -63,7 +63,7 @@
 from website.util import rubeus
 
 # import so that associated listener is instantiated and gets emails
-from website.notifications.events.files import FileEvent  # noqa
+from notifications.events.files import FileEvent  # noqa
 
 ERROR_MESSAGES = {'FILE_GONE': """
 <style>
diff --git a/api_tests/notifications/test_notification_digest.py b/api_tests/notifications/test_notification_digest.py
@@ -1,6 +1,6 @@
 import pytest
 from osf.models import Notification, NotificationType, EmailTask
-from website.notifications.tasks import (
+from notifications.tasks import (
     send_user_email_task,
     send_moderator_email_task,
     send_users_digest_email,
diff --git a/conftest.py b/conftest.py
@@ -35,7 +35,6 @@ def pytest_configure(config):
     'framework.auth.core',
     'website.app',
     'website.archiver.tasks',
-    'website.notifications.listeners',
     'website.search.elastic_search',
     'website.search_migration.migrate',
     'website.util.paths',
diff --git a/notifications/__init__.py b/notifications/__init__.py
diff --git a/notifications/events/__init__.py b/notifications/events/__init__.py
diff --git a/notifications/events/base.py b/notifications/events/base.py
diff --git a/notifications/events/files.py b/notifications/events/files.py
@@ -9,7 +9,7 @@
 from furl import furl
 import markupsafe
 
-from website.notifications.events.base import (
+from notifications.events.base import (
     register,
     Event,
     event_registry,
diff --git a/notifications/file_event_notifications.py b/notifications/file_event_notifications.py
diff --git a/notifications/listeners.py b/notifications/listeners.py
diff --git a/notifications/tasks.py b/notifications/tasks.py
@@ -164,7 +164,7 @@ def send_moderator_email_task(self, user_id, provider_id, notification_ids, mess
         logger.exception('Retrying send_moderator_email_task due to exception')
         raise self.retry(exc=e)
 
-@celery_app.task(bind=True, name='website.notifications.tasks.send_users_digest_email')
+@celery_app.task(bind=True, name='notifications.tasks.send_users_digest_email')
 def send_users_digest_email():
     today = date.today()
 
@@ -181,7 +181,7 @@ def send_users_digest_email():
             notification_ids = [msg['notification_id'] for msg in group['info']]
             send_user_email_task.delay(user_id, notification_ids, freq)
 
-@celery_app.task(bind=True, name='website.notifications.tasks.send_moderators_digest_email')
+@celery_app.task(bind=True, name='notifications.tasks.send_moderators_digest_email')
 def send_moderators_digest_email():
     today = date.today()
 
diff --git a/osf/models/notification.py b/osf/models/notification.py
@@ -1,12 +1,11 @@
 import logging
 
-import waffle
 from django.db import models
 from django.utils import timezone
 
 from website import settings
 from api.base import settings as api_settings
-from osf import email, features
+from osf import email
 
 
 class Notification(models.Model):
@@ -29,9 +28,8 @@ def send(
         """
 
         """
-        if not protocol_type == 'email':
-            raise NotImplementedError(f'Protocol type {protocol_type}. Email notifications are only implemented.')
         recipient_address = destination_address or self.subscription.user.username
+
         if not api_settings.CI_ENV:
             logging.info(
                 f"Attempting to send Notification:"
@@ -41,23 +39,13 @@ def send(
                 f"\ncontext={self.event_context}"
                 f"\nemail={email_context}"
             )
-
-        if protocol_type == 'email' and waffle.switch_is_active(features.ENABLE_MAILHOG):
+        elif protocol_type == 'email' and settings.DEV_MODE:
             email.send_email_over_smtp(
                 recipient_address,
                 self.subscription.notification_type,
                 self.event_context,
                 email_context
             )
-        elif protocol_type == 'email' and settings.DEV_MODE:
-            if not api_settings.CI_ENV:
-                logging.info(
-                    f"Attempting to send email in DEV_MODE for just mocked logs:"
-                    f"\nto={recipient_address}"
-                    f"\ntype={self.subscription.notification_type.name}"
-                    f"\ncontext={self.event_context}"
-                    f"\nemail_context={email_context}"
-                )
         elif protocol_type == 'email':
             email.send_email_with_send_grid(
                 self.subscription.user,
diff --git a/tests/base.py b/tests/base.py
@@ -53,7 +53,6 @@ def get_default_metaschema():
     'framework.auth.core',
     'website.app',
     'website.archiver.tasks',
-    'website.notifications.listeners',
     'website.search.elastic_search',
     'website.search_migration.migrate',
     'website.util.paths',
diff --git a/tests/test_events.py b/tests/test_events.py
@@ -4,8 +4,8 @@
 
 from osf.models import NotificationType
 from tests.utils import capture_notifications
-from website.notifications.events.base import event_registry
-from website.notifications.events.files import (
+from notifications.events.base import event_registry
+from notifications.events.files import (
     FileAdded, FileRemoved, FolderCreated, FileUpdated,
     AddonFileCopied, AddonFileMoved, AddonFileRenamed,
 )
diff --git a/website/app.py b/website/app.py
@@ -19,7 +19,7 @@
 from framework.transactions import handlers as transaction_handlers
 # Imports necessary to connect signals
 from website.archiver import listeners  # noqa
-from website.notifications import listeners  # noqa
+from notifications import listeners  # noqa
 from website.identifiers import listeners  # noqa
 from website.reviews import listeners  # noqa
 from werkzeug.middleware.proxy_fix import ProxyFix
diff --git a/website/settings/defaults.py b/website/settings/defaults.py
@@ -457,7 +457,7 @@ class CeleryConfig:
         'framework.email.tasks',
         'scripts.triggered_mails',
         'website.mailchimp_utils',
-        'website.notifications.tasks',
+        'notifications.tasks',
         'website.collections.tasks',
         'website.identifiers.tasks',
         'website.preprints.tasks',
@@ -552,7 +552,7 @@ class CeleryConfig:
         'osf.management.commands.data_storage_usage',
         'osf.management.commands.registration_schema_metrics',
         'website.mailchimp_utils',
-        'website.notifications.tasks',
+        'notifications.tasks',
         'website.archiver.tasks',
         'website.identifiers.tasks',
         'website.search.search',
@@ -625,12 +625,12 @@ class CeleryConfig:
             'kwargs': {'dry_run': False},
         },
         'send_moderators_digest_email': {
-            'task': 'website.notifications.tasks.send_moderators_digest_email',
+            'task': 'notifications.tasks.send_moderators_digest_email',
             'schedule': crontab(minute=0, hour=5),  # Daily 12 a.m
             'kwargs': {'dry_run': False},
         },
         'send_users_digest_email': {
-            'task': 'website.notifications.tasks.send_users_digest_email',
+            'task': 'notifications.tasks.send_users_digest_email',
             'schedule': crontab(minute=0, hour=5),  # Daily 12 a.m
             'kwargs': {'dry_run': False},
         },
