diff --git a/db.sqlite3 b/db.sqlite3 index 29dda90..4fd0c49 100644 Binary files a/db.sqlite3 and b/db.sqlite3 differ diff --git a/fireworks_detect/admin.py b/fireworks_detect/admin.py index a84473d..553b3d2 100644 --- a/fireworks_detect/admin.py +++ b/fireworks_detect/admin.py @@ -10,7 +10,7 @@ from django.urls import path, reverse from django.utils.html import format_html from django.utils.translation import gettext as _, gettext_lazy, ngettext -from .models import ClassificationRule, Event, PendingEvent, Sensor +from .models import BrowserProcessingSettings, ClassificationRule, Event, PendingEvent, Sensor from . import views as classifier_views @@ -21,6 +21,33 @@ class ClassificationRuleAdmin(admin.ModelAdmin): search_fields = ("value",) +@admin.register(BrowserProcessingSettings) +class BrowserProcessingSettingsAdmin(admin.ModelAdmin): + list_display = ("beta_status",) + readonly_fields = ("beta_status",) + fieldsets = ( + (gettext_lazy("Browser-side media processing (Beta)"), { + "fields": ("beta_status", "browser_processing_beta_enabled"), + "description": gettext_lazy( + "Enables experimental client-side video audio extraction and YAMNet pre-classification. " + "Browser compatibility may vary. Disabling this restores the normal server-side submission flow." + ), + }), + ) + + @admin.display(description=gettext_lazy("Beta status")) + def beta_status(self, obj): + if obj and obj.browser_processing_beta_enabled: + return format_html('{}', _("Enabled")) + return format_html('{}', _("Disabled — normal submission")) + + def has_add_permission(self, request): + return super().has_add_permission(request) and not BrowserProcessingSettings.objects.exists() + + def has_delete_permission(self, request, obj=None): + return False + + class ClassificationAdmin(admin.ModelAdmin): list_display = ("original_filename", "source_type", "sensor", "occurrences", "location", "visually_confirmed", "primary_label", "primary_score", "duration", "created_at") list_filter = ("source_type", "visually_confirmed", "created_at") diff --git a/fireworks_detect/browser_policy.py b/fireworks_detect/browser_policy.py new file mode 100644 index 0000000..00b7ea8 --- /dev/null +++ b/fireworks_detect/browser_policy.py @@ -0,0 +1,67 @@ +"""Public, advisory configuration for the optional browser processing beta.""" + +import json + +from django.urls import reverse + +from .models import BrowserProcessingSettings, ClassificationRule + +POLICY_VERSION = 1 +SPEECH_LABEL_TERMS = ( + "speech", "conversation", "narration", "monologue", "babbling", "whisper", + "speaking", "speech synthesizer", +) +GATE_RESULTS = {"whitelist_match", "no_match", "unavailable", "error"} + + +def browser_config(): + """Keep template configuration in one small, non-secret object.""" + return { + "browserProcessingBeta": BrowserProcessingSettings.enabled(), + "policyUrl": reverse("fireworks_detect:browser_policy"), + "policyVersion": POLICY_VERSION, + } + + +def browser_policy(): + enabled = BrowserProcessingSettings.enabled() + policy = { + "version": POLICY_VERSION, + "browser_processing_beta_enabled": enabled, + "whitelist": [], + "privacy_sensitive_speech": [], + "thresholds": {}, + } + if not enabled: + return policy + rules = ClassificationRule.objects.filter(enabled=True).order_by("value") + policy["whitelist"] = list(rules.filter(rule_type=ClassificationRule.RuleType.WHITELIST).values_list("value", flat=True)) + policy["privacy_sensitive_speech"] = [ + value for value in rules.filter(rule_type=ClassificationRule.RuleType.BLACKLIST).values_list("value", flat=True) + if any(term in value.lower() for term in SPEECH_LABEL_TERMS) + ] + return policy + + +def advisory_browser_metadata(post_data): + """Parse bounded diagnostics; never use this to authorize or classify audio.""" + raw = post_data.get("browser_processing_metadata", "") + if not raw or len(raw) > 1024: + return {} + try: + submitted = json.loads(raw) + except (TypeError, ValueError): + return {} + if not isinstance(submitted, dict): + return {} + metadata = {} + for key in ("browser_processing_used", "browser_override"): + if type(submitted.get(key)) is bool: + metadata[key] = submitted[key] + version = submitted.get("browser_processing_version") + if type(version) is int and 0 < version <= POLICY_VERSION: + metadata["browser_processing_version"] = version + gate_result = submitted.get("browser_gate_result") + if isinstance(gate_result, str) and gate_result in GATE_RESULTS: + metadata["browser_gate_result"] = gate_result + return metadata diff --git a/fireworks_detect/migrations/0009_browserprocessingsettings.py b/fireworks_detect/migrations/0009_browserprocessingsettings.py new file mode 100644 index 0000000..a10af34 --- /dev/null +++ b/fireworks_detect/migrations/0009_browserprocessingsettings.py @@ -0,0 +1,24 @@ +# Generated by Django 6.1.1 on 2026-10-02 14:31 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('fireworks_detect', '0008_sensor_owner_sensor_archived_at'), + ] + + operations = [ + migrations.CreateModel( + name='BrowserProcessingSettings', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('browser_processing_beta_enabled', models.BooleanField(default=False)), + ], + options={ + 'verbose_name': 'Browser-side media processing (Beta)', + 'verbose_name_plural': 'Browser-side media processing (Beta)', + }, + ), + ] diff --git a/fireworks_detect/migrations/0010_create_browser_processing_settings.py b/fireworks_detect/migrations/0010_create_browser_processing_settings.py new file mode 100644 index 0000000..c3097a4 --- /dev/null +++ b/fireworks_detect/migrations/0010_create_browser_processing_settings.py @@ -0,0 +1,16 @@ +from django.db import migrations + + +def create_disabled_settings(apps, schema_editor): + Settings = apps.get_model("fireworks_detect", "BrowserProcessingSettings") + Settings.objects.get_or_create(pk=1, defaults={"browser_processing_beta_enabled": False}) + + +class Migration(migrations.Migration): + dependencies = [ + ("fireworks_detect", "0009_browserprocessingsettings"), + ] + + operations = [ + migrations.RunPython(create_disabled_settings, migrations.RunPython.noop), + ] diff --git a/fireworks_detect/models.py b/fireworks_detect/models.py index 0d5d47f..2edf4cd 100644 --- a/fireworks_detect/models.py +++ b/fireworks_detect/models.py @@ -88,6 +88,27 @@ class ClassificationRule(models.Model): return f"{self.value} ({self.get_rule_type_display()})" +class BrowserProcessingSettings(models.Model): + """Single site-wide switch for experimental browser processing.""" + + browser_processing_beta_enabled = models.BooleanField(default=False) + + class Meta: + verbose_name = _("Browser-side media processing (Beta)") + verbose_name_plural = _("Browser-side media processing (Beta)") + + def save(self, *args, **kwargs): + self.pk = 1 + return super().save(*args, **kwargs) + + @classmethod + def enabled(cls): + return bool(cls.objects.filter(pk=1).values_list("browser_processing_beta_enabled", flat=True).first()) + + def __str__(self): + return str(_("Browser-side media processing (Beta)")) + + class ClassifiedAudio(models.Model): """Shared fields for a classifier response and its original audio upload.""" diff --git a/fireworks_detect/templates/fireworks_detect/dashboard.html b/fireworks_detect/templates/fireworks_detect/dashboard.html index ea24bc0..9862782 100644 --- a/fireworks_detect/templates/fireworks_detect/dashboard.html +++ b/fireworks_detect/templates/fireworks_detect/dashboard.html @@ -9,6 +9,7 @@ {% vite_asset "frontend/src/entries/dashboard.js" %} {% include "js_translations.html" %} + {% include "fireworks_detect/includes/browser_processing_config.html" %}
{% if user.is_authenticated %}{{ user.get_username|first|upper }}{% endif %} diff --git a/fireworks_detect/templates/fireworks_detect/home.html b/fireworks_detect/templates/fireworks_detect/home.html index ac798b8..381951e 100644 --- a/fireworks_detect/templates/fireworks_detect/home.html +++ b/fireworks_detect/templates/fireworks_detect/home.html @@ -9,6 +9,7 @@ {% vite_asset "frontend/src/entries/fireworks-home.js" %} {% include "js_translations.html" %} + {% include "fireworks_detect/includes/browser_processing_config.html" %} @@ -30,4 +31,4 @@ -