Merge pull request #515 from Kitware/upgrade-resonant

Upgrade to Resonant v0.51.0

Author: brianhelba

.copier-answers.resonant.yml

@@ -1,4 +1,4 @@
-_commit: v0.50.5
+_commit: v0.51.0
 _src_path: https://github.com/kitware-resonant/cookiecutter-resonant
 core_app_name: core
 include_example_code: false

.devcontainer/devcontainer-lock.json

@@ -0,0 +1,39 @@
+{
+  "features": {
+    "ghcr.io/devcontainers-extra/features/heroku-cli:1": {
+      "version": "1.0.5",
+      "resolved": "ghcr.io/devcontainers-extra/features/heroku-cli@sha256:499a883bd3537c38c892e405fb6f3233e7101877852cc560b8ed5eec176c672a",
+      "integrity": "sha256:499a883bd3537c38c892e405fb6f3233e7101877852cc560b8ed5eec176c672a"
+    },
+    "ghcr.io/devcontainers/features/aws-cli:1": {
+      "version": "1.1.4",
+      "resolved": "ghcr.io/devcontainers/features/aws-cli@sha256:1f93c8315b7a6d76982ebb2269f8b0d50413fc0f965c032edf4aee0caceb73ef",
+      "integrity": "sha256:1f93c8315b7a6d76982ebb2269f8b0d50413fc0f965c032edf4aee0caceb73ef"
+    },
+    "ghcr.io/devcontainers/features/git-lfs:1": {
+      "version": "1.2.5",
+      "resolved": "ghcr.io/devcontainers/features/git-lfs@sha256:71c2b371cf12ab7fcec47cf17369c6f59156100dad9abf9e4c593049d789de72",
+      "integrity": "sha256:71c2b371cf12ab7fcec47cf17369c6f59156100dad9abf9e4c593049d789de72"
+    },
+    "ghcr.io/devcontainers/features/github-cli:1": {
+      "version": "1.1.0",
+      "resolved": "ghcr.io/devcontainers/features/github-cli@sha256:d22f50b70ed75339b4eed1ba9ecde3a1791f90e88d37936517e3bace0bbad671",
+      "integrity": "sha256:d22f50b70ed75339b4eed1ba9ecde3a1791f90e88d37936517e3bace0bbad671"
+    },
+    "ghcr.io/devcontainers/features/node:1": {
+      "version": "1.7.1",
+      "resolved": "ghcr.io/devcontainers/features/node@sha256:8c0de46939b61958041700ee89e3493f3b2e4131a06dc46b4d9423427d06e5f6",
+      "integrity": "sha256:8c0de46939b61958041700ee89e3493f3b2e4131a06dc46b4d9423427d06e5f6"
+    },
+    "ghcr.io/devcontainers/features/terraform:1": {
+      "version": "1.4.2",
+      "resolved": "ghcr.io/devcontainers/features/terraform@sha256:250d08e39c99d9e959e091e74527c22c04eeae728b424da99f002423c7902f82",
+      "integrity": "sha256:250d08e39c99d9e959e091e74527c22c04eeae728b424da99f002423c7902f82"
+    },
+    "ghcr.io/rails/devcontainer/features/postgres-client:1": {
+      "version": "1.2.0",
+      "resolved": "ghcr.io/rails/devcontainer/features/postgres-client@sha256:7e6b118646d6e0d82a9ec06e81ad1b5406f7042f0279d35fff3a7a612be7a050",
+      "integrity": "sha256:7e6b118646d6e0d82a9ec06e81ad1b5406f7042f0279d35fff3a7a612be7a050"
+    }
+  }
+}

.devcontainer/devcontainer.json

@@ -38,6 +38,8 @@
         // Django
         "batisteo.vscode-django",
         "augustocdias.tasks-shell-input",
+        // Vue
+        "vue.volar",
         // Other file formats
         "editorconfig.editorconfig",
         "mikestead.dotenv",

.github/workflows/ci.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Install npm
         uses: actions/setup-node@v6
         with:
-          node-version: 24.15.0
+          node-version: 24
           cache: npm
           cache-dependency-path: client/package-lock.json
       - name: Install packages
@@ -40,7 +40,7 @@ jobs:
         ports:
           - 5432:5432
       rabbitmq:
