Merge pull request #3 from testdrivenio/features/update-course

update django celery course

Author: mjhea0

compose/auto_deploy_do.sh

@@ -3,6 +3,12 @@
 # This shell script quickly deploys your project to your
 # DigitalOcean Droplet
 
+if [ -z "$DIGITAL_OCEAN_IP_ADDRESS" ]
+then
+    echo "DIGITAL_OCEAN_IP_ADDRESS not defined"
+    exit 0
+fi
+
 # generate TAR file from git
 git archive --format tar --output ./project.tar master
 

compose/local/django/celery/worker/start

@@ -3,4 +3,5 @@
 set -o errexit
 set -o nounset
 
+# celery -A django_celery_example worker -l INFO
 python manage.py celery_worker

compose/production/django/celery/flower/start

@@ -17,4 +17,4 @@ celery -A django_celery_example \
     --broker="${CELERY_BROKER}" \
     flower \
     --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}" \
-    --persistent=1 --db=/app/flower_db/flower.db  --state_save_interval=5000
+    --persistent=1 --db=/app/flower_db/flower.db --state_save_interval=5000

compose/production/nginx/Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.19-alpine
+FROM nginx:1.21-alpine
 
 RUN rm /etc/nginx/conf.d/default.conf
 COPY nginx.conf /etc/nginx/conf.d

django_celery_example/__init__.py

@@ -1,5 +1,3 @@
-from __future__ import absolute_import, unicode_literals
-
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app

django_celery_example/asgi.py

@@ -1,22 +1,25 @@
+"""
+ASGI config for django_celery_example project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/3.2/howto/deployment/asgi/
+"""
+
+
 import os
 
-import django
-from asgiref.compatibility import guarantee_single_callable
 from channels.routing import ProtocolTypeRouter, URLRouter
-from django.conf import settings
+from django.core.asgi import get_asgi_application
 
 from polls import routing
 
-
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'django_celery_example.settings')
-django.setup()
 
 application = ProtocolTypeRouter({
+    "http": get_asgi_application(),
     'websocket': URLRouter(
         routing.urlpatterns
     )
 })
-
-if not settings.DEBUG:
-    # https://github.com/django/channels/issues/1319
-    application = guarantee_single_callable(application)

django_celery_example/celery.py

@@ -1,14 +1,8 @@
 """
-Celery config file
-
 https://docs.celeryproject.org/en/stable/django/first-steps-with-django.html
-
 """
-from __future__ import absolute_import
-import logging
 import os
-import time
-
+import logging
 from celery import Celery
 from celery.signals import after_setup_logger
 
@@ -18,23 +12,24 @@
 # set the default Django settings module for the 'celery' app.
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'django_celery_example.settings')
 
-# you change change the name here
+# you can change the name here
 app = Celery("django_celery_example")
 
 # read config from Django settings, the CELERY namespace would make celery
 # config keys has `CELERY` prefix
 app.config_from_object('django.conf:settings', namespace='CELERY')
 
-# load tasks.py in django apps
+# discover and load tasks.py in django apps
 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
 
 
 @app.task
-def add(x, y):
+def divide(x, y):
     # from celery.contrib import rdb
     # rdb.set_trace()
 
     # this is for test purposes
+    import time
     time.sleep(10)
     return x / y
 

django_celery_example/settings.py

@@ -1,31 +1,28 @@
 """
 Django settings for django_celery_example project.
 
-Generated by 'django-admin startproject' using Django 3.1.4.
+Generated by 'django-admin startproject' using Django 3.2.9.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/3.1/topics/settings/
+https://docs.djangoproject.com/en/3.2/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/3.1/ref/settings/
+https://docs.djangoproject.com/en/3.2/ref/settings/
 """
-
 import os
-from pathlib import Path
 
+from pathlib import Path
 from kombu import Queue
 
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 
 
 # Quick-start development settings - unsuitable for production
-# See https://docs.djangoproject.com/en/3.1/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/
 
-# SECURITY WARNING: keep the secret key used in production secret!
 SECRET_KEY = os.environ.get("SECRET_KEY", "&nl8s430j^j8l*je+m&ys5dv#zoy)0a2+x1!m8hx290_sx&0gh")
 
-# SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = int(os.environ.get("DEBUG", default=1))
 
 ALLOWED_HOSTS = os.environ.get("DJANGO_ALLOWED_HOSTS", "127.0.0.1").split(" ")
@@ -40,9 +37,9 @@
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
-    'polls',
     'channels',
     'django_celery_beat',
+    'polls',
     'tdd',
 ]
 
@@ -79,7 +76,7 @@
 
 
 # Database
