Upgrade course 1.3 (#8)

updates

Author: michael-yin

.env/.dev-sample

@@ -3,7 +3,7 @@ SECRET_KEY=dbaa1_i7%*3r9-=z-+_mz4r-!qeed@(-a_r(g@k8jo8y3r27%m
 DJANGO_ALLOWED_HOSTS=*
 
 SQL_ENGINE=django.db.backends.postgresql
-SQL_DATABASE=hello_django_dev
+SQL_DATABASE=hello_django
 SQL_USER=hello_django
 SQL_PASSWORD=hello_django
 SQL_HOST=db

.env/.prod-sample

@@ -3,7 +3,7 @@ SECRET_KEY=dbaa1_i7%*3r9-=z-+_mz4r-!qeed@(-a_r(g@k8jo8y3r27%m
 DJANGO_ALLOWED_HOSTS=*
 
 SQL_ENGINE=django.db.backends.postgresql
-SQL_DATABASE=hello_django_dev
+SQL_DATABASE=hello_django
 SQL_USER=hello_django
 SQL_PASSWORD=hello_django
 SQL_HOST=db

README.md

@@ -1 +1,3 @@
-https://testdriven.io/courses/django-celery/
+Source code of the [The Definitive Guide to Celery and Djang](https://testdriven.io/courses/django-celery/)
+
+By [Michael Yin](https://github.com/michael-yin/)

compose/local/django/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim-buster
+FROM python:3.10-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1

compose/local/django/celery/beat/start

@@ -4,4 +4,6 @@ set -o errexit
 set -o nounset
 
 rm -f './celerybeat.pid'
+
+# celery -A django_celery_example beat -l INFO
 celery -A django_celery_example beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler

compose/local/django/celery/worker/start

@@ -3,5 +3,7 @@
 set -o errexit
 set -o nounset
 
-# celery -A django_celery_example worker -l INFO
-python manage.py celery_worker
+watchfiles \
+  --filter python \
+  'celery -A django_celery_example worker --loglevel=info -Q high_priority,default'
+

compose/production/django/Dockerfile

@@ -1,4 +1,4 @@
-FROM python:3.9-slim-buster
+FROM python:3.10-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 

compose/production/django/celery/beat/start

@@ -5,4 +5,4 @@ set -o pipefail
 set -o nounset
 
 
-celery -A django_celery_example beat -l INFO
+exec celery -A django_celery_example beat -l INFO

compose/production/django/celery/flower/start

@@ -13,7 +13,7 @@ until worker_ready; do
 done
 >&2 echo 'Celery workers is available'
 
-celery -A django_celery_example \
+exec celery -A django_celery_example \
     --broker="${CELERY_BROKER}" \
     flower \
     --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}" \

compose/production/django/celery/worker/start

@@ -4,4 +4,4 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-celery -A django_celery_example worker -l INFO
+exec celery -A django_celery_example worker -l INFO

compose/production/nginx/Dockerfile

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

django_celery_example/asgi.py

@@ -4,10 +4,9 @@
 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/
+https://docs.djangoproject.com/en/4.0/howto/deployment/asgi/
 """
 
-
 import os
 
 from channels.routing import ProtocolTypeRouter, URLRouter
@@ -23,3 +22,4 @@
         routing.urlpatterns
     )
 })
+

django_celery_example/celery.py

@@ -1,8 +1,9 @@
 """
-https://docs.celeryproject.org/en/stable/django/first-steps-with-django.html
+https://docs.celeryq.dev/en/stable/django/first-steps-with-django.html
 """
 import os
 import logging
+
 from celery import Celery
 from celery.signals import after_setup_logger
 
@@ -19,7 +20,7 @@
 # config keys has `CELERY` prefix
 app.config_from_object('django.conf:settings', namespace='CELERY')
 
-# discover and load tasks.py in django apps
+# discover and load tasks.py from from all registered Django apps
 app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
 
 

django_celery_example/settings.py

@@ -1,28 +1,31 @@
 """
 Django settings for django_celery_example project.
 
-Generated by 'django-admin startproject' using Django 3.2.9.
+Generated by 'django-admin startproject' using Django 4.0.7.
 
 For more information on this file, see
-https://docs.djangoproject.com/en/3.2/topics/settings/
+https://docs.djangoproject.com/en/4.0/topics/settings/
 
 For the full list of settings and their values, see
-https://docs.djangoproject.com/en/3.2/ref/settings/
+https://docs.djangoproject.com/en/4.0/ref/settings/
 """
 import os
 
 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.2/howto/deployment/checklist/
+# See https://docs.djangoproject.com/en/4.0/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(" ")
@@ -74,9 +77,8 @@
 # WSGI_APPLICATION = 'django_celery_example.wsgi.application'
 ASGI_APPLICATION = 'django_celery_example.asgi.application'
 
-
 # Database
-# https://docs.djangoproject.com/en/3.2/ref/settings/#databases
+# https://docs.djangoproject.com/en/4.0/ref/settings/#databases
 
 DATABASES = {
     "default": {
@@ -91,7 +93,7 @@
 
 
 # Password validation
-# https://docs.djangoproject.com/en/3.2/ref/settings/#auth-password-validators
+# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators
 
 AUTH_PASSWORD_VALIDATORS = [
     {
@@ -110,32 +112,33 @@
 
 
 # Internationalization
-# https://docs.djangoproject.com/en/3.2/topics/i18n/
+# https://docs.djangoproject.com/en/4.0/topics/i18n/
 
 LANGUAGE_CODE = 'en-us'
 
 TIME_ZONE = 'UTC'
 
 USE_I18N = True
 
-USE_L10N = True
-
 USE_TZ = True
 
 
 # Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/3.2/howto/static-files/
+# https://docs.djangoproject.com/en/4.0/howto/static-files/
 
-STATIC_URL = '/static/'
+STATIC_URL = 'static/'
 STATIC_ROOT = os.path.join(BASE_DIR, 'staticfiles')
 
+# where Django hold upload files
+MEDIA_URL = '/media/'
+MEDIA_ROOT = os.path.join(BASE_DIR, 'mediafiles')
+
 # Default primary key field type
-# https://docs.djangoproject.com/en/3.2/ref/settings/#default-auto-field
+# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field
 
 DEFAULT_AUTO_FIELD = 'django.db.models.BigAutoField'
 
-MEDIA_URL = '/media/'
-MEDIA_ROOT = os.path.join(BASE_DIR, 'mediafiles')
+################################################################################
 
 CELERY_BROKER_URL = os.environ.get("CELERY_BROKER", "redis://127.0.0.1:6379/0")
 CELERY_RESULT_BACKEND = os.environ.get("CELERY_BACKEND", "redis://127.0.0.1:6379/0")
@@ -149,13 +152,15 @@
     },
 }
 
+
 CELERY_BEAT_SCHEDULE = {
     # 'task-clear-session': {
     #     'task': 'task_clear_session',
     #     "schedule": 5.0,  # five seconds
     # },
 }
 
+
 CELERY_TASK_DEFAULT_QUEUE = 'default'
 
 # Force all queues to be explicitly listed in `CELERY_TASK_QUEUES` to help prevent typos
@@ -169,7 +174,6 @@
     Queue('low_priority'),
 )
 
-# manual task routing
 
 # CELERY_TASK_ROUTES = {
 #     'django_celery_example.celery.*': {
@@ -187,3 +191,4 @@ def route_task(name, args, kwargs, options, task=None, **kw):
 
 
 CELERY_TASK_ROUTES = (route_task,)
+

django_celery_example/urls.py

@@ -1,7 +1,7 @@
 """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/
+    https://docs.djangoproject.com/en/4.0/topics/http/urls/
 Examples:
 Function views
     1. Add an import:  from my_app import views
@@ -19,6 +19,6 @@
 
 urlpatterns = [
     path('admin/', admin.site.urls),
-    path("member/", include('tdd.urls')),
+    path('member/', include('tdd.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.2/howto/deployment/wsgi/
+https://docs.djangoproject.com/en/4.0/howto/deployment/wsgi/
 """
 
 import os

docker-compose.prod.yml

@@ -34,7 +34,7 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data/
     environment:
-      - POSTGRES_DB=hello_django_dev
+      - POSTGRES_DB=hello_django
       - POSTGRES_USER=hello_django
       - POSTGRES_PASSWORD=hello_django
 
@@ -92,29 +92,29 @@ services:
       - redis
       - db
 
-  prometheus:
-    image: prom/prometheus
-    ports:
-      - 9090:9090
-    command:
-      - --config.file=/etc/prometheus/prometheus.yml
-    volumes:
-      - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
-    depends_on:
-      - cadvisor
+  # prometheus:
+  #   image: prom/prometheus
+  #   ports:
+  #     - 9090:9090
+  #   command:
+  #     - --config.file=/etc/prometheus/prometheus.yml
+  #   volumes:
+  #     - ./prometheus.yml:/etc/prometheus/prometheus.yml:ro
+  #   depends_on:
+  #     - cadvisor
 
-  cadvisor:
-    image: google/cadvisor
-    container_name: cadvisor
-    volumes:
-      - /:/rootfs:ro
-      - /var/run:/var/run:rw
-      - /sys:/sys:ro
-      - /var/lib/docker/:/var/lib/docker:ro
-      - /var/run/docker.sock:/var/run/docker.sock:ro
+  # cadvisor:
+  #   image: google/cadvisor
+  #   container_name: cadvisor
+  #   volumes:
+  #     - /:/rootfs:ro
+  #     - /var/run:/var/run:rw
+  #     - /sys:/sys:ro
+  #     - /var/lib/docker/:/var/lib/docker:ro
+  #     - /var/run/docker.sock:/var/run/docker.sock:ro
 
 volumes:
   postgres_data:
   staticfiles:
   mediafiles:
-  flower_db:
+  flower_db:

docker-compose.yml

@@ -26,12 +26,12 @@ services:
     volumes:
       - postgres_data:/var/lib/postgresql/data/
     environment:
-      - POSTGRES_DB=hello_django_dev
+      - POSTGRES_DB=hello_django
       - POSTGRES_USER=hello_django
       - POSTGRES_PASSWORD=hello_django
 
   redis:
-    image: redis:6-alpine
+    image: redis:7-alpine
 
   celery_worker:
     build:

polls/consumers.py

@@ -11,15 +11,17 @@ def get_task_info(task_id):
     return task info according to the task_id
     """
     task = AsyncResult(task_id)
-    if task.state == 'FAILURE':
+    state = task.state
+    
+    if state == 'FAILURE':
         error = str(task.result)
         response = {
-            'state': task.state,
+            'state': state,
             'error': error,
         }
     else:
         response = {
-            'state': task.state,
+            'state': state,
         }
     return response
 
@@ -30,6 +32,8 @@ def notify_channel_layer(task_id):
 
     Since Celery now still not support `asyncio`, so we should use async_to_sync
     to make it synchronous
+
+    https://channels.readthedocs.io/en/stable/topics/channel_layers.html#using-outside-of-consumers
     """
     channel_layer = get_channel_layer()
     async_to_sync(channel_layer.group_send)(

polls/factories.py

@@ -1,6 +1,6 @@
 from factory import LazyAttribute
 from factory.django import DjangoModelFactory
-from factory.fuzzy import FuzzyText
+from factory import Faker
 
 from django.contrib.auth.hashers import make_password
 from django.contrib.auth.models import User
@@ -10,8 +10,9 @@ class UserFactory(DjangoModelFactory):
     class Meta:
         model = User
 
-    username = FuzzyText(length=6)
+    username = Faker("user_name")
     email = LazyAttribute(lambda o: '%[email protected]' % o.username)
     password = LazyAttribute(lambda o: make_password(o.username))
-    first_name = FuzzyText(length=6)
-    last_name = FuzzyText(length=6)
+    first_name = Faker("first_name")
+    last_name = Faker("last_name")
+