Merge branch 'deployments/ood.antenna.insectai.org' of https://github.com/RolnickLab/antenna into deployments/ood.antenna.insectai.org

Author: annavik

ami/main/api/views.py

@@ -1118,7 +1118,9 @@ def get_queryset(self) -> QuerySet["Occurrence"]:
         qs = qs.with_detections_count().with_timestamps()  # type: ignore
         qs = qs.with_identifications()  # type: ignore
 
-        if self.action != "list":
+        if self.action == "list":
+            qs = qs.has_determination()  # type: ignore
+        else:
             qs = qs.prefetch_related(
                 Prefetch(
                     "detections", queryset=Detection.objects.order_by("-timestamp").select_related("source_image")

ami/main/models.py

@@ -2235,6 +2235,12 @@ class OccurrenceQuerySet(models.QuerySet["Occurrence"]):
     def valid(self):
         return self.exclude(detections__isnull=True)
 
+    def has_determination(self):
+        """
+        Filter out occurrences that are missing a determination.
+        """
+        return self.filter(determination__isnull=False)
+
     def with_detections_count(self):
         return self.annotate(detections_count=models.Count("detections", distinct=True))