From 8f838715ddc69d73aea67a2552e56f5162f3526f Mon Sep 17 00:00:00 2001 From: Joren de Graaf Date: Thu, 1 Oct 2026 16:38:13 +0200 Subject: [PATCH] added compass direction finding --- .env.vite.example | 16 + .gitignore | 3 + README.md | 91 ++ .../__pycache__/admin.cpython-313.pyc | Bin 6370 -> 7205 bytes .../classification_urls.cpython-313.pyc | Bin 0 -> 484 bytes .../__pycache__/h3_utils.cpython-313.pyc | Bin 0 -> 2242 bytes .../__pycache__/models.cpython-313.pyc | Bin 10018 -> 14891 bytes .../__pycache__/tests.cpython-313.pyc | Bin 202 -> 20238 bytes .../__pycache__/urls.cpython-313.pyc | Bin 1151 -> 1265 bytes .../__pycache__/views.cpython-313.pyc | Bin 16388 -> 24507 bytes fireworks_detect/admin.py | 21 +- fireworks_detect/classification_urls.py | 11 + fireworks_detect/h3_utils.py | 42 + fireworks_detect/h3_utils.py.orig | 33 + fireworks_detect/management/__init__.py | 1 + .../__pycache__/__init__.cpython-313.pyc | Bin 0 -> 228 bytes .../management/commands/__init__.py | 1 + .../__pycache__/__init__.cpython-313.pyc | Bin 0 -> 233 bytes .../management/commands/backfill_h3_cells.py | 25 + .../migrations/0003_classificationrule.py | 35 + ..._occurrences_event_source_type_and_more.py | 63 + ...ongitude_pendingevent_latitude_and_more.py | 33 + ...0006_event_h3_cell_pendingevent_h3_cell.py | 23 + ...ent_direction_accuracy_degrees_and_more.py | 43 + .../0003_classificationrule.cpython-313.pyc | Bin 0 -> 1495 bytes ...event_source_type_and_more.cpython-313.pyc | Bin 0 -> 2065 bytes ...ingevent_latitude_and_more.cpython-313.pyc | Bin 0 -> 1290 bytes ..._cell_pendingevent_h3_cell.cpython-313.pyc | Bin 0 -> 1006 bytes ..._accuracy_degrees_and_more.cpython-313.pyc | Bin 0 -> 1457 bytes fireworks_detect/models.py | 79 +- .../fireworks_detect/event_detail.html | 28 +- .../fireworks_detect/events_list.html | 19 +- .../manual_pending_submission.html | 7 + .../templates/fireworks_detect/map.html | 150 +- fireworks_detect/tests.py | 267 ++- fireworks_detect/urls.py | 2 + fireworks_detect/views.py | 189 ++- frontend/src/main.js | 1 + hello/__pycache__/tests.cpython-313.pyc | Bin 0 -> 191 bytes hello/templates/home.html | 157 +- members/__pycache__/forms.cpython-313.pyc | Bin 756 -> 1657 bytes members/__pycache__/models.cpython-313.pyc | Bin 961 -> 2206 bytes .../__pycache__/settings_urls.cpython-313.pyc | Bin 0 -> 472 bytes members/__pycache__/tests.cpython-313.pyc | Bin 0 -> 14360 bytes members/__pycache__/views.cpython-313.pyc | Bin 1759 -> 6009 bytes members/forms.py | 16 +- members/migrations/0002_usersettings.py | 30 + .../0002_usersettings.cpython-313.pyc | Bin 0 -> 1700 bytes members/models.py | 18 +- members/settings_urls.py | 9 + members/templates/members/login.html | 29 + .../templates/members/ntfy_test_result.html | 1 + members/templates/members/user_settings.html | 32 + members/tests.py | 165 +- members/views.py | 88 +- .../__pycache__/settings.cpython-313.pyc | Bin 2965 -> 3087 bytes myproject/__pycache__/urls.cpython-313.pyc | Bin 1496 -> 1911 bytes myproject/settings.py | 6 + myproject/urls.py | 4 + notifications/__init__.py | 3 + .../__pycache__/__init__.cpython-313.pyc | Bin 0 -> 294 bytes .../__pycache__/services.cpython-313.pyc | Bin 0 -> 2871 bytes notifications/services.py | 52 + package-lock.json | 1435 +++++++++++++++++ package.json | 15 + requirements.txt | 2 + scripts/dev-django.mjs | 13 + .../classification_audio_change_form.html | 2 +- vite.config.mjs | 25 + vite_integration/__init__.py | 1 + .../__pycache__/__init__.cpython-313.pyc | Bin 0 -> 219 bytes .../__pycache__/apps.cpython-313.pyc | Bin 0 -> 541 bytes .../__pycache__/tests.cpython-313.pyc | Bin 0 -> 2806 bytes vite_integration/apps.py | 6 + .../vite_integration/example_assets.html | 3 + vite_integration/templatetags/__init__.py | 1 + .../__pycache__/__init__.cpython-313.pyc | Bin 0 -> 241 bytes .../__pycache__/vite.cpython-313.pyc | Bin 0 -> 5906 bytes vite_integration/templatetags/vite.py | 106 ++ vite_integration/tests.py | 31 + 80 files changed, 3369 insertions(+), 64 deletions(-) create mode 100644 .env.vite.example create mode 100644 .gitignore create mode 100644 fireworks_detect/__pycache__/classification_urls.cpython-313.pyc create mode 100644 fireworks_detect/__pycache__/h3_utils.cpython-313.pyc create mode 100644 fireworks_detect/classification_urls.py create mode 100644 fireworks_detect/h3_utils.py create mode 100644 fireworks_detect/h3_utils.py.orig create mode 100644 fireworks_detect/management/__init__.py create mode 100644 fireworks_detect/management/__pycache__/__init__.cpython-313.pyc create mode 100644 fireworks_detect/management/commands/__init__.py create mode 100644 fireworks_detect/management/commands/__pycache__/__init__.cpython-313.pyc create mode 100644 fireworks_detect/management/commands/backfill_h3_cells.py create mode 100644 fireworks_detect/migrations/0003_classificationrule.py create mode 100644 fireworks_detect/migrations/0004_event_location_event_occurrences_event_source_type_and_more.py create mode 100644 fireworks_detect/migrations/0005_event_latitude_event_longitude_pendingevent_latitude_and_more.py create mode 100644 fireworks_detect/migrations/0006_event_h3_cell_pendingevent_h3_cell.py create mode 100644 fireworks_detect/migrations/0007_event_direction_accuracy_degrees_and_more.py create mode 100644 fireworks_detect/migrations/__pycache__/0003_classificationrule.cpython-313.pyc create mode 100644 fireworks_detect/migrations/__pycache__/0004_event_location_event_occurrences_event_source_type_and_more.cpython-313.pyc create mode 100644 fireworks_detect/migrations/__pycache__/0005_event_latitude_event_longitude_pendingevent_latitude_and_more.cpython-313.pyc create mode 100644 fireworks_detect/migrations/__pycache__/0006_event_h3_cell_pendingevent_h3_cell.cpython-313.pyc create mode 100644 fireworks_detect/migrations/__pycache__/0007_event_direction_accuracy_degrees_and_more.cpython-313.pyc create mode 100644 fireworks_detect/templates/fireworks_detect/manual_pending_submission.html create mode 100644 frontend/src/main.js create mode 100644 hello/__pycache__/tests.cpython-313.pyc create mode 100644 members/__pycache__/settings_urls.cpython-313.pyc create mode 100644 members/__pycache__/tests.cpython-313.pyc create mode 100644 members/migrations/0002_usersettings.py create mode 100644 members/migrations/__pycache__/0002_usersettings.cpython-313.pyc create mode 100644 members/settings_urls.py create mode 100644 members/templates/members/login.html create mode 100644 members/templates/members/ntfy_test_result.html create mode 100644 members/templates/members/user_settings.html create mode 100644 notifications/__init__.py create mode 100644 notifications/__pycache__/__init__.cpython-313.pyc create mode 100644 notifications/__pycache__/services.cpython-313.pyc create mode 100644 notifications/services.py create mode 100644 package-lock.json create mode 100644 package.json create mode 100644 requirements.txt create mode 100644 scripts/dev-django.mjs create mode 100644 vite.config.mjs create mode 100644 vite_integration/__init__.py create mode 100644 vite_integration/__pycache__/__init__.cpython-313.pyc create mode 100644 vite_integration/__pycache__/apps.cpython-313.pyc create mode 100644 vite_integration/__pycache__/tests.cpython-313.pyc create mode 100644 vite_integration/apps.py create mode 100644 vite_integration/templates/vite_integration/example_assets.html create mode 100644 vite_integration/templatetags/__init__.py create mode 100644 vite_integration/templatetags/__pycache__/__init__.cpython-313.pyc create mode 100644 vite_integration/templatetags/__pycache__/vite.cpython-313.pyc create mode 100644 vite_integration/templatetags/vite.py create mode 100644 vite_integration/tests.py 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 3597787e6626ec2aac435291b9f131b11eb0c89a..19e118e3539d52d141c07ce072cb50ad87bd762f 100644 GIT binary patch delta 2279 zcmZuy?QaxC7~k1@e}8XlU(V%vmF$6y1&T@pQ;NU=JxEW|G!~Za-Sk+xy{)r%B!y@% zXu#m7W@18&;fvAGpwR^UV*IEkej#o6K(hpbCWdHYQgi$P&NEw%BDcx@X6AXGdEVx? zvwsYI^+vcE3i$>0eD}jo=VFPaa2LA1wDpkxNRR|2VM-kDUV7N?^K=VEFI)7|p;&@` zpY(JM!yfjKNSBZiiauuG-)!I}QP@n=sJ}13l)!Bmhk8iwjaW^(hIj@Bq~UbQG)iQoK}2PS4~r!(MoDfGpgft9n)`7&cESG zXiD^Vv}K~=mOWPIi?$=>Ij#B^G)s0^uJfv1$Ci&UCrWK$9$OwZG($qT9q((;!yBD3$7j;A#n*mRC3I zep>PKnpszMeL*Q1)ftV<;WDj@!niUfn#@~ic-X7Fev!$g+n>`tYG zb=``UHG)fUOiEcZ=XG_#>V76tA--B#P|CPMFgCeABGXk-Iuar|=83zrL?tj|~uWBQyaGKnOSUho83Yv6fCaW)M;D`}(3mzb#;X3!8GMdJ4&+0{sP z#hc~leIfDG1tt=~=DgvknwXw-{F)$eu+PODqz&gz)JJbSx4&ky1xQwqBP78_k_1Qr zbO3Y$bOAsDH1FEC$XhZ9A}E(r)b_(mN`njlsAFOVmxXmvNE#y0^c|pSt}(_WomH`M zoQ>f#j>f^Yp2-zw*CUtz%Bf4Iu3cPpZTnY5u7RdQaBp9S*}7YB2SB+(|8aG?Im^@3 z?_Ne3dfT1vgBq4avYQQ-hv4_?*sQh6rrn;s(N~zN>0;0j)*?yLLo1%$XveMV9xrmk zHZn%P@osbTA`a6B-mOTcE?)ul+y}653^z#ue8crEKZBQP4wVa*RQ%K_Dp5o59Sfw_$n$U{jL5c1iL>CL>_F zpYI1~my-$#fIT!9+TrJZVOd&=rRc@bk7$(c4o@zgV2f-YGeMMLi z%{1#+QRg+KX3XL$34juEkRA4RaK)`J_(o3TC2qyOMetg`$)Kp7$5QPqmh5XwVpoz$ z!;#PXcp*EPh2=YpRZ^SAYK`S&r$B#+e9Z`>M^%Ify%YNq>6FB?HhEsBU&J#ud1mR) zaS5HEf5xve^2{e5B2=WuQ(Jeu#~i;v8j^u(O9 zyaZP?vxbS~A2Z5W=T{j2QQ0KntmHJ{J~{umFZkFj?^|<5nf)#Ik*jQp*lVsZSa%?V z?hAp(LhgaE<$)kS7Dn$1qwFFOJy+6~(ks!--Cd~viReHtU&Hs(gRAMmroa~L(h#%j eAbt`Iqgixq;9hrbwLAAjfYo}2;;scJg#Qm@r3q#L delta 1533 zcmZuwUu;uV7{BM<_O89%?f-UN2hwhXatksyR~!p-X#}L|J?i$>RaFt#x9{hhXV3eWy)klRIW^=@2r;2u$Th`BK<^y zRxu6VOKx%!M#UtoOTDg~hpKbUnhM7q(In=p$#$SZjX9%SDCK93l3p$>=(cR?WwS!z zmLroQG=zGDdU0{uN@1~RRJbnnF^cmv1e4B0&_Tn}!lS0WN}bWdiZG^m;YaZ;7<3IR zMHpj8@_ExLSjJ4gU|H0dUbJ*GpQoKnMmrFa2+bRSmo*0&yf4&3Y!yrvFUkJQ>G?mA+>JCzTnE=}Ft(Yxl%{4EmaJgG~9yuZ%3%(nym!gZ+?y4@d> z7WlzEvK_;&h;#>A>?W$ey{Mbke>b8@*sTos+nA{CWKb1qzA){8MP)yUu3lGML`E}u z0KW6=k$Kj=@Ruh=o`X>Hn1Xk?kU6B6--U}x6fQRZlf`RLmIVtno;@)(GB%_+d1!h7 zC0UfnMZIk3MfwUmm>4#JU!y1)xT$uMUGP9XR^+9^?8h_@-N{zE3n7KDn}OX_n8Ajb zv>z!6DY-$>USx1)=?e(xWmD;U@QBa?A9=@R9;gTY^j;!eQ1W$ed+Di7AKN`G7P9^D zt*?EGyFZBMO-Z`9O0v=By{P&;w@272r%@CjbU~lLr;*brob%r!eQ+o+(eVZoX(D|c z)lT8w!54ZGi3x-d+zzy8I88j1CN-4NkUx|Q?(AzL39B-%m)V;+^-1u?cAioTQ?T8` zdVyNgdck5r8b0A(@R}TD!Wj|1QNpVb8YbjTco4qAo^3VK*_e$4d>Ls^@!1$hM{PO& zK(oaKqrC6ThSPk>m^)(~hI-^O=~#U)`WqpGFcnMn3^AMkjR=3Hwv(s&?1Y?#8?gk* z!Ts2WOPh-C-?I1`^G?$Udk}aVUS&JmJ!|NtqN!UZpBvhRV$7c&ML3PHRhM!oK)}I( zKU%*~c@D^ELAnh-jpvtaWwcV%OS}TS{kDthbB1Z@ln)*6GI#RKT-vUK3zgzxNq?E1 zXATMb&8rL^ON5YL1<$&Wekdd#3fj8RwI*~ukrgseKHGUeo?eTmp9pw*92a1v?HvbZ F^)GWGRZ;)| 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 0000000000000000000000000000000000000000..270d5d8be63f818fc6ca83997ae5d542dcf1b393 GIT binary patch literal 484 zcmZWlJxc>Y5Z%46T<#2t2wJ3&SY4B?ECjI-1xdhW+dw!ko7`RQi`mtXRNC2D`6KM? z{S#WcU}YicBKZUEMU4=rSl*jA^JZq}wVH!e$h)U_4}P|#c?k&zU9Ba}tB8#_mGZN-0BXJHa zOMMVgoRMNI!aO72)}$W+8|5(M-5wJx5Ml7x8`d%yf+L p8>)Yx)0u_V8rSxxh0N-0{dt=_4quGpSHu1zGgDvJZd}+7%g5T3WY{)=lnaekV=I@`vDx`m{T6RAXPB?~1@T5v)(?w^G$$6h;5x4YHb zwMu)6dO(O%g@^z(h;l(Ks!$Ic;D8XKLLAp|AYt(hamcMogakb?Z~YUeAP_uhXW!4v z?Ckf=%-iw#S^&q7vtKQJA^`lt7WKi^COcduo$%NBDMj}XhP%Z5=<^SZTva(Zs!;>_H6DK!;M%}q!% zuO#NDXX2UKckP!0C6CX}cPLgMN$gz|$$EH@#K5aVB4bP!hYCqobq0`tq`N*Jt63eX zZDhmfsaey8gB?DrnGOK{cmj0pG&epDkapslXR~Yvzzh)~>8m+yipUR=5aq^dQOhI& zVTd^5TOL%UES4>F3%3r7*NVC!F34h96$`2%=Vgj3fD1{N}8CTpN^lkS_*nW)s3{8ku70C(-ezGpH|C-v{IBODAg$P&_ZQhQ;J4G zQ*{=eX!Yj`RKB6nt9mLc8*;`NUW}$tLD7e<-?V(V*fpW8Xu^I%mryK2rLB9ldwuZa z7YEC2rOTG zBv~HWBLQ_bn)XOzuaOI5HT`-LrZ~vONe>HLMNecW1s z(7$4|i%dIQAQw2DAI5BNhbgR{BF29`cqur{&2q0|jd(!>omV-Pgi)tH&%wc_+;8H9 z#q!J;c z=;`}M?sS)150_$B)&fb>o&2L5Nd8{g*R{%h)bc@#=^fkw;^_D((EfzS_fx$OUEb~) zg}Z?v=coKAeC8a5&wFES{5P!x|9umA6SZvc8zr-Qq0BLgo*9SW5~*Ja^=4s{&`9kj z`^I&%>%>lXY(gTiq8h+!piV?JsFsP!B^`biYkOb=E9o$oHZr@W)w8!dN@lmk)I9sLW6!OcM1+a8wF!Kb<( zjcrk1jZ9)R7W zsx8oc>YA1=uK literal 0 HcmV?d00001 diff --git a/fireworks_detect/__pycache__/models.cpython-313.pyc b/fireworks_detect/__pycache__/models.cpython-313.pyc index 09e3e849aa7d6e3e91bbd49502a7e751d14a6188..f7a87c72bf4864e95fd836361545ce3df8f0ea13 100644 GIT binary patch delta 7076 zcmbtZeNbH2b$@TazrR>uSzvj5EU+LD`hW=8k_AXe0twlAVA+wZ&13h0)?Rk;eTyu~ zomre|Q#`WAQg2eZ(>Qe+H-i$p#dV#kO{Z1UPUC6Q%s$k1x6f|I?zDB7aa$Zqb=q{A zo^$sDB$51+H|V$Lo_p@O_nv$2Ip<#e_QW?cu1}m!8wcMM~0F#|CO$k&e>$4tb;Xv4U9%t9=THjZ1zY{WKZCw5jgjXTDi z#3^tAu7wlLK~A)sv7KzVda2&+W-KePY-N^*vFyNdlvq2wjO7HD>x{QwkHh6S;$vJl za6Oy2RkM7=dv(3r{iu{o#HCCkojOEFn!HuZU*mZ@{XN|))z^8=9G7RLg=A*U4XQ>X zdg7vzzQyE6#ntqA{VBeNexR565It--)>seh8u+JJ0lvT${J|@GE?Y<#r90?~VV}Pd zNKk7~zOEzPSTJVNPsu4o2eg1%zh-LV8|XWxDLza?=Fhi9pdzBz4Abd!k~Jr2 zA+iTxqtRcQJNY*H?||5-j&8U7#mQaR&_r-fnm(0&h74i5VJw=Y`FS}NC!awPLvb87 zWnp?Qp(tQcGQxyr5^^%GC^&8bJ{a3UYcJnH73+}`Xd7r*QCS=r&T}Hdk49=p6Ocqe zXhvuO(9F?jJROThi5W}Qk#iCm#Xd+Qwb>eHn3b4;oCl?hJeio2i`A80G+T_wP!*3# z8Pb7zw;}9B*pF}+p$#E~z*evwDSH|0^hMk6+gJtiVpqM@{3?Ajw4Z*N51NglX^}vAjyu7v>x{K&E>oeyP89A9yGMe>NnMD3{Qi?rQ%;sf=6rHk`>^xwYWB? zp=#}?0M~iqLK>Y_M8{~&96Ogz#AIcXc!A4SY8Y0k%CMa$2KoVCm(_{-?K;sQ8V7a2 zGm9o-nKef&TJ08wIWA|UwFg0wW;`z?7i7(fMvi8{R$6c&m3VqVj&9f*O&vu67|bX% zBIp51=CPK|lLb~~cav6>U_0A0#ng?YQ%Z(NiBv|j!=jgHWh;vnH?ss9aD)nOSu|Gt zmBA&;`wm~;(YoqrT|T^WI@djvI}%qN^15DEYqMRpm%S7?9DbO-=&Comz_m|N$y-fd zY_Vjaq}yd^0~a!JNhfq_d<13`1N~a{tejy}WHyM#6Uuy2x=6Zk06YL3ctCc-wBQy7 zjYeTc(I`3;1?LVP&{uP<>uT4PhL=yiYRC(FRbg-TmhfP%Y2S@Ua_)z6mWPU?#j`mP z@s`bamlcmzQr9Sy6FhGo6#*tU46;Hk-bgjJ8Q zJbc5F-*ZHTKhM#{qXm~g?`mFkH7~cRuI-D5KQ$PPwvRc0I}YA>pq(#vkDcPkE1#uA zeezj7$DO5;y^8)-D1uJN2~J2f59)~Zj1e5rS9!nbj2&1enzPrKM2l!0G}8aD2Th_) zv=8#s;|SXNOWKH+uG<3*5L?YB(E|5;z->p5W_1qgi67K=f%dIW_W^NFhdPF}Hs|MZmAhrh^+iRHaMkqgsWhW}C1@%p3 zjss}c#7N2i;Y3KJ0~zH$glLcL;o zfy9d59*+%pb&~?AM4GU0hs8N5wIC%gIghhnfynb|lKHt_-XtEH5Ko-cOvi^NriPAf za#k~ybEMfedL{&V#@@>w-rKrlDtNmtn~EF%0!}0_lOXalY4Vg3m2i67!;fzd&utIK zCovK&%qP=QJeo-p%+KiOoHeFeAc&v-lCvR8&LI5+!dU>!<&b6`zz5VC`YIM7N^yf} zS;Mqv%>)oJXtp`&0{FMtL`KnEaXFTllaf(zb`V=gu_qM9&db`7)-3VqXd;k`%NIsL zbw!Z$K_v;$AGFocKXX2i#i31JviEFCO^Oa~>o97OrZE!4GR1&V@>8I(V&0+``(;pz zsui3r1cR#DB}>8IeC44^W(xcm&(UugcIZfizV50U-O_hgf?;{vlpHs@Kc<|eu6cJ@ zb%%47FeI;E3DzCF0A}6Ke~ClKTl^+{g~g3SAUMIpEki%Wi-r!+4=pi8 zxaXUOR-3!CmAf;0icP@j`Ln1|f(eL5&}L%V_|B3h36jCn&a&Dmz8`lLd@?`FMa&Zf z6TP)_z`QhZ5cYD6rDAgnN=BHL1xc7mq#(-@SYjc}ko26;CoIehne;YcdLbjE(itI< z#Z)hzNX>2&b`A6iae0==veK)0<7I`>67SN$NP2D_5=cRc#UN3PT@>!^Y8&WG^`zuk z$S=>AI_}ki8>-4J%Q_?GtY%ae=4GN8V@X*`kr!Y}nqf}LoYO1`r8oofA}|Tq2v0&c z3YcWPUMZS2TFj1M^FY9Y3&CPBJ$MO)s_$`My{v~gR4K0j{CJUj&*IEJZ+_nSg1g|Y z0taDt=k3iZ{`I`)@n3WPn)Bs&KD1j6?aq7pRZstoM{c&|haXdiAN%`#XLF~|0>0mM zX=yZ9)vh`^So1E`4u1oin(tFX`|_Uss%JkomegS>7ng4h%kS@c3R>>2+O9hKeqi^$ z=WBko{gyA1b41qloWsXX9-O3&4-J5`{3MPURW;Vl!nTFo&Ywm;e)OuVHY@6SfE4vT zxMdAJuuIAt2UUP;H%>r0%1>yzi9;HHNYjb%Bf`%qjXwp)BW?}7d3u%0e!}IR)kKH0HQQw@>QVk%|Gut9>o+@ zYyR02EM>9Jf+hv;9Rv4HFaSwv-q)%6I+wjUZ};-<6+^!7u-bPxxBbXFe9k?Vvy7GQ z?``fkYtj1T8>kIE0A7L_gMQ=|_|H?PXD?j1k9bmE6uE2Y^t+x1_+O=ZZv-TIyh_cR zDDnDzV&C%a;4jl3dfPzE>3jPK`k?>O_wJa{_%L}53K64boPhwDAr%dp6>oU#-9xj% zL&!przPo>C)ein8`cReH$h7FlH@6-@kH3Tebvoq_^WnFi^}oUMe?TKOVrK-UF^*l= zYr5V(&5)7FoMuj@pOJ|i-|zwSwVEORRr+r=XZi2bL$zb=m4@WI(0W4<_5BUP_W)j{ zZ`Tg;e@p+fcBJX=kcp9;+(1A(6SM;PBZNPuj|AE}D`VI65Ii*_8-}KrQWwcVl=?OR zTwA;8D}g}6yU2MD;jaM{GXOkaz;^(iFx0><{x_+y?nAKmSAs)z16#) z$6abe4TJpa^s$CWUlew-o!J09IC9JTH zi69&XUZ+g?jqrp5m#sPM4wOolVH7I{U_1V}a!KsI()4J)xzHjMK8}ZdsOY^6waOlaHzH$AOKP(AHH? z>+;h#z3=#QQ;(~j&zA0>p;cFCxn)huszTy})2`|LZ*6VQHZg zK0kd!NE#sP^w5umYTn1t&#;DJfMJkf1H%wQfnf_Ko|Zuu%agwx@%8deWFnMsR>?7T}>7I zfosRE9xF7p=9>o8rh!7JrI_p$I=b^6qiV-!p|LsNxKnN1x!%Zm!|R;eYg;m|3!K&Y zlKpx63(kVuzvQ?tQKN4JZS+vf)qV^*@EpBi2S3`%gxu0ZtTPFC?Mq2>^2TKBtquJ5 zXlLtSw&IE>B95Q!i(_ri^ZeMK6jz(Ks!sLa*+AT`k#(2De9?2F!AwjNY zI)q0=DIN{t1lE>kK!6Htq+pDNdu45C$x#Tk-?G#fyJPdis5B9=|7=s3v0L!fpMl5% z|CvD2=ZlZ>8z$Py7C25e*jx0yaG#G^9eEKyxq=G&XG3!9MZSD&hdPfzcOPV};w3dV%k~^3ZJ#er}KQX1-(T#2pTPShxQVAHLt^ delta 3106 zcmZ`*eQaA-6@Sj(WXiQCZHf_>aH--R3fJ9d@q)7-(>mO`?pnm+Z@DMPNrYZ2pA|(|P42^T{ zOY=d(mHd16oO{l>_nt4`pOxPltX%PW-4c#>?*01dx2onVYldzi^|F+aGOSS-CYzw6)*XCv#cMZT2Y2*2xl_<`zpKy9-BGDVib)xJM9MgZ9cMz&wZGQq z5j-dITn~6Dui&|nS267EvC>H-iB}4)2f5x&T;CW|Dj~@_ZWb9Z=6cckdQf48Bd?C; zCX3}IAF7^EtlSH4TVwX!WT*-Z>(^KS9ltfUf;!Vk8l;2^4VOO$H{Ix zK`+4pg5v}+f;s{bIEoLaG#223KfB*<5(~r|!Qc8I*U(s*VsN7(03WhCOPayFKjI#C zW#o)JET0L$x9Y1L_KYJf^9s0b3Cqrm3xz)ON1Wt78sOUaTb_kwm{1VpRd}GN^B3m|rUC}SIV=xd^P=cDnwdj+fJV|A@iGC4Hv6GN$ zYC+K_nts*dL5Y7^lc`aI#qV2@_}k1&ifqWE7@#sYjX-Ct*0cFmkcp+(06Z7FQ(rX zqjg`aDL_)+M$qY8(ddlmj(nQfGYIG4->qqO1$q)k8)u2Ri{K&wIgr!Uc#&WnUP-jr z%`?J#iQtj15LZLMlo5^6dQrV(I3~C{RZyQXY=yEq&aaWs9Km-HbO%CIjKkPTtK0Un zuS0*^r|8FAO&I>8w1xRFiYzexD(P(T*9%IzAxB245N4#0DFI@4e6cqlx#vsWcBU{3 zOd|*VuWeHvXy3zBxZGYZ;va?^?LXZbjeJL%72tY@k`S%PtcAv%YJopW*6r}mj>I%| zEW?>OK9n6iJ1}6_b@5-rPm;tpXwB7^IW=fDP2swJS{Wc%@0Nyhf@>2hFJBUgYv#*S zB*F=%2!uC&K(jXqenNmXxPMz)9i$Zk>fL%HR?t=H54O`E`>Q|lH{JC&-R?Yb$Nwn2 zyXP=`kZiCl+ac2RWB-bU$JcE zJj}MUh#TI-g$X(f^&V^p)vdFh#fHQ^XYJa*II^)HYz#^f%GH$*;fk{vexI6gXIR=+ zVrQi@emLI}fx*4*Y8zib8UAwua8o zyY0rNzoDIF;;!xEqOO*uwzj?(t{S$yTDoNTPvif5p)_`!&XOe7GRRySp#=l^G+ z2)FPvxecEUWo^7L!hcIgc%NXWxcrh92*%-seVz4AIk;k#>@~|4oZS!DO>iLVLz}<8xd4Nr`xzSgO^Tkz( c=BwXfA(oswv?}3e^&tmK%$~Y0;YWD)zhZ`-(f|Me diff --git a/fireworks_detect/__pycache__/tests.cpython-313.pyc b/fireworks_detect/__pycache__/tests.cpython-313.pyc index c1fd97e54bb84384a73dbd7d58c0a7363a600e2f..71feee094019466f3f4ce5b28fcec93006b2de75 100644 GIT binary patch literal 20238 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 delta 3782 zcmZuzeNa@_6@PE{?E_pEQ2E>iS^3fh5u+k2Lbtun$<+ub%f-rIU8a zjJ0Vyog}?U8>g*f(srV$nzSU*RvYUi=`>CLz-qre2cDL!^~djh3UigLE%>MjecfE9sqC=YnSi*q@!Qptr1B@Zfu|kyVICgA@k(o)q8Gq=r2<3PFqo}W zE;8GQ4~n%?!}KnACJbr^I;8=7zC&RBITIgBFXbV1&nG4T(u(EFNnJ zjjOTIcmsPzu5~n{@k(}HE@Lkj_}PYh&#p~415F5)BiM|hxojj1+Tl1%=)tI(2p$S+ zhhYmUYRE1RVM_R$bLn%dW;~m&Ih$srCTL+N3ihvhs57T_NQ)V|ufL6L4!Ao9Qc}bb04@c`* zTgjM6A5+5KEt$=v08ZPXlfC2i$dnrBVmIBD;#Ow&REt&2=Lyt2PSZTnCs0Z|omv#? z08Y2EDHl9?jAodKtH>d%`0ltfK5%zg?RW7+R?Vas?rquJ8 z(#NiN3#T{MluF`DthaVROtG`IuZhRm6Lllv3+!^;r_JBS1-_N=LwrCEEp~Kt?QU1B zw31(-ii4x1lJ(@sNcac@Y33L+*ZAA%Lx7TM=Iq$rrYKza)%?Tu7^h^gUJN%qIb|BF) zUQEQj^-ZqRs0`;}3Vb$rjrlj6Nu42oyu6N+L{adt;7ydw?Coku36I89BMBNTL|;J4 zjQG&FHf-poJPev@Xgq&D$D&Vg81V@$20Z3p;}YG0uuzz0zV1#AMZ-prN;(`H4RS_; z57Fv`Fg>~Pn8-eAeZJF_EvCA?0u|UQJji^M;Wr4TU5!Nkk16NKjXDWt(CmW1UT$mj z@KU7qp8HWqwEMH;>~5Pgl}Z+%+TZ0&8Q^uWW3-frj_Jj;Hu96&wDQQ=)QqLk{Clqum8XVFW= zC!1!9>)zTH>jTChrbyZar;0H=EDjZBQ z{FGpxT;XRlBu0g4f;S0>PT?&AiD2E^gw(Qdp5Ow(Ap#;*Q_?kU0;tCL*1`t@dwp*~ zic$;L5PVLnT={1a$-*xPo+Y6EfQtl|2rQl@i4zyOppH%dtj5im=U%JI|BFVq@L$iu zy_*v5WePbJCs$pY-l0_4Q?umj9zq}9d2I0spdid_JX*mRLi!A<1~xI(iIvX(ki;WD zN`^T|^G0yq+RO^;@sT)SnPSmUiE@AU^+sO05cwkZ*M5h?hIdjs`+NWX{nTw(bXVxn zY~`D?#?$mJypb7Wk?;^d70v7Ddw@b-VOH;Xomb{{Ci)}50wY?VpoqZni|qHTp7)Z(9@zm0guE{Y#j`{{j+wI?vQjRlX(t)#dc>M`|zM=sU!x(w2s7o<*{}", 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 0000000000000000000000000000000000000000..1550165203fc45c32379eccd94b355b31a01a680 GIT binary patch literal 228 zcmX|*K?=e!6hsphErNIGR**(?E3Vz>#;x!PO>9%m|B^;T@8Kc5gD2_M3kbb{DOP7Q zGn+S4k48flw3|MQdGJ?Le&TJYqY&puRoUT>0u%ymMy>$HmZVs2t*>{(7Ua^_$h4KO4wL+Hw literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..08a3b6c3c56f68cb6e50ffd5acb590649b247641 GIT binary patch literal 233 zcmYL@K?=e!5JeLeEkf_mrQLKqfVgxih+APOO>9$5rlb+6_wW$j!IO0B1%zI}6fOSE z{I_}YyD*$HpTqK5g1@gGhVWnM0$=WI&n(M%Ji0A5%E~L*QymHEWabo^NT(*vrIyA; z8EH?VPPQ>`XNZC_#0TqoUAu#Vw1kqZG&;3Tl?JND6=Xn^smTeBgB`zi_^V-11EMm@ fAtqJR1}jbCa+Yg5^&k4xb-(yM=A5@Iu@es;YuH4t literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..da5c675c8cd1ed96adf7de40ac3bf7a86e9954dc GIT binary patch literal 1495 zcmZ`(&2QsG6dyZ@6Q^mKq)AiKk1ddbQczv7%SvI{O537JTef@XfQnG1k!w$rX&pN| zcDj@k64IV~LF&K2jpIt(5yv!_L~~k+Q*T)n#1Y=u4ehRiC6C{m_nSAr_vNd}$uxpT zJ^S_OMI50&q%wLE*TU602tOf=u<|9^R=BdQa&-yKqW2J1D+tH-m0fLg=;r%rERuPw z5w9gKrBYKxy2TpY44CKoLTh<8b$sjQ3_=sv%GInQFWpC6!HBC^;W4Zl3Xkt6b~CpR zL^4o`;rM=XH#gRnzzMA3Bu>@i_f)I{t}qst#uIe~5Sjl)OyaDe;whY~tANV`t~l0H z0vDtwBaWxBZYXOCF4kkfeP%4W1b$}6T4rz=&(>A^PF*!rK8Y(l+nB4(3w>vl$4i-e z$ZYPAar)fj$3C%XK&?Q0ytcOX3Gu1xdz{b{>INgFO9Fsq$ed7q;Q5reW{Zl% ziRpCc7m(i0+I5#4aD3=Ehge2AMKD)$M!|iYey|uu-*t- zlB%gZ4<5O!tEhBb_N+t6n=o>XyCZRnumGKO*vwJbX$#sr;3ji}pV8CWlt_`#K!`{a z0zer%5g9_BbxcPx18s^BsGuJ>%%!d;%{G;FqOQdtN;yqpVlzztj+`3~^NK`fgEbyO zVYXyoLf>qfJQ6b-p65{0jkL)}w!QfuDUtg+4C~fT+H2F%T$Tv&184$^m_fkVK_{R- zA$%F`yMh;qJ)`NhsBz?R>OvC)?8r6Rr$N(m4g1J+8=moYFB&&vZ$MYxeJi0dpR4Ut zE?YTVq~QMs%L_ErkiMe~V`@?R;mI(K^yz+Tv6osLYT=g#mN_hHTy9Ax@ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..c20ead50e8f951bd738635bc130ca0d0c192b95d GIT binary patch literal 2065 zcmb_c&u<$=6rSC+*Y?Iv+>P6qhLkF;D_JGkNG(z=p+Jfhi9joq=>;k6XtO)EH(l?T z*>xb55S5TPbKxK06mA?j@CR_TeMvM|PQIlIh+}!PYu6UINl;m7XWpB6Kfn2AP74JC z!S~y(U-v%9BJ{gdMqhd;oUViL1HuR^pP(&;D_bg8ucIm#S}{GOJ` zTx+DN>48+LsxVq!gWHkEf>7u!=2Aa&#y$v{L*?{GRVLj*T)~K|Sm7F0Erq9c(%bn- zheU=_G@RPWY!|2QrLm4PH5F%T+8O>i@E_%$2m`SVJX2H7@y@?CdjZc{DxSkde5t0L z6UBrmrHSN25o(w}w}#RiB2dC_frX_tN+ZUUHejQ z`CA4r;4+_Wyj8s_at}s~9>`k&952>APQPUQX-HfeQ6~}$YinzFh~wK~=+!+Z=0ETF zRHW%X4I+{CS+e+O@G^;!-u3O^DO?x(E8^3j5jCqCX!634z;02IipO-_qrNLD2Wc*6sprh8ib4s9mlg=Y1u)?_Ma6V#PfAd+l)tC zLNt)i17yxPP3A#xF1g8PVG!oN7lN06KpYl8$1Un^ihP>}t`{_twhX)DdW_UPpFS&( zL5Wwb%I8+4WmVj&$_p}HuG99J?UIQ7gdSGsM3%&j5+V#jpmBf;F61|Oh_2PkvhbVBJS;WA{r9H-+^qW@FVfuYO)r!_81&c z%jS`{7g+6ssL2A$-Lr!Rv&PsYgt5l2qy^NuOJY39h$TaH;?RdH6DLjVzy;ViU2Pw5 zNz8bVLU;%a`3{}vD0lBfQ%m~uPfrY#n?K4f_Opw}3)hY>EgqZYBXhZLE+3YDxzRJ% zUu04_YBO`U+{jhugargFO5dy; z(w=$u-!_#CRR~t+R`|;1KU4@lXH>Y<&o0FnE=^$At>K>eXtI&S3_`um?6Gpk)W6;0 zE2E=(SWSss!k1NdH|BQC=;UxE+Y;MVkVN+V-o6rb6C(3V|XR#D;-0}6*dNI6Ihi6NR052zd%6Ax}ODebUy=}wnvSLJ3j z@$AL_LH`F2#*;_k0-38PZfjQK)i>={2r-02C+YOPnfLkoy>?KkI0#nd=EwGJ9ieYZ zDV8x52FoD4Lj)200IgzyS4*NajV94`L`qi?(VBSOES!$ti&`!Vt)(}NBc(J-(&>aP z;iX~B6KQthfJKRa?1RwQP#Mf)m9&WjCPR;~+ zf{95CGP0x-Ye_pJhW*bmoc~aVL(W}?s|%Zq3a3?WRHXf=K=(*70(e(9L&2WMVmqM$ zOPQa_y9)~owvG4bUVBBZP@Fa(vGD+1rN z7qG`iwo0Z;VS@4-`y38>ugg(@)@=_sBa?M!+ouE$$a^+?;!i)fmPqP>W5dZ9gf!zYm*1Hx&7MQ z`;|}QUv|DedAe6?ejm|o=d|h6IZfxz9~Df`iaIk7uDMm@GTTaz5C|_{&(! z+g42Ewlg3}>rOru%i;#8@DD-B6l{GBWBkiRxbefRWAm+ZP@UbY&i+K8WZu64*y2p6 literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..fd97f1316ffbfd9125315e359868f16f5472bbcd GIT binary patch literal 1006 zcma)4&u`N(6t?rLN!p373^8qJz_cBDSt_9+O+u3ZiNhE>%p5COY3-%yQl~gBY&RqX z;>czH04MklIPeE>-7cGa<nmQtpUJS zO{R}M0pm>tjsOA(J_cKm!!3gwx4=AD2FO?d$ZW!0XIgarUN;NO&B&_TLrv<2^m}o{ zLlLJelTI%sG|AfMH2{<+Wc*%%BhUmKBESsBj&?!w>RPa7!Bxcd2tdJ4hOF5Nx9+0KZ9o(i#@^m<-yP48%B_Z3FE@|PI z5qh934i9ibStL3t?B^z97WSyL^4;ExX+mV>V!w}Ir(TvW&hs#qK2}Z1AfXCZFn%@& z6J4v=6^xaljA6h7Oro49G4ngUgepromg2kJ_wpdzS*kSbK5L$70`lWSiSr_MQ?9iST$ z5;F@cbJY5Jp&eh*lM@tg2j{L6fM6usVgXR#w)HuJ5tOqSgUit7L5bNCI0G zW<98IHwhvZ3!@(SG>pAtL1?rK+HVy}T1H&Kh^tuP8de>JXUh6|{&+yghEg<~DG#j| z{`yYGIyRP6JhY_!BR+e^_#DJrr|_G2_&@ylGuEHSXRAMt2ddvOxQR#jaAnjU6S>Dd zHIL*3fWC#TfYWCY-;Rk-6Y3@6+QP!ZO+ueimXPWV;?Xc94a)q0Ren1ZdJ4sq4;ef; zA;k5(CU?CZNLAsK#v4GOZ-y@078%wILtBG+k~2h@Tc>a)cYQ0Mp)bb!X}Zy(&_9Z! zCim#kOj?g388v9{nw%#jPT~k5Wao*?eE4ck=Nmg*N}X=fh=0QN3bhQBd!V#5b;5Y@sAZzuxr6NVes=os;^o8f z>xb6lfi=5t&F+@oZ|qsOzYb+`=1H&8Kwh({S8?Ae?oNCx?pb&L%r!RY;q9{KM Xq}bn#ImLKw9u!J@h0=EfAdUV7^H5#h literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..18b7435c3d4bdb191e07ea305ffdae303223f068 GIT binary patch literal 191 zcmey&%ge<81Z$HvW!V7f#~=<2FhLog1%QmH48aV+jNS}hj75wJ4Czdo%r8OGnvAzN zLQ;!MoD+*v{WO_wai?S@=B4NBl>o(xn1KpbGJFQ9yQQz6k)NBYpOs&fnwOhcRFavM zr(aN6l98XM57DBZk(!f}uMg5#tXEKZi^C>2KczG$)vkyGsGkvti$RPJ%#4hT_ZSq4 H*nk`WOOr3y literal 0 HcmV?d00001 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 0d15953164e7180cf875f90e0db0c72208a78920..08e52d5b2da6c339c2134ec7be20c4f292c34d0e 100644 GIT binary patch literal 1657 zcmah}&1)M+6rcT=)rS?yj%(L71}mk9h{oE)M1h3RW1&jzQZ2q2mbEmJ*X)NnGa_{^ z$tf6eNe(6BYX`v_IQsj_p-O_} zzrA{OuxS$VHx4F3$I3{8a!fqp8TUxj;6{~rrf1zVn-;g4Hn*!}g?vstdzE-}*Jx>v z6DQffVP${rXiEnybN^$R>*Z^OGu&1)6z!%w7H0;IOyz8`c#m;a+7XO=JHxgqxnhEqwqJ4q!Fl!YJJKY)*T$=BQ%k`D=)FhCZg8j?Kxa3M)&#qBb`QWU+#bj`X39VVG*bTXmeiFn?6{29G(*Ay$uwTe_EwA#v zUiN)e^!+&P3?c@4$@hO41QBk8QN{PQqbN*RlKMVJ_lklwif~1$au}-#dH3jwlp|bHZ zd=7SFL{S2GOit&QkEmK`JaPC6Oz>3%46|Kx_yP_tBP=3(f}jmPMGdX8O`oBbp8ygt z_WsT^>8*1DkQt)Q6gTe)ufxhTH?s*}C7gPcJ3XhCQ}Z7ek|rN-Hx`U1fcU%|O>+HuM?nkWNPGdJd+>mKMY(vACVMopNqoB?9)2PEZ zb`;iw7&A0ClOen^UqV<$u=Ig;THk(?^aoPq?uVTolY-CUP?Nh38}Jt58UR+v+7Ugy zy!IkFS=cyo{wgiMpg)ygmVa%Ye8-0yVz?sTSmt8!N$x`hwXx$Tg8hew7~KUpCOf1x zS^4Pi8CaApw7VdU@%RgPLbmx87(r%A?T7^l>-e2O28s&kkv?R{7A)!t3|{3}l&Y-l z{P%RM|A(|`1FUng2JncSRu*4Zs>4e4=hb25+Uv^Zu(J7k<>pELW_Hi4NpdqO(0Ro4 z&CD|T=LlG>0-NkHd1q2u{D%O%EgQ6vg+Lp8R-CM*Gb$bZQV9KQaO7GQw(#x1`p=qB z`=9PkmA{)kM_=(9umv+Dz65w<8HVu(S^1M(J-036*3+fu>(AED38?4gg3)+7c>eI& L!?y%feWZT@C`M*b delta 304 zcmey#^M#e~GcPX}0}xyZ-IcYMVIrS|jvJ6Sl_8iRn9-ZTi?N7NfgzYFnAw}ji@Atd zfkA>ni6NLpiXoUahB1g^VuLg*YdV`I`@{tzoQ${Fd{c9iQj0d8)@5YmpZt^2iIHov z4U=S+IMB!XhliUdF$K@cGXB7{K%Sb-Rb1yWT6)+7O9vBL-!AfuQENVGA0 zXJTSC`@#SuAPPZhfCf)~$0`+mi_5S=bRQT{6fkO{T}00cNX3jhEB diff --git a/members/__pycache__/models.cpython-313.pyc b/members/__pycache__/models.cpython-313.pyc index 6d0d2e0cc1a9b406ac50728e29876459268bf496..1f2649685a65e0a8df9b605af5f8cb0ae2c93496 100644 GIT binary patch literal 2206 zcmah~Pi)gx7=KRe#7&&0NhpP^1D8#e0wO^`M=KB#kTU+XVT#+GB3W+zlBRR)?Ac+I z3ppXS3*&&0cIr+mr*Yp7aN1#)Bs(OtgoLzHZ<_+zb>C+vtm&9|Qa*q0`#pdD{=HxN zu~>w_TKehd&0m9r{DGU{5(Y}Y4$5Pq5QV!*Zg7l~Q4ib<+z7IuOb(G_Lj%h21?30y2u!v^%On&5EW&%OKz+)&yiJX= zjUSfX)42_+Msu4Mqh?KGPIc4F)wi4t%gpJUnpv@OH7_eW=l3RC-*UsMYCB9--ElwT z>|h@SkM@TknxvOJ_$2oz*Ge4Qp4ra-Q24&k`shq6ezql^?PIi0Ng)$+Mb(QAJVjI$ z{5K2=x}>UKHZ%j{hFx4$y*!MnNli;t84iRyc4b3jSF6;}**NT39F0O9!lrI4uQ_z3 zTB9EBMmH^ZRabSevJ{@1#CSEQx~^)D!>VfyhuYxyAUc{vfn8^zp}>CHpMtngdWorS zVy2Ur*(tUYrB!a%V!`x!j(}HLv%iWLKK*NYgukwsfMo*h?PjCTBaz*=PB7 za-n(i4bKU4{x{J5$e^PESN|1=(Lq-Nj4ugA3E|OojFiH~iBTKw;Pg92R|zWoLXbrO z#bo!bw}UMKp56z-7Vxkl!r+esj>EifdG8C#*g}9!cw7(xE{M(z29+fg39d_0iLq2= zJQH`NRhu$paQSz!i+9g|M%l>*nB{fLELSTH23@jDxok1ns-vnIvS~Tha&_HD>dd-b z)hV;H?&MxTeak8Vcg!+XpcU#+S7OwFG0?rS!@DS~8JhXURnWpZEo%+Kfs4bN4Z~ow z5Yb43hBvi84ak2R1Wgi@APZIajNm5rCYN2Nj<$;xzZ*llJPghoxk4t)rT}AyP#i{q z#doFKl&x7d^)GO0?@p~7P#S|B#lxdx>+<+9b{r4{>=+1`+o{C1w7 zgnF<`9`(qez`p@f3~2ioP)xw1n7ir1-aZU7@>&Jes=SPg$6fy_iSt=kT-C7@VL+qAGS1b@dKVVjF{L<>m zHFZ^4EUL@5@{3Du_{t^a%BB1wJB6^gT3qtkLNuN7mfB#3D_yoMgKDO4mpnT)wKaq4 z3`x#Sc_xoofk1GoG>2hfJ(hV_bJz@`C~(|u9mIX|JHPlUn&?K4cA`hO#jZTxmgk>e z{iX1t(9-U-qg%~pU3yJGeVvSP^WT2*pIA~-l$lgol3E-eUnBxjCJZ73Km;p{V43XB z9FPN+0Ezi&vfScK$x6&i&(}*yDgs-^>YJaEngh{-YRoMTo80`A(wtPgA_bskMj$Sh g01_XV85tSxGRS;kV`nt&2=jw?}pt4K~J(AF!wO zANUBaB5q=%v7p271MY$ZrkHuN``)~nrETYcisobzeyRGcn@wc?!Lp^m8*qUO>!1c1 zbby<3Q9V^d3^||)Pl0PR(XF)+ZmVm$=?YpgGK#VC+Wuw zqC1D{#(WIO6PG~R15TL7i4Xzpa809rM4pdnEP{6M;EN!p98=LAVnMjTvY@f2vA4^) zDP?5775cOjmj|rJ8B#_pt&^#fK3o>oGCg2dEAvXBwiAR={tlLk3S!#cLZJk?5W{pS+Zn$k#`%X~O|xg?#;jOPiq+}$U1InP6YZy7^K4Ja{{S7NfOP-> literal 0 HcmV?d00001 diff --git a/members/__pycache__/tests.cpython-313.pyc b/members/__pycache__/tests.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b04a91210dec918f64265bf92aaffbf948df2055 GIT binary patch literal 14360 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 XK0^!lpY^o3;;yS({>b1j-O2w3_&f9f literal 0 HcmV?d00001 diff --git a/members/__pycache__/views.cpython-313.pyc b/members/__pycache__/views.cpython-313.pyc index c4972bed85cd53276d5c8b5462f6b92c29161045..b960a6a6852cbaacb9e4f03fb570dd9bdf7a5a71 100644 GIT binary patch literal 6009 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 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 0000000000000000000000000000000000000000..7e53fcbe9a19e6c7934d16a76b592013c25c04e0 GIT binary patch literal 1700 zcmZ`(O>7%Q6rSC+*K5Z~?D!{5fDl(vV^?Y%kXzX(LQRuYAwR9^O^}LAM{9fRY`Wex zv+JVt0umDEUO*KWIF=j7AXS26kG4738VP~KsW(Rfaplc!oJ6YG)$YuD^Sw9Uyq`H8 z9}gjT9=&{dc+ZE>UtAbI{ zS?kSV%@41v22`cs%ZX|ba992Z7b*yV7z4!YNQA70UBoyb-X4kIdrcHX@G=RQxlx!> zq`)E!+jSa{ziR6R>S6ZPueT_%3Cp7F7;)^aRdp+s{?m5nv2 z-q7d~eoT&75NyC$e@a;R387`nCfL*(gej&|JHjn$KvDV2hGsryVOK>=t!$7gr~_3} z(^`hZV(x;W*$#Gy4SQhC$%r%tbeYd=83yyUU>}w+El02E6}Kkwd8JA$XqgzwlQ_VF z5`)w9Scs1Gbex}S{v0jRDEAw?%oaC|7S)W51lw`)a!n^j)n);!>6ZVG&>KmnVAmZW7bNm_jQf7PmjwnoWLgpxGp5m6(+y$~%xv zuI}$`;(c|ah3mt3k4d79}Q>g`*#u+2)aRV3}EOm+V=&WiPIiEEL}R znCEnumZjzq4S+lM$LrMQSJKyLAfw_xL;fQ?Bz)z8xt5 z{D)*OmFuQ*$NQbsT064dk6wEr_tGof^vbWfSJh5hZAbR{(dp;O-pq~e%#CCDm*CIA zUVgKa-|Xcdbn*{+`G=kS!}h@!1B5ojUGZN&d@7!t53`R%Sc+nCFeb+*1`(86?l0at z@k@z`lh}ALG>|5zc3%B0f zLh-`M^W-_d#Z8qJuWmo2AAra&U7O!i14$5sQyB@V-_iUZDE+sb6y#^2USy#YS@;Km H;QIIvalX2+ literal 0 HcmV?d00001 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 8e5c4f590e7e3d03676bfb53c70c96d3fae4e666..650482928d815348eb1373f30b668aed0670953b 100644 GIT binary patch delta 420 zcmbO#-Y>!XnU|M~0SF!*-jlUvBCjN)!$kGw`e4o?o?xybUVVmO?m)&OJ|N8lr1^t+ ziv)uCV%UQDb-5WB^cjN%f(3zcLV=71jKRWsEc%Q^g25t1LcyZJVn9{mAXUKtlfL5vpYZw3>QY4?Qsj0O&f$(e$3Ma1bB{5=%1k^EN+W{>j8By!jrRF(d0sPGDe67UWQ45A-P12VG|1f#yX>Kp4EkRR?J#S<5RoEOlIZ%i(Caj7vEpw~P?Hn?fBJ5BNyHrP? z8jL1;x7m9paOZy!#kflexA)eZQrxE&vxAbgdEFr%<$MHn=Dk6`xQ1_V2GU+`JQsoc z>p)m|TPI-8y&h;g_fDZ}-@FGqk?+>1g&Oncz__`vuWBY&N=43{ze=pspY}_S-4PG} E0Gr-D82|tP diff --git a/myproject/__pycache__/urls.cpython-313.pyc b/myproject/__pycache__/urls.cpython-313.pyc index 0a3e8d47dcfe61248de1daf23ad448a6e799db13..057e8dd68bd6d6671da45302086c4ef354e96687 100644 GIT binary patch delta 830 zcmZuvJ#W)c6t$D*_$y9IoPI!Q5=bHHVk4nYl>sCqmZU7U1X5)wIH}{hI1aq$Qprmg z7#OK6A@MU1D`H_st}+xX!NMOXst^(r&o4DmP~LFgx#!$-uYK(=;_pJ^Op*i&pL-ua z?Ar`Q{YaAZw03R?H9)^B_rs zg`R67SnmZtlwREefvai9LtRpSv{83=#CcQDC^OVc?`N=0T=PBZy!b1+T*qD mF?fK9SF1;MRB4WvZjHfa7%(bVic1npGLwrqKr$@FnI);WSU{R4o3kZwi30^ezAEmRypT;~@(wno$+GO)9GtBD ROby&0_$CLiE3=3KgLan2MOZn2VSd81#W+ zfs92g=}el;FByT#G?{M+`sJ5ore!84mSpDVxfT`W7u^ypPR&b+&qETwB?b{HNvlK= z_tRv(#ZjDERF;{XT3o~oG_i;UM6d#hTkP@ii8(p(@hcfV1Gx;htn@STb5r%R@{3aQ zaubV6GPCmZ3o1)8^7HglvJ&&s^YxLfEY^>Y&&Y)iep(~?kL!f=SI*Mqr7R&Xu zuj>udwlO6wX0F==JFaI{t+MG^u7m5uZW79H)up&e-3?OqjxxaFJ*xsN`Dgr;m0ZkE zyj?8bzDB7_eYI4$8BnmS6v*8cVVh1Qx44vd!aY!jsWoqT0?M0L}R)@MLk9( zU8HhN%E|tTl|$wQs-LMK(LT3`nOP+>xWx#atyrvSo16c8p9-<9dxUP{s%hCRO7g!4 zljFW>7>?N>hT-=aM#HVNY))&2akpjKy`79Zh6(&^X-$Ie=ZPx z3zzFAWyHG_Y~^BYZOL^!;&`*g%_i~XqUG7dmu}zEi#gGkDyC=pN}ZS-Y5aJDK<-p> zg0Fa1gSaiP9iGYahERYq)^wc;so z&%Yp-eJNPhilO--SjL%K{t59Yj~vRA+V8WN#o$gc4nq>1flY`z z#3taf570l;Lwjm+FE#kl2Ooa$==x4-a_`i|$F1%DclI(v|4zu6_=D>QT1qYo``OV) z=eDzNJXH6F$9IR%Y!9E=8J>EW+*A8MN`ILCLLE66L0abH>AxpWe=0(^pPuNvcIEL~ zk7u9W?ch5*=|V>>>?Je*c|L};p)L~S9}7L6`M)h}Ej*riYIgALo%Ef~kJdWs+PC}K z$gj`*Hvg-9Cz<2y?*{C6c_)3NbEni%OZ&-e7m3`qv=W%|BoMJd*gl`w!^g z;pdM&S{57;qj6Lc3x^ROICy&%E|-ulUJx9qBo$uZX2{L^7kC0V037`99%~Ut1^#(W zTFpe;ujYPlASyI4s>!FgojksdHNYLX8AcPJ@ddWT+dt4D?jRwl+p5)r#N_YzS%!(j zAMpw=K7u-9216ynUwV5JS6rT;b<3&cDF;aa1g!*OI`KSMWH6VwnjaQ(s-JF<#yYQ4 z;CUxDqj?bU6?dJNG|U$vQ+@5KOW2C*UAu2VnW6<*&^zB(gBc`TkP11O&Vf8V!@IM* z3)HEAXu-+BI~^oem{upkv^rF}&~qTg9n7lGJwX4GrVk`h9@@)J>}JnyXV30tr?<1y ze;Dj!r#smwhiRXxq&()JcfA_p5^arZ`3w{Z$(f|Me literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..6441af8854e00cafaca51752515daae365ce3657 GIT binary patch literal 219 zcmXwzF$%&k6owNOEkf^*)umZ(@F1=Y@7$VFBDtl(rU**l~o}@F_1d2 zqw{QMkYor7Lb9IFW+X)F4no{W+ew=R&s?c^?!2<4^k8z!s~R$AdHQwoGa7`kptP4@ j@Gp=I2$58E6U|GPo(i?}L$q}}L$~qWr<68i>IVoP;1@rA literal 0 HcmV?d00001 diff --git a/vite_integration/__pycache__/apps.cpython-313.pyc b/vite_integration/__pycache__/apps.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..3ee823fa2897aa3f8e180a3811a9ea566e15375e GIT binary patch literal 541 zcmZ8e!AcxK5bd6sT{r5YCNV^bq8@~~?3{!ILck;hOu$QnC!uJa-m#b2?y;sv(5sL? z5OU8c|BzdLAV+D)A>`yOu*p5u&WeyaRK4QWD_(U^`u$l(@$=i)(Pyf^LUR|LDVS^% zxMG3{{(-&c$T!$iw#7uW%0zs~cj9&qqasN=H=#+nf3RCsZ>$;W;<%;T%%{!d8G$Qy z$dC($k>D7M2on)wM$w%-6W*ESj$J!6n2mw4aPQCWj%PU zi`~ZAcUqOXUpylz=zHxKwx7=U9)OW!1>k1^NY|7B&jXw`vYavt07H$nE45L^68$h& zL)nxLB&{bd>`%h5Uk0chSvv;l9O|RSsTu%#WN;Gh^e?g#J674qqB3KNPLE7hox2lj zvetk0zt2ooRXwQAF+Bcl3g^~+N*~$v%Jc8Zlk2&)%eT0A$M2`HpPRl$5M%g`RvwJB ngG+>b?`3=PD||$4_=);4rQb2<{0H0o(~bE0r@g<7%B|`jPY{z# literal 0 HcmV?d00001 diff --git a/vite_integration/__pycache__/tests.cpython-313.pyc b/vite_integration/__pycache__/tests.cpython-313.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b1b0ee004f6c54e801bccc26a7b21ac5fb19c9ff GIT binary patch literal 2806 zcmb6bO>YxNbavNkZyY-&F_4hZ#&I2r5wQs+ElFub0uG4-ZtyxO5XyA1*Y-yC+RSd! z##JRw6;%)ICHJbT)S_N`6to2usj4b&K#Gt!_06o;Av96NvotgB&GVc0 z{dV2&_acD&uRqPti3t5k5eEQgu%3r)8OccIrVyb!KgA_^!iVTtm=cmM;$mmll$dlA zchW;V3>T-QWD99YdWjcsx9pi}P5Ov0gt|}|$x=6xTQ0T?3HCF@U*MwN2NX#~Im)G6w>&2*x~YC_S`xi3DW(dxdu352 zM9ZnzP)$?Q3&sNuq=V2lOjIR@%Zje$fjet!V6RQHj|0ApE+WFoi10E;1exzf#3c)` ziWl8rf=d=<_b@Mey3tTW2JukCh$MsI1#h&~+B2(}>Zk!KII3op0@cxY&jtsu_MjWy`I6Ik1;2AlAPbOxuoJh|m(hcGU z0nemQZ_22qlS?3e8O@+{)6GC=fa6G=gZnL9E^{;7P$L6FRK`|3{PR4Jk3y;z-rAVs zG#>G6NmF&Rc3^9st-=KP-31z35_LZ@Cv_mSGlK1IHD^#ILm@j@hpGE;PF++>m1-H@ zf}*FPHE^*^pgQRDSkZGBcCu8hK+;>Mw-4#dOQR`c&`Q3F?gu;9f{~SAWHq?&nsi_C zed+()U*A1)W8#*SxZ|K>KTq72&ah0_6vP&g!761x1n>DuaRSF9ottY01p?6svdj%Y zkJ0%VKHaPukkx=Wn(z$Ll5^VFp}q04AiLt6EXMdl8#1Af5Az{3N4pmTS(@SH7TGJe z4!d~762$M^ZS0P&x&TuHej5q(B3?j!=pfqP_-hVq$-{fSAUT9mo$m;}D9>%rQ9w3F z)R(IHoemF0UeRkix5}zokX5t6n!!L(F^a%k+xZ`2)-a$7U3smfS^^+7alyf+c(B}@o7Q{(Q!Xzn za1Yh&2Uwt0`g?Er`|ABi@9quN`;M&c9l8-%*?a2RnLEBcYre>eFY;~Xy9?i3s1Kg1 zrwb3k4cr6|+ZAq-e}qsHzEA)goZ?~d>^n`*@AH@Vx-SBke$3x(5C6DOKYOWeEWy<& z{w(F|Nb`4kde?dmuJjyS?TLLQJryYJsRy-%>;Ar{Zi+o&e9sv1w!iP05dnR_7!}6^ z;pUF^(Zk}+K8cwo?r&rb)ER3lK-(KSUXJ(S`OPLPs)N zXvrFbuzZFd^PJfK*v*MK?vWe0JHJ0tPkgWqIW|P(Ku$oH2h|w}) zA2YV@o9(frW47boC2zz3p+6wwHCP@B9LN2RTJNE*d+7DQ(ZC;Q_%Af@k2}c4zixYi IU}I+d3%MS+VE_OC literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..cd8d34205cb701dfc53f1db63d11f56a81c89139 GIT binary patch literal 241 zcmYk0F$w}P5JeLe6~Q~Cwa}C{>H#cl6x$HpF`IQa6XGc7Jv@YWu=5t%i5C#|0%k$M z-^~9Ey#K3yzsI7Uk9#(Y_f?0V_}5h3Xs&F@0yBKjxQtg&_*@eVNgLtycCQVH9R@)u z2#7-NLO4X}z_6GK<1nR#;f7QMM<^W} zZcIgSl+vN$rc^U-rnETRl4`}RlnxJXNVVZM2|W`^C%kFa-rZ>5S^>x8nB35TrWo8V zM>-JhkQ*W2Bu63NEH^>EtyoYEbJw_% zyQJnN#V}OUNPI&E7>P4Zu!JkwoRXVVp}?P3%t?3$D!4SI7d0RSZx}*DSF@;17=)!z z)bc7OWXtHV6wb3g^l3ci#zlmZz;Ea^QV!*d8?I=?_Z#-PZa%9jq_8^f_kV+E;tf zyUa-3=L9BHn6HU(05}|0H=KZ~T`po>b2w;3NRA9-=AeL-VGt~(U8w2&;))E2I*2MITBV^Zh z8E=Fyx58uWf@}`0gj-%4TF75JW{2Z*gUhY$i>=${_gVbVpZ2_W@ZE#&^}pNyL680L z5Y((f2b8OBAQZ?f>E<2;qJDETXx|!NdTnEYp_)7;mzhIQ*Ms8hNI%(YhuIBV1UoaM z8V+ybiW+Af&M>j#E9uXxAbz|7*bMS%3Ad3RLRK-dk=dLl@|{# ziJKP1O}4nj+InbFJY?~Qa17dW@Kh5KE?q@05cR7VtInOkg(q5XWiW4U#A!KuVstQ@ zkq5KK2G3^Y!Sva|^zk@Lr$hJpT|`H8r`wpV7-}}JUIuaC%PPh_Fyt0^46-mXYmkPu zWzUU4yY-;`Q}a#zU-L~9Q+OcBT-|E;5vQ51Mjjm)J#jR9Iz4#sp28s;#`IEOo- zJ6)9H1F00J@k6A7Y^b}uNY=H^>@-#j#VdFxv}}dPkRYQndFhH3>%CsE8~54b{w1+* zQSAFbw#5O9ANX&<@X(72<^v$=1tT-wv^A7LJD`;$MMS73vYHD1lqGkgv8pY5su@8t zyO*tw!ep2q8KpWC7zM_6Q*B#SCSKjvlLI3sjt|PC+0z4~L$j^P1lic62c?NAL)T_U zDav|vlBSzdL9b}}gp{sm(nW2$EMXwVE5%a&VlUvc3bigE5KvYoRIqj_rXdls`o*B)qZaR zQ@xthRA4<6A~t=1VFB|0H_&&3GpH&8Cxf#9cd-WZQl08N#f{NW1SU~!_mn12R1?Az zH`S|0hU)8&bp9>A@@N~jA-@EdvLFxQ0&M2Tj76|=DGm#_(fs^#=Nc+A=O{n}El z7$(Rb++|Ud6e%U28jIXuxdhcD?$-U$_rq6V6xw)Q7DuEpTa>*bY}jc*)y^}xcjcFV)_!nYg>J^Zz};p*f&{F1nBQQWo? z*=lv4v?C*yFtRMR%$@o+2rQokcYbdWyL)rvKnM3xM`&P2AP2>2s`~%;p{iavJWJP5 zCt%2W3gU63$=V)B8dJ0OnqX@Rm#K>cwxY3W{18A&6Nxfvh*QI|46Cv-v<w$AE`08)qRSAl`0^o92$)W;x#(W;wR`?ckfix5TAbaxs>i zZ@A}2;f_B%w2*%*e(hOX+-vcBzq{u{;g(gz06&%DF*`E&w|$my`iI*bsr;ULzn3}= zp}&L%+PIH=;ejUZqb48F_k|lo&eR{g4@Ppqcfo%la6wp4re%L88ue#r@TW0JRQ8RL z_=_e_s%0VL%lI>ajPNKga}a3@<-lkFjJ+DVNNCj8g3fXVn?wfNf`$O*G_Fo^{CYaz zeIGoCFT+L9-l~iBK;txfayvpIn777jT!v3KdULD2>qhbaj0t|Sy2AA|*Z?pySdA;7cyMI4nIe{| znRrH;hO>YvU7YQ@C>0HcPCZqz^%fzo$&lrjObb#0*nLVfzLjC;fAg|E?QDX(l z6F{fo{b0IZrt8^y20c;*Z4JErdOR{{k|#sZ2GB;09rf3{2ML`7kSCJ;kuQKI)qPji3=>K?-w5QdR4CTIW}D3+&nY#I)iGYmLSa7sRpn_&kW zzcLMApN|VpC^uQrE@kOS!$)Z+;&uaEcgq6w&QeSddX#|=lh61rgNHDk0DY->gScV< zdT9<41q)0--RXj$PtR9!el$OKI z%R=MJ;tS%{)Tct%ay0fv_?7U&)7P8rXz#plx$~j7i*FXM2XE}T*|~pyPdhE;C7J@w2wq0+&8S9-NT5jC9F!NdCj^$|kQdC-uO4njHqdV{VQ2Q<#Ld{g}Ax*&TgG4q{tVGH0gM!`Px!q{UnM4AIOB_AxuEh5r);78rs6iMKy648Ze0q+-Qr0?3myf_+WAr4mu%f z4Ad3?iHTw0ql9UMGLenMr%0K|g6=dv1C&9+HX;S-aY!y^M<0{`9s?%wG2;iwegN!l zjJ^1)xgi4GIs?1C(6JcpnfKimP*cm?iIqsxi|X7H-||7`ptV_mA!&dCjhi51X_kWtcXs5@mGdU}lx6~=?(sPR{w(^E`%Cv_ncJ%V6{PQbf z>($XW&cAYg!Tf#J7Pndaw(su6QMi@36P>z~p8YpwZ`OgQ2SD~4_9*%;C5Jm3*smt!Lg(o zch+DK&aVF1!8D+QiX~lBrFulB2uyH#yCK0*74Cn?QI%Z#)GWM)&TA*&+UYl&Nk2K; zHffsE2b0O&dmc+X0>9k{_w9acZ_>4}@Z*=s$tPDT!mzVvey+WRel8=#Lp`u`_oV8_ z?opMvEyrJS3)Cu!b;Nmmjx4wNs;1Yt^dJevH z0UqNy$mS4)Lc+$SKx{D(TWN>j^)c(f8M{5b)P8=k9Sr4JyZwTt00NF zPP_eapj$UBj4bsYUhF;mLC)?yVz(Zh53V$JEQc>Hhaumv8sMX$+lUW_?uAfz^FqoN zw_E&n_Z%L9q2muZfowLf=dxM6AIdlinG-Bjw44c7B?czC;RHy0Un-8f2ZJyy4GM{A z1%tfZ&2n#;FtGRN}O#2p_!F5c*sn(2t4xBH@McDr6A5GR)^F^%WBTiGsIK z*DVygg`|I>O_1M0iCZXn3+H8?KYwAM*YmAcbj9(FK+KgY-ovTU1VDCup+aA@BlYZR0IA4 DZ95S= literal 0 HcmV?d00001 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() +