From 89e51a2937d8a6cd43b7ed59a746fc924d35d17e Mon Sep 17 00:00:00 2001 From: Jonathan Math Date: Mon, 5 Oct 2020 00:45:20 +0700 Subject: [PATCH] change celery Task import and task initialization as per the new version of celery --- apps/analyzer/models.py | 2 +- apps/analyzer/tasks.py | 2 +- apps/feed_import/tasks.py | 2 +- apps/feed_import/views.py | 2 +- apps/notifications/tasks.py | 2 +- apps/oauth/views.py | 4 ++-- apps/profile/middleware.py | 2 +- apps/profile/models.py | 4 ++-- apps/profile/tasks.py | 2 +- apps/reader/forms.py | 2 +- apps/reader/models.py | 2 +- apps/reader/tasks.py | 2 +- apps/reader/views.py | 4 ++-- apps/rss_feeds/management/commands/backup_mongo.py | 2 +- apps/rss_feeds/management/commands/task_feeds.py | 4 ++-- apps/rss_feeds/models.py | 6 +++--- apps/rss_feeds/tasks.py | 2 +- apps/search/models.py | 4 ++-- apps/search/tasks.py | 2 +- apps/social/models.py | 4 ++-- apps/social/tasks.py | 2 +- apps/social/views.py | 10 +++++----- apps/statistics/tasks.py | 2 +- 23 files changed, 35 insertions(+), 35 deletions(-) diff --git a/apps/analyzer/models.py b/apps/analyzer/models.py index 10f344e30..b185e1714 100644 --- a/apps/analyzer/models.py +++ b/apps/analyzer/models.py @@ -45,7 +45,7 @@ class MPopularityQuery(mongo.Document): return "%s - \"%s\"" % (self.email, self.query) def queue_email(self): - EmailPopularityQuery.delay(pk=self.pk) + EmailPopularityQuery().delay(pk=self.pk) @classmethod def ensure_all_sent(cls, queue=True): diff --git a/apps/analyzer/tasks.py b/apps/analyzer/tasks.py index 60f7f41bf..489efc670 100644 --- a/apps/analyzer/tasks.py +++ b/apps/analyzer/tasks.py @@ -1,4 +1,4 @@ -from celery.task import Task +from celery import Task from utils import log as logging class EmailPopularityQuery(Task): diff --git a/apps/feed_import/tasks.py b/apps/feed_import/tasks.py index d0f6c1c7c..59033fed9 100644 --- a/apps/feed_import/tasks.py +++ b/apps/feed_import/tasks.py @@ -1,4 +1,4 @@ -from celery.task import Task +from celery import Task from django.contrib.auth.models import User from apps.feed_import.models import UploadedOPML, OPMLImporter from apps.reader.models import UserSubscription diff --git a/apps/feed_import/views.py b/apps/feed_import/views.py index b8ed91941..bee11fe25 100644 --- a/apps/feed_import/views.py +++ b/apps/feed_import/views.py @@ -46,7 +46,7 @@ def opml_upload(request): folders = opml_importer.try_processing() except TimeoutError: folders = None - ProcessOPML.delay(request.user.pk) + ProcessOPML().delay(request.user.pk) feed_count = opml_importer.count_feeds_in_opml() logging.user(request, "~FR~SBOPML upload took too long, found %s feeds. Tasking..." % feed_count) payload = dict(folders=folders, delayed=True, feed_count=feed_count) diff --git a/apps/notifications/tasks.py b/apps/notifications/tasks.py index 3ad7b80eb..dbc3e4db2 100644 --- a/apps/notifications/tasks.py +++ b/apps/notifications/tasks.py @@ -1,4 +1,4 @@ -from celery.task import Task +from celery import Task from django.contrib.auth.models import User from apps.notifications.models import MUserFeedNotification from utils import log as logging diff --git a/apps/oauth/views.py b/apps/oauth/views.py index 770619444..9db3fa562 100644 --- a/apps/oauth/views.py +++ b/apps/oauth/views.py @@ -67,7 +67,7 @@ def twitter_connect(request): social_services.syncing_twitter = True social_services.save() - SyncTwitterFriends.delay(user_id=request.user.pk) + SyncTwitterFriends().delay(user_id=request.user.pk) logging.user(request, "~BB~FRFinishing Twitter connect") return {} @@ -131,7 +131,7 @@ def facebook_connect(request): social_services.syncing_facebook = True social_services.save() - SyncFacebookFriends.delay(user_id=request.user.pk) + SyncFacebookFriends().delay(user_id=request.user.pk) logging.user(request, "~BB~FRFinishing Facebook connect") return {} diff --git a/apps/profile/middleware.py b/apps/profile/middleware.py index 7a2b07bf5..631bd79ca 100644 --- a/apps/profile/middleware.py +++ b/apps/profile/middleware.py @@ -29,7 +29,7 @@ class LastSeenMiddleware(object): logging.user(request, "~FG~BBRepeat visitor: ~SB%s (%s)" % ( request.user.profile.last_seen_on, ip)) from apps.profile.tasks import CleanupUser - CleanupUser.delay(user_id=request.user.pk) + CleanupUser().delay(user_id=request.user.pk) elif settings.DEBUG: logging.user(request, "~FG~BBRepeat visitor (ignored): ~SB%s (%s)" % ( request.user.profile.last_seen_on, ip)) diff --git a/apps/profile/models.py b/apps/profile/models.py index d371d6595..189eacdfb 100644 --- a/apps/profile/models.py +++ b/apps/profile/models.py @@ -161,7 +161,7 @@ class Profile(models.Model): def activate_premium(self, never_expire=False): from apps.profile.tasks import EmailNewPremium - EmailNewPremium.delay(user_id=self.user.pk) + EmailNewPremium().delay(user_id=self.user.pk) was_premium = self.is_premium self.is_premium = True @@ -186,7 +186,7 @@ class Profile(models.Model): scheduled_feeds = [] logging.user(self.user, "~SN~FMTasking the scheduling immediate premium setup of ~SB%s~SN feeds..." % len(scheduled_feeds)) - SchedulePremiumSetup.apply_async(kwargs=dict(feed_ids=scheduled_feeds)) + SchedulePremiumSetup().apply_async(kwargs=dict(feed_ids=scheduled_feeds)) UserSubscription.queue_new_feeds(self.user) diff --git a/apps/profile/tasks.py b/apps/profile/tasks.py index 491fb7302..035ddc103 100644 --- a/apps/profile/tasks.py +++ b/apps/profile/tasks.py @@ -1,5 +1,5 @@ import datetime -from celery.task import Task +from celery import Task from apps.profile.models import Profile, RNewUserQueue from utils import log as logging from apps.reader.models import UserSubscription, UserSubscriptionFolders diff --git a/apps/reader/forms.py b/apps/reader/forms.py index afb2b88a9..1bd43a68c 100644 --- a/apps/reader/forms.py +++ b/apps/reader/forms.py @@ -166,7 +166,7 @@ class SignupForm(forms.Form): RNewUserQueue.add_user(new_user.pk) if new_user.email: - EmailNewUser.delay(user_id=new_user.pk) + EmailNewUser().delay(user_id=new_user.pk) if getattr(settings, 'AUTO_PREMIUM_NEW_USERS', False): new_user.profile.activate_premium() diff --git a/apps/reader/models.py b/apps/reader/models.py index 7263e4640..4a76952cc 100644 --- a/apps/reader/models.py +++ b/apps/reader/models.py @@ -475,7 +475,7 @@ class UserSubscription(models.Model): logging.user(user, "~BB~FW~SBQueueing NewFeeds: ~FC(%s) %s" % (len(new_feeds), new_feeds)) size = 4 for t in (new_feeds[pos:pos + size] for pos in range(0, len(new_feeds), size)): - NewFeeds.apply_async(args=(t,), queue="new_feeds") + NewFeeds().apply_async(args=(t,), queue="new_feeds") @classmethod def refresh_stale_feeds(cls, user, exclude_new=False): diff --git a/apps/reader/tasks.py b/apps/reader/tasks.py index 7b2556a05..a01a009a1 100644 --- a/apps/reader/tasks.py +++ b/apps/reader/tasks.py @@ -1,5 +1,5 @@ import datetime -from celery.task import Task +from celery import Task from utils import log as logging from django.contrib.auth.models import User from django.conf import settings diff --git a/apps/reader/views.py b/apps/reader/views.py index de8317a03..fe983f1a5 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -301,7 +301,7 @@ def load_feeds(request): if len(scheduled_feeds) > 0 and request.user.is_authenticated: logging.user(request, "~SN~FMTasking the scheduling immediate fetch of ~SB%s~SN feeds..." % len(scheduled_feeds)) - ScheduleImmediateFetches.apply_async(kwargs=dict(feed_ids=scheduled_feeds, user_id=user.pk)) + ScheduleImmediateFetches().apply_async(kwargs=dict(feed_ids=scheduled_feeds, user_id=user.pk)) starred_counts, starred_count = MStarredStoryCounts.user_counts(user.pk, include_total=True) if not starred_count and len(starred_counts): @@ -410,7 +410,7 @@ def load_feeds_flat(request): if len(scheduled_feeds) > 0 and request.user.is_authenticated: logging.user(request, "~SN~FMTasking the scheduling immediate fetch of ~SB%s~SN feeds..." % len(scheduled_feeds)) - ScheduleImmediateFetches.apply_async(kwargs=dict(feed_ids=scheduled_feeds, user_id=user.pk)) + ScheduleImmediateFetches().apply_async(kwargs=dict(feed_ids=scheduled_feeds, user_id=user.pk)) flat_folders = [] flat_folders_with_inactive = [] diff --git a/apps/rss_feeds/management/commands/backup_mongo.py b/apps/rss_feeds/management/commands/backup_mongo.py index 4bcafbc96..33293bb9d 100644 --- a/apps/rss_feeds/management/commands/backup_mongo.py +++ b/apps/rss_feeds/management/commands/backup_mongo.py @@ -5,4 +5,4 @@ class Command(BaseCommand): option_list = BaseCommand.option_list def handle(self, *args, **options): - BackupMongo.apply() \ No newline at end of file + BackupMongo().apply() \ No newline at end of file diff --git a/apps/rss_feeds/management/commands/task_feeds.py b/apps/rss_feeds/management/commands/task_feeds.py index c94eeecb1..49b5076a2 100644 --- a/apps/rss_feeds/management/commands/task_feeds.py +++ b/apps/rss_feeds/management/commands/task_feeds.py @@ -15,6 +15,6 @@ class Command(BaseCommand): def handle(self, *args, **options): if options['broken']: - TaskBrokenFeeds.apply() + TaskBrokenFeeds().apply() else: - TaskFeeds.apply() \ No newline at end of file + TaskFeeds().apply() \ No newline at end of file diff --git a/apps/rss_feeds/models.py b/apps/rss_feeds/models.py index 0a2d812f4..b721331d8 100644 --- a/apps/rss_feeds/models.py +++ b/apps/rss_feeds/models.py @@ -561,7 +561,7 @@ class Feed(models.Model): # for feed_ids in (feeds[pos:pos + queue_size] for pos in xrange(0, len(feeds), queue_size)): for feed_id in feeds: - UpdateFeeds.apply_async(args=(feed_id,), queue='update_feeds') + UpdateFeeds().apply_async(args=(feed_id,), queue='update_feeds') @classmethod def drain_task_feeds(cls): @@ -2250,7 +2250,7 @@ class Feed(models.Model): else: logging.debug(' ---> [%-30s] [%s] ~FB~SBQueuing pushed stories, last pushed %s...' % (self.log_title[:30], self.pk, latest_push_date_delta)) self.set_next_scheduled_update() - PushFeeds.apply_async(args=(self.pk, xml), queue='push_feeds') + PushFeeds().apply_async(args=(self.pk, xml), queue='push_feeds') # def calculate_collocations_story_content(self, # collocation_measures=TrigramAssocMeasures, @@ -3047,7 +3047,7 @@ class MStarredStoryCounts(mongo.Document): @classmethod def schedule_count_tags_for_user(cls, user_id): - ScheduleCountTagsForUser.apply_async(kwargs=dict(user_id=user_id)) + ScheduleCountTagsForUser().apply_async(kwargs=dict(user_id=user_id)) @classmethod def count_for_user(cls, user_id, total_only=False): diff --git a/apps/rss_feeds/tasks.py b/apps/rss_feeds/tasks.py index c829819b8..3d0ae6497 100644 --- a/apps/rss_feeds/tasks.py +++ b/apps/rss_feeds/tasks.py @@ -3,7 +3,7 @@ import os import shutil import time import redis -from celery.task import Task +from celery import Task from celery.exceptions import SoftTimeLimitExceeded from utils import log as logging from utils import s3_utils as s3 diff --git a/apps/search/models.py b/apps/search/models.py index 4510667b2..6baa9c449 100644 --- a/apps/search/models.py +++ b/apps/search/models.py @@ -49,7 +49,7 @@ class MUserSearch(mongo.Document): self.save() def schedule_index_subscriptions_for_search(self): - IndexSubscriptionsForSearch.apply_async(kwargs=dict(user_id=self.user_id), + IndexSubscriptionsForSearch().apply_async(kwargs=dict(user_id=self.user_id), queue='search_indexer_tasker') # Should be run as a background task @@ -122,7 +122,7 @@ class MUserSearch(mongo.Document): if not isinstance(feed_ids, list): feed_ids = [feed_ids] - IndexFeedsForSearch.apply_async(kwargs=dict(feed_ids=feed_ids, user_id=user_id), + IndexFeedsForSearch().apply_async(kwargs=dict(feed_ids=feed_ids, user_id=user_id), queue='search_indexer') @classmethod diff --git a/apps/search/tasks.py b/apps/search/tasks.py index 7dfbbe8b2..b0c3b6305 100644 --- a/apps/search/tasks.py +++ b/apps/search/tasks.py @@ -1,4 +1,4 @@ -from celery.task import Task +from celery import Task class IndexSubscriptionsForSearch(Task): diff --git a/apps/social/models.py b/apps/social/models.py index 0df36171e..06bdd8abe 100644 --- a/apps/social/models.py +++ b/apps/social/models.py @@ -474,7 +474,7 @@ class MSocialProfile(mongo.Document): if followee.protected and user_id != self.user_id and not force: from apps.social.tasks import EmailFollowRequest - EmailFollowRequest.apply_async(kwargs=dict(follower_user_id=self.user_id, + EmailFollowRequest().apply_async(kwargs=dict(follower_user_id=self.user_id, followee_user_id=user_id), countdown=settings.SECONDS_TO_DELAY_CELERY_EMAILS) return @@ -500,7 +500,7 @@ class MSocialProfile(mongo.Document): if not force: from apps.social.tasks import EmailNewFollower - EmailNewFollower.apply_async(kwargs=dict(follower_user_id=self.user_id, + EmailNewFollower().apply_async(kwargs=dict(follower_user_id=self.user_id, followee_user_id=user_id), countdown=settings.SECONDS_TO_DELAY_CELERY_EMAILS) diff --git a/apps/social/tasks.py b/apps/social/tasks.py index 2d934836d..5afd6105a 100644 --- a/apps/social/tasks.py +++ b/apps/social/tasks.py @@ -1,5 +1,5 @@ from bson.objectid import ObjectId -from celery.task import Task +from celery import Task from apps.social.models import MSharedStory, MSocialProfile, MSocialServices, MSocialSubscription from django.contrib.auth.models import User from utils import log as logging diff --git a/apps/social/views.py b/apps/social/views.py index f529dcc9c..48a20f293 100644 --- a/apps/social/views.py +++ b/apps/social/views.py @@ -621,7 +621,7 @@ def mark_story_as_shared(request): }) if source_user_id: shared_story.set_source_user_id(int(source_user_id)) - UpdateRecalcForSubscription.delay(subscription_user_id=request.user.pk, + UpdateRecalcForSubscription().delay(subscription_user_id=request.user.pk, shared_story_id=str(shared_story.id)) logging.user(request, "~FCSharing ~FM%s: ~SB~FB%s" % (story.story_title[:20], comments[:30])) else: @@ -659,13 +659,13 @@ def mark_story_as_shared(request): if post_to_services: for service in post_to_services: if service not in shared_story.posted_to_services: - PostToService.delay(shared_story_id=str(shared_story.id), service=service) + PostToService().delay(shared_story_id=str(shared_story.id), service=service) if shared_story.source_user_id and shared_story.comments: - EmailStoryReshares.apply_async(kwargs=dict(shared_story_id=str(shared_story.id)), + EmailStoryReshares().apply_async(kwargs=dict(shared_story_id=str(shared_story.id)), countdown=settings.SECONDS_TO_DELAY_CELERY_EMAILS) - EmailFirstShare.apply_async(kwargs=dict(user_id=request.user.pk)) + EmailFirstShare().apply_async(kwargs=dict(user_id=request.user.pk)) if format == 'html': stories = MSharedStory.attach_users_to_stories(stories, profiles) @@ -812,7 +812,7 @@ def save_comment_reply(request): story_feed_id=feed_id, story_title=shared_story.story_title) - EmailCommentReplies.apply_async(kwargs=dict(shared_story_id=str(shared_story.id), + EmailCommentReplies().apply_async(kwargs=dict(shared_story_id=str(shared_story.id), reply_id=str(reply.reply_id)), countdown=settings.SECONDS_TO_DELAY_CELERY_EMAILS) diff --git a/apps/statistics/tasks.py b/apps/statistics/tasks.py index 7a8c5f7e4..fb6bf8ac1 100644 --- a/apps/statistics/tasks.py +++ b/apps/statistics/tasks.py @@ -1,4 +1,4 @@ -from celery.task import Task +from celery import Task from apps.statistics.models import MStatistics from apps.statistics.models import MFeedback # from utils import log as logging