Apply score threshold filter

ami/main/api/views.py

@@ -30,7 +30,7 @@
 from ami.base.serializers import FilterParamsSerializer, SingleParamSerializer
 from ami.base.views import ProjectMixin
 from ami.main.api.serializers import TagSerializer
-from ami.utils.requests import get_active_classification_threshold, project_id_doc_param
+from ami.utils.requests import get_default_classification_threshold, project_id_doc_param
 from ami.utils.storages import ConnectionTestResult
 
 from ..models import (
@@ -336,7 +336,9 @@ def get_queryset(self) -> QuerySet:
                     "occurrences__determination",
                     distinct=True,
                     filter=models.Q(
-                        occurrences__determination_score__gte=get_active_classification_threshold(self.request),
+                        occurrences__determination_score__gte=get_default_classification_threshold(
+                            project, self.request
+                        ),
                     ),
                 ),
             )
@@ -493,9 +495,10 @@ def get_serializer_context(self):
 
     def get_queryset(self) -> QuerySet:
         queryset = super().get_queryset()
+        project = self.get_active_project()
         with_detections_default = False
 
-        classification_threshold = get_active_classification_threshold(self.request)
+        classification_threshold = get_default_classification_threshold(project, self.request)
         queryset = queryset.with_occurrences_count(  # type: ignore
             classification_threshold=classification_threshold
         ).with_taxa_count(  # type: ignore
@@ -652,9 +655,9 @@ class SourceImageCollectionViewSet(DefaultViewSet, ProjectMixin):
     ]
 
     def get_queryset(self) -> QuerySet:
-        classification_threshold = get_active_classification_threshold(self.request)
         query_set: QuerySet = super().get_queryset()
         project = self.get_active_project()