-        image: rabbitmq:4.2-management-alpine
+        image: rabbitmq:4.3-management-alpine
         options: >-
           --health-cmd "rabbitmq-diagnostics ping"
           --health-start-period 30s

.vscode/launch.json

@@ -57,9 +57,9 @@
         "worker",
         "--loglevel",
         "INFO",
-        "--pool",
-        "solo",
-        "--without-heartbeat"
+        "--without-mingle",
+        "--without-heartbeat",
+        "--without-gossip"
       ],
       "console": "integratedTerminal",
       "justMyCode": false,
@@ -72,7 +72,6 @@
       "name": "Pytest: Debug",
       "type": "debugpy",
       "request": "launch",
-      "module": "pytest",
       "purpose": ["debug-test"],
       "console": "integratedTerminal",
       "django": true,

Procfile

@@ -2,4 +2,4 @@ release: python ./manage.py migrate
 # Set `graceful_timeout` to shorter than the 30 second limit imposed by Heroku restarts
 # Set `timeout` to shorter than the 30 second limit imposed by the Heroku router
 web: gunicorn --bind 0.0.0.0:$PORT --graceful-timeout 25 --timeout 15 bats_ai.wsgi
-worker: REMAP_SIGTERM=SIGQUIT celery --app bats_ai.celery worker --loglevel INFO --without-heartbeat --concurrency 1
+worker: REMAP_SIGTERM=SIGQUIT celery --app bats_ai.celery worker --loglevel INFO --without-mingle --without-heartbeat --without-gossip

README.md

@@ -14,14 +14,13 @@
 ## Run
 Open the **Run and Debug** panel (`Ctrl+Shift+D`) and select a launch configuration:
 
-* **Django: Server** — Starts the development server at <http://localhost:8000/>
-* **Django: Server (eager Celery)** — Same, but Celery tasks run synchronously
+* **Django: Server** - Starts the development server at <http://localhost:8000/>
+* **Django: Server (eager Celery)** - Same, but Celery tasks run synchronously
   in the web process (useful for debugging task code without a worker)
-* **Celery: Worker** — Starts only the Celery worker
-* **Django + Celery** — Starts both the server and a Celery worker
-* **Django: Management Command** — Pick and run any management command
+* **Celery: Worker** - Starts only the Celery worker
+* **Django: Management Command** - Pick and run any management command
 * **Vite: Dev Server** - Starts the frontend development server at <http://localhost:8080/>
-* **Django + Celery + Vite** - Starts the server, a Celery worker, and the frontend.
+* **Django + Celery + Vite** - Starts the server, a Celery worker, and the frontend
 
 ## Test
 Run the full test suite from a terminal: `tox`

bats_ai/settings/heroku_production.py

@@ -16,3 +16,6 @@
 
 # Inform rate limiting that "X-Forwarded-For" should be trusted, as it's appended by Heroku.
 ALLAUTH_TRUSTED_PROXY_COUNT = 1
+
+# Spectrogram generation takes too much memory for worker parallelism
+CELERY_WORKER_CONCURRENCY = 1

client/README.md

@@ -1,13 +1,13 @@
 # Vue Project Template
 
 This is a project boilerplate template designed for building SPAs that
-will serve as front-ends to Girder 4-based servers. The following features
+will serve as front-ends to Resonant-based servers. The following features
 are included:
 
 - `vuetify` installation and configuration
 - `axios` installation and configuration
 - `vue-router` installation and skeleton boilerplate
-- Girder 4 OAuth client library installation and configuration
+- Resonant OAuth client library installation and configuration
 - A home page containing a working OAuth login / logout button
 - Sentry integration (if no DSN is provided, this will be inactive)
 - TypeScript

dev/native-development.md

@@ -13,7 +13,7 @@ Runs Python on the host while using Docker Compose for services.
 1. Ensure services are running: `docker compose -f ./docker-compose.yml up -d`
 1. `source ./dev/export-env.sh`
 1. `./manage.py runserver_plus`
-1. In a separate terminal: `celery --app bats_ai.celery worker --loglevel INFO --without-heartbeat`
+1. In a separate terminal: `celery --app bats_ai.celery worker --loglevel INFO --without-mingle --without-heartbeat --without-gossip`
 1. Access http://localhost:8000/
 
 Stop services when done: `docker compose stop`