feat(double-check): Allow validation of imported annotations [ADEV-10]

.github/workflows/cypress.yml

@@ -57,6 +57,7 @@ jobs:
         env:
           CYPRESS_CI_ENV: true
         with:
+          component: true
           working-directory: frontend
           start: |
             poetry run python ../manage.py runserver

backend/api/admin.py → backend/api/admin/__init__.py

@@ -7,7 +7,6 @@
 from django.db import IntegrityError, transaction
 from django.utils.html import format_html
 
-
 from backend.api.models import (
     Dataset,
     DatasetFile,
@@ -16,7 +15,6 @@
     AnnotationCampaign,
     AnnotationTask,
     AnnotationComment,
-    AnnotationResult,
     AnnotationSession,
     SpectroConfig,
     DatasetType,
@@ -26,6 +24,12 @@
     ConfidenceIndicator,
     ConfidenceIndicatorSet,
 )
+from backend.api.admin.annotation import (
+    DetectorAdmin,
+    DetectorConfigurationAdmin,
+    AnnotationResultAdmin,
+    AnnotationResultValidationAdmin,
+)
 
 
 def get_many_to_many(obj, field_name, related_field_name="name"):
@@ -55,7 +59,7 @@ class NewItemsForm(forms.ModelForm):
 
 
 class ConfidenceIndicatorAdmin(admin.ModelAdmin):
-    """Collection presentation in DjangoAdmin"""
+    """ConfidenceIndicatorAdmin presentation in DjangoAdmin"""
 
     list_display = (
         "id",
@@ -75,7 +79,7 @@ def save_model(self, request, obj, form, change):
 
 
 class ConfidenceIndicatorSetAdmin(admin.ModelAdmin):
-    """Collection presentation in DjangoAdmin"""
+    """ConfidenceIndicatorSet presentation in DjangoAdmin"""
 
     list_display = (
         "id",
@@ -84,12 +88,6 @@ class ConfidenceIndicatorSetAdmin(admin.ModelAdmin):
     )
 
 
-class CollectionAdmin(admin.ModelAdmin):
-    """Collection presentation in DjangoAdmin"""
-
-    list_display = ("name", "desc", "owner")
-
-
 class DatasetTypeAdmin(admin.ModelAdmin):
     """DatasetType presentation in DjangoAdmin"""
 
@@ -113,9 +111,7 @@ class DatasetAdmin(admin.ModelAdmin):
         "dataset_type",
         "geo_metadatum",
         "owner",
-        "tabular_metadatum",
         "show_spectro_configs",
-        "show_collections",
     )
     fields = (
         "name",
@@ -129,18 +125,12 @@ class DatasetAdmin(admin.ModelAdmin):
         "dataset_type",
         "geo_metadatum",
         "owner",
-        "tabular_metadatum",
-        "collections",
     )
 
     def show_spectro_configs(self, obj):
         """show_spectro_configs"""
         return get_many_to_many(obj, "spectro_configs")
 
-    def show_collections(self, obj):
-        """show_collections"""
-        return get_many_to_many(obj, "collections")
-
     def show_audio_metadatum_url(self, obj):
         """show_audio_metadatum_url"""
         return format_html(
@@ -159,7 +149,6 @@ class DatasetFileAdmin(admin.ModelAdmin):
         "size",
         "dataset",
         "audio_metadatum",
-        "tabular_metadatum",
     )
 
 
@@ -175,7 +164,6 @@ class AnnotationSetAdmin(admin.ModelAdmin):
     list_display = (
         "name",
         "desc",
-        "owner",
         "show_tags",
     )
 
@@ -190,8 +178,6 @@ class AnnotationCommentAdmin(admin.ModelAdmin):
     list_display = (
         "id",
         "comment",
-        "annotation_task",
-        "annotation_result",
     )
 
 
@@ -212,7 +198,11 @@ class AnnotationCampaignAdmin(admin.ModelAdmin):
         "show_datasets",
         "show_annotators",
         "confidence_indicator_set",
+        "usage",
     )
+    search_fields = ("name", "desc")
+
+    list_filter = ("datasets", "usage")
 
     def show_spectro_configs(self, obj):
         """show_spectro_configs"""
@@ -234,24 +224,10 @@ class AnnotationTaskAdmin(admin.ModelAdmin):
         "status",
         "annotation_campaign",
         "dataset_file",
-        "annotator_id",
-    )
-    list_filter = ("status", "annotation_campaign", "annotator_id")
-
-
-class AnnotationResultAdmin(admin.ModelAdmin):
-    """AnnotationResult presentation in DjangoAdmin"""
-
-    list_display = (
-        "id",
-        "start_time",
-        "end_time",
-        "start_frequency",
-        "end_frequency",
-        "annotation_tag",
-        "annotation_task",
-        "confidence_indicator",
+        "annotator",
     )
+    search_fields = ("dataset_file__filename",)
+    list_filter = ("status", "annotation_campaign", "annotator")
 
 
 class AnnotationSessionAdmin(admin.ModelAdmin):
@@ -332,40 +308,6 @@ class SpectroConfigAdmin(admin.ModelAdmin):
     )
 
 
