Merge branch 'main' of github.com:RolnickLab/antenna into 706-support-for-reprocessing-detections-and-skipping-detector

Author: mihow

.envs/.ci/.django

@@ -16,3 +16,6 @@ MINIO_DEFAULT_BUCKET=ami-ci
 MINIO_STORAGE_USE_HTTPS=False
 MINIO_TEST_BUCKET=ami-test-ci
 MINIO_BROWSER_REDIRECT_URL=http://minio:9001
+
+DEFAULT_PROCESSING_SERVICE_NAME=Test Processing Service
+DEFAULT_PROCESSING_SERVICE_ENDPOINT=http://ml_backend:2000

.envs/.local/.django

@@ -37,3 +37,8 @@ MINIO_DEFAULT_BUCKET=ami
 MINIO_STORAGE_USE_HTTPS=False
 MINIO_TEST_BUCKET=ami-test
 MINIO_BROWSER_REDIRECT_URL=http://minio:9001
+
+# Default processing service (local)
+DEFAULT_PROCESSING_SERVICE_NAME=Local Processing Service
+DEFAULT_PROCESSING_SERVICE_ENDPOINT=http://ml_backend:2000
+# DEFAULT_PIPELINES_ENABLED=random,constant  # When set to None, all pipelines will be enabled.

.envs/.production/.django-example

@@ -53,3 +53,8 @@ DJANGO_ACCOUNT_ALLOW_REGISTRATION=True
 # Gunicorn
 # ------------------------------------------------------------------------------
 WEB_CONCURRENCY=4
+
+# Default processing service
+DEFAULT_PROCESSING_SERVICE_NAME="AMI Data Companion"
+DEFAULT_PROCESSING_SERVICE_ENDPOINT=https://ml.antenna.insectai.org/
+DEFAULT_PIPELINES_ENABLED=global_moths_2024,quebec_vermont_moths_2023,panama_moths_2023,uk_denmark_moths_2023

ami/base/views.py

@@ -22,20 +22,23 @@ class ProjectMixin:
     def get_active_project(self) -> Project:
         from ami.base.serializers import SingleParamSerializer
 
+        param = "project_id"
+
         project_id = None
         # Extract from URL `/projects/` is in the url path
         if "/projects/" in self.request.path:
             project_id = self.kwargs.get("pk")
 
         # If not in URL, try query parameters
         if not project_id:
-            if self.require_project:
-                project_id = SingleParamSerializer[int].clean(
-                    param_name="project_id",
-                    field=serializers.IntegerField(required=True, min_value=0),
-                    data=self.request.query_params,
-                )
-            else:
-                project_id = self.request.query_params.get("project_id")  # No validation
+            # Look for project_id in GET query parameters or POST data
+            # POST data returns a list of ints, but QueryDict.get() returns a single value
+            project_id = self.request.query_params.get(param) or self.request.data.get(param)
+
+            project_id = SingleParamSerializer[int].clean(
+                param_name=param,
+                field=serializers.IntegerField(required=self.require_project, min_value=0),
+                data={param: project_id} if project_id else {},
+            )
 
         return get_object_or_404(Project, id=project_id) if project_id else None

ami/main/admin.py

@@ -26,6 +26,7 @@
     Site,
     SourceImage,
     SourceImageCollection,
+    Tag,
     TaxaList,
     Taxon,
 )
@@ -75,9 +76,33 @@ def save_related(self, request, form, formsets, change):
     filter_horizontal = ("members",)
 
     inlines = [ProjectPipelineConfigInline]
+    autocomplete_fields = ("default_filters_include_taxa", "default_filters_exclude_taxa")
 
     fieldsets = (
-        (None, {"fields": ("name", "description", "priority", "active")}),
+        (
+            None,
+            {
+                "fields": (
+                    "name",
+                    "description",
+                    "priority",
+                    "active",
+                    "feature_flags",
+                )
+            },
+        ),
+        (
+            "Settings",
+            {
+                "fields": (
+                    "default_processing_pipeline",
+                    "session_time_gap_seconds",
+                    "default_filters_score_threshold",
+                    "default_filters_include_taxa",
+                    "default_filters_exclude_taxa",
+                ),
+            },
+        ),
         (
             "Ownership & Access",
             {
@@ -455,6 +480,7 @@ class TaxonAdmin(admin.ModelAdmin[Taxon]):
         "rank",
         "parent",
         "parent_names",
+        "tag_list",
         "list_names",
         "created_at",
         "updated_at",
@@ -475,10 +501,10 @@ def get_queryset(self, request):
 
         return qs.annotate(occurrence_count=models.Count("occurrences")).order_by("-occurrence_count")
 
-    @admin.display(
-        description="Occurrences",
-        ordering="occurrence_count",
-    )
+    @admin.display(description="Tags")
+    def tag_list(self, obj) -> str:
+        return ", ".join([tag.name for tag in obj.tags.all()])
+
     def occurrence_count(self, obj) -> int:
         return obj.occurrence_count
 
@@ -596,3 +622,10 @@ def populate_collection_async(self, request: HttpRequest, queryset: QuerySet[Sou
 
     # Hide images many-to-many field from form. This would list all source images in the database.
     exclude = ("images",)
+
+
+@admin.register(Tag)
+class TagAdmin(admin.ModelAdmin):
+    list_display = ("id", "name", "project")
+    list_filter = ("project",)
+    search_fields = ("name",)