Merge pull request #229 from ttys0dev/async

Migrate to async Django

Author: Luis-manzur

.github/workflows/deploy.yml

@@ -16,7 +16,7 @@ jobs:
     if: (github.event_name == 'pull_request' && github.event.pull_request.merged == true)
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -30,12 +30,12 @@ jobs:
     needs: build
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - name: Set shortcode
       id: vars
       run: echo "::set-output name=sha_short::$(git rev-parse --short HEAD)"
     - name: Configure AWS credentials
-      uses: aws-actions/configure-aws-credentials@v4
+      uses: aws-actions/configure-aws-credentials@v5
       with:
         aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}

.github/workflows/lint.yml

@@ -10,8 +10,8 @@ jobs:
   pre-commit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
-      - uses: actions/setup-python@v5
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
         with:
-          python-version: "3.10"
+          python-version: "3.12"
       - uses: pre-commit/action@v3.0.1

.github/workflows/tests.yml

@@ -10,7 +10,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
 
     - name: Create the .env settings file
       run: cp .env.example .env.dev

.pre-commit-config.yaml

@@ -3,7 +3,7 @@
 exclude: migrations
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
+    rev: v6.0.0
     hooks:
      - id: check-added-large-files
      - id: check-ast
@@ -15,13 +15,11 @@ repos:
      - id: debug-statements
      - id: detect-private-key
      - id: fix-byte-order-marker
-     - id: fix-encoding-pragma
-       args: [--remove]
      - id: trailing-whitespace
        args: [--markdown-linebreak-ext=md]
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.11.8
+    rev: v0.14.8
     hooks:
       - id: ruff
         args: [ --fix ]

CHANGELOG.md

@@ -3,6 +3,8 @@ The following changes are not yet released, but are code complete:
 
 ## Current
 
+ - Migrated to async Django 6.0.1
+
 **0.3.5 - 2025-11-21** #228
 
 Features:

docker/Dockerfile

@@ -1,9 +1,9 @@
 # Note: Force M1 to emulate amd64
-FROM --platform=linux/amd64 python:3.10
+FROM --platform=linux/amd64 python:3.13
 
 # Install uv
 # https://docs.astral.sh/uv/guides/integration/docker/#installing-uv
-COPY --from=ghcr.io/astral-sh/uv:0.7 /uv /uvx /bin/
+COPY --from=ghcr.io/astral-sh/uv:0.9 /uv /uvx /bin/
 
 # Install apt dependencies
 # caching: https://docs.docker.com/build/cache/optimize/#use-cache-mounts
@@ -68,8 +68,9 @@ EXPOSE 5050
 ARG options
 ENV OPTIONS $options
 
-CMD gunicorn $OPTIONS doctor.wsgi:application \
+CMD gunicorn $OPTIONS doctor.asgi:application \
       --workers ${DOCTOR_WORKERS:-1} \
+      --worker-class uvicorn.workers.UvicornWorker \
       --max-requests 1000 \
       --max-requests-jitter 100 \
       --timeout 5400 \

doctor/wsgi.py doctor/asgi.pydoctor/wsgi.py renamed to doctor/asgi.py

@@ -9,8 +9,8 @@
 
 import os
 
-from django.core.wsgi import get_wsgi_application
+from django.core.asgi import get_asgi_application
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "doctor.settings")
 
-application = get_wsgi_application()
+application = get_asgi_application()

doctor/lib/utils.py

@@ -1,9 +1,9 @@
+import asyncio
 import datetime
 import io
 import logging
 import os
 import re
-import subprocess
 import warnings
 from collections import namedtuple
 from decimal import Decimal
@@ -165,7 +165,7 @@ def do_test(self, *args, **kwargs):
     return do_test
 
 
-def make_png_thumbnail_for_instance(filepath, max_dimension):
+async def make_png_thumbnail_for_instance(filepath, max_dimension):
     """Abstract function for making a thumbnail for a PDF
 
     See helper functions below for how to use this in a simple way.
@@ -184,14 +184,17 @@ def make_png_thumbnail_for_instance(filepath, max_dimension):
         filepath,
         "-png",
     ]
-    p = subprocess.Popen(
-        command, close_fds=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+    p = await asyncio.create_subprocess_exec(
+        *command,
+        close_fds=True,
+        stdout=asyncio.subprocess.PIPE,
+        stderr=asyncio.subprocess.PIPE,
     )
-    stdout, stderr = p.communicate()
+    stdout, stderr = await p.communicate()
     return stdout, stderr.decode("utf-8"), str(p.returncode)
 
 
-def make_png_thumbnails(filepath, max_dimension, pages, directory):
+async def make_png_thumbnails(filepath, max_dimension, pages, directory):
     """Abstract function for making a thumbnail for a PDF
 
     See helper functions below for how to use this in a simple way.
@@ -212,13 +215,13 @@ def make_png_thumbnails(filepath, max_dimension, pages, directory):
             "-png",
             f"{directory.name}/thumb-{page}",
         ]
-        p = subprocess.Popen(
-            command,
+        p = await asyncio.create_subprocess_exec(
+            *command,
             close_fds=True,
-            stdout=subprocess.PIPE,
-            stderr=subprocess.PIPE,
+            stdout=asyncio.subprocess.DEVNULL,
+            stderr=asyncio.subprocess.DEVNULL,
         )
-        p.communicate()
+        await p.wait()
 
 
 def pdf_bytes_from_image_array(image_list, output_path) -> None:
@@ -392,17 +395,22 @@ def log_sentry_event(
     logger.log(level, message, extra=extra, **kwargs)
 
 
-def strip_metadata_with_exiftool(path: str) -> bool:
+async def strip_metadata_with_exiftool(path: str) -> bool:
     """Strip metadata from a file in place using exiftool
 
     :param path: Temporary file path
     :return: True if exiftool succeeded or False if exiftool failed
     """
-    result = subprocess.run(
-        ["exiftool", "-all=", "-overwrite_original", path],
-        capture_output=True,
-        text=True,
+    process = await asyncio.create_subprocess_exec(
+        "exiftool",
+        "-all=",
+        "-overwrite_original",
+        path,
+        close_fds=True,
+        stdout=asyncio.subprocess.DEVNULL,
+        stderr=asyncio.subprocess.DEVNULL,
     )
+    result = await process.wait()
 
     # exiftool returns 0 = success
-    return result.returncode == 0
+    return result == 0

doctor/settings.py

@@ -24,7 +24,7 @@
 ALLOWED_HOSTS = ["doctor", "0.0.0.0", "localhost"]
 INSTALLED_APPS = []
 ROOT_URLCONF = "doctor.urls"
-WSGI_APPLICATION = "doctor.wsgi.application"
+ASGI_APPLICATION = "doctor.asgi.application"
 
 
 SENTRY_DSN = env("SENTRY_DSN", default="")