diff --git a/.env.vite.example b/.env.vite.example new file mode 100644 index 0000000..1bccc05 --- /dev/null +++ b/.env.vite.example @@ -0,0 +1,16 @@ +# Frontend development server +VITE_HOST=127.0.0.1 +VITE_PORT=5173 +VITE_DEV_SERVER_URL=http://127.0.0.1:5173/ +VITE_USE_DEV_SERVER=true + +# Django development process (override the whole command for uv, docker, etc.) +DJANGO_HOST=127.0.0.1 +DJANGO_PORT=8000 +# DJANGO_DEV_COMMAND=python manage.py runserver 127.0.0.1:8000 + +# Production build output and Django static namespace +VITE_OUT_DIR=vite_integration/static/vite +VITE_STATIC_PREFIX=vite +# Must match Django STATIC_URL plus VITE_STATIC_PREFIX (for example, /static/vite/). +VITE_BASE_URL=/static/vite/ diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..55baf66 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +vite_integration/static/vite/* +!vite_integration/static/vite/.gitkeep +node_modules/ diff --git a/README.md b/README.md index e69de29..80c6c62 100644 --- a/README.md +++ b/README.md @@ -0,0 +1,91 @@ +# Portable Django + Vite integration + +This repository did not previously contain Vite configuration, package scripts, a manifest, or Vite-aware Django templates. Its only asset setup was Django native static files. The files below add an isolated, reusable Vite integration without attaching any Vite bundle to existing pages. + +## What is included + +- `vite_integration/`: reusable Django app and `{% vite_asset %}` tag +- `frontend/src/main.js`: replaceable example entry point +- `vite.config.mjs`: Vite output, manifest, host, port, and entry configuration +- `package.json`: `dev`, `django`, `vite`, and `build` scripts +- `scripts/dev-django.mjs`: configurable backend process for `concurrently` +- `.env.vite.example`: documented development and production variables + +Vite builds into `vite_integration/static/vite/`. Because this is a Django app static directory, Django's staticfiles finders and `collectstatic` discover the manifest and built assets automatically. + +## Prerequisites + +- Python and the Django environment for the project +- Node.js 20+ and npm +- A configured Django `STATIC_URL` and `STATIC_ROOT` for production + +## Install in this repository + +```sh +cp .env.vite.example .env.vite +npm install +set -a; . ./.env.vite; set +a +npm run dev +``` + +`npm run dev` starts Django and Vite together using `concurrently`. It runs `python manage.py runserver 127.0.0.1:8000` and Vite on `127.0.0.1:5173` by default. Change the variables before starting it, or set `DJANGO_DEV_COMMAND` to replace the backend command completely. + +## Add an entry point to a template + +Choose an entry point and include it once in the relevant base template: + +```django +{% load vite %} +{% vite_asset "frontend/src/main.js" %} +``` + +The tag renders Vite's HMR client and the entry point when `VITE_USE_DEV_SERVER=true`. Otherwise it reads Vite's manifest and renders the fingerprinted CSS and JavaScript under Django's static URL. See `vite_integration/templates/vite_integration/example_assets.html` for the same snippet. + +## Production + +```sh +set -a; . ./.env.vite; set +a +VITE_USE_DEV_SERVER=false npm run build +VITE_USE_DEV_SERVER=false python manage.py collectstatic --noinput +``` + +Build before `collectstatic`. The generated `vite/.vite/manifest.json` and `vite/assets/*` are collected with all other Django static files. Do not use the Vite development server in production. + +## Reuse in a fresh Django project + +Copy these files and directories: + +```text +vite_integration/ +frontend/src/ +scripts/dev-django.mjs +vite.config.mjs +package.json +.env.vite.example +``` + +Then add `vite_integration` to `INSTALLED_APPS`, add the template tag to a base template, configure `STATIC_URL`/`STATIC_ROOT`, install npm packages, and use the development or production commands above. The integration contains no application names, routes, or backend URLs. + +## Configuration values to customize + +| Variable/setting | Default | Purpose | +| --- | --- | --- | +| `DJANGO_DEV_COMMAND` | `python manage.py runserver :` | Complete backend development command | +| `DJANGO_HOST`, `DJANGO_PORT` | `127.0.0.1`, `8000` | Default backend bind address | +| `VITE_HOST`, `VITE_PORT` | `127.0.0.1`, `5173` | Vite bind address and port | +| `VITE_DEV_SERVER_URL` | `http://127.0.0.1:5173/` | URL Django templates use for HMR | +| `VITE_USE_DEV_SERVER` | `false` | Enables HMR tags; set only for development | +| `VITE_ENTRY` | `frontend/src/main.js` | Vite Rollup entry point | +| `VITE_OUT_DIR` | `vite_integration/static/vite` | Build output relative to project root | +| `VITE_STATIC_PREFIX` | `vite` | Django static namespace for built files | +| `VITE_BASE_URL` | `/static/vite/` | Public base URL emitted by Vite | +| `VITE_MANIFEST_PATH` | staticfiles finder | Optional explicit manifest location | + +Django settings override environment variables with the same names. `VITE_BASE_URL` must equal the public `STATIC_URL` followed by `VITE_STATIC_PREFIX` (for example, `/static/vite/`). A `.env.vite` file is not automatically read by Django; export/source it in the process manager, shell, container, or deployment configuration. + +## Troubleshooting + +- **Vite manifest not found:** run `npm run build` before `collectstatic`; check that `VITE_OUT_DIR` ends below a Django app `static/` directory and that its final segment matches `VITE_STATIC_PREFIX`. +- **Browser cannot reach HMR:** set `VITE_DEV_SERVER_URL` to the browser-reachable Vite address, and use matching `VITE_HOST`/`VITE_PORT`. For containers or remote browsers this is often `0.0.0.0` for the host plus a public hostname for the URL. +- **A page fails in development:** set `VITE_USE_DEV_SERVER=true` only while `npm run vite` or `npm run dev` is running. +- **Assets return 404 after deployment:** rerun both the build and `collectstatic`; ensure the web server serves `STATIC_ROOT` at `STATIC_URL`. diff --git a/fireworks_detect/__pycache__/admin.cpython-313.pyc b/fireworks_detect/__pycache__/admin.cpython-313.pyc index 3597787..19e118e 100644 Binary files a/fireworks_detect/__pycache__/admin.cpython-313.pyc and b/fireworks_detect/__pycache__/admin.cpython-313.pyc differ diff --git a/fireworks_detect/__pycache__/classification_urls.cpython-313.pyc b/fireworks_detect/__pycache__/classification_urls.cpython-313.pyc new file mode 100644 index 0000000..270d5d8 Binary files /dev/null and b/fireworks_detect/__pycache__/classification_urls.cpython-313.pyc differ diff --git a/fireworks_detect/__pycache__/h3_utils.cpython-313.pyc b/fireworks_detect/__pycache__/h3_utils.cpython-313.pyc new file mode 100644 index 0000000..cb0061f Binary files /dev/null and b/fireworks_detect/__pycache__/h3_utils.cpython-313.pyc differ diff --git a/fireworks_detect/__pycache__/models.cpython-313.pyc b/fireworks_detect/__pycache__/models.cpython-313.pyc index 09e3e84..f7a87c7 100644 Binary files a/fireworks_detect/__pycache__/models.cpython-313.pyc and b/fireworks_detect/__pycache__/models.cpython-313.pyc differ diff --git a/fireworks_detect/__pycache__/tests.cpython-313.pyc b/fireworks_detect/__pycache__/tests.cpython-313.pyc index c1fd97e..71feee0 100644 Binary files a/fireworks_detect/__pycache__/tests.cpython-313.pyc and b/fireworks_detect/__pycache__/tests.cpython-313.pyc differ diff --git a/fireworks_detect/__pycache__/urls.cpython-313.pyc b/fireworks_detect/__pycache__/urls.cpython-313.pyc index 9a4a154..28c6b5f 100644 Binary files a/fireworks_detect/__pycache__/urls.cpython-313.pyc and b/fireworks_detect/__pycache__/urls.cpython-313.pyc differ diff --git a/fireworks_detect/__pycache__/views.cpython-313.pyc b/fireworks_detect/__pycache__/views.cpython-313.pyc index 2266358..6c6dd5a 100644 Binary files a/fireworks_detect/__pycache__/views.cpython-313.pyc and b/fireworks_detect/__pycache__/views.cpython-313.pyc differ diff --git a/fireworks_detect/admin.py b/fireworks_detect/admin.py index 9492173..6667f9b 100644 --- a/fireworks_detect/admin.py +++ b/fireworks_detect/admin.py @@ -4,17 +4,28 @@ from django.contrib import admin, messages from django.utils import timezone from django.utils.html import format_html -from .models import Event, PendingEvent, Sensor +from .models import ClassificationRule, Event, PendingEvent, Sensor + + +@admin.register(ClassificationRule) +class ClassificationRuleAdmin(admin.ModelAdmin): + list_display = ("value", "rule_type", "enabled") + list_filter = ("rule_type", "enabled") + search_fields = ("value",) class ClassificationAdmin(admin.ModelAdmin): - list_display = ("original_filename", "sensor", "primary_label", "primary_score", "duration", "created_at") - list_filter = ("created_at",) + list_display = ("original_filename", "source_type", "sensor", "occurrences", "location", "visually_confirmed", "primary_label", "primary_score", "duration", "created_at") + list_filter = ("source_type", "visually_confirmed", "created_at") search_fields = ("original_filename",) - readonly_fields = ("audio_file", "sensor", "original_filename", "created_at", "pretty_classifier_response") - fields = ("audio_file", "sensor", "original_filename", "created_at") + readonly_fields = ("audio_file", "sensor", "h3_cell", "direction_display", "direction_accuracy_degrees", "original_filename", "created_at", "pretty_classifier_response") + fields = ("audio_file", "sensor", "source_type", "occurrences", "location", "latitude", "longitude", "h3_cell", "direction_display", "direction_accuracy_degrees", "visually_confirmed", "original_filename", "created_at") change_form_template = "admin/fireworks_detect/classification_audio_change_form.html" + @admin.display(description="Direction") + def direction_display(self, obj): + return obj.direction_display + @admin.display(description="Classifier response") def pretty_classifier_response(self, obj): return format_html("
{}
", json.dumps(obj.classifier_response, indent=2, sort_keys=True)) diff --git a/fireworks_detect/classification_urls.py b/fireworks_detect/classification_urls.py new file mode 100644 index 0000000..297eb76 --- /dev/null +++ b/fireworks_detect/classification_urls.py @@ -0,0 +1,11 @@ +from django.urls import path + +from .views import classification_blacklist, classification_whitelist + + +app_name = "classification_rules" + +urlpatterns = [ + path("whitelist/", classification_whitelist, name="whitelist"), + path("blacklist/", classification_blacklist, name="blacklist"), +] diff --git a/fireworks_detect/h3_utils.py b/fireworks_detect/h3_utils.py new file mode 100644 index 0000000..909a026 --- /dev/null +++ b/fireworks_detect/h3_utils.py @@ -0,0 +1,42 @@ +import h3 + +from django.conf import settings + + +H3_RESOLUTION_SETTING = "FIREWORKS_H3_RESOLUTION" + + +def h3_resolution(): + resolution = getattr(settings, H3_RESOLUTION_SETTING, 9) + if isinstance(resolution, bool) or not isinstance(resolution, int) or not 0 <= resolution <= 15: + raise ValueError(f"{H3_RESOLUTION_SETTING} must be an integer between 0 and 15.") + return resolution + + +def cell_from_coordinates(latitude, longitude): + if latitude is None or longitude is None: + return None + return h3.latlng_to_cell(float(latitude), float(longitude), h3_resolution()) + + +def cell_boundary(cell): + try: + return [[latitude, longitude] for latitude, longitude in h3.cell_to_boundary(cell)] + except (ValueError, h3.H3Error): + return None + + +def cell_center(cell): + """Return the centre of an H3 cell without exposing its source coordinate.""" + try: + latitude, longitude = h3.cell_to_latlng(cell) + return [latitude, longitude] + except (ValueError, h3.H3Error): + return None + + +def cell_disk(cell, distance=1): + try: + return sorted(h3.grid_disk(cell, distance)) + except (ValueError, h3.H3Error): + return [] diff --git a/fireworks_detect/h3_utils.py.orig b/fireworks_detect/h3_utils.py.orig new file mode 100644 index 0000000..e5fd7f3 --- /dev/null +++ b/fireworks_detect/h3_utils.py.orig @@ -0,0 +1,33 @@ +import h3 + +from django.conf import settings + + +H3_RESOLUTION_SETTING = "FIREWORKS_H3_RESOLUTION" + + +def h3_resolution(): + resolution = getattr(settings, H3_RESOLUTION_SETTING, 9) + if isinstance(resolution, bool) or not isinstance(resolution, int) or not 0 <= resolution <= 15: + raise ValueError(f"{H3_RESOLUTION_SETTING} must be an integer between 0 and 15.") + return resolution + + +def cell_from_coordinates(latitude, longitude): + if latitude is None or longitude is None: + return None + return h3.latlng_to_cell(float(latitude), float(longitude), h3_resolution()) + + +def cell_boundary(cell): + try: + return [[latitude, longitude] for latitude, longitude in h3.cell_to_boundary(cell)] + except (ValueError, h3.H3Error): + return None + + +def cell_disk(cell, distance=1): + try: + return sorted(h3.grid_disk(cell, distance)) + except (ValueError, h3.H3Error): + return [] diff --git a/fireworks_detect/management/__init__.py b/fireworks_detect/management/__init__.py new file mode 100644 index 0000000..4e8dff8 --- /dev/null +++ b/fireworks_detect/management/__init__.py @@ -0,0 +1 @@ +"""Management commands for fireworks detection.""" diff --git a/fireworks_detect/management/__pycache__/__init__.cpython-313.pyc b/fireworks_detect/management/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..1550165 Binary files /dev/null and b/fireworks_detect/management/__pycache__/__init__.cpython-313.pyc differ diff --git a/fireworks_detect/management/commands/__init__.py b/fireworks_detect/management/commands/__init__.py new file mode 100644 index 0000000..5667b8e --- /dev/null +++ b/fireworks_detect/management/commands/__init__.py @@ -0,0 +1 @@ +"""Fireworks detection management commands.""" diff --git a/fireworks_detect/management/commands/__pycache__/__init__.cpython-313.pyc b/fireworks_detect/management/commands/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..08a3b6c Binary files /dev/null and b/fireworks_detect/management/commands/__pycache__/__init__.cpython-313.pyc differ diff --git a/fireworks_detect/management/commands/backfill_h3_cells.py b/fireworks_detect/management/commands/backfill_h3_cells.py new file mode 100644 index 0000000..6387915 --- /dev/null +++ b/fireworks_detect/management/commands/backfill_h3_cells.py @@ -0,0 +1,25 @@ +from django.core.management.base import BaseCommand + +from fireworks_detect.h3_utils import cell_from_coordinates, h3_resolution +from fireworks_detect.models import Event, PendingEvent + + +class Command(BaseCommand): + help = "Populate H3 cells for coordinate-bearing Pending and approved events." + + def handle(self, *args, **options): + updated = 0 + for model in (PendingEvent, Event): + for record in model.objects.exclude(latitude__isnull=True).exclude(longitude__isnull=True): + h3_cell = cell_from_coordinates(record.latitude, record.longitude) + if record.h3_cell == h3_cell: + continue + record.h3_cell = h3_cell + record.save(update_fields=["h3_cell"]) + updated += 1 + + self.stdout.write( + self.style.SUCCESS( + f"Updated {updated} record(s) at H3 resolution {h3_resolution()}." + ) + ) diff --git a/fireworks_detect/migrations/0003_classificationrule.py b/fireworks_detect/migrations/0003_classificationrule.py new file mode 100644 index 0000000..fcda334 --- /dev/null +++ b/fireworks_detect/migrations/0003_classificationrule.py @@ -0,0 +1,35 @@ +# Generated by Django 6.1.1 on 2026-09-29 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("fireworks_detect", "0002_sensor_event_sensor_pendingevent_sensor"), + ] + + operations = [ + migrations.CreateModel( + name="ClassificationRule", + fields=[ + ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")), + ("value", models.CharField(max_length=255)), + ( + "rule_type", + models.CharField( + choices=[("whitelist", "Whitelist"), ("blacklist", "Blacklist")], + max_length=10, + ), + ), + ("enabled", models.BooleanField(default=True)), + ], + options={ + "ordering": ["value"], + }, + ), + migrations.AddConstraint( + model_name="classificationrule", + constraint=models.UniqueConstraint(fields=("value", "rule_type"), name="unique_classification_rule"), + ), + ] diff --git a/fireworks_detect/migrations/0004_event_location_event_occurrences_event_source_type_and_more.py b/fireworks_detect/migrations/0004_event_location_event_occurrences_event_source_type_and_more.py new file mode 100644 index 0000000..64c0e4c --- /dev/null +++ b/fireworks_detect/migrations/0004_event_location_event_occurrences_event_source_type_and_more.py @@ -0,0 +1,63 @@ +# Generated by Django 6.1.1 on 2026-09-29 20:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('fireworks_detect', '0003_classificationrule'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='location', + field=models.CharField(blank=True, max_length=255), + ), + migrations.AddField( + model_name='event', + name='occurrences', + field=models.PositiveIntegerField(default=1), + ), + migrations.AddField( + model_name='event', + name='source_type', + field=models.CharField(choices=[('sensor', 'Sensor'), ('manual', 'Manual report')], default='sensor', max_length=10), + ), + migrations.AddField( + model_name='event', + name='visually_confirmed', + field=models.BooleanField(default=False), + ), + migrations.AddField( + model_name='pendingevent', + name='location', + field=models.CharField(blank=True, max_length=255), + ), + migrations.AddField( + model_name='pendingevent', + name='occurrences', + field=models.PositiveIntegerField(default=1), + ), + migrations.AddField( + model_name='pendingevent', + name='source_type', + field=models.CharField(choices=[('sensor', 'Sensor'), ('manual', 'Manual report')], default='sensor', max_length=10), + ), + migrations.AddField( + model_name='pendingevent', + name='visually_confirmed', + field=models.BooleanField(default=False), + ), + migrations.AlterField( + model_name='event', + name='audio_file', + field=models.FileField(blank=True, upload_to='fireworks_audio/%Y/%m/%d'), + ), + migrations.AlterField( + model_name='pendingevent', + name='audio_file', + field=models.FileField(blank=True, upload_to='fireworks_audio/%Y/%m/%d'), + ), + ] diff --git a/fireworks_detect/migrations/0005_event_latitude_event_longitude_pendingevent_latitude_and_more.py b/fireworks_detect/migrations/0005_event_latitude_event_longitude_pendingevent_latitude_and_more.py new file mode 100644 index 0000000..08ec713 --- /dev/null +++ b/fireworks_detect/migrations/0005_event_latitude_event_longitude_pendingevent_latitude_and_more.py @@ -0,0 +1,33 @@ +# Generated by Django 6.1.1 on 2026-09-29 21:26 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('fireworks_detect', '0004_event_location_event_occurrences_event_source_type_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='latitude', + field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True), + ), + migrations.AddField( + model_name='event', + name='longitude', + field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True), + ), + migrations.AddField( + model_name='pendingevent', + name='latitude', + field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True), + ), + migrations.AddField( + model_name='pendingevent', + name='longitude', + field=models.DecimalField(blank=True, decimal_places=6, max_digits=9, null=True), + ), + ] diff --git a/fireworks_detect/migrations/0006_event_h3_cell_pendingevent_h3_cell.py b/fireworks_detect/migrations/0006_event_h3_cell_pendingevent_h3_cell.py new file mode 100644 index 0000000..ffa9aea --- /dev/null +++ b/fireworks_detect/migrations/0006_event_h3_cell_pendingevent_h3_cell.py @@ -0,0 +1,23 @@ +# Generated by Django 6.1.1 on 2026-09-29 21:41 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('fireworks_detect', '0005_event_latitude_event_longitude_pendingevent_latitude_and_more'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='h3_cell', + field=models.CharField(blank=True, db_index=True, max_length=20), + ), + migrations.AddField( + model_name='pendingevent', + name='h3_cell', + field=models.CharField(blank=True, db_index=True, max_length=20), + ), + ] diff --git a/fireworks_detect/migrations/0007_event_direction_accuracy_degrees_and_more.py b/fireworks_detect/migrations/0007_event_direction_accuracy_degrees_and_more.py new file mode 100644 index 0000000..cd75365 --- /dev/null +++ b/fireworks_detect/migrations/0007_event_direction_accuracy_degrees_and_more.py @@ -0,0 +1,43 @@ +# Generated by Django 6.1.1 on 2026-09-30 07:10 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('fireworks_detect', '0006_event_h3_cell_pendingevent_h3_cell'), + ] + + operations = [ + migrations.AddField( + model_name='event', + name='direction_accuracy_degrees', + field=models.FloatField(blank=True, null=True), + ), + migrations.AddField( + model_name='event', + name='direction_degrees', + field=models.FloatField(blank=True, null=True), + ), + migrations.AddField( + model_name='event', + name='direction_source', + field=models.CharField(blank=True, max_length=32), + ), + migrations.AddField( + model_name='pendingevent', + name='direction_accuracy_degrees', + field=models.FloatField(blank=True, null=True), + ), + migrations.AddField( + model_name='pendingevent', + name='direction_degrees', + field=models.FloatField(blank=True, null=True), + ), + migrations.AddField( + model_name='pendingevent', + name='direction_source', + field=models.CharField(blank=True, max_length=32), + ), + ] diff --git a/fireworks_detect/migrations/__pycache__/0003_classificationrule.cpython-313.pyc b/fireworks_detect/migrations/__pycache__/0003_classificationrule.cpython-313.pyc new file mode 100644 index 0000000..da5c675 Binary files /dev/null and b/fireworks_detect/migrations/__pycache__/0003_classificationrule.cpython-313.pyc differ diff --git a/fireworks_detect/migrations/__pycache__/0004_event_location_event_occurrences_event_source_type_and_more.cpython-313.pyc b/fireworks_detect/migrations/__pycache__/0004_event_location_event_occurrences_event_source_type_and_more.cpython-313.pyc new file mode 100644 index 0000000..c20ead5 Binary files /dev/null and b/fireworks_detect/migrations/__pycache__/0004_event_location_event_occurrences_event_source_type_and_more.cpython-313.pyc differ diff --git a/fireworks_detect/migrations/__pycache__/0005_event_latitude_event_longitude_pendingevent_latitude_and_more.cpython-313.pyc b/fireworks_detect/migrations/__pycache__/0005_event_latitude_event_longitude_pendingevent_latitude_and_more.cpython-313.pyc new file mode 100644 index 0000000..dd332b6 Binary files /dev/null and b/fireworks_detect/migrations/__pycache__/0005_event_latitude_event_longitude_pendingevent_latitude_and_more.cpython-313.pyc differ diff --git a/fireworks_detect/migrations/__pycache__/0006_event_h3_cell_pendingevent_h3_cell.cpython-313.pyc b/fireworks_detect/migrations/__pycache__/0006_event_h3_cell_pendingevent_h3_cell.cpython-313.pyc new file mode 100644 index 0000000..fd97f13 Binary files /dev/null and b/fireworks_detect/migrations/__pycache__/0006_event_h3_cell_pendingevent_h3_cell.cpython-313.pyc differ diff --git a/fireworks_detect/migrations/__pycache__/0007_event_direction_accuracy_degrees_and_more.cpython-313.pyc b/fireworks_detect/migrations/__pycache__/0007_event_direction_accuracy_degrees_and_more.cpython-313.pyc new file mode 100644 index 0000000..fe0d027 Binary files /dev/null and b/fireworks_detect/migrations/__pycache__/0007_event_direction_accuracy_degrees_and_more.cpython-313.pyc differ diff --git a/fireworks_detect/models.py b/fireworks_detect/models.py index 2f3fcb5..b65a4e8 100644 --- a/fireworks_detect/models.py +++ b/fireworks_detect/models.py @@ -1,6 +1,8 @@ +import math import secrets from django.contrib.auth.hashers import check_password, make_password +from django.core.exceptions import ValidationError from django.core.files.storage import default_storage from django.db import models, transaction from django.utils import timezone @@ -44,13 +46,48 @@ class Sensor(models.Model): self.save(update_fields=fields) +class ClassificationRule(models.Model): + """A configurable inclusion or exclusion rule for a classification label.""" + + class RuleType(models.TextChoices): + WHITELIST = "whitelist", "Whitelist" + BLACKLIST = "blacklist", "Blacklist" + + value = models.CharField(max_length=255) + rule_type = models.CharField(max_length=10, choices=RuleType.choices) + enabled = models.BooleanField(default=True) + + class Meta: + ordering = ["value"] + constraints = [ + models.UniqueConstraint(fields=["value", "rule_type"], name="unique_classification_rule"), + ] + + def __str__(self): + return f"{self.value} ({self.get_rule_type_display()})" + + class ClassifiedAudio(models.Model): """Shared fields for a classifier response and its original audio upload.""" - audio_file = models.FileField(upload_to="fireworks_audio/%Y/%m/%d") + class SourceType(models.TextChoices): + SENSOR = "sensor", "Sensor" + MANUAL = "manual", "Manual report" + + audio_file = models.FileField(upload_to="fireworks_audio/%Y/%m/%d", blank=True) sensor = models.ForeignKey(Sensor, null=True, blank=True, on_delete=models.SET_NULL, related_name="%(class)s_records") original_filename = models.CharField(max_length=255) classifier_response = models.JSONField() + source_type = models.CharField(max_length=10, choices=SourceType.choices, default=SourceType.SENSOR) + occurrences = models.PositiveIntegerField(default=1) + location = models.CharField(max_length=255, blank=True) + latitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True) + longitude = models.DecimalField(max_digits=9, decimal_places=6, null=True, blank=True) + h3_cell = models.CharField(max_length=20, blank=True, db_index=True) + visually_confirmed = models.BooleanField(default=False) + direction_degrees = models.FloatField(null=True, blank=True) + direction_accuracy_degrees = models.FloatField(null=True, blank=True) + direction_source = models.CharField(max_length=32, blank=True) created_at = models.DateTimeField(auto_now_add=True) class Meta: @@ -60,6 +97,36 @@ class ClassifiedAudio(models.Model): def __str__(self): return self.original_filename + def clean(self): + super().clean() + errors = {} + if self.direction_degrees is not None and ( + not math.isfinite(self.direction_degrees) or not 0 <= self.direction_degrees < 360 + ): + errors["direction_degrees"] = "Direction must be a finite value from 0 up to, but not including, 360 degrees." + if self.direction_accuracy_degrees is not None and ( + not math.isfinite(self.direction_accuracy_degrees) or self.direction_accuracy_degrees < 0 + ): + errors["direction_accuracy_degrees"] = "Compass accuracy must be a finite, non-negative value." + if errors: + raise ValidationError(errors) + + + @property + def direction_cardinal(self): + if self.direction_degrees is None: + return None + directions = ("N", "NE", "E", "SE", "S", "SW", "W", "NW") + return directions[int((self.direction_degrees + 22.5) % 360 // 45)] + + + @property + def direction_display(self): + if self.direction_degrees is None: + return "—" + return f"{self.direction_degrees:g}° ({self.direction_cardinal})" + + @property def predictions(self): predictions = self.classifier_response.get("predictions", []) @@ -120,6 +187,16 @@ class PendingEvent(ClassifiedAudio): sensor=self.sensor, original_filename=self.original_filename, classifier_response=self.classifier_response, + source_type=self.source_type, + occurrences=self.occurrences, + location=self.location, + latitude=self.latitude, + longitude=self.longitude, + h3_cell=self.h3_cell, + visually_confirmed=self.visually_confirmed, + direction_degrees=self.direction_degrees, + direction_accuracy_degrees=self.direction_accuracy_degrees, + direction_source=self.direction_source, ) self.delete() return event diff --git a/fireworks_detect/templates/fireworks_detect/event_detail.html b/fireworks_detect/templates/fireworks_detect/event_detail.html index abe5cca..be61e06 100644 --- a/fireworks_detect/templates/fireworks_detect/event_detail.html +++ b/fireworks_detect/templates/fireworks_detect/event_detail.html @@ -1 +1,27 @@ -

{{ event.original_filename }}

Approved {{ event.approved_at|date:"j M Y, H:i" }} · {{ result.duration_seconds|default:"—" }} seconds · {{ result.frames_analysed|default:"—" }} frames

Top sound classes

{% for prediction in predictions %}
{{ prediction.label }}{{ prediction.score_display }}
{% empty %}

No predictions returned.

{% endfor %}

Notable moments

{% for prediction in peak_predictions %}
{{ prediction.label }}{{ prediction.time_seconds|default:"—" }}s · {{ prediction.score_display }}
{% empty %}

No peak events returned.

{% endfor %} +{% if event.source_type == "manual" %} +

Manual fireworks report

+

Approved {{ event.approved_at|date:"j M Y, H:i" }} · Reported manually

+

Report details

+
Occurrences{{ event.occurrences }}
+
Location{{ event.location|default:"Not recorded" }}
+
Captured location{{ event_h3_cell|default:"Not recorded" }}
+
Direction{{ event.direction_display }}
+{% if event.direction_accuracy_degrees is not None %}
Compass accuracy±{{ event.direction_accuracy_degrees|floatformat:"-1" }}°
{% endif %} +
Visually confirmed{% if event.visually_confirmed %}Yes{% else %}No{% endif %}
+

This was a manual report; there is no audio classification attached.

+{% else %} +

{{ event.original_filename }}

+

Approved {{ event.approved_at|date:"j M Y, H:i" }} · {{ result.duration_seconds|default:"—" }} seconds · {{ result.frames_analysed|default:"—" }} frames

+

Top sound classes

+{% for prediction in predictions %} +
{{ prediction.label }}{{ prediction.score_display }}
+{% empty %} +

No predictions returned.

+{% endfor %} +

Notable moments

+{% for prediction in peak_predictions %} +
{{ prediction.label }}{{ prediction.time_seconds|default:"—" }}s · {{ prediction.score_display }}
+{% empty %} +

No peak events returned.

+{% endfor %} +{% endif %} diff --git a/fireworks_detect/templates/fireworks_detect/events_list.html b/fireworks_detect/templates/fireworks_detect/events_list.html index fae1a33..7f8cf32 100644 --- a/fireworks_detect/templates/fireworks_detect/events_list.html +++ b/fireworks_detect/templates/fireworks_detect/events_list.html @@ -1 +1,18 @@ -{% if events %}{% for event in events %}{% endfor %}{% else %}

No approved events yet. Submit a classification, then approve it from the Pending page in admin.

{% endif %} +{% if events %} +{% for event in events %} + +{% endfor %} +{% else %} +

No approved events yet. Submit a classification, then approve it from the Pending page in admin.

+{% endif %} diff --git a/fireworks_detect/templates/fireworks_detect/manual_pending_submission.html b/fireworks_detect/templates/fireworks_detect/manual_pending_submission.html new file mode 100644 index 0000000..840b578 --- /dev/null +++ b/fireworks_detect/templates/fireworks_detect/manual_pending_submission.html @@ -0,0 +1,7 @@ +
+{% if error %} + Could not report fireworks

{{ error }}

+{% else %} + Report sent to Pending

{{ pending.occurrences }} occurrence{{ pending.occurrences|pluralize }} reported at {{ pending.created_at|date:"H:i" }}.

+{% endif %} +
diff --git a/fireworks_detect/templates/fireworks_detect/map.html b/fireworks_detect/templates/fireworks_detect/map.html index 5b1fac2..5950f1d 100644 --- a/fireworks_detect/templates/fireworks_detect/map.html +++ b/fireworks_detect/templates/fireworks_detect/map.html @@ -16,10 +16,10 @@ } .topbar { display:flex; align-items:center; justify-content:space-between; gap:1rem; margin-bottom:3.5rem; }.brand { display:flex; align-items:center; gap:.7rem; color:var(--ink); font-size:.9rem; font-weight:800; letter-spacing:.1em; text-decoration:none; text-transform:uppercase; }.brand-mark { display:grid; width:2.25rem; aspect-ratio:1; place-items:center; border-radius:.75rem; color:#141022; background:linear-gradient(135deg,#fcd34d,#fb7185); box-shadow:0 .5rem 1.5rem #fb718550; }.nav { display:flex; gap:.35rem; padding:.25rem; border:1px solid var(--line); border-radius:.75rem; background:#111a31a6; }.nav a { padding:.5rem .75rem; border-radius:.5rem; color:var(--muted); font-size:.86rem; font-weight:700; text-decoration:none; }.nav a[aria-current="page"] { color:var(--ink); background:#2a3b67; } .kicker { margin:0 0 .65rem; color:#bfdbfe; font-size:.76rem; font-weight:800; letter-spacing:.14em; text-transform:uppercase; }.headline { display:flex; align-items:end; justify-content:space-between; gap:2rem; margin-bottom:2rem; }.headline h1 { margin:0; font-size:clamp(2.3rem,5vw,4.5rem); line-height:.98; letter-spacing:-.06em; }.headline p { max-width:30rem; margin:0; color:var(--muted); line-height:1.6; } - .filters { display:grid; grid-template-columns:1.3fr repeat(3,minmax(8rem,1fr)) auto; gap:.75rem; align-items:end; margin-bottom:1rem; padding:1rem; border:1px solid var(--line); border-radius:1.1rem; background:#121d37d9; box-shadow:0 1rem 3rem #03071466; }.filter { display:grid; gap:.35rem; }.filter label { color:#9fb1d5; font-size:.7rem; font-weight:800; letter-spacing:.08em; text-transform:uppercase; }.filter select,.filter input { width:100%; min-height:2.65rem; border:1px solid #354a77; border-radius:.65rem; padding:0 .75rem; color:var(--ink); font:inherit; background:#0c1428; }.filter select:focus,.filter input:focus { outline:2px solid #82b5ff; outline-offset:2px; }.mock-tag { align-self:center; padding:.46rem .65rem; border:1px solid #4a5f8e; border-radius:999px; color:#c9d8f6; font-size:.75rem; font-weight:700; white-space:nowrap; background:#1d2b4e; } - .map-panel { overflow:hidden; border:1px solid var(--line); border-radius:1.25rem; background:var(--surface); box-shadow:0 1.5rem 4rem #0206168a; }.map-header { display:flex; align-items:center; justify-content:space-between; gap:1rem; padding:1rem 1.2rem; border-bottom:1px solid var(--line); }.map-header strong { font-size:.95rem; }.live { display:flex; align-items:center; gap:.45rem; color:#a7f3d0; font-size:.8rem; }.live i { width:.5rem; height:.5rem; border-radius:50%; background:var(--green); box-shadow:0 0 0 .25rem #34d3992e; }.map-wrap { position:relative; }.map { height:clamp(30rem,65vh,45rem); background:#dce4cf; }.legend { position:absolute; z-index:600; right:1rem; bottom:1rem; width:min(15rem,calc(100% - 2rem)); padding:.85rem; border:1px solid #344973; border-radius:.8rem; color:#dce7fe; font-size:.78rem; background:#101a31e8; box-shadow:0 .75rem 2rem #05091480; backdrop-filter:blur(10px); }.legend h2 { margin:0 0 .6rem; font-size:.82rem; }.legend div { display:flex; align-items:center; gap:.5rem; margin-top:.4rem; }.legend-dot { width:.7rem; height:.7rem; border:2px solid #f2c56b; border-radius:50%; background:#ed8e2e88; }.legend-ring { width:.85rem; height:.85rem; border:2px solid #a98af7; border-radius:50%; background:#8b5cf633; }.legend-line { width:1.1rem; border-top:2px dashed #644b9c; }.sensor-icon { display:grid; width:2.1rem; height:2.1rem; place-items:center; border:2px solid #e6edff; border-radius:50%; color:#14203b; font-size:.72rem; font-weight:900; background:linear-gradient(135deg,#a5c8ff,#c4b5fd); box-shadow:0 .2rem .8rem #18275080; }.source-icon { display:grid; width:2.45rem; height:2.45rem; place-items:center; border:2px solid #fff3d5; border-radius:50% 50% 50% 0; color:#452000; font-size:1.15rem; background:#f7a52f; box-shadow:0 .3rem 1rem #a84f2670; transform:rotate(-45deg); }.source-icon span { transform:rotate(45deg); }.direction-arrow { display:block; color:#5c408d; font-size:1.5rem; font-weight:900; line-height:1; text-shadow:0 .1rem .4rem #fff8; } - .leaflet-control-zoom a { color:#243456!important; }.leaflet-popup-content-wrapper,.leaflet-popup-tip { color:#e9f1ff; background:#14203a; }.leaflet-popup-content { margin:.75rem .9rem; font-family:inherit; }.popup-title { display:block; margin-bottom:.2rem; font-weight:800; }.popup-meta { color:#a9b9d8; font-size:.78rem; } - @media (max-width:52rem) { .shell { width:min(100% - 1.25rem,80rem); }.topbar { margin-bottom:2.5rem; }.headline { align-items:start; flex-direction:column; gap:1rem; }.filters { grid-template-columns:1fr 1fr; }.filters .filter:first-child { grid-column:1/-1; }.mock-tag { justify-self:start; }.map { height:32rem; } } + .filters { display:grid; grid-template-columns:repeat(5,minmax(8rem,1fr)) auto auto; gap:.75rem; align-items:end; margin-bottom:1rem; padding:1rem; border:1px solid var(--line); border-radius:1.1rem; background:#121d37d9; box-shadow:0 1rem 3rem #03071466; }.filter { display:grid; gap:.35rem; }.filter label { color:#9fb1d5; font-size:.7rem; font-weight:800; letter-spacing:.08em; text-transform:uppercase; }.filter select,.filter input { width:100%; min-height:2.65rem; border:1px solid #354a77; border-radius:.65rem; padding:0 .75rem; color:var(--ink); font:inherit; background:#0c1428; }.filter select:focus,.filter input:focus { outline:2px solid #82b5ff; outline-offset:2px; }.filter-submit { min-height:2.65rem; border:1px solid #8ab7ff; border-radius:.65rem; padding:0 1rem; color:#101a31; font:inherit; font-weight:800; background:#b9d6ff; cursor:pointer; }.map-tag { align-self:center; padding:.46rem .65rem; border:1px solid #4a5f8e; border-radius:999px; color:#c9d8f6; font-size:.75rem; font-weight:700; white-space:nowrap; background:#1d2b4e; } + .map-panel { overflow:hidden; border:1px solid var(--line); border-radius:1.25rem; background:var(--surface); box-shadow:0 1.5rem 4rem #0206168a; }.map-header { display:flex; align-items:center; justify-content:space-between; gap:1rem; padding:1rem 1.2rem; border-bottom:1px solid var(--line); }.map-header strong { font-size:.95rem; }.live { display:flex; align-items:center; gap:.45rem; color:#a7f3d0; font-size:.8rem; }.live i { width:.5rem; height:.5rem; border-radius:50%; background:var(--green); box-shadow:0 0 0 .25rem #34d3992e; }.map-wrap { position:relative; }.map { height:clamp(30rem,65vh,45rem); background:#dce4cf; }.legend { position:absolute; z-index:600; right:1rem; bottom:1rem; width:min(15rem,calc(100% - 2rem)); padding:.85rem; border:1px solid #344973; border-radius:.8rem; color:#dce7fe; font-size:.78rem; background:#101a31e8; box-shadow:0 .75rem 2rem #05091480; backdrop-filter:blur(10px); }.legend h2 { margin:0 0 .6rem; font-size:.82rem; }.legend div { display:flex; align-items:center; gap:.5rem; margin-top:.4rem; }.legend-dot { width:.7rem; height:.7rem; border:2px solid #f2c56b; border-radius:50%; background:#ed8e2e88; }.legend-ring { width:.85rem; height:.85rem; border:2px solid #a98af7; border-radius:50%; background:#8b5cf633; }.legend-line { width:1.1rem; border-top:2px dashed #644b9c; }.report-icon { display:grid; width:2.3rem; height:2.3rem; place-items:center; border:2px solid #fff3d5; border-radius:50%; color:#452000; font-size:1rem; font-weight:900; background:#f7a52f; box-shadow:0 .3rem 1rem #a84f2670; }.source-icon { display:grid; width:2.45rem; height:2.45rem; place-items:center; border:2px solid #fff3d5; border-radius:50% 50% 50% 0; color:#452000; font-size:1.15rem; background:#f7a52f; box-shadow:0 .3rem 1rem #a84f2670; transform:rotate(-45deg); }.source-icon span { transform:rotate(45deg); }.direction-marker { display:grid; width:3.5rem; height:3.5rem; place-items:center; border:3px solid #fff7e6; border-radius:50%; color:#fff; background:#6d45a0; box-shadow:0 .3rem 1rem #281642b3; }.direction-marker span { display:block; font-size:2.45rem; font-weight:950; line-height:1; text-shadow:0 .1rem .25rem #1e1136; transform-origin:center; } + .map-compass { position:relative; width:5rem; height:5rem; border:2px solid #eaf1ff; border-radius:50%; color:#f7fbff; font-size:.72rem; font-weight:900; background:#111a31e8; box-shadow:0 .5rem 1.5rem #05091480; backdrop-filter:blur(8px); }.map-compass span { position:absolute; display:grid; place-items:center; }.map-compass .compass-n { top:.35rem; left:50%; transform:translateX(-50%); color:#ffd18c; }.map-compass .compass-e { top:50%; right:.45rem; transform:translateY(-50%); }.map-compass .compass-s { bottom:.35rem; left:50%; transform:translateX(-50%); }.map-compass .compass-w { top:50%; left:.45rem; transform:translateY(-50%); }.map-compass .compass-needle { top:1.3rem; left:50%; color:#ffd18c; font-size:2rem; line-height:1; transform:translateX(-50%); text-shadow:0 .1rem .35rem #3b1b48; }.leaflet-control-zoom a { color:#243456!important; }.leaflet-popup-content-wrapper,.leaflet-popup-tip { color:#e9f1ff; background:#14203a; }.leaflet-popup-content { margin:.75rem .9rem; font-family:inherit; }.popup-title { display:block; margin-bottom:.2rem; font-weight:800; }.popup-meta { color:#a9b9d8; font-size:.78rem; } + @media (max-width:52rem) { .shell { width:min(100% - 1.25rem,80rem); }.topbar { margin-bottom:2.5rem; }.headline { align-items:start; flex-direction:column; gap:1rem; }.filters { grid-template-columns:1fr 1fr; }.filters .filter:first-child { grid-column:1/-1; }.map { height:32rem; } } @media (max-width:30rem) { .nav a { padding:.5rem; }.filters { grid-template-columns:1fr; }.filters .filter:first-child { grid-column:auto; } } @@ -34,59 +34,125 @@
-

Future event intelligence

Sound activity map.

-

A concept view of sensors triangulating a likely source. This uses entirely mock data for Heerenveen, ready for future incoming event records.

+

Manual report intelligence

Sound activity map.

+

Reviewed manual reports with a captured location appear as their H3 cell, not their precise coordinates. Saved phone compass readings show the reported direction of the sound.

-
-
-
-
-
- Mock data -
+
+
+
+
+
+
+ + {{ mapped_event_count }} report{{ mapped_event_count|pluralize }} +
-
-
Heerenveen, Netherlands 3 sensors simulated
-
- +
+
Manual reports · privacy-preserving H3 cells H3 resolution {{ h3_resolution }} · sensor layer disabled
+
+
+ {{ h3_cells|json_script:"h3-cells-data" }} + {{ map_events|json_script:"map-events-data" }} diff --git a/fireworks_detect/tests.py b/fireworks_detect/tests.py index 7ce503c..38b8b78 100644 --- a/fireworks_detect/tests.py +++ b/fireworks_detect/tests.py @@ -1,3 +1,266 @@ -from django.test import TestCase +from datetime import timedelta +from decimal import Decimal -# Create your tests here. +from django.core.exceptions import ValidationError +from django.db import IntegrityError, transaction +from django.test import TestCase, override_settings +from django.urls import reverse +from django.utils import timezone + +from .h3_utils import cell_from_coordinates, h3_resolution +from .models import ClassificationRule, Event, PendingEvent + + +class ClassificationRuleApiTests(TestCase): + def test_whitelist_returns_only_enabled_whitelist_entries_in_value_order(self): + ClassificationRule.objects.create(value="Explosion", rule_type=ClassificationRule.RuleType.WHITELIST) + ClassificationRule.objects.create(value="Fireworks", rule_type=ClassificationRule.RuleType.WHITELIST) + ClassificationRule.objects.create(value="Disabled firework", rule_type=ClassificationRule.RuleType.WHITELIST, enabled=False) + ClassificationRule.objects.create(value="Speech", rule_type=ClassificationRule.RuleType.BLACKLIST) + + response = self.client.get(reverse("classification_rules:whitelist")) + + self.assertEqual(response.status_code, 200) + self.assertEqual(response.json(), {"classifications": ["Explosion", "Fireworks"]}) + + def test_blacklist_returns_only_enabled_blacklist_entries_in_value_order(self): + ClassificationRule.objects.create(value="Speech", rule_type=ClassificationRule.RuleType.BLACKLIST) + ClassificationRule.objects.create(value="Conversation", rule_type=ClassificationRule.RuleType.BLACKLIST) + ClassificationRule.objects.create(value="Disabled music", rule_type=ClassificationRule.RuleType.BLACKLIST, enabled=False) + ClassificationRule.objects.create(value="Fireworks", rule_type=ClassificationRule.RuleType.WHITELIST) + + response = self.client.get(reverse("classification_rules:blacklist")) + + self.assertEqual(response.status_code, 200) + self.assertEqual(response.json(), {"classifications": ["Conversation", "Speech"]}) + + def test_classification_rule_is_unique_within_a_rule_type(self): + ClassificationRule.objects.create(value="Fireworks", rule_type=ClassificationRule.RuleType.WHITELIST) + + with transaction.atomic(): + with self.assertRaises(IntegrityError): + ClassificationRule.objects.create(value="Fireworks", rule_type=ClassificationRule.RuleType.WHITELIST) + + ClassificationRule.objects.create(value="Fireworks", rule_type=ClassificationRule.RuleType.BLACKLIST) + + +class ManualPendingEventTests(TestCase): + def test_manual_report_creates_a_timestamped_pending_event(self): + response = self.client.post(reverse("fireworks_detect:submit_manual_pending"), { + "occurrences": "4", + "latitude": "52.1234567", + "longitude": "5.9876543", + }) + + self.assertEqual(response.status_code, 200) + self.assertContains(response, "Report sent to Pending") + pending = PendingEvent.objects.get() + self.assertEqual(pending.original_filename, "Manual fireworks report") + self.assertEqual(pending.source_type, PendingEvent.SourceType.MANUAL) + self.assertEqual(pending.occurrences, 4) + self.assertEqual(pending.latitude, Decimal("52.123457")) + self.assertEqual(pending.longitude, Decimal("5.987654")) + self.assertEqual(pending.h3_cell, cell_from_coordinates(pending.latitude, pending.longitude)) + self.assertIsNone(pending.direction_degrees) + self.assertIsNone(pending.direction_accuracy_degrees) + self.assertEqual(pending.direction_source, "") + self.assertFalse(pending.sensor) + self.assertFalse(pending.audio_file) + self.assertEqual(pending.classifier_response, {}) + self.assertIsNotNone(pending.created_at) + + def test_manual_report_rejects_an_invalid_occurrence_count(self): + response = self.client.post(reverse("fireworks_detect:submit_manual_pending"), {"occurrences": "0"}) + + self.assertEqual(response.status_code, 400) + self.assertContains(response, "Choose between 1 and 1,000 occurrences.", status_code=400) + self.assertFalse(PendingEvent.objects.exists()) + + def test_event_details_and_source_type_are_kept_when_a_pending_event_is_approved(self): + pending = PendingEvent.objects.create( + original_filename="Manual fireworks report", + classifier_response={}, + source_type=PendingEvent.SourceType.MANUAL, + occurrences=3, + location="Back garden", + latitude=Decimal("52.123456"), + longitude=Decimal("5.987654"), + h3_cell=cell_from_coordinates(Decimal("52.123456"), Decimal("5.987654")), + direction_degrees=237, + direction_accuracy_degrees=8, + direction_source="device_compass", + visually_confirmed=True, + ) + + event = pending.approve() + + self.assertEqual(event.source_type, PendingEvent.SourceType.MANUAL) + self.assertEqual(event.occurrences, 3) + self.assertEqual(event.location, "Back garden") + self.assertEqual(event.latitude, Decimal("52.123456")) + self.assertEqual(event.longitude, Decimal("5.987654")) + self.assertEqual(event.h3_cell, pending.h3_cell) + self.assertEqual(event.direction_degrees, 237) + self.assertEqual(event.direction_accuracy_degrees, 8) + self.assertEqual(event.direction_source, "device_compass") + self.assertTrue(event.visually_confirmed) + + def test_existing_style_records_default_to_sensor_source_type(self): + pending = PendingEvent.objects.create(original_filename="recording.wav", classifier_response={}) + + self.assertEqual(pending.source_type, PendingEvent.SourceType.SENSOR) + + def test_home_page_includes_the_manual_report_form(self): + response = self.client.get(reverse("hello")) + + self.assertContains(response, "Report fireworks now") + self.assertContains(response, "I heard fireworks — send to Pending") + self.assertContains(response, "navigator.geolocation") + self.assertContains(response, "Capture direction") + self.assertContains(response, "DeviceOrientationEvent.requestPermission") + self.assertContains(response, 'manual-direction-panel" hidden') + self.assertContains(response, "DeviceOrientationEvent.requestPermission(true)") + self.assertContains(response, 'webkitCompassHeading" in event') + self.assertContains(response, "direction will update live") + self.assertContains(response, "Stop direction capture") + + self.assertContains(response, "htmx.ajax") + def test_manual_event_appears_in_the_normal_event_list_with_its_details(self): + event = Event.objects.create( + original_filename="Manual fireworks report", + classifier_response={}, + source_type=Event.SourceType.MANUAL, + occurrences=5, + location="Back garden", + latitude=Decimal("52.123456"), + longitude=Decimal("5.987654"), + direction_degrees=237, + direction_accuracy_degrees=8, + visually_confirmed=True, + ) + + list_response = self.client.get(reverse("fireworks_detect:events_list")) + self.assertContains(list_response, "Manual fireworks report") + self.assertContains(list_response, "5 occurrences") + self.assertContains(list_response, "Back garden") + + detail_response = self.client.get(reverse("fireworks_detect:event_detail", args=[event.pk])) + self.assertContains(detail_response, "Report details") + self.assertContains(detail_response, "Visually confirmed") + self.assertContains(detail_response, "Captured location") + self.assertContains(detail_response, cell_from_coordinates(event.latitude, event.longitude)) + self.assertNotContains(detail_response, "52.123456, 5.987654") + self.assertContains(detail_response, "237° (SW)") + self.assertContains(detail_response, "Compass accuracy") + + @override_settings(FIREWORKS_H3_RESOLUTION=8) + def test_h3_resolution_is_configurable(self): + self.assertEqual(h3_resolution(), 8) + self.assertTrue(cell_from_coordinates(Decimal("52.123456"), Decimal("5.987654"))) + + def test_map_uses_manual_h3_data_and_excludes_sensor_events(self): + manual_cell = cell_from_coordinates(Decimal("52.123456"), Decimal("5.987654")) + sensor_cell = cell_from_coordinates(Decimal("53.123456"), Decimal("5.987654")) + Event.objects.create( + original_filename="Manual fireworks report", + classifier_response={}, + source_type=Event.SourceType.MANUAL, + occurrences=4, + latitude=Decimal("52.123456"), + longitude=Decimal("5.987654"), + h3_cell=manual_cell, + visually_confirmed=True, + direction_degrees=237, + direction_accuracy_degrees=8, + ) + Event.objects.create( + original_filename="Sensor recording.wav", + classifier_response={}, + source_type=Event.SourceType.SENSOR, + occurrences=9, + latitude=Decimal("53.123456"), + longitude=Decimal("5.987654"), + h3_cell=sensor_cell, + ) + + response = self.client.get(reverse("fireworks_detect:map"), {"range": "all"}) + + self.assertContains(response, "H3 resolution 9") + self.assertContains(response, "map-events-data") + self.assertContains(response, manual_cell) + self.assertContains(response, '"direction_degrees": 237.0') + self.assertContains(response, "cardinalDirection(report.direction_degrees)") + self.assertContains(response, "sensor layer disabled") + self.assertContains(response, "Map compass: north is up") + self.assertContains(response, "Sensor events — coming soon") + self.assertNotContains(response, sensor_cell) + self.assertNotContains(response, "52.123456") + self.assertNotContains(response, "H3 demo cell") + + def test_map_date_range_filters_manual_reports(self): + recent_cell = cell_from_coordinates(Decimal("52.400000"), Decimal("5.700000")) + older_cell = cell_from_coordinates(Decimal("53.400000"), Decimal("5.700000")) + Event.objects.create( + original_filename="Recent manual report", classifier_response={}, + source_type=Event.SourceType.MANUAL, latitude=Decimal("52.400000"), + longitude=Decimal("5.700000"), h3_cell=recent_cell, + ) + older = Event.objects.create( + original_filename="Older manual report", classifier_response={}, + source_type=Event.SourceType.MANUAL, latitude=Decimal("53.400000"), + longitude=Decimal("5.700000"), h3_cell=older_cell, + ) + Event.objects.filter(pk=older.pk).update(created_at=timezone.now() - timedelta(days=8)) + + response = self.client.get(reverse("fireworks_detect:map"), {"range": "7"}) + + self.assertContains(response, recent_cell) + self.assertNotContains(response, older_cell) + self.assertContains(response, "Last 7 days") + + + def test_manual_report_saves_a_valid_compass_direction_and_accuracy(self): + response = self.client.post(reverse("fireworks_detect:submit_manual_pending"), { + "occurrences": "2", + "direction_degrees": "237", + "direction_accuracy_degrees": "8", + }) + + self.assertEqual(response.status_code, 200) + pending = PendingEvent.objects.get() + self.assertEqual(pending.direction_degrees, 237) + self.assertEqual(pending.direction_accuracy_degrees, 8) + self.assertEqual(pending.direction_source, "device_compass") + self.assertEqual(pending.direction_cardinal, "SW") + + def test_zero_degree_direction_is_valid_and_accuracy_may_be_absent(self): + response = self.client.post(reverse("fireworks_detect:submit_manual_pending"), { + "occurrences": "1", + "direction_degrees": "0", + }) + + self.assertEqual(response.status_code, 200) + pending = PendingEvent.objects.get() + self.assertEqual(pending.direction_degrees, 0) + self.assertIsNone(pending.direction_accuracy_degrees) + self.assertEqual(pending.direction_cardinal, "N") + + def test_invalid_directions_are_rejected_by_model_validation_and_not_saved_by_manual_submission(self): + for invalid_direction in (-1, 360): + pending = PendingEvent( + original_filename="Manual fireworks report", + classifier_response={}, + direction_degrees=invalid_direction, + ) + with self.assertRaises(ValidationError): + pending.full_clean() + + response = self.client.post(reverse("fireworks_detect:submit_manual_pending"), { + "occurrences": "1", + "direction_degrees": str(invalid_direction), + }) + self.assertEqual(response.status_code, 200) + saved = PendingEvent.objects.latest("created_at") + self.assertIsNone(saved.direction_degrees) + self.assertIsNone(saved.direction_accuracy_degrees) + self.assertEqual(saved.direction_source, "") diff --git a/fireworks_detect/urls.py b/fireworks_detect/urls.py index 56787f2..dd4c918 100644 --- a/fireworks_detect/urls.py +++ b/fireworks_detect/urls.py @@ -10,6 +10,7 @@ from .views import ( fireworks_map_view, fireworks_view, pending_audio, + submit_manual_pending_event, submit_pending_event, sensor_heartbeat, ) @@ -23,6 +24,7 @@ urlpatterns = [ path("classify/upload/", classify_upload, name="classify_upload"), path("heartbeat/", sensor_heartbeat, name="sensor_heartbeat"), path("submit-pending/", submit_pending_event, name="submit_pending"), + path("submit-manual-pending/", submit_manual_pending_event, name="submit_manual_pending"), path("events/", events_view, name="events"), path("events/list/", events_list, name="events_list"), path("admin-audio/pending//", pending_audio, name="pending_audio"), diff --git a/fireworks_detect/views.py b/fireworks_detect/views.py index ee14c7c..1fdbe93 100644 --- a/fireworks_detect/views.py +++ b/fireworks_detect/views.py @@ -1,3 +1,6 @@ +import math +from datetime import timedelta +from decimal import Decimal, InvalidOperation import json import mimetypes import uuid @@ -9,11 +12,14 @@ from django.contrib.admin.views.decorators import staff_member_required from django.http import FileResponse, Http404, JsonResponse from django.core import signing from django.shortcuts import get_object_or_404, redirect, render +from django.utils import timezone +from django.utils.dateparse import parse_date from django.views.decorators.cache import never_cache from django.views.decorators.csrf import csrf_exempt from django.views.decorators.http import require_http_methods -from .models import Event, PendingEvent, Sensor +from .h3_utils import cell_boundary, cell_center, cell_from_coordinates, h3_resolution +from .models import ClassificationRule, Event, PendingEvent, Sensor CLASSIFIER_URL = "http://192.168.1.122:5000/classify" @@ -35,9 +41,107 @@ def fireworks_view(request): return render(request, "fireworks_detect/home.html") +MAP_DATE_RANGES = { + "7": 7, + "14": 14, + "30": 30, + "all": None, + "custom": None, +} + + +def _map_filters(request): + """Return the selected map filters, using an inclusive date range.""" + selected_range = request.GET.get("range", "14") + if selected_range not in MAP_DATE_RANGES: + selected_range = "14" + + if selected_range == "custom": + date_from = parse_date(request.GET.get("from", "")) + date_to = parse_date(request.GET.get("to", "")) + elif MAP_DATE_RANGES[selected_range]: + date_to = timezone.localdate() + date_from = date_to - timedelta(days=MAP_DATE_RANGES[selected_range] - 1) + else: + date_from = date_to = None + + visual = request.GET.get("visual", "all") + if visual not in {"all", "yes", "no"}: + visual = "all" + return { + "date_from": date_from, + "date_to": date_to, + "range": selected_range, + "visual": visual, + } + + +def _events_for_map(filters): + """Create privacy-preserving map data for reviewed manual reports only.""" + events = Event.objects.filter(source_type=Event.SourceType.MANUAL) + if filters["date_from"]: + events = events.filter(created_at__date__gte=filters["date_from"]) + if filters["date_to"]: + events = events.filter(created_at__date__lte=filters["date_to"]) + if filters["visual"] == "yes": + events = events.filter(visually_confirmed=True) + elif filters["visual"] == "no": + events = events.filter(visually_confirmed=False) + + cells = {} + mapped_events = [] + for event in events.values( + "h3_cell", "latitude", "longitude", "occurrences", "visually_confirmed", + "direction_degrees", "direction_accuracy_degrees", "created_at", + ): + # Coordinates are used only here to derive an H3 cell; they never leave the server. + h3_cell = event["h3_cell"] or cell_from_coordinates(event["latitude"], event["longitude"]) + center = cell_center(h3_cell) if h3_cell else None + boundary = cell_boundary(h3_cell) if h3_cell else None + if not center or not boundary: + continue + + aggregate = cells.setdefault(h3_cell, { + "cell": h3_cell, + "boundary": boundary, + "center": center, + "reports": 0, + "occurrences": 0, + }) + aggregate["reports"] += 1 + aggregate["occurrences"] += event["occurrences"] + mapped_events.append({ + "cell": h3_cell, + "center": center, + "occurrences": event["occurrences"], + "visually_confirmed": event["visually_confirmed"], + # A day is sufficient for this map and avoids sharing a precise report time. + "reported_on": event["created_at"].date().isoformat(), + "direction_degrees": float(event["direction_degrees"]) if event["direction_degrees"] is not None else None, + "direction_accuracy_degrees": ( + float(event["direction_accuracy_degrees"]) + if event["direction_accuracy_degrees"] is not None else None + ), + }) + + return mapped_events, list(cells.values()) + @never_cache def fireworks_map_view(request): - return render(request, "fireworks_detect/map.html") + filters = _map_filters(request) + map_events, h3_cells = _events_for_map(filters) + return render(request, "fireworks_detect/map.html", { + "h3_resolution": h3_resolution(), + "h3_cells": h3_cells, + "map_events": map_events, + "mapped_event_count": len(map_events), + "map_filters": { + "date_from": filters["date_from"].isoformat() if filters["date_from"] else "", + "date_to": filters["date_to"].isoformat() if filters["date_to"] else "", + "range": filters["range"], + "visual": filters["visual"], + }, + }) @never_cache @@ -181,6 +285,68 @@ def submit_pending_event(request): return render(request, "fireworks_detect/pending_submission.html", {"pending": pending}) +def _manual_coordinates(request): + try: + latitude = Decimal(request.POST.get("latitude", "")) + longitude = Decimal(request.POST.get("longitude", "")) + if not -90 <= latitude <= 90 or not -180 <= longitude <= 180: + return None, None + return latitude.quantize(Decimal("0.000001")), longitude.quantize(Decimal("0.000001")) + except (InvalidOperation, TypeError, ValueError): + return None, None + + +def _manual_direction(request): + try: + heading = float(request.POST.get("direction_degrees", "")) + except (TypeError, ValueError): + return None, None + + if not math.isfinite(heading) or not 0 <= heading < 360: + return None, None + + try: + accuracy = float(request.POST.get("direction_accuracy_degrees", "")) + except (TypeError, ValueError): + accuracy = None + if accuracy is not None and (not math.isfinite(accuracy) or accuracy < 0): + accuracy = None + return heading, accuracy + +@require_http_methods(["POST"]) +@never_cache +def submit_manual_pending_event(request): + try: + occurrences = int(request.POST.get("occurrences", "")) + except (TypeError, ValueError): + occurrences = 0 + + if not 1 <= occurrences <= 1000: + return render( + request, + "fireworks_detect/manual_pending_submission.html", + {"error": "Choose between 1 and 1,000 occurrences."}, + status=400, + ) + + latitude, longitude = _manual_coordinates(request) + h3_cell = cell_from_coordinates(latitude, longitude) + direction_degrees, direction_accuracy_degrees = _manual_direction(request) + + pending = PendingEvent.objects.create( + original_filename="Manual fireworks report", + classifier_response={}, + source_type=PendingEvent.SourceType.MANUAL, + occurrences=occurrences, + latitude=latitude, + longitude=longitude, + h3_cell=h3_cell or "", + direction_degrees=direction_degrees, + direction_accuracy_degrees=direction_accuracy_degrees, + direction_source="device_compass" if direction_degrees is not None else "", + ) + return render(request, "fireworks_detect/manual_pending_submission.html", {"pending": pending}) + @never_cache def events_list(request): return render(request, "fireworks_detect/events_list.html", {"events": Event.objects.all()[:30]}) @@ -191,6 +357,7 @@ def event_detail(request, event_id): event = get_object_or_404(Event, pk=event_id) context = _classification_context(event.classifier_response) context["event"] = event + context["event_h3_cell"] = event.h3_cell or cell_from_coordinates(event.latitude, event.longitude) return render(request, "fireworks_detect/event_detail.html", context) @@ -264,3 +431,21 @@ def sensor_heartbeat(request): return _sensor_error("A valid sensor API token is required.", 401) sensor.record_heartbeat() return JsonResponse({"ok": True, "sensor": sensor.name, "heartbeat_at": sensor.last_heartbeat.isoformat()}) + + +@require_http_methods(["GET"]) +def classification_whitelist(request): + classifications = ClassificationRule.objects.filter( + rule_type=ClassificationRule.RuleType.WHITELIST, + enabled=True, + ).order_by("value").values_list("value", flat=True) + return JsonResponse({"classifications": list(classifications)}) + + +@require_http_methods(["GET"]) +def classification_blacklist(request): + classifications = ClassificationRule.objects.filter( + rule_type=ClassificationRule.RuleType.BLACKLIST, + enabled=True, + ).order_by("value").values_list("value", flat=True) + return JsonResponse({"classifications": list(classifications)}) diff --git a/frontend/src/main.js b/frontend/src/main.js new file mode 100644 index 0000000..7cc8c43 --- /dev/null +++ b/frontend/src/main.js @@ -0,0 +1 @@ +// Replace this optional entry point with your project's client-side code. diff --git a/hello/__pycache__/tests.cpython-313.pyc b/hello/__pycache__/tests.cpython-313.pyc new file mode 100644 index 0000000..18b7435 Binary files /dev/null and b/hello/__pycache__/tests.cpython-313.pyc differ diff --git a/hello/templates/home.html b/hello/templates/home.html index bc53e8d..8c0643b 100644 --- a/hello/templates/home.html +++ b/hello/templates/home.html @@ -4,6 +4,7 @@ Welkom · Sound Signal + -
+ {% if user.is_authenticated %}{{ user.get_username|first|upper }}{% endif %} +
+
✦ Sound Signal

Control room

Welkom {{ naam }}

@@ -31,8 +36,158 @@ Open vuurwerk detector Open kaart concept Open formulier + Open gebeurtenissen Audio analysis · Sensor map
+
+

No recording needed

+

Report fireworks now

+

Choose how many times you heard fireworks, then send it straight to Pending. The report is timestamped now.

+
+ {% csrf_token %} + + + + + + + + +
+
+
+
+ diff --git a/members/__pycache__/forms.cpython-313.pyc b/members/__pycache__/forms.cpython-313.pyc index 0d15953..08e52d5 100644 Binary files a/members/__pycache__/forms.cpython-313.pyc and b/members/__pycache__/forms.cpython-313.pyc differ diff --git a/members/__pycache__/models.cpython-313.pyc b/members/__pycache__/models.cpython-313.pyc index 6d0d2e0..1f26496 100644 Binary files a/members/__pycache__/models.cpython-313.pyc and b/members/__pycache__/models.cpython-313.pyc differ diff --git a/members/__pycache__/settings_urls.cpython-313.pyc b/members/__pycache__/settings_urls.cpython-313.pyc new file mode 100644 index 0000000..3622e95 Binary files /dev/null and b/members/__pycache__/settings_urls.cpython-313.pyc differ diff --git a/members/__pycache__/tests.cpython-313.pyc b/members/__pycache__/tests.cpython-313.pyc new file mode 100644 index 0000000..b04a912 Binary files /dev/null and b/members/__pycache__/tests.cpython-313.pyc differ diff --git a/members/__pycache__/views.cpython-313.pyc b/members/__pycache__/views.cpython-313.pyc index c4972be..b960a6a 100644 Binary files a/members/__pycache__/views.cpython-313.pyc and b/members/__pycache__/views.cpython-313.pyc differ diff --git a/members/forms.py b/members/forms.py index 94baa3b..ffa9ab3 100644 --- a/members/forms.py +++ b/members/forms.py @@ -1,8 +1,20 @@ from django import forms -from .models import Member +from .models import Member, UserSettings class MemberForm(forms.ModelForm): class Meta: model = Member fields = ["first_name", "last_name", "phone"] - \ No newline at end of file + + + +class UserSettingsForm(forms.ModelForm): + class Meta: + model = UserSettings + fields = ["ntfy_url", "ntfy_enabled"] + widgets = { + "ntfy_url": forms.URLInput(attrs={"id": "ntfy-url", "placeholder": "https://ntfy.example.com/my-topic"}), + } + + def clean_ntfy_url(self): + return self.cleaned_data["ntfy_url"].strip() diff --git a/members/migrations/0002_usersettings.py b/members/migrations/0002_usersettings.py new file mode 100644 index 0000000..e49f501 --- /dev/null +++ b/members/migrations/0002_usersettings.py @@ -0,0 +1,30 @@ +# Generated by Django 6.1.1 on 2026-09-30 07:38 + +import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0001_initial'), + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name='UserSettings', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ntfy_url', models.URLField(blank=True)), + ('ntfy_enabled', models.BooleanField(default=False)), + ('ntfy_last_tested_at', models.DateTimeField(blank=True, null=True)), + ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='notification_settings', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'User settings', + 'verbose_name_plural': 'User settings', + }, + ), + ] diff --git a/members/migrations/__pycache__/0002_usersettings.cpython-313.pyc b/members/migrations/__pycache__/0002_usersettings.cpython-313.pyc new file mode 100644 index 0000000..7e53fcb Binary files /dev/null and b/members/migrations/__pycache__/0002_usersettings.cpython-313.pyc differ diff --git a/members/models.py b/members/models.py index cf28725..951b3e6 100644 --- a/members/models.py +++ b/members/models.py @@ -1,3 +1,4 @@ +from django.conf import settings from django.db import models # Create your models here. @@ -8,4 +9,19 @@ class Member(models.Model): joined_date = models.DateTimeField(auto_now_add=True) def __str__(self): - return f"{self.first_name} {self.last_name}" \ No newline at end of file + return f"{self.first_name} {self.last_name}" + +class UserSettings(models.Model): + """Per-user configuration for optional notification providers.""" + + user = models.OneToOneField(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="notification_settings") + ntfy_url = models.URLField(blank=True) + ntfy_enabled = models.BooleanField(default=False) + ntfy_last_tested_at = models.DateTimeField(null=True, blank=True) + + class Meta: + verbose_name = "User settings" + verbose_name_plural = "User settings" + + def __str__(self): + return f"Notification settings for {self.user}" diff --git a/members/settings_urls.py b/members/settings_urls.py new file mode 100644 index 0000000..7b0ab02 --- /dev/null +++ b/members/settings_urls.py @@ -0,0 +1,9 @@ +from django.urls import path + +from . import views + + +urlpatterns = [ + path("", views.user_settings, name="user_settings"), + path("notifications/ntfy/test/", views.test_ntfy_notification, name="ntfy_test_notification"), +] diff --git a/members/templates/members/login.html b/members/templates/members/login.html new file mode 100644 index 0000000..e51e5d1 --- /dev/null +++ b/members/templates/members/login.html @@ -0,0 +1,29 @@ + + + + + + Sign in · Sound Signal + + + +
+

✦ Sound Signal

+

Sign in

+

Sign in to manage your notification settings.

+ {% if form.errors %} +
Your username and password did not match. Please try again.
+ {% endif %} +
+ {% csrf_token %} + + {{ form.username }} + + {{ form.password }} + {% if next %}{% endif %} + +
+

You will return to the page you requested.

+
+ + diff --git a/members/templates/members/ntfy_test_result.html b/members/templates/members/ntfy_test_result.html new file mode 100644 index 0000000..e098109 --- /dev/null +++ b/members/templates/members/ntfy_test_result.html @@ -0,0 +1 @@ +{% if success %}
✓ Test notification sent successfully.
{% else %}
Could not send the test notification: {{ error }}
{% endif %} diff --git a/members/templates/members/user_settings.html b/members/templates/members/user_settings.html new file mode 100644 index 0000000..b510d7a --- /dev/null +++ b/members/templates/members/user_settings.html @@ -0,0 +1,32 @@ + + + + + + Settings · Sound Signal + + + + +
+

Settings

+

Manage personal notification preferences.

+ {% if messages %}
    {% for message in messages %}
  • {{ message }}
  • {% endfor %}
{% endif %} +
+ {% csrf_token %} +
+

Notifications / ntfy

+

Use a topic URL from your ntfy server. Test the current URL before saving it.

+ + {{ form.ntfy_url }} + {{ form.ntfy_url.errors }} +
{{ form.ntfy_enabled }}
+ +
+
+ +
+
+ + + diff --git a/members/tests.py b/members/tests.py index 7ce503c..ed7b6f7 100644 --- a/members/tests.py +++ b/members/tests.py @@ -1,3 +1,164 @@ -from django.test import TestCase +from socket import timeout as SocketTimeout +from unittest.mock import MagicMock, patch +from urllib.error import HTTPError, URLError -# Create your tests here. +from django.contrib.auth import get_user_model +from django.test import SimpleTestCase, TestCase +from django.urls import reverse + +from notifications.services import NotificationError, send_notification, send_ntfy_notification + +from .models import UserSettings + + + +class NtfyNotificationServiceTests(SimpleTestCase): + @patch("notifications.services.urlopen") + def test_posts_a_title_and_message_to_the_topic_url(self, mock_urlopen): + response = MagicMock() + response.getcode.return_value = 200 + mock_urlopen.return_value = response + + self.assertTrue(send_ntfy_notification("https://ntfy.example.com/private-topic", "Fireworks Detector", "Test message")) + + request = mock_urlopen.call_args.args[0] + self.assertEqual(request.get_method(), "POST") + self.assertEqual(request.data, b"Test message") + self.assertEqual(request.get_header("Title"), "Fireworks Detector") + + @patch("notifications.services.urlopen", side_effect=HTTPError("https://ntfy.example.com/topic", 503, "Unavailable", None, None)) + def test_non_success_http_response_is_a_safe_failure(self, mock_urlopen): + with self.assertRaisesMessage(NotificationError, "HTTP 503"): + send_ntfy_notification("https://ntfy.example.com/topic", "Title", "Message") + + @patch("notifications.services.urlopen", side_effect=URLError(SocketTimeout())) + def test_timeout_is_a_safe_failure(self, mock_urlopen): + with self.assertRaisesMessage(NotificationError, "timed out"): + send_ntfy_notification("https://ntfy.example.com/topic", "Title", "Message") + + +class UserSettingsNtfyTests(TestCase): + url = "https://ntfy.example.com/private-topic" + + def setUp(self): + self.user = get_user_model().objects.create_user(username="first-user", password="secret") + self.other_user = get_user_model().objects.create_user(username="other-user", password="secret") + self.client.force_login(self.user) + + def test_test_endpoint_requires_login(self): + self.client.logout() + + response = self.client.post(reverse("ntfy_test_notification"), {"ntfy_url": self.url}) + + self.assertEqual(response.status_code, 302) + + @patch("members.views.send_ntfy_notification") + def test_invalid_url_is_rejected_without_sending(self, mock_send): + response = self.client.post(reverse("ntfy_test_notification"), {"ntfy_url": "not a URL"}) + + self.assertEqual(response.status_code, 400) + self.assertContains(response, "valid HTTP or HTTPS", status_code=400) + mock_send.assert_not_called() + + @patch("members.views.send_ntfy_notification") + def test_successful_test_returns_inline_success_and_marks_current_url_in_session(self, mock_send): + response = self.client.post(reverse("ntfy_test_notification"), {"ntfy_url": self.url}) + + self.assertEqual(response.status_code, 200) + self.assertContains(response, "Test notification sent successfully") + mock_send.assert_called_once_with( + self.url, + title="Fireworks Detector", + message="ntfy notifications are configured correctly.", + ) + + @patch("members.views.send_ntfy_notification", side_effect=NotificationError("Connection to the ntfy server timed out.")) + def test_delivery_failure_returns_an_inline_safe_error(self, mock_send): + response = self.client.post(reverse("ntfy_test_notification"), {"ntfy_url": self.url}) + + self.assertEqual(response.status_code, 502) + self.assertContains(response, "timed out", status_code=502) + + def test_user_cannot_save_an_untested_url(self): + response = self.client.post(reverse("user_settings"), {"ntfy_url": self.url, "ntfy_enabled": "on"}) + + self.assertEqual(response.status_code, 200) + self.assertContains(response, "Test this URL successfully") + settings = UserSettings.objects.get(user=self.user) + self.assertFalse(settings.ntfy_enabled) + self.assertEqual(settings.ntfy_url, "") + + @patch("members.views.send_ntfy_notification") + def test_successfully_tested_url_can_be_saved(self, mock_send): + self.client.post(reverse("ntfy_test_notification"), {"ntfy_url": self.url}) + + response = self.client.post(reverse("user_settings"), {"ntfy_url": self.url, "ntfy_enabled": "on"}) + + self.assertRedirects(response, reverse("user_settings")) + settings = UserSettings.objects.get(user=self.user) + self.assertEqual(settings.ntfy_url, self.url) + self.assertTrue(settings.ntfy_enabled) + self.assertIsNotNone(settings.ntfy_last_tested_at) + + @patch("members.views.send_ntfy_notification") + def test_changing_the_url_requires_another_successful_test(self, mock_send): + self.client.post(reverse("ntfy_test_notification"), {"ntfy_url": self.url}) + self.client.post(reverse("user_settings"), {"ntfy_url": self.url, "ntfy_enabled": "on"}) + + changed_url = "https://ntfy.example.com/another-topic" + response = self.client.post(reverse("user_settings"), {"ntfy_url": changed_url, "ntfy_enabled": "on"}) + + self.assertEqual(response.status_code, 200) + self.assertContains(response, "Test this URL successfully") + self.assertEqual(UserSettings.objects.get(user=self.user).ntfy_url, self.url) + + @patch("members.views.send_ntfy_notification") + def test_one_users_successful_test_cannot_authorize_another_users_settings(self, mock_send): + self.client.post(reverse("ntfy_test_notification"), {"ntfy_url": self.url}) + self.client.force_login(self.other_user) + + response = self.client.post(reverse("user_settings"), {"ntfy_url": self.url, "ntfy_enabled": "on"}) + + self.assertEqual(response.status_code, 200) + self.assertContains(response, "Test this URL successfully") + settings = UserSettings.objects.get(user=self.other_user) + self.assertFalse(settings.ntfy_enabled) + + @patch("notifications.services.send_ntfy_notification") + def test_reusable_sender_only_delivers_for_enabled_user_settings(self, mock_send): + self.assertFalse(send_notification(self.user, "Title", "Message")) + UserSettings.objects.create(user=self.user, ntfy_url=self.url, ntfy_enabled=True) + + self.assertTrue(send_notification(self.user, "Title", "Message")) + mock_send.assert_called_once_with(self.url, "Title", "Message") + + +class FrontendAuthenticationTests(TestCase): + def setUp(self): + self.user = get_user_model().objects.create_user(username="profile-user", password="secret") + + def test_frontend_login_page_is_available(self): + response = self.client.get(reverse("login")) + + self.assertEqual(response.status_code, 200) + self.assertContains(response, "Sign in") + self.assertContains(response, "csrfmiddlewaretoken") + + def test_frontend_login_authenticates_and_returns_home(self): + response = self.client.post(reverse("login"), {"username": "profile-user", "password": "secret"}) + + self.assertRedirects(response, "/") + + def test_protected_settings_redirects_to_frontend_login(self): + response = self.client.get(reverse("user_settings")) + + self.assertRedirects(response, "/login/?next=/settings/") + + def test_profile_circle_is_visible_only_for_authenticated_users(self): + anonymous_response = self.client.get(reverse("hello")) + self.assertNotContains(anonymous_response, "class=\"profile-circle\"") + + self.client.force_login(self.user) + authenticated_response = self.client.get(reverse("hello")) + self.assertContains(authenticated_response, "class=\"profile-circle\"") + self.assertContains(authenticated_response, reverse("user_settings")) diff --git a/members/views.py b/members/views.py index e38670e..2764ac3 100644 --- a/members/views.py +++ b/members/views.py @@ -1,6 +1,16 @@ +from hashlib import sha256 + +from django.contrib import messages +from django.contrib.auth.decorators import login_required +from django.core.exceptions import ValidationError +from django.core.validators import URLValidator from django.shortcuts import render, redirect -from .forms import MemberForm -from .models import Member +from django.utils import timezone +from django.views.decorators.http import require_POST + +from notifications.services import NotificationError, send_ntfy_notification +from .forms import MemberForm, UserSettingsForm +from .models import Member, UserSettings def member_create(request): if request.method == "POST": @@ -32,4 +42,76 @@ def hello_form(request): else: message = "Please enter your name." - return render(request, "hello-form.html", {"message": message}) \ No newline at end of file + return render(request, "hello-form.html", {"message": message}) + +NTFY_TEST_SESSION_PREFIX = "ntfy_tested_url_fingerprint" + + +def _validated_ntfy_url(value): + url = value.strip() + if not url: + raise ValidationError("Enter an ntfy topic URL.") + URLValidator(schemes=["http", "https"])(url) + return url + + +def _ntfy_test_session_key(user): + return f"{NTFY_TEST_SESSION_PREFIX}:{user.pk}" + + +def _url_fingerprint(url): + return sha256(url.encode("utf-8")).hexdigest() + + +@login_required +def user_settings(request): + settings, _ = UserSettings.objects.get_or_create(user=request.user) + saved_ntfy_url = settings.ntfy_url + if request.method == "POST": + form = UserSettingsForm(request.POST, instance=settings) + if form.is_valid(): + url = form.cleaned_data["ntfy_url"] + tested_fingerprint = request.session.get(_ntfy_test_session_key(request.user)) + was_previously_tested = saved_ntfy_url == url and settings.ntfy_last_tested_at is not None + if url and tested_fingerprint != _url_fingerprint(url) and not was_previously_tested: + form.add_error("ntfy_url", "Test this URL successfully before saving notification settings.") + else: + settings = form.save(commit=False) + if not url: + settings.ntfy_enabled = False + settings.ntfy_last_tested_at = None + elif tested_fingerprint == _url_fingerprint(url): + settings.ntfy_last_tested_at = timezone.now() + settings.save() + request.session.pop(_ntfy_test_session_key(request.user), None) + messages.success(request, "Notification settings saved.") + return redirect("user_settings") + else: + form = UserSettingsForm(instance=settings) + return render(request, "members/user_settings.html", {"form": form}) + + +@login_required +@require_POST +def test_ntfy_notification(request): + try: + url = _validated_ntfy_url(request.POST.get("ntfy_url", "")) + except ValidationError: + return render( + request, + "members/ntfy_test_result.html", + {"error": "Enter a valid HTTP or HTTPS ntfy topic URL."}, + status=400, + ) + + try: + send_ntfy_notification( + url, + title="Fireworks Detector", + message="ntfy notifications are configured correctly.", + ) + except NotificationError as error: + return render(request, "members/ntfy_test_result.html", {"error": str(error)}, status=502) + + request.session[_ntfy_test_session_key(request.user)] = _url_fingerprint(url) + return render(request, "members/ntfy_test_result.html", {"success": True}) diff --git a/myproject/__pycache__/settings.cpython-313.pyc b/myproject/__pycache__/settings.cpython-313.pyc index 8e5c4f5..6504829 100644 Binary files a/myproject/__pycache__/settings.cpython-313.pyc and b/myproject/__pycache__/settings.cpython-313.pyc differ diff --git a/myproject/__pycache__/urls.cpython-313.pyc b/myproject/__pycache__/urls.cpython-313.pyc index 0a3e8d4..057e8dd 100644 Binary files a/myproject/__pycache__/urls.cpython-313.pyc and b/myproject/__pycache__/urls.cpython-313.pyc differ diff --git a/myproject/settings.py b/myproject/settings.py index 86681d1..c84e1a8 100644 --- a/myproject/settings.py +++ b/myproject/settings.py @@ -32,6 +32,8 @@ ALLOWED_HOSTS = ["django.jorendegraaf.eu", "100.91.62.59"] CSRF_TRUSTED_ORIGINS = ["https://django.jorendegraaf.eu"] # Caddy supplies this header for proxied HTTPS requests. SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https") +LOGIN_URL = "/login/" +LOGIN_REDIRECT_URL = "/" # Application definition @@ -43,6 +45,7 @@ INSTALLED_APPS = [ 'django.contrib.sessions', 'django.contrib.messages', 'django.contrib.staticfiles', + 'vite_integration', 'hello', 'fireworks_detect', 'members' @@ -124,6 +127,9 @@ USE_TZ = True # https://docs.djangoproject.com/en/6.1/howto/static-files/ STATICFILES_DIRS = [BASE_DIR / 'project_admin' / 'static'] + +# H3 resolution for new coordinate-bearing fireworks records (0–15). +FIREWORKS_H3_RESOLUTION = 9 STATIC_URL = 'static/' STATIC_ROOT = BASE_DIR / 'staticfiles' MEDIA_URL = 'media/' diff --git a/myproject/urls.py b/myproject/urls.py index 59c20a7..2a69a57 100644 --- a/myproject/urls.py +++ b/myproject/urls.py @@ -15,12 +15,16 @@ Including another URLconf 2. Add a URL to urlpatterns: path('blog/', include('blog.urls')) """ from django.contrib import admin +from django.contrib.auth import views as auth_views from django.conf import settings from django.urls import path, include, re_path from django.views.static import serve urlpatterns = [ path('admin/', admin.site.urls), + path('login/', auth_views.LoginView.as_view(template_name='members/login.html'), name='login'), + path('classifications/', include('fireworks_detect.classification_urls')), + path('settings/', include('members.settings_urls')), path('', include('hello.urls')), path('fireworks/', include('fireworks_detect.urls')), path('members/', include('members.urls')) diff --git a/notifications/__init__.py b/notifications/__init__.py new file mode 100644 index 0000000..708741a --- /dev/null +++ b/notifications/__init__.py @@ -0,0 +1,3 @@ +from .services import NotificationError, send_notification, send_ntfy_notification + +__all__ = ["NotificationError", "send_notification", "send_ntfy_notification"] diff --git a/notifications/__pycache__/__init__.cpython-313.pyc b/notifications/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..c49c5d1 Binary files /dev/null and b/notifications/__pycache__/__init__.cpython-313.pyc differ diff --git a/notifications/__pycache__/services.cpython-313.pyc b/notifications/__pycache__/services.cpython-313.pyc new file mode 100644 index 0000000..7a66174 Binary files /dev/null and b/notifications/__pycache__/services.cpython-313.pyc differ diff --git a/notifications/services.py b/notifications/services.py new file mode 100644 index 0000000..8018381 --- /dev/null +++ b/notifications/services.py @@ -0,0 +1,52 @@ +"""Small reusable notification helpers for project notification providers.""" + +import socket +from urllib.error import HTTPError, URLError +from urllib.request import Request, urlopen + + +class NotificationError(Exception): + """A safe, user-displayable notification delivery failure.""" + + +def send_ntfy_notification(url, title, message, timeout=10): + """Publish a plain-text notification to an ntfy topic URL.""" + request = Request( + url, + data=message.encode("utf-8"), + headers={"Content-Type": "text/plain; charset=utf-8", "Title": title}, + method="POST", + ) + try: + response = urlopen(request, timeout=timeout) + status_code = response.getcode() + response.close() + except HTTPError as error: + raise NotificationError(f"ntfy server responded with HTTP {error.code}.") from error + except (TimeoutError, socket.timeout): + raise NotificationError("Connection to the ntfy server timed out.") from None + except URLError as error: + if isinstance(error.reason, (TimeoutError, socket.timeout)): + raise NotificationError("Connection to the ntfy server timed out.") from error + raise NotificationError("Could not connect to the ntfy server.") from error + except OSError as error: + raise NotificationError("Could not connect to the ntfy server.") from error + + if not 200 <= status_code < 300: + raise NotificationError(f"ntfy server responded with HTTP {status_code}.") + return True + + +def send_notification(user, title, message): + """Send through the user's enabled provider, or safely do nothing.""" + from members.models import UserSettings + + try: + settings = UserSettings.objects.get(user=user) + except UserSettings.DoesNotExist: + return False + + if not settings.ntfy_enabled or not settings.ntfy_url: + return False + send_ntfy_notification(settings.ntfy_url, title, message) + return True diff --git a/package-lock.json b/package-lock.json new file mode 100644 index 0000000..cb5d650 --- /dev/null +++ b/package-lock.json @@ -0,0 +1,1435 @@ +{ + "name": "django-vite-integration", + "lockfileVersion": 3, + "requires": true, + "packages": { + "": { + "name": "django-vite-integration", + "devDependencies": { + "concurrently": "^9.1.2", + "vite": "^6.2.0" + } + }, + "node_modules/@esbuild/aix-ppc64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz", + "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "aix" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz", + "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz", + "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/android-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz", + "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz", + "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/darwin-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz", + "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz", + "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/freebsd-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz", + "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz", + "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz", + "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ia32": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz", + "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-loong64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz", + "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-mips64el": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz", + "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==", + "cpu": [ + "mips64el" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-ppc64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz", + "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-riscv64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz", + "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-s390x": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz", + "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/linux-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz", + "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz", + "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/netbsd-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz", + "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "netbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz", + "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openbsd-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz", + "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/openharmony-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz", + "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/sunos-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz", + "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "sunos" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-arm64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz", + "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-ia32": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz", + "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@esbuild/win32-x64": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz", + "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ], + "engines": { + "node": ">=18" + } + }, + "node_modules/@napi-rs/lzma-linux-x64-gnu": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/@napi-rs/lzma-linux-x64-gnu/-/lzma-linux-x64-gnu-1.5.1.tgz", + "integrity": "sha512-oTXEIha4SsuXdTA4Iyskj0kpdx2yVXdhd75c2v3xGrHFfVMsbhTPZU/nMPL4sWKo4pBHm3aucLaqGlF696dTyQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ], + "engines": { + "node": "^22.20 || ^24.12 || >=25" + } + }, + "node_modules/@rollup/rollup-android-arm-eabi": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.63.5.tgz", + "integrity": "sha512-J25QJU+B78T4FhhBsNpLJyVWOi31mwtpcMwywHmOKH65Q9IWGA81gPj+dnwlhU8wktVriYE+tFAaQgrnJRzAZg==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-android-arm64": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.63.5.tgz", + "integrity": "sha512-LDopB3zuZM5Ux9TT2luNEBJW/tYbGU2g1d+VpKk6I+gSKDb+/7sYE6M225gRQt4RbMX6MSwMsVR/phdjVUgRLg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "android" + ] + }, + "node_modules/@rollup/rollup-darwin-arm64": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.63.5.tgz", + "integrity": "sha512-wlJEERGfeuHeBavCL2qVnNacOK43NDoZM4sjkeRPymd04OAE9T1zBqDJgmZ+CIsPTYKwdzpUC8vmOw84dwY4Tg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-darwin-x64": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.63.5.tgz", + "integrity": "sha512-4nJJGg5jbo2wwPP4JP+LfEBA3bvP8rU9CLuhp7jWvq9sxEyhjQFTFdrqi+/dHEin/pd8jpT0vcehIpnZtmEdcQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ] + }, + "node_modules/@rollup/rollup-freebsd-arm64": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.63.5.tgz", + "integrity": "sha512-DrZbyCDF1hneuO6jRbvZ2D7+PIBM6yIwYnJpg2vIk58T+wuFpiaGZrfUr59lDWw45bg+IrpTGLPiNi/Fk4w3Cg==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-freebsd-x64": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.63.5.tgz", + "integrity": "sha512-gqfUVMJMB3mehqywxp6hTBFfgtMQykZY19+cfiaYP0toIJLb/1DZRJHVkQQGP13W4TAwfZDWeg1qBcheTRioXQ==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "freebsd" + ] + }, + "node_modules/@rollup/rollup-linux-arm-gnueabihf": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.63.5.tgz", + "integrity": "sha512-CFmhpvAwzSaWMlN3VN7UtmoTihlZNzoP0juQib5TQRnYUyDV8dXeWOp29sobWAT6gXl/hQgAClLlEiYozQG3OQ==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm-musleabihf": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.63.5.tgz", + "integrity": "sha512-Uc9H8eXCOayV6JLTH5bXKMId6qbhNHa818/BgYjm4jrlq3vZquC9cqyvHBw17xy5Mnj5f+I3gFK5JcEf3hSqrw==", + "cpu": [ + "arm" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-gnu": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.63.5.tgz", + "integrity": "sha512-VcPr/szv/1BFw112Kt//fxulXt/JPqzzidU84iW68L2DdjnOO8QFUv2zTSYBEPHD6movBD4z+bbr5y60GYM7Jw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-arm64-musl": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.63.5.tgz", + "integrity": "sha512-BnxtJ5/91BrIHYIkGrmjz/lbMhqEHt1dPFqIxIFR+jPn0xVc/oUSCtIT089zfp5ufwGDlYz2UC+Fe1SRBpYFbQ==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-gnu": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.63.5.tgz", + "integrity": "sha512-LrYcHZwF+fAMNKHYTOQ5osWM4AZF7YF6D+XtsjDyEvljtt11twc+zHVXBLNEjxVSUnKYsOhvVz4Z213eW02COQ==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-loong64-musl": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.63.5.tgz", + "integrity": "sha512-nj7QKQePAAUpCpJHtg0pR0W/b92A9NO17JS3BAQmHDn/yhmkir2p8llrKY9TOhleKIaSzy1JhxS3T9FVld6coA==", + "cpu": [ + "loong64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-gnu": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.63.5.tgz", + "integrity": "sha512-5ylkX6dWMeBKge9nTU+Rxfb+ZfaCIJ9lRqIFaK0eAMcWp7OJbYnLveLgXmm0VrvuLKb8qIK+mHyH0qu88RM+iA==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-ppc64-musl": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.63.5.tgz", + "integrity": "sha512-oHK4ZHYFDKjZviK34I+NwgfbGxgI7ztrNxj2hPTSSNFgeq1a/lEd7dHV2fdGAuTH4Iym3RHJg+vAbWaWG4B7Zg==", + "cpu": [ + "ppc64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-gnu": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.63.5.tgz", + "integrity": "sha512-UcetmHZ6XOXuUByiKZyQmb55ZPr0LABr3Ec/HB9wKZn6CEAFWZkE+hsJErJ9hbPBC7nI0dKuELx7CoV6IM7TMg==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-riscv64-musl": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.63.5.tgz", + "integrity": "sha512-C5CmDPQBtvjVo8cgQsBs+w6WB0JLkiixhgi6hVLV11hERWdn/p0XcPU2OUcZzac9BPOFq7SbaHFa8r3SWEysCQ==", + "cpu": [ + "riscv64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-s390x-gnu": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.63.5.tgz", + "integrity": "sha512-lHVQHJFKsuuxLMi3MQO9XVL8Tje3JR82CzB+QDKC5NWBcsIWuwsn9uIM5e3lBhI+fF1/s63qnyYqsg65+8rV/w==", + "cpu": [ + "s390x" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-gnu": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.63.5.tgz", + "integrity": "sha512-3W9bTFcQNJn71cSJVM9RKIiZOy8DO/XLDii8Uv/Pm6WKqDRj7JV3ZfuXIEfyuy5LXpIzAbB/1M4Ukp9GKNa7nA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-linux-x64-musl": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.63.5.tgz", + "integrity": "sha512-VDC7rRJlee/scpki96GZ27Omf6yU87s1YXwVTpjE5841faVlDYYT565rgfmoR1U0sqL7z5ivQSDjcsF6VRXyBA==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "linux" + ] + }, + "node_modules/@rollup/rollup-openbsd-x64": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.63.5.tgz", + "integrity": "sha512-z86Ok2p4pTdv5xqCKZsTooO7yBEiaJR/HzU3Wx8RmWsPoLppnMKROhJusQob8B3IE1ghC343kUW9rC2r+Wf3ig==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openbsd" + ] + }, + "node_modules/@rollup/rollup-openharmony-arm64": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.63.5.tgz", + "integrity": "sha512-IzQmj+xXwQFGhMAMKMQVXkMwMZN3TqkJgAE0nSsqvVwWWciP4AIPMmWRqOQ2GfX7TUDZr+xqGFcBS36CRPGw0g==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "openharmony" + ] + }, + "node_modules/@rollup/rollup-win32-arm64-msvc": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.63.5.tgz", + "integrity": "sha512-F6qpTaPc9bwBH85kjy0/BLmLSW1uv7AoOXCoRIkg2arlgCYlWYcAbiMkvZuAcaWk9TpCRG//okznLAqLGshkMw==", + "cpu": [ + "arm64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-ia32-msvc": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.63.5.tgz", + "integrity": "sha512-igoDsTFhhwECBeGbUuLeIk7t8Y1apa+cs6mDWpx2EZ0ch7oEQgzHbFUXN9euoHekCAQzXdXApAGkV6jznS7tWw==", + "cpu": [ + "ia32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-gnu": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.63.5.tgz", + "integrity": "sha512-U3teMeMbXFmaM5D+OTJpsOXd+wV/qftIeYF9kBKL4v73641qyJmoXFtA28DQLsnmlyayEsTe72xpLHrArq6vHw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@rollup/rollup-win32-x64-msvc": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.63.5.tgz", + "integrity": "sha512-ypfC34F3RKXvCXBglGqGMsUSMKlgwd1HX9AOAlx9RoZZ6GaI42YHVeKpzg3JG+wpBUJYTG+NNZhqbDWL8tBZkw==", + "cpu": [ + "x64" + ], + "dev": true, + "license": "MIT", + "optional": true, + "os": [ + "win32" + ] + }, + "node_modules/@types/estree": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", + "dev": true, + "license": "MIT" + }, + "node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/chalk?sponsor=1" + } + }, + "node_modules/chalk/node_modules/supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/cliui": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", + "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", + "dev": true, + "license": "ISC", + "dependencies": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.1", + "wrap-ansi": "^7.0.0" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-name": "~1.1.4" + }, + "engines": { + "node": ">=7.0.0" + } + }, + "node_modules/color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, + "license": "MIT" + }, + "node_modules/concurrently": { + "version": "9.2.4", + "resolved": "https://registry.npmjs.org/concurrently/-/concurrently-9.2.4.tgz", + "integrity": "sha512-TZ0CEhyzvFjgtAvHTusDMgj7wNdihCh7LLLrzdUOXIhdlnL2JBBGA9eJxR24rtqgmdjh3OA3hrN1rCHj6HM8qA==", + "dev": true, + "license": "MIT", + "dependencies": { + "chalk": "4.1.2", + "rxjs": "7.8.2", + "shell-quote": "1.9.0", + "supports-color": "8.1.1", + "tree-kill": "1.2.2", + "yargs": "17.7.2" + }, + "bin": { + "conc": "dist/bin/concurrently.js", + "concurrently": "dist/bin/concurrently.js" + }, + "engines": { + "node": ">=18" + }, + "funding": { + "url": "https://github.com/open-cli-tools/concurrently?sponsor=1" + } + }, + "node_modules/emoji-regex": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", + "dev": true, + "license": "MIT" + }, + "node_modules/esbuild": { + "version": "0.25.12", + "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz", + "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "bin": { + "esbuild": "bin/esbuild" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "@esbuild/aix-ppc64": "0.25.12", + "@esbuild/android-arm": "0.25.12", + "@esbuild/android-arm64": "0.25.12", + "@esbuild/android-x64": "0.25.12", + "@esbuild/darwin-arm64": "0.25.12", + "@esbuild/darwin-x64": "0.25.12", + "@esbuild/freebsd-arm64": "0.25.12", + "@esbuild/freebsd-x64": "0.25.12", + "@esbuild/linux-arm": "0.25.12", + "@esbuild/linux-arm64": "0.25.12", + "@esbuild/linux-ia32": "0.25.12", + "@esbuild/linux-loong64": "0.25.12", + "@esbuild/linux-mips64el": "0.25.12", + "@esbuild/linux-ppc64": "0.25.12", + "@esbuild/linux-riscv64": "0.25.12", + "@esbuild/linux-s390x": "0.25.12", + "@esbuild/linux-x64": "0.25.12", + "@esbuild/netbsd-arm64": "0.25.12", + "@esbuild/netbsd-x64": "0.25.12", + "@esbuild/openbsd-arm64": "0.25.12", + "@esbuild/openbsd-x64": "0.25.12", + "@esbuild/openharmony-arm64": "0.25.12", + "@esbuild/sunos-x64": "0.25.12", + "@esbuild/win32-arm64": "0.25.12", + "@esbuild/win32-ia32": "0.25.12", + "@esbuild/win32-x64": "0.25.12" + } + }, + "node_modules/escalade": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", + "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=6" + } + }, + "node_modules/fdir": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } + } + }, + "node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "hasInstallScript": true, + "license": "MIT", + "optional": true, + "os": [ + "darwin" + ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", + "dev": true, + "license": "ISC", + "engines": { + "node": "6.* || 8.* || >= 10.*" + } + }, + "node_modules/has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/is-fullwidth-code-point": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=8" + } + }, + "node_modules/nanoid": { + "version": "3.3.19", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.19.tgz", + "integrity": "sha512-Y2tUNy4ouw6tq5oDSKeQYGOyhkUBhNOcGV/02KC+6kd9eDGqdZd++mjMiIDilrBYvjEnCYvVtsuHCuP+okSfug==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.cjs" + }, + "engines": { + "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" + } + }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", + "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", + "dev": true, + "license": "ISC" + }, + "node_modules/picomatch": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz", + "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/jonschlinkert" + } + }, + "node_modules/postcss": { + "version": "8.5.28", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.28.tgz", + "integrity": "sha512-RRuzqDtt5Y9h3quz5hWhK+TPnsmVs6WwSU6LkJMeY4HstUEDuYTG8UJSdawMRzmzAtV+KEoG8N3Qg2qLy5vM/A==", + "dev": true, + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/postcss/" + }, + { + "type": "tidelift", + "url": "https://tidelift.com/funding/github/npm/postcss" + }, + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "dependencies": { + "nanoid": "^3.3.18", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" + }, + "engines": { + "node": "^10 || ^12 || >=14" + } + }, + "node_modules/require-directory": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", + "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/rollup": { + "version": "4.63.5", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.63.5.tgz", + "integrity": "sha512-KRWwmNLlPw5M7HcdYfm15oBv9n9LPtjzpzCIxS/phwqvPyxHSoKX6Y2YU3pxSPfy0CLquVgsx/j/hBi6OvH1Nw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "1.0.9" + }, + "bin": { + "rollup": "dist/bin/rollup" + }, + "engines": { + "node": ">=18.0.0", + "npm": ">=8.0.0" + }, + "optionalDependencies": { + "@napi-rs/lzma-linux-x64-gnu": "1.5.1", + "@rollup/rollup-android-arm-eabi": "4.63.5", + "@rollup/rollup-android-arm64": "4.63.5", + "@rollup/rollup-darwin-arm64": "4.63.5", + "@rollup/rollup-darwin-x64": "4.63.5", + "@rollup/rollup-freebsd-arm64": "4.63.5", + "@rollup/rollup-freebsd-x64": "4.63.5", + "@rollup/rollup-linux-arm-gnueabihf": "4.63.5", + "@rollup/rollup-linux-arm-musleabihf": "4.63.5", + "@rollup/rollup-linux-arm64-gnu": "4.63.5", + "@rollup/rollup-linux-arm64-musl": "4.63.5", + "@rollup/rollup-linux-loong64-gnu": "4.63.5", + "@rollup/rollup-linux-loong64-musl": "4.63.5", + "@rollup/rollup-linux-ppc64-gnu": "4.63.5", + "@rollup/rollup-linux-ppc64-musl": "4.63.5", + "@rollup/rollup-linux-riscv64-gnu": "4.63.5", + "@rollup/rollup-linux-riscv64-musl": "4.63.5", + "@rollup/rollup-linux-s390x-gnu": "4.63.5", + "@rollup/rollup-linux-x64-gnu": "4.63.5", + "@rollup/rollup-linux-x64-musl": "4.63.5", + "@rollup/rollup-openbsd-x64": "4.63.5", + "@rollup/rollup-openharmony-arm64": "4.63.5", + "@rollup/rollup-win32-arm64-msvc": "4.63.5", + "@rollup/rollup-win32-ia32-msvc": "4.63.5", + "@rollup/rollup-win32-x64-gnu": "4.63.5", + "@rollup/rollup-win32-x64-msvc": "4.63.5", + "fsevents": "~2.3.2" + } + }, + "node_modules/rxjs": { + "version": "7.8.2", + "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", + "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "tslib": "^2.1.0" + } + }, + "node_modules/shell-quote": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.9.0.tgz", + "integrity": "sha512-Iov+JwFv/2HcTpcwNMKd8+IWNb8tboQJNQTkAY/LLVK7gGH9jy+LGkVqPxfekHl+yMmiqXszdGWXgkfml7hjqA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/source-map-js": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", + "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", + "dev": true, + "license": "BSD-3-Clause", + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/string-width": { + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", + "dev": true, + "license": "MIT", + "dependencies": { + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, + "engines": { + "node": ">=8" + } + }, + "node_modules/supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "has-flag": "^4.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/supports-color?sponsor=1" + } + }, + "node_modules/tinyglobby": { + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", + "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", + "dev": true, + "license": "MIT", + "dependencies": { + "fdir": "^6.5.0", + "picomatch": "^4.0.4" + }, + "engines": { + "node": ">=12.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/SuperchupuDev" + } + }, + "node_modules/tree-kill": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz", + "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==", + "dev": true, + "license": "MIT", + "bin": { + "tree-kill": "cli.js" + } + }, + "node_modules/tslib": { + "version": "2.8.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", + "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, + "license": "0BSD" + }, + "node_modules/vite": { + "version": "6.4.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.3.tgz", + "integrity": "sha512-NTKlcQjlAK7MlQoyb6LgaqHc8sso/pVyUJYWMws3jg21uTJw/LddqIFPcPqP6PzpgbIcZyKI85sFE4HBrQDA8A==", + "dev": true, + "license": "MIT", + "dependencies": { + "esbuild": "^0.25.0", + "fdir": "^6.4.4", + "picomatch": "^4.0.2", + "postcss": "^8.5.3", + "rollup": "^4.34.9", + "tinyglobby": "^0.2.13" + }, + "bin": { + "vite": "bin/vite.js" + }, + "engines": { + "node": "^18.0.0 || ^20.0.0 || >=22.0.0" + }, + "funding": { + "url": "https://github.com/vitejs/vite?sponsor=1" + }, + "optionalDependencies": { + "fsevents": "~2.3.3" + }, + "peerDependencies": { + "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", + "jiti": ">=1.21.0", + "less": "*", + "lightningcss": "^1.21.0", + "sass": "*", + "sass-embedded": "*", + "stylus": "*", + "sugarss": "*", + "terser": "^5.16.0", + "tsx": "^4.8.1", + "yaml": "^2.4.2" + }, + "peerDependenciesMeta": { + "@types/node": { + "optional": true + }, + "jiti": { + "optional": true + }, + "less": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "sass": { + "optional": true + }, + "sass-embedded": { + "optional": true + }, + "stylus": { + "optional": true + }, + "sugarss": { + "optional": true + }, + "terser": { + "optional": true + }, + "tsx": { + "optional": true + }, + "yaml": { + "optional": true + } + } + }, + "node_modules/wrap-ansi": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", + "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "engines": { + "node": ">=10" + }, + "funding": { + "url": "https://github.com/chalk/wrap-ansi?sponsor=1" + } + }, + "node_modules/y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=10" + } + }, + "node_modules/yargs": { + "version": "17.7.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", + "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "dev": true, + "license": "MIT", + "dependencies": { + "cliui": "^8.0.1", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", + "require-directory": "^2.1.1", + "string-width": "^4.2.3", + "y18n": "^5.0.5", + "yargs-parser": "^21.1.1" + }, + "engines": { + "node": ">=12" + } + }, + "node_modules/yargs-parser": { + "version": "21.1.1", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", + "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", + "dev": true, + "license": "ISC", + "engines": { + "node": ">=12" + } + } + } +} diff --git a/package.json b/package.json new file mode 100644 index 0000000..82826da --- /dev/null +++ b/package.json @@ -0,0 +1,15 @@ +{ + "name": "django-vite-integration", + "private": true, + "type": "module", + "scripts": { + "dev": "concurrently --kill-others-on-fail --names django,vite --prefix-colors blue,magenta \"npm:django\" \"npm:vite\"", + "django": "node scripts/dev-django.mjs", + "vite": "vite", + "build": "vite build" + }, + "devDependencies": { + "concurrently": "^9.1.2", + "vite": "^6.2.0" + } +} diff --git a/requirements.txt b/requirements.txt new file mode 100644 index 0000000..41aeac4 --- /dev/null +++ b/requirements.txt @@ -0,0 +1,2 @@ +Django==6.1.1 +h3>=4.1,<5 diff --git a/scripts/dev-django.mjs b/scripts/dev-django.mjs new file mode 100644 index 0000000..e1d5f04 --- /dev/null +++ b/scripts/dev-django.mjs @@ -0,0 +1,13 @@ +import { spawn } from "node:child_process"; + +const host = process.env.DJANGO_HOST ?? "0.0.0.0"; +const port = process.env.DJANGO_PORT ?? "8000"; +const command = process.env.DJANGO_DEV_COMMAND ?? `python manage.py runserver ${host}:${port}`; +const child = spawn(command, { shell: true, stdio: "inherit" }); + +child.on("exit", (code, signal) => { + if (signal) { + process.kill(process.pid, signal); + } + process.exit(code ?? 0); +}); diff --git a/templates/admin/fireworks_detect/classification_audio_change_form.html b/templates/admin/fireworks_detect/classification_audio_change_form.html index aa37b3c..0341204 100644 --- a/templates/admin/fireworks_detect/classification_audio_change_form.html +++ b/templates/admin/fireworks_detect/classification_audio_change_form.html @@ -1 +1 @@ -{% extends "admin/fireworks_detect/classification_change_form.html" %}{% block after_field_sets %}{{ block.super }}{% if original %}
Loads only when played
{% endif %}{% endblock %} +{% extends "admin/fireworks_detect/classification_change_form.html" %}{% block after_field_sets %}{{ block.super }}{% if original.audio_file %}
Loads only when played
{% endif %}{% endblock %} diff --git a/vite.config.mjs b/vite.config.mjs new file mode 100644 index 0000000..a52fc1a --- /dev/null +++ b/vite.config.mjs @@ -0,0 +1,25 @@ +import { resolve } from "node:path"; +import { defineConfig } from "vite"; + +const root = process.cwd(); +const environment = process.env; +const entrypoint = environment.VITE_ENTRY ?? "frontend/src/main.js"; +const outputDirectory = environment.VITE_OUT_DIR ?? "vite_integration/static/vite"; + +export default defineConfig({ + base: environment.VITE_BASE_URL ?? "/static/vite/", + server: { + host: environment.VITE_HOST ?? "127.0.0.1", + port: Number(environment.VITE_PORT ?? 5173), + strictPort: true, + cors: true, + }, + build: { + outDir: resolve(root, outputDirectory), + emptyOutDir: true, + manifest: ".vite/manifest.json", + rollupOptions: { + input: resolve(root, entrypoint), + }, + }, +}); diff --git a/vite_integration/__init__.py b/vite_integration/__init__.py new file mode 100644 index 0000000..ac07cbe --- /dev/null +++ b/vite_integration/__init__.py @@ -0,0 +1 @@ +"""Portable Django template tags for Vite assets.""" diff --git a/vite_integration/__pycache__/__init__.cpython-313.pyc b/vite_integration/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..6441af8 Binary files /dev/null and b/vite_integration/__pycache__/__init__.cpython-313.pyc differ diff --git a/vite_integration/__pycache__/apps.cpython-313.pyc b/vite_integration/__pycache__/apps.cpython-313.pyc new file mode 100644 index 0000000..3ee823f Binary files /dev/null and b/vite_integration/__pycache__/apps.cpython-313.pyc differ diff --git a/vite_integration/__pycache__/tests.cpython-313.pyc b/vite_integration/__pycache__/tests.cpython-313.pyc new file mode 100644 index 0000000..b1b0ee0 Binary files /dev/null and b/vite_integration/__pycache__/tests.cpython-313.pyc differ diff --git a/vite_integration/apps.py b/vite_integration/apps.py new file mode 100644 index 0000000..50ab195 --- /dev/null +++ b/vite_integration/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class ViteIntegrationConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "vite_integration" diff --git a/vite_integration/templates/vite_integration/example_assets.html b/vite_integration/templates/vite_integration/example_assets.html new file mode 100644 index 0000000..c50c4b2 --- /dev/null +++ b/vite_integration/templates/vite_integration/example_assets.html @@ -0,0 +1,3 @@ +{% load vite %} +{# Add this once inside a base template's or just before . #} +{% vite_asset "frontend/src/main.js" %} diff --git a/vite_integration/templatetags/__init__.py b/vite_integration/templatetags/__init__.py new file mode 100644 index 0000000..020fad5 --- /dev/null +++ b/vite_integration/templatetags/__init__.py @@ -0,0 +1 @@ +"""Template-tag package for the portable Vite integration.""" diff --git a/vite_integration/templatetags/__pycache__/__init__.cpython-313.pyc b/vite_integration/templatetags/__pycache__/__init__.cpython-313.pyc new file mode 100644 index 0000000..cd8d342 Binary files /dev/null and b/vite_integration/templatetags/__pycache__/__init__.cpython-313.pyc differ diff --git a/vite_integration/templatetags/__pycache__/vite.cpython-313.pyc b/vite_integration/templatetags/__pycache__/vite.cpython-313.pyc new file mode 100644 index 0000000..4b01bf8 Binary files /dev/null and b/vite_integration/templatetags/__pycache__/vite.cpython-313.pyc differ diff --git a/vite_integration/templatetags/vite.py b/vite_integration/templatetags/vite.py new file mode 100644 index 0000000..2e0010d --- /dev/null +++ b/vite_integration/templatetags/vite.py @@ -0,0 +1,106 @@ +"""Django template tags that select Vite HMR or manifest-backed assets.""" + +import json +import os +from functools import lru_cache +from pathlib import Path +from urllib.parse import urljoin + +from django import template +from django.conf import settings +from django.contrib.staticfiles import finders +from django.template import TemplateSyntaxError +from django.templatetags.static import static +from django.utils.safestring import mark_safe +from django.utils.html import format_html + +register = template.Library() + + +def _setting(name, default=None): + value = getattr(settings, name, None) + return value if value is not None else os.environ.get(name, default) + + +def _as_bool(value): + return str(value).lower() in {"1", "true", "yes", "on"} + + +def _use_dev_server(): + return _as_bool(_setting("VITE_USE_DEV_SERVER", False)) + + +def _static_prefix(): + return str(_setting("VITE_STATIC_PREFIX", "vite")).strip("/") + + +def _manifest_path(): + configured_path = _setting("VITE_MANIFEST_PATH") + if configured_path: + return Path(configured_path) + found_path = finders.find(f"{_static_prefix()}/.vite/manifest.json") + if found_path: + return Path(found_path) + raise TemplateSyntaxError( + "Vite manifest not found. Run `npm run build`, then `python manage.py collectstatic`." + ) + + +@lru_cache(maxsize=8) +def _read_manifest(path, modified_time): + with Path(path).open(encoding="utf-8") as manifest_file: + manifest = json.load(manifest_file) + if not isinstance(manifest, dict): + raise TemplateSyntaxError("Vite manifest must contain a JSON object.") + return manifest + + +def _manifest(): + path = _manifest_path() + try: + modified_time = path.stat().st_mtime_ns + except OSError as error: + raise TemplateSyntaxError("Vite manifest could not be read.") from error + return _read_manifest(str(path), modified_time) + + +def _production_tags(entrypoint): + manifest = _manifest() + try: + entry = manifest[entrypoint] + except KeyError as error: + raise TemplateSyntaxError(f"Vite entry point `{entrypoint}` is missing from the manifest.") from error + + css_files = [] + visited = set() + + def visit(chunk_name): + if chunk_name in visited: + return + visited.add(chunk_name) + chunk = manifest.get(chunk_name, {}) + for imported_chunk in chunk.get("imports", []): + visit(imported_chunk) + for css_file in chunk.get("css", []): + if css_file not in css_files: + css_files.append(css_file) + + visit(entrypoint) + tags = [format_html('', static(f"{_static_prefix()}/{css_file}")) for css_file in css_files] + tags.append(format_html('', static(f"{_static_prefix()}/{entry['file']}"))) + return mark_safe("\n".join(tags)) + + +@register.simple_tag +def vite_asset(entrypoint): + """Render one entry point from Vite's dev server or production manifest.""" + if _use_dev_server(): + dev_server_url = _setting("VITE_DEV_SERVER_URL", "http://127.0.0.1:5173/").rstrip("/") + "/" + hmr_client_url = urljoin(dev_server_url, "@vite/client") + entry_url = urljoin(dev_server_url, entrypoint.lstrip("/")) + return format_html( + '\n', + hmr_client_url, + entry_url, + ) + return _production_tags(entrypoint) diff --git a/vite_integration/tests.py b/vite_integration/tests.py new file mode 100644 index 0000000..74aae0d --- /dev/null +++ b/vite_integration/tests.py @@ -0,0 +1,31 @@ +import json +from pathlib import Path +from tempfile import TemporaryDirectory + +from django.template import Context, Template +from django.test import SimpleTestCase, override_settings + +from .templatetags.vite import _read_manifest + + +class ViteAssetTemplateTagTests(SimpleTestCase): + def setUp(self): + _read_manifest.cache_clear() + + def render_asset(self): + return Template('{% load vite %}{% vite_asset "frontend/src/main.js" %}').render(Context()) + + @override_settings(VITE_USE_DEV_SERVER=True, VITE_DEV_SERVER_URL="http://vite.test:4173/") + def test_development_renders_hmr_client_and_entrypoint(self): + rendered = self.render_asset() + + self.assertIn("http://vite.test:4173/@vite/client", rendered) + self.assertIn("http://vite.test:4173/frontend/src/main.js", rendered) + + def test_production_resolves_css_and_script_from_manifest(self): + with TemporaryDirectory() as temporary_directory: + manifest_path = Path(temporary_directory) / "manifest.json" + manifest_path.write_text(json.dumps({"frontend/src/main.js": {"file": "assets/main-hash.js", "css": ["assets/main-hash.css"]}}), encoding="utf-8") + with override_settings(VITE_USE_DEV_SERVER=False, VITE_MANIFEST_PATH=manifest_path, VITE_STATIC_PREFIX="vite", STATIC_URL="/static/"): + rendered = self.render_asset() +