+        classification_threshold = get_default_classification_threshold(project, self.request)
         if project:
             query_set = query_set.filter(project=project)
         queryset = query_set.with_occurrences_count(  # type: ignore
@@ -1052,11 +1055,6 @@ def filter_queryset(self, request, queryset, view):
             return queryset
 
 
-OccurrenceDeterminationScoreFilter = ThresholdFilter.create(
-    query_param="classification_threshold", filter_param="determination_score"
-)
-
-
 class OccurrenceViewSet(DefaultViewSet, ProjectMixin):
     """
     API endpoint that allows occurrences to be viewed or edited.
@@ -1074,7 +1072,6 @@ class OccurrenceViewSet(DefaultViewSet, ProjectMixin):
         OccurrenceVerified,
         OccurrenceVerifiedByMeFilter,
         OccurrenceTaxaListFilter,
-        OccurrenceDeterminationScoreFilter,
     ]
     filterset_fields = [
         "event",
@@ -1118,7 +1115,7 @@ def get_queryset(self) -> QuerySet["Occurrence"]:
         )
         qs = qs.with_detections_count().with_timestamps()  # type: ignore
         qs = qs.with_identifications()  # type: ignore
-
+        qs = qs.filter_by_score_threshold(project, self.request)  # type: ignore
         if self.action != "list":
             qs = qs.prefetch_related(
                 Prefetch(
@@ -1360,10 +1357,12 @@ def get_queryset(self) -> QuerySet:
                 qs = qs.prefetch_related(
                     Prefetch(
                         "occurrences",
-                        queryset=Occurrence.objects.filter(self.get_occurrence_filters(project))[:1],
+                        queryset=Occurrence.objects.filter_by_score_threshold(project, self.request).filter(
+                            self.get_occurrence_filters(project)
+                        )[:1],
                         to_attr="example_occurrences",
                     )
-                )
+                )  # type: ignore
         else:
             # Add empty occurrences list to make the response consistent
             qs = qs.annotate(example_occurrences=models.Value([], output_field=models.JSONField()))
@@ -1385,6 +1384,7 @@ def get_taxa_observed(self, qs: QuerySet, project: Project, include_unobserved=F
                 occurrence_filters,
                 determination_id=models.OuterRef("id"),
             )
+            .filter_by_score_threshold(project, self.request)  # type: ignore
             .values("determination_id")
             .annotate(count=models.Count("id"))
             .values("count"),
@@ -1564,13 +1564,15 @@ def get(self, request):
                 "captures_count": SourceImage.objects.visible_for_user(user)  # type: ignore
                 .filter(deployment__project=project)
                 .count(),
-                "occurrences_count": Occurrence.objects.valid()
+                "occurrences_count": Occurrence.objects.valid()  # type: ignore
                 .visible_for_user(user)
                 .filter(project=project)
-                .count(),  # type: ignore
-                "taxa_count": Occurrence.objects.visible_for_user(user)
+                .filter_by_score_threshold(project, self.request)  # type: ignore
+                .count(),
+                "taxa_count": Occurrence.objects.visible_for_user(user)  # type: ignore
+                .filter_by_score_threshold(project, self.request)
                 .unique_taxa(project=project)
-                .count(),  # type: ignore
+                .count(),
             }
         else:
             data = {

ami/main/models.py

@@ -26,6 +26,7 @@
 from django.utils import timezone
 from django_pydantic_field import SchemaField
 from guardian.shortcuts import get_perms
+from rest_framework.request import Request
 
 import ami.tasks
 import ami.utils
@@ -36,6 +37,7 @@
 from ami.ml.schemas import BoundingBox
 from ami.users.models import User
 from ami.utils.media import calculate_file_checksum, extract_timestamp
+from ami.utils.requests import get_default_classification_threshold
 from ami.utils.schemas import OrderedEnum
 
 if typing.TYPE_CHECKING:
@@ -2459,6 +2461,12 @@ def unique_taxa(self, project: Project | None = None):
         )
         return qs
 
+    def filter_by_score_threshold(self, project: Project | None = None, request: Request | None = None):
+        if project is None:
+            return self
+        score_threshold = get_default_classification_threshold(project, request)
+        return self.filter(determination_score__gte=score_threshold)
+
 
 class OccurrenceManager(models.Manager.from_queryset(OccurrenceQuerySet)):
     def get_queryset(self):

ami/utils/requests.py

@@ -56,6 +56,32 @@ def get_active_classification_threshold(request: Request) -> float:
     return classification_threshold
 
 
+def get_default_classification_threshold(project, request: Request | None = None) -> float:
+    """
+    Get the classification threshold from project settings by default,
+    or from request query parameters if `apply_defaults=false` is set in the request.
+
+    Args:
+        project: A Project instance.
+        request: The incoming request object (optional).
+
+    Returns:
+        The classification threshold value from project settings by default,
+        or from request if `apply_defaults=false` is provided.
+    """
+    # If request exists and apply_defaults is explicitly false, get from request
+    if request is not None:
+        apply_defaults = request.query_params.get("apply_defaults", "true").lower()
+        if apply_defaults == "false":
+            return get_active_classification_threshold(request)
+
+    # Otherwise, get from project
+    if project is None:
+        return 0.0
+
+    return getattr(project, "default_filters_score_threshold", 0.0) or 0.0
+
+
 project_id_doc_param = OpenApiParameter(
     name="project_id",
     description="Filter by project ID",

ui/src/components/filtering/default-filter-control.tsx

@@ -0,0 +1,84 @@
+import {
+  FormActions,
+  FormRow,
+  FormSection,
+} from 'components/form/layout/layout'
+import { useProjectDetails } from 'data-services/hooks/projects/useProjectDetails'
+import { ProjectDetails } from 'data-services/models/project-details'
+import {
+  IconButton,
+  IconButtonTheme,
+} from 'design-system/components/icon-button/icon-button'
+import { IconType } from 'design-system/components/icon/icon'
+import { InputValue } from 'design-system/components/input/input'
+import { ChevronRightIcon } from 'lucide-react'
+import { buttonVariants, Popover } from 'nova-ui-kit'
+import { Link, useParams } from 'react-router-dom'
+import { APP_ROUTES } from 'utils/constants'
+import { STRING, translate } from 'utils/language'
+
+export const DefaultFiltersControl = () => {
+  const { projectId } = useParams()
+  const { project } = useProjectDetails(projectId as string, true)
+
+  return (
+    <div className="flex items-center justify-between pl-2">
+      <div className="flex items-center gap-1">
+        <span className="text-muted-foreground body-overline-small font-bold pt-0.5">
+          {translate(STRING.NAV_ITEM_DEFAULT_FILTERS)}
+        </span>
+        {project ? <InfoPopover project={project} /> : null}
+      </div>
+    </div>
+  )
+}
+
+const InfoPopover = ({ project }: { project: ProjectDetails }) => (
+  <Popover.Root>
+    <Popover.Trigger asChild>
+      <IconButton icon={IconType.Info} theme={IconButtonTheme.Plain} />
+    </Popover.Trigger>
+    <Popover.Content className="p-0">
+      <FormSection
+        title={translate(STRING.NAV_ITEM_DEFAULT_FILTERS)}
+        description="Data is filtered by default based on global project configuration."
+      >
+        <FormRow>
+          <InputValue
+            label="Score threshold"
+            value={project.settings.scoreThreshold}
+          />
+        </FormRow>
+        <FormRow
+          style={
+            project.featureFlags.default_filters
+              ? undefined
+              : { display: 'none' }
+          }
+        >
+          <InputValue
+            label="Include taxa"
+            value={project.settings.includeTaxa
+              .map((taxon) => taxon.name)
+              .join(', ')}
+          />
+          <InputValue
+            label="Exclude taxa"
+            value={project.settings.excludeTaxa
+              .map((taxon) => taxon.name)
+              .join(', ')}
+          />
+        </FormRow>
+      </FormSection>
+      <FormActions>
+        <Link
+          className={buttonVariants({ size: 'small', variant: 'outline' })}
+          to={APP_ROUTES.DEFAULT_FILTERS({ projectId: project.id })}
+        >
+          <span>Configure</span>
+          <ChevronRightIcon className="w-4 h-4" />
+        </Link>
+      </FormActions>
+    </Popover.Content>
+  </Popover.Root>
+)

ui/src/components/filtering/filter-control.tsx

@@ -1,4 +1,4 @@
-import { X } from 'lucide-react'
+import { XIcon } from 'lucide-react'
 import { Button } from 'nova-ui-kit'
 import { useFilters } from 'utils/useFilters'
 import { AlgorithmFilter, NotAlgorithmFilter } from './filters/algorithm-filter'
@@ -7,7 +7,6 @@ import { CollectionFilter } from './filters/collection-filter'
 import { DateFilter } from './filters/date-filter'
 import { ImageFilter } from './filters/image-filter'
 import { PipelineFilter } from './filters/pipeline-filter'
-import { ScoreFilter } from './filters/score-filter'
 import { SessionFilter } from './filters/session-filter'
 import { StationFilter } from './filters/station-filter'
 import { StatusFilter } from './filters/status-filter'
@@ -23,8 +22,6 @@ const ComponentMap: {
   [key: string]: (props: FilterProps) => JSX.Element
 } = {
   algorithm: AlgorithmFilter,
-  best_determination_score: ScoreFilter,
-  classification_threshold: ScoreFilter,
   collection: CollectionFilter,
   collections: CollectionFilter,
   date_end: DateFilter,
@@ -87,12 +84,12 @@ export const FilterControl = ({
         />
         {clearable && filter.value && (
           <Button
-            size="icon"
             className="shrink-0 text-muted-foreground"
-            variant="ghost"
             onClick={() => clearFilter(field)}
+            size="icon"
+            variant="ghost"
           >
-            <X className="w-4 h-4" />
+            <XIcon className="w-4 h-4" />
           </Button>
         )}
       </div>

ui/src/pages/occurrences/occurrences.tsx

@@ -1,3 +1,4 @@
+import { DefaultFiltersControl } from 'components/filtering/default-filter-control'
 import { FilterControl } from 'components/filtering/filter-control'
 import { FilterSection } from 'components/filtering/filter-section'
 import { someActive } from 'components/filtering/utils'
@@ -28,7 +29,6 @@ import { useColumnSettings } from 'utils/useColumnSettings'
 import { useFilters } from 'utils/useFilters'
 import { usePagination } from 'utils/usePagination'
 import { useUser } from 'utils/user/userContext'
-import { useUserPreferences } from 'utils/userPreferences/userPreferencesContext'
 import { useSelectedView } from 'utils/useSelectedView'
 import { useSort } from 'utils/useSort'
 import { OccurrenceActions } from './occurrence-actions'
@@ -38,7 +38,6 @@ import { OccurrenceNavigation } from './occurrence-navigation'
 
 export const Occurrences = () => {
   const { user } = useUser()
-  const { userPreferences } = useUserPreferences()
   const { projectId, id } = useParams()
   const { columnSettings, setColumnSettings } = useColumnSettings(
     'occurrences',
@@ -59,9 +58,7 @@ export const Occurrences = () => {
     order: 'desc',
   })
   const { pagination, setPage } = usePagination()
-  const { activeFilters, filters } = useFilters({
-    classification_threshold: `${userPreferences.scoreThreshold}`,
-  })
+  const { activeFilters, filters } = useFilters()
   const { occurrences, total, isLoading, isFetching, error } = useOccurrences({
     projectId,
     pagination,
@@ -94,15 +91,13 @@ export const Occurrences = () => {
           <FilterSection defaultOpen>
             <FilterControl field="detections__source_image" readonly />
             <FilterControl field="event" readonly />
-            <FilterControl field="date_start" />
-            <FilterControl field="date_end" />
             <FilterControl field="taxon" />
             {taxaLists.length > 0 && (
               <FilterControl data={taxaLists} field="taxa_list_id" />
             )}
-            <FilterControl clearable={false} field="classification_threshold" />
             <FilterControl field="verified" />
             {user.loggedIn && <FilterControl field="verified_by_me" />}
+            <DefaultFiltersControl />
           </FilterSection>
           <FilterSection
             title="More filters"
@@ -111,6 +106,8 @@ export const Occurrences = () => {
               activeFilters
             )}
           >
+            <FilterControl field="date_start" />
+            <FilterControl field="date_end" />
             <FilterControl field="collection" />
             <FilterControl field="deployment" />
             <FilterControl field="algorithm" />