Merge pull request #151 from stuartmaxwell:uvicorn

Uvicorn

config/settings.py

@@ -64,7 +64,6 @@
 CSRF_TRUSTED_ORIGINS = [f"https://{domain}" for domain in ALLOWED_HOSTS]
 
 INSTALLED_APPS = [
-    "daphne",
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",

contact_form/tasks.py

@@ -15,6 +15,7 @@ async def send_email_async(message: str, name: str = "", email: str = "") -> Non
     payload = {
         "from": settings.CONTACT_FORM_FROM,
         "to": settings.CONTACT_FORM_TO,
+        "reply_to": email,
         "subject": "Contact Form Submission from stuartm.nz",
         "html": f"<ul><li>Name: {name}</li><li>Email: {email}</li><li>Message:<br>{message}</li></ul>",
         "text": f"Name: {name}\n\nEmail: {email}\n\nMessage:\n\n{message}\n\n",

contact_form/views.py

@@ -13,7 +13,28 @@
 
 # A simple view to display the converter HTML template.
 async def contact_form(request: HttpRequest, contact_form_title: str = "Contact Form") -> HttpResponse:
-    """Render the contact form template."""
+    """Async view for the contact form.
+
+    This displays the contact form, or processes the form data if it was submitted and then displays the success.
+
+    An optional title can be passed in to customise the title of the contact form. This is useful so the form can be
+    used in multiple places with different titles. For example, in the spf_generator app, the contact form is added to
+    `urls.py` file as follows:
+
+    ```python
+    urlpatterns = [
+        path("contact/", contact_form, {"contact_form_title": "Request a New SPF Record"}, name="contact_form"),
+        path("", generate_spf_record, name="spf_generator"),
+        ]
+    ```
+
+    Args:
+        request (HttpRequest): The HTTP request.
+        contact_form_title (str): The title for the contact form.
+
+    Returns:
+        HttpResponse: The HTTP response.
+    """
     if request.method == "POST":
         form = ContactForm(request.POST)
         if form.is_valid():

docker-compose.yml

@@ -2,7 +2,7 @@ services:
   app:
     build: .
     entrypoint: /app/entrypoint.sh
-    command: uv run --no-cache daphne -b 0.0.0.0 -p 8000 --proxy-headers config.asgi:application
+    command: uv run --no-cache gunicorn --worker-tmp-dir /dev/shm --workers=2 --worker-class uvicorn_worker.UvicornWorker --bind 0.0.0.0:8000 config.asgi:application
     user: "1000"
     environment:
       - "S3_BUCKET=${S3_BUCKET}"

justfile

@@ -18,7 +18,7 @@ sync-up:
 
 # Run the Django development server
 run:
-    {{uvr}} manage.py runserver
+    {{uvr}} gunicorn --workers=2 --worker-class uvicorn_worker.UvicornWorker --bind 127.0.0.1:8000 config.asgi:application
 
 # Make migrations
 makemigrations:

pyproject.toml

@@ -19,7 +19,8 @@ dependencies = [
   "pygments>=2.18.0",
   "djpress-publish-mastodon>=1.0.0",
   "httpx>=0.27.2",
-  "daphne>=4.1.2",
+  "uvicorn>=0.32.1",
+  "uvicorn-worker>=0.2.0",
 ]
 
 [tool.curlylint.rules]