Merge branch 'main' into fix/upload-captures

mohamedelabbas1996 · web-flow · commit b7371df5f6f1 · 2025-04-03T19:52:48.000-04:00
diff --git a/ami/main/api/views.py b/ami/main/api/views.py
@@ -1069,9 +1069,9 @@ def get_serializer_class(self):
         else:
             return OccurrenceSerializer
 
-    def get_queryset(self) -> QuerySet:
+    def get_queryset(self) -> QuerySet["Occurrence"]:
         project = self.get_active_project()
-        qs = super().get_queryset()
+        qs = super().get_queryset().valid()  # type: ignore
         if project:
             qs = qs.filter(project=project)
         qs = qs.select_related(
@@ -1085,10 +1085,7 @@ def get_queryset(self) -> QuerySet:
         if self.action == "list":
             qs = (
                 qs.all()
-                .exclude(detections=None)
-                .exclude(event=None)
                 .filter(determination_score__gte=get_active_classification_threshold(self.request))
-                .exclude(first_appearance_timestamp=None)  # This must come after annotations
                 .order_by("-determination_score")
             )
 
@@ -1426,11 +1423,7 @@ def get(self, request):
                 "events_count": Event.objects.filter(deployment__project=project, deployment__isnull=False).count(),
                 "captures_count": SourceImage.objects.filter(deployment__project=project).count(),
                 # "detections_count": Detection.objects.filter(occurrence__project=project).count(),
-                "occurrences_count": Occurrence.objects.filter(
-                    project=project,
-                    # determination_score__gte=confidence_threshold,
-                    event__isnull=False,
-                ).count(),
+                "occurrences_count": Occurrence.objects.valid().filter(project=project).count(),  # type: ignore
                 "taxa_count": Occurrence.objects.all().unique_taxa(project=project).count(),  # type: ignore
             }
         else:
@@ -1440,10 +1433,7 @@ def get(self, request):
                 "events_count": Event.objects.filter(deployment__isnull=False).count(),
                 "captures_count": SourceImage.objects.count(),
                 # "detections_count": Detection.objects.count(),
-                "occurrences_count": Occurrence.objects.filter(
-                    # determination_score__gte=confidence_threshold,
-                    event__isnull=False
-                ).count(),
+                "occurrences_count": Occurrence.objects.valid().count(),  # type: ignore
                 "taxa_count": Occurrence.objects.all().unique_taxa().count(),  # type: ignore
                 "last_updated": timezone.now(),
             }
diff --git a/ami/main/models.py b/ami/main/models.py
@@ -2188,11 +2188,14 @@ def __str__(self) -> str:
         return f"#{self.pk} from SourceImage #{self.source_image_id} with Algorithm #{self.detection_algorithm_id}"
 
 
-class OccurrenceQuerySet(models.QuerySet):
-    def with_detections_count(self) -> models.QuerySet:
+class OccurrenceQuerySet(models.QuerySet["Occurrence"]):
+    def valid(self):
+        return self.exclude(detections__isnull=True)
+
+    def with_detections_count(self):
         return self.annotate(detections_count=models.Count("detections", distinct=True))
 
-    def with_timestamps(self) -> models.QuerySet:
+    def with_timestamps(self):
         """
         These are timestamps used for filtering and ordering in the UI.
         """
@@ -2206,14 +2209,14 @@ def with_timestamps(self) -> models.QuerySet:
             ),
         )
 
-    def with_identifications(self) -> models.QuerySet:
+    def with_identifications(self):
         return self.prefetch_related(
             "identifications",
             "identifications__taxon",
             "identifications__user",
         )
 
-    def unique_taxa(self, project: Project | None = None) -> models.QuerySet:
+    def unique_taxa(self, project: Project | None = None):
         qs = self
         if project:
             qs = self.filter(project=project)
@@ -2225,12 +2228,16 @@ def unique_taxa(self, project: Project | None = None) -> models.QuerySet:
         return qs
 
 
