wip update dependencies and local dev environment

Author: briancaffey

backend/.dockerignore

@@ -0,0 +1,6 @@
+data/*
+static/*
+backup.json
+media/*
+notebooks/*
+.pytest_cache/

backend/apps/banking/tasks.py

@@ -3,16 +3,17 @@
 from io import StringIO
 
 import celery
-from celery.task import task
 
 from apps.banking.models import StatementFile, Transaction
 
+from backend.celery_app import app
+
 
 class BaseTask(celery.Task):
     pass
 
 
-@task(bind=True, base=BaseTask)
+@app.task(bind=True, base=BaseTask)
 def process_statement_file(self, statement_file_id):
 
     """

backend/apps/core/management/commands/watch_celery.py

@@ -3,6 +3,8 @@
 from . import consumers
 
 websocket_urlpatterns = [
-    url(r"^ws/ping-pong/$", consumers.CoreConsumer),
-    # url(r'^ws/chat/(?P<room_name>[^/]+)/$', consumers.CoreConsumer),
+    url(
+        r"^ws/ping-pong/$",
+        consumers.CoreConsumer.as_asgi(),
+    ),
 ]

backend/apps/core/management/commands/watch_celery_beat.py

@@ -2,31 +2,27 @@
 
 import celery
 from celery.decorators import periodic_task
-from celery.task import task
-from celery.task.schedules import crontab
 from django.core.mail import send_mail
 
+from backend.celery_app import app
+
 
 # http://docs.celeryproject.org/en/latest/userguide/tasks.html#task-inheritance
 class BaseTask(celery.Task):
     pass
 
 
-@task(bind=True, base=BaseTask)
+@app.task(bind=True, base=BaseTask)
 def debug_task(self):
     time.sleep(10)
 
 
-@periodic_task(
-    run_every=(crontab(minute="*/1")),
-    name="debug_periodic_task",
-    ignore_result=True,
-)
+@app.task(bind=True, base=BaseTask)
 def debug_periodic_task():
     print("Periodic task complete")
 
 
-@task(bind=True, base=BaseTask)
+@app.task(bind=True, base=BaseTask)
 def send_test_email_task(self):
     send_mail(
         "Email subject",
@@ -37,7 +33,7 @@ def send_test_email_task(self):
     )
 
 
-@task(bind=True, base=BaseTask)
+@app.task(bind=True, base=BaseTask)
 def sleep_task(self, seconds):
     time.sleep(int(seconds))
     return f"Slept {seconds} seconds"

backend/apps/core/management/commands/watch_daphne.py

@@ -1,11 +1,13 @@
 from channels.auth import AuthMiddlewareStack
 from channels.routing import ProtocolTypeRouter, URLRouter
+from django.core.asgi import get_asgi_application
 
 import apps.core.routing
 
 application = ProtocolTypeRouter(
     {
         # Empty for now (http->django views is added by default)
+        "http": get_asgi_application(),
         "websocket": AuthMiddlewareStack(
             URLRouter(apps.core.routing.websocket_urlpatterns)
         ),

backend/apps/core/routing.py

@@ -12,7 +12,7 @@
 
 import os
 
-from kombu import Queue
+from kombu import Exchange, Queue
 import redis
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -169,6 +169,15 @@
 
 # Channels
 
+CACHES = {
+    "default": {
+        "BACKEND": "django_redis.cache.RedisCache",
+        "LOCATION": f"redis://{REDIS_SERVICE_HOST}:6379/4",
+        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient"},
+        "KEY_PREFIX": "djangoredis",
+    }
+}
+
 CHANNEL_LAYERS = {
     "default": {
         "BACKEND": "channels_redis.core.RedisChannelLayer",
@@ -200,16 +209,44 @@
 }
 
 # Celery Configuration
+CELERY_QUEUE_DEFAULT = "default"
+CELERY_QUEUE_OTHER = "other"
+
+CELERY_BROKER_URL = f"redis://{REDIS_SERVICE_HOST}:6379/1"  # noqa
+CELERY_RESULT_BACKEND = f"redis://{REDIS_SERVICE_HOST}:6379/2"  # noqa
 CELERY_ACCEPT_CONTENT = ["application/json"]
 CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"
-CELERY_BROKER_URL = f"redis://{REDIS_SERVICE_HOST}:6379/1"  # noqa
-CELERY_RESULT_BACKEND = f"redis://{REDIS_SERVICE_HOST}:6379/2"  # noqa
 
 CELERY_QUEUE_DEFAULT = 'default'
 
 CELERY_QUEUES = (Queue(CELERY_QUEUE_DEFAULT, routing_key='default'),)
 
+CELERY_QUEUES = (
+    Queue(
+        CELERY_QUEUE_DEFAULT,
+        Exchange(CELERY_QUEUE_DEFAULT),
+        routing_key=CELERY_QUEUE_DEFAULT,
+    ),
+    Queue(
+        CELERY_QUEUE_OTHER,
+        Exchange(CELERY_QUEUE_OTHER),
+        routing_key=CELERY_QUEUE_OTHER,
+    ),
+)
+
+CELERY_DEFAULT_EXCHANGE_TYPE = "direct"
+CELERY_TASK_DEFAULT_QUEUE = CELERY_QUEUE_DEFAULT
+CELERY_TASK_DEFAULT_EXCHANGE = CELERY_QUEUE_DEFAULT
+CELERY_TASK_DEFAULT_ROUTING_KEY = CELERY_QUEUE_DEFAULT
+
+CELERY_BEAT_SCHEDULE = {
+    'debug-periodic': {
+        'task': 'apps.core.tasks.debug_periodic_task',
+        'schedule': 30,  # scrape suppliers once every 5 minutes
+    },
+}
+
 
 AUTH_USER_MODEL = "accounts.CustomUser"
 

backend/apps/core/tasks.py

@@ -1,12 +1,12 @@
-boto3==1.16.4
+boto3==1.16.23
 
-celery==4.4.7
-kombu==4.6.11
+celery==5.0.2
+kombu==5.0.2
 
-channels==2.4.0
-channels-redis==3.1.0
+channels==3.0.2
+channels-redis==3.2.0
 
-daphne==2.5.0
+daphne==3.0.1
 
 graphene-django==2.13.0
 django-graphql-jwt==0.3.1