-# https://docs.djangoproject.com/en/3.1/ref/settings/#databases
+# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
 
 DATABASES = {
     "default": {
@@ -94,7 +91,7 @@
 
 
 # Password validation
-# https://docs.djangoproject.com/en/3.1/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -113,7 +110,7 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/3.1/topics/i18n/
+# https://docs.djangoproject.com/en/3.2/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
@@ -127,11 +124,16 @@
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/3.1/howto/static-files/
+# https://docs.djangoproject.com/en/3.2/howto/static-files/
 
 STATIC_URL = '/static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
 
+# Default primary key field type
+# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
+
+DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
+
 MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'mediafiles')
 

django_celery_example/urls.py

@@ -1,9 +1,24 @@
+"""django_celery_example URL Configuration
+
+The `urlpatterns` list routes URLs to views. For more information please see:
+    https://docs.djangoproject.com/en/3.2/topics/http/urls/
+Examples:
+Function views
+    1. Add an import:  from my_app import views
+    2. Add a URL to urlpatterns:  path('', views.home, name='home')
+Class-based views
+    1. Add an import:  from other_app.views import Home
+    2. Add a URL to urlpatterns:  path('', Home.as_view(), name='home')
+Including another URLconf
+    1. Import the include() function: from django.urls import include, path
+    2. Add a URL to urlpatterns:  path('blog/', include('blog.urls'))
+"""
 from django.contrib import admin
 from django.urls import path, include
 
 
 urlpatterns = [
     path('admin/', admin.site.urls),
     path("member/", include('tdd.urls')),
-    path("", include('polls.urls')),
+    path('', include('polls.urls')),
 ]

django_celery_example/wsgi.py

@@ -4,7 +4,7 @@
 It exposes the WSGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/3.1/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/3.2/howto/deployment/wsgi/
 """
 
 import os

docker-compose.prod.yml

@@ -9,7 +9,7 @@ services:
       - mediafiles:/app/mediafiles
     ports:
       - 80:80
-      - 5559:5555
+      - 5555:5555
       - 15672:15672
     depends_on:
       - web
@@ -30,7 +30,7 @@ services:
       - db
 
   db:
-    image: postgres:12.0-alpine
+    image: postgres:14-alpine
     volumes:
       - postgres_data:/var/lib/postgresql/data/
     environment:
@@ -39,10 +39,10 @@ services:
       - POSTGRES_PASSWORD=hello_django
 
   redis:
-    image: redis:5-alpine
+    image: redis:6-alpine
 
   rabbitmq:
-    image: rabbitmq:3.8-management
+    image: rabbitmq:3-management
     env_file:
       - ./.env/.prod-sample
 
@@ -92,7 +92,6 @@ services:
       - redis
       - db
 
-
   prometheus:
     image: prom/prometheus
     ports:
@@ -118,4 +117,4 @@ volumes:
   postgres_data:
   staticfiles:
   mediafiles:
-  flower_db:
+  flower_db:

docker-compose.yml

@@ -22,7 +22,7 @@ services:
       - db
 
   db:
-    image: postgres:12.0-alpine
+    image: postgres:14-alpine
     volumes:
       - postgres_data:/var/lib/postgresql/data/
     environment:
@@ -31,19 +31,14 @@ services:
       - POSTGRES_PASSWORD=hello_django
 
   redis:
-    image: redis:5-alpine
+    image: redis:6-alpine
 
   celery_worker:
     build:
       context: .
       dockerfile: ./compose/local/django/Dockerfile
     image: django_celery_example_celery_worker
     command: /start-celeryworker
-    # logging:
-    #   driver: syslog
-    #   options:
-    #     syslog-address: "tcp+tls://logs2.papertrailapp.com:45883"
-    #     tag: "{{.Name}}/{{.ID}}"
     volumes:
       - .:/app
     env_file:
@@ -70,7 +65,7 @@ services:
     build:
       context: .
       dockerfile: ./compose/local/django/Dockerfile
-    image: django_celery_example_celey_flower
+    image: django_celery_example_celery_flower
     command: /start-flower
     volumes:
       - .:/app

polls/apps.py

@@ -2,4 +2,5 @@
 
 
 class PollsConfig(AppConfig):
+    default_auto_field = 'django.db.models.BigAutoField'
     name = 'polls'

polls/base_task.py

@@ -5,7 +5,6 @@
 
 
 class custom_celery_task:
-
     EXCEPTION_BLOCK_LIST = (
         IndexError,
         KeyError,
@@ -15,8 +14,8 @@ class custom_celery_task:
     )
 
     def __init__(self, *args, **kwargs):
-            self.task_args = args
-            self.task_kwargs = kwargs
+        self.task_args = args
+        self.task_kwargs = kwargs
 
     def __call__(self, func):
         @functools.wraps(func)

polls/consumers.py

@@ -2,7 +2,6 @@
 
 from asgiref.sync import async_to_sync
 from channels.layers import get_channel_layer
-# from channels.generic.websocket import WebsocketConsumer
 from channels.generic.websocket import AsyncWebsocketConsumer
 from celery.result import AsyncResult
 
@@ -50,25 +49,14 @@ async def connect(self):
 
         await self.accept()
 
+        await self.send(text_data=json.dumps(get_task_info(self.task_id)))
+
     async def disconnect(self, close_code):
         await self.channel_layer.group_discard(
             self.task_id,
             self.channel_name
         )
 
-    async def receive(self, text_data):
-        text_data_json = json.loads(text_data)
-        task_type = text_data_json['type']
-
-        if task_type == 'check_task_status':
-            await self.channel_layer.group_send(
-                self.task_id,
-                {
-                    'type': 'update_task_status',
-                    'data': get_task_info(self.task_id)
-                }
-            )
-
     async def update_task_status(self, event):
         data = event['data']