cleanup species view

Author: BryonLewis

bats_ai/core/views/species.py

@@ -1,38 +1,30 @@
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from django.db.models import (
     BooleanField,
     Case,
     Exists,
     F,
-    IntegerField,
     OuterRef,
     Value,
     When,
 )
-from django.http import Http404, HttpRequest
 from django.shortcuts import get_object_or_404
 from ninja import Query, Schema
 from ninja.pagination import RouterPaginated
 
 from bats_ai.core.models import GRTSCells, Recording, Species, SpeciesRange
 
+if TYPE_CHECKING:
+    from django.http import HttpRequest
+
 router = RouterPaginated()
 
 # Continental US sample frame ID, defaulting to CONUS GRTS when not specified.
 CONUS_SAMPLE_FRAME_ID = 14
 
-_SPECIES_SCHEMA_FIELDS = (
-    "species_code",
-    "family",
-    "genus",
-    "species",
-    "common_name",
-    "species_code_6",
-    "category",
-    "pk",
-)
-
 
 class SpeciesSchema(Schema):
     species_code: str | None
@@ -46,32 +38,6 @@ class SpeciesSchema(Schema):
     in_range: bool | None = None
 
 
-def _primary_grts_cell(grts_cell_id: int) -> GRTSCells:
-    order = GRTSCells.sort_order()
-    whens = [When(sample_frame_id=sid, then=Value(rank)) for rank, sid in enumerate(order)]
-    cell = (
-        GRTSCells.objects.filter(grts_cell_id=grts_cell_id)
-        .exclude(geom_4326__isnull=True)
-        .annotate(
-            frame_rank=Case(
-                *whens,
-                default=Value(len(order)),
-                output_field=IntegerField(),
-            ),
-        )
-        .order_by("frame_rank")
-        .first()
-    )
-    if cell is None:
-        raise Http404(f"No GRTS cell geometry found for grts_cell_id={grts_cell_id}")
-    return cell
-
-
-def _species_values_qs(qs):
-    """Restrict columns to SpeciesSchema (excluding optional in_range)."""
-    return qs.annotate(pk=F("id")).values(*_SPECIES_SCHEMA_FIELDS)
-
-
 @router.get("/", response=list[SpeciesSchema], auth=None)
 def get_species(
     request: HttpRequest,
@@ -127,9 +93,4 @@ def get_species(
                 ),
             )
 
-    return list(
-        qs.order_by("species_code").values(
-            *_SPECIES_SCHEMA_FIELDS,
-            "in_range",
-        )
-    )
+    return qs.order_by("species_code")