Second-stick-of-celery

.gitignore

@@ -24,3 +24,6 @@ media/submissions/csv/*
 
 project/npda/dummy_sheets/local_generated_data/*
 !project/npda/dummy_sheets/local_generated_data/.gitkeep
+
+# exclude celerybeat-schedule
+celerybeat-schedule

Caddyfile

@@ -19,6 +19,13 @@
         }
     }
 
+    # FLOWER monitoring is served from a /flower path
+    # currently commented out until security is established
+    # handle /flower* {
+    #     reverse_proxy http://flower:8888
+    # }
+
+
     log {
         level ERROR # switch to DEBUG for more verbose logging
     }

docker-compose.yml

@@ -26,11 +26,49 @@ services:
     image: npda-django:built # build image and save for use by other containers
     depends_on:
       - postgis
+      - redis
     volumes:
       - .:/app/
     command: s/start-dev
     restart: always
 
+  # Redis backend for Celery task scheduler
+  redis:
+    image: redis:alpine
+    expose:
+      - 6379
+    restart: always
+
+  # Celery worker
+  celeryworker:
+    <<: *global # this will inherit config from x-global-environment
+    image: npda-django:built
+    container_name: npda-celery-worker
+    command: celery -A project worker -l info
+    restart: always
+
+  # Flower UI for Celery tasks
+  flower:
+    <<: *global # this will inherit config from x-global-environment
+    image: npda-django:built
+    ports:
+      - 8888:8888
+    volumes:
+      - npda-flower-data:/data
+    container_name: npda-flower
+    command: celery -A project flower --persistent=True -url_prefix=/flower
+    restart: always
+    depends_on:
+      - redis
+      - django
+
+  # Celery scheduled tasks/cron
+  celerybeat:
+    <<: *global # this will inherit config from x-global-environment
+    image: npda-django:built
+    container_name: npda-celery-beat
+    command: celery -A project beat -l info
+    restart: always
 
   # PostgreSQL with PostGIS extension
   postgis:
@@ -44,6 +82,7 @@ services:
     <<: *django # this will inherit all the settings from the django service
     ports:
       - 8007:8007
+    container_name: npda-mkdocs
     command: >
       sh -c "mkdocs build --config-file documentation/mkdocs.yml &&
         mkdocs serve --config-file documentation/mkdocs.yml"
@@ -52,3 +91,5 @@ services:
 volumes:
   npda-caddy-data:
   npda-postgis-data:
+  npda-flower-data:
+  npda-redis-data:

project/__init__.py

@@ -0,0 +1,3 @@
+from .celery import app as celery_app
+
+__all__ = ["celery_app"]

project/celery.py

@@ -0,0 +1,36 @@
+import logging
+import os
+
+from celery import Celery
+from celery import Task
+from django.conf import settings
+import django
+
+# Logging setup
+logger = logging.getLogger(__name__)
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "project.settings")
+django.setup()  # This is crucial!
+
+app = Celery("project")
+
+app.config_from_object("django.conf:settings", namespace="CELERY")
+
+app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
+
+
+class NPDATask(Task):
+    def on_failure(self, exc, task_id, args, kwargs, einfo):
+        print(f"Task {task_id} failed with exception: {exc}")
+        return super().on_failure(exc, task_id, args, kwargs, einfo)
+
+    def on_success(self, retval, task_id, args, kwargs):
+        pass
+
+
+@app.task(bind=True)
+def debug_task(self):
+    logger.debug("Request: {0!r}".format(self.request))
+
+
+app.Task = NPDATask

project/npda/__init__.py

@@ -1 +0,0 @@
-

project/npda/forms/visit_form.py

@@ -279,7 +279,6 @@ def clean_gluten_free_diet(self):
         data = self.cleaned_data["gluten_free_diet"]
         # Convert the list of tuples to a dictionary
         gluten_free_diet_dict = dict(YES_NO_UNKNOWN)
-
         if data is None or data in gluten_free_diet_dict:
             return data
         else:
@@ -950,10 +949,12 @@ def round_to_one_decimal_place(value):
             "psychological_additional_support_status"
         )
 
-        has_psychological_data = any([
-            psychological_screening_assessment_date,
-            psychological_additional_support_status
-        ])
+        has_psychological_data = any(
+            [
+                psychological_screening_assessment_date,
+                psychological_additional_support_status,
+            ]
+        )
 
         if has_psychological_data and psychological_additional_support_status != 99:
             measure_must_have_date_and_value(
@@ -1154,7 +1155,7 @@ def save(self, commit=True):
         # I haven't implemented it here. The risk is that future versions of Django will add more
         # behaviour that we miss out on.
 
-        if getattr(self, "async_validation_results"):
+        if hasattr(self, "async_validation_results"):
             self.instance.bmi = self.async_validation_results.bmi
 
             for field_prefix in ["height", "weight", "bmi"]:
@@ -1166,6 +1167,19 @@ def save(self, commit=True):
                     setattr(self.instance, f"{field_prefix}_centile", result.centile)
                     setattr(self.instance, f"{field_prefix}_sds", result.sds)
 
+        self.instance.patient = (
+            self.patient
+        )  # This is the patient object that is passed to the form
+
+        # check if any of the fields have critical error codes
+        for field in self.errors:
+            if (
+                hasattr(self.errors[field][0], "code")
+                and self.errors[field][0].code == ErrorCode.CRITICAL_TYPE_MISMATCH
+            ):
+                # set the field value to None to allow it to be saved
+                setattr(self.instance, field, None)
+
         if commit:
             self.instance.save()