-class OccurrenceManager(models.Manager):
-    def get_queryset(self) -> OccurrenceQuerySet:
-        return OccurrenceQuerySet(self.model, using=self._db).select_related(
-            "determination",
-            "deployment",
-            "project",
+class OccurrenceManager(models.Manager.from_queryset(OccurrenceQuerySet)):
+    def get_queryset(self):
+        return (
+            super()
+            .get_queryset()
+            .select_related(
+                "determination",
+                "deployment",
+                "project",
+            )
         )
 
 
@@ -2250,7 +2257,7 @@ class Occurrence(BaseModel):
     detections: models.QuerySet[Detection]
     identifications: models.QuerySet[Identification]
 
-    objects: OccurrenceManager = OccurrenceManager()
+    objects = OccurrenceManager()
 
     def __str__(self) -> str:
         name = f"Occurrence #{self.pk}"
diff --git a/ui/src/data-services/models/occurrence.ts b/ui/src/data-services/models/occurrence.ts
@@ -120,11 +120,19 @@ export class Occurrence {
     return this._occurrence.detections_count
   }
 
-  get sessionId(): string {
+  get sessionId(): string | undefined {
+    if (!this._occurrence.event) {
+      return undefined
+    }
+
     return `${this._occurrence.event.id}`
   }
 
-  get sessionLabel(): string {
+  get sessionLabel(): string | undefined {
+    if (!this._occurrence.event) {
+      return undefined
+    }
+
     return this._occurrence.event.name
   }
 
diff --git a/ui/src/pages/occurrence-details/occurrence-details.tsx b/ui/src/pages/occurrence-details/occurrence-details.tsx
@@ -69,20 +69,22 @@ export const OccurrenceDetails = ({
             )
             .map((item) => ({
               ...item,
-              to: pathname.includes(
-                APP_ROUTES.SESSIONS({ projectId: projectId as string })
-              )
-                ? undefined
-                : getAppRoute({
-                    to: APP_ROUTES.SESSION_DETAILS({
-                      projectId: projectId as string,
-                      sessionId: occurrence.sessionId,
+              to:
+                !occurrence.sessionId ||
+                pathname.includes(
+                  APP_ROUTES.SESSIONS({ projectId: projectId as string })
+                )
+                  ? undefined
+                  : getAppRoute({
+                      to: APP_ROUTES.SESSION_DETAILS({
+                        projectId: projectId as string,
+                        sessionId: occurrence.sessionId,
+                      }),
+                      filters: {
+                        occurrence: occurrence.id,
+                        capture: item.captureId,
+                      },
                     }),
-                    filters: {
-                      occurrence: occurrence.id,
-                      capture: item.captureId,
-                    },
-                  }),
             }))
         : [],
     [occurrence]
@@ -97,17 +99,19 @@ export const OccurrenceDetails = ({
     {
       label: translate(STRING.FIELD_LABEL_SESSION),
       value: occurrence.sessionLabel,
-      to: pathname.includes(
-        APP_ROUTES.SESSIONS({ projectId: projectId as string })
-      )
-        ? undefined
-        : getAppRoute({
-            to: APP_ROUTES.SESSION_DETAILS({
-              projectId: projectId as string,
-              sessionId: occurrence.sessionId,
+      to:
+        !occurrence.sessionId ||
+        pathname.includes(
+          APP_ROUTES.SESSIONS({ projectId: projectId as string })
+        )
+          ? undefined
+          : getAppRoute({
+              to: APP_ROUTES.SESSION_DETAILS({
+                projectId: projectId as string,
+                sessionId: occurrence.sessionId,
+              }),
+              filters: { occurrence: occurrence.id },
             }),
-            filters: { occurrence: occurrence.id },
-          }),
     },
     {
       label: translate(STRING.FIELD_LABEL_DATE),
diff --git a/ui/src/pages/occurrences/occurrence-columns.tsx b/ui/src/pages/occurrences/occurrence-columns.tsx
@@ -97,58 +97,34 @@ export const columns: (
     id: 'session',
     name: translate(STRING.FIELD_LABEL_SESSION),
     sortField: 'event',
-    renderCell: (item: Occurrence) => (
-      <Link
-        to={APP_ROUTES.SESSION_DETAILS({
-          projectId,
-          sessionId: item.sessionId,
-        })}
-      >
-        <BasicTableCell value={item.sessionLabel} theme={CellTheme.Primary} />
-      </Link>
-    ),
+    renderCell: (item: Occurrence) => {
+      if (!item.sessionId) {
+        return <></>
+      }
+
+      return (
+        <Link
+          to={APP_ROUTES.SESSION_DETAILS({
+            projectId,
+            sessionId: item.sessionId,
+          })}
+        >
+          <BasicTableCell value={item.sessionLabel} theme={CellTheme.Primary} />
+        </Link>
+      )
+    },
   },
   {
     id: 'date',
     name: translate(STRING.FIELD_LABEL_DATE_OBSERVED),
     sortField: 'first_appearance_timestamp',
-    renderCell: (item: Occurrence) => (
-      <Link
-        to={getAppRoute({
-          to: APP_ROUTES.SESSION_DETAILS({
-            projectId,
-            sessionId: item.sessionId,
-          }),
-          filters: {
-            occurrence: item.id,
-            timestamp: item.firstAppearanceTimestamp,
-          },
-        })}
-      >
-        <BasicTableCell value={item.dateLabel} />
-      </Link>
-    ),
+    renderCell: (item: Occurrence) => <BasicTableCell value={item.dateLabel} />,
   },
   {
     id: 'time',
     sortField: 'first_appearance_time',
     name: translate(STRING.FIELD_LABEL_TIME_OBSERVED),
-    renderCell: (item: Occurrence) => (
-      <Link
-        to={getAppRoute({
-          to: APP_ROUTES.SESSION_DETAILS({
-            projectId,
-            sessionId: item.sessionId,
-          }),
-          filters: {
-            occurrence: item.id,
-            timestamp: item.firstAppearanceTimestamp,
-          },
-        })}
-      >
-        <BasicTableCell value={item.timeLabel} />
-      </Link>
-    ),
+    renderCell: (item: Occurrence) => <BasicTableCell value={item.timeLabel} />,
   },
   {
     id: 'duration',

Original file line number	Diff line number	Diff line change
`@@ -120,11 +120,19 @@ export class Occurrence {`
`120`	`120`	`return this._occurrence.detections_count`
`121`	`121`	`}`
`122`	`122`
`123`		`- get sessionId(): string {`
	`123`	`+ get sessionId(): string \| undefined {`
	`124`	`+ if (!this._occurrence.event) {`
	`125`	`+ return undefined`
	`126`	`+ }`
	`127`	`+`
`124`	`128`	return `${this._occurrence.event.id}`
`125`	`129`	`}`
`126`	`130`
`127`		`- get sessionLabel(): string {`
	`131`	`+ get sessionLabel(): string \| undefined {`
	`132`	`+ if (!this._occurrence.event) {`
	`133`	`+ return undefined`
	`134`	`+ }`
	`135`	`+`
`128`	`136`	`return this._occurrence.event.name`
`129`	`137`	`}`
`130`	`138`