-class TabularMetadatumAdmin(admin.ModelAdmin):
-    """TabularMetadatum presentation in DjangoAdmin"""
-
-    list_display = (
-        "name",
-        "desc",
-        "dimension_count",
-        "variable_count",
-    )
-
-
-class TabularMetadataVariableAdmin(admin.ModelAdmin):
-    """TabularMetadataVariable presentation in DjangoAdmin"""
-
-    list_display = (
-        "name",
-        "desc",
-        "data_type",
-        "dimension_size",
-        "variable_position",
-        "tabular_metadata",
-    )
-
-
-class TabularMetadataShapeAdmin(admin.ModelAdmin):
-    """TabularMetadataShape presentation in DjangoAdmin"""
-
-    list_display = (
-        "dimension_position",
-        "tabular_metadata_dimension",
-        "tabular_metadata_variable",
-    )
-
-
 admin.site.register(ConfidenceIndicator, ConfidenceIndicatorAdmin)
 admin.site.register(ConfidenceIndicatorSet, ConfidenceIndicatorSetAdmin)
 admin.site.register(DatasetType, DatasetTypeAdmin)
@@ -376,15 +318,8 @@ class TabularMetadataShapeAdmin(admin.ModelAdmin):
 admin.site.register(AnnotationCampaign, AnnotationCampaignAdmin)
 admin.site.register(AnnotationComment, AnnotationCommentAdmin)
 admin.site.register(AnnotationTask, AnnotationTaskAdmin)
-admin.site.register(AnnotationResult, AnnotationResultAdmin)
 admin.site.register(AnnotationSession, AnnotationSessionAdmin)
 admin.site.register(AudioMetadatum, AudioMetadatumAdmin)
 admin.site.register(GeoMetadatum, GeoMetadatumAdmin)
 admin.site.register(SpectroConfig, SpectroConfigAdmin)
 admin.site.register(WindowType, WindowTypeAdmin)
-
-
-# admin.site.register(Collection, CollectionAdmin)
-# admin.site.register(TabularMetadatum, TabularMetadatumAdmin)
-# admin.site.register(TabularMetadataVariable, TabularMetadataVariableAdmin)
-# admin.site.register(TabularMetadataShape, TabularMetadataShapeAdmin)

backend/api/admin/annotation/__init__.py

@@ -0,0 +1,23 @@
+""" Annotation admin management """
+from django.contrib import admin
+
+from backend.api.admin.annotation.detector import (
+    DetectorAdmin,
+    DetectorConfigurationAdmin,
+)
+from backend.api.admin.annotation.result import (
+    AnnotationResultAdmin,
+    AnnotationResultValidationAdmin,
+)
+from backend.api.models.annotation import (
+    Detector,
+    DetectorConfiguration,
+    AnnotationResult,
+    AnnotationResultValidation,
+)
+
+admin.site.register(Detector, DetectorAdmin)
+admin.site.register(DetectorConfiguration, DetectorConfigurationAdmin)
+
+admin.site.register(AnnotationResult, AnnotationResultAdmin)
+admin.site.register(AnnotationResultValidation, AnnotationResultValidationAdmin)

backend/api/admin/annotation/detector.py

@@ -0,0 +1,16 @@
+"""Detector model"""
+from django.contrib import admin
+
+
+class DetectorAdmin(admin.ModelAdmin):
+    """Detector in DjangoAdmin"""
+
+    search_fields = ["name", "configurations__configuration"]
+    list_display = ["name"]
+
+
+class DetectorConfigurationAdmin(admin.ModelAdmin):
+    """Detector in DjangoAdmin"""
+
+    search_fields = ["configuration", "detector"]
+    list_display = ["configuration", "detector"]

backend/api/admin/annotation/result.py

@@ -0,0 +1,66 @@
+"""Detector model"""
+from django.contrib import admin
+
+
+class AnnotationResultAdmin(admin.ModelAdmin):
+    """AnnotationResult presentation in DjangoAdmin"""
+
+    list_display = (
+        "id",
+        "start_time",
+        "end_time",
+        "start_frequency",
+        "end_frequency",
+        "annotation_tag",
+        "confidence_indicator",
+        "annotation_campaign",
+        "dataset_file",
+        "annotator",
+        "detector_configuration",
+    )
+    search_fields = (
+        "annotation_tag__name",
+        "confidence_indicator__label",
+        "annotator__username",
+        "annotator__first_name",
+        "annotator__last_name",
+        "detector_configuration__detector__name",
+    )
+    list_filter = (
+        "annotation_campaign",
+        "annotator",
+    )
+
+
+class AnnotationResultValidationAdmin(admin.ModelAdmin):
+    """AnnotationResultValidation presentation in DjangoAdmin"""
+
+    list_display = (
+        "id",
+        "is_valid",
+        "annotator",
+        "result",
+        "get_campaign",
+        "get_detector",
+    )
+    search_fields = (
+        "annotator__username",
+        "annotator__first_name",
+        "annotator__last_name",
+        "result__annotation_campaign__name",
+        "result__detector_configuration__detector__name",
+    )
+    list_filter = ("is_valid",)
+
+    @admin.display(description="Campaign")
+    def get_campaign(self, result_validation):
+        """Get campaign for given result validation"""
+        return result_validation.result.annotation_campaign
+
+    @admin.display(description="Detector")
+    def get_detector(self, result_validation):
+        """Get detector for given result validation"""
+        conf = result_validation.result.detector_configuration
+        if conf is None:
+            return None
+        return conf.detector