Merge pull request #413 from Kitware/rm-views

Author: brianhelba

bats_ai/core/views/__init__.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-from .annotations import router as annotation_router
 from .configuration import router as configuration_router
 from .export_annotation import router as export_annotation_router
 from .grts_cells import router as grts_cells_router
@@ -9,12 +8,10 @@
 from .recording import router as recording_router
 from .recording_annotation import router as recording_annotation_router
 from .recording_tag import router as recording_tag_router
-from .sequence_annotations import router as sequence_annotation_router
 from .species import router as species_router
 from .vetting_details import router as vetting_router
 
 __all__ = [
-    "annotation_router",
     "configuration_router",
     "export_annotation_router",
     "grts_cells_router",
@@ -23,7 +20,6 @@
     "recording_annotation_router",
     "recording_router",
     "recording_tag_router",
-    "sequence_annotation_router",
     "species_router",
     "vetting_router",
 ]

bats_ai/core/views/annotations.py

@@ -25,10 +25,6 @@
     Spectrogram,
 )
 from bats_ai.core.tasks.tasks import recording_compute_spectrogram
-from bats_ai.core.views.sequence_annotations import (
-    SequenceAnnotationSchema,
-    UpdateSequenceAnnotationSchema,
-)
 from bats_ai.core.views.species import SpeciesSchema
 
 if TYPE_CHECKING:
@@ -272,6 +268,35 @@ def linestring_to_list(ls):
         )
 
 
+class SequenceAnnotationSchema(Schema):
+    id: int
+    start_time: int
+    end_time: int
+    type: str | None
+    comments: str
+    species: list[SpeciesSchema] | None
+    owner_email: str = None
+
+    @classmethod
+    def from_orm(cls, obj, owner_email=None):
+        return cls(
+            start_time=obj.start_time,
+            end_time=obj.end_time,
+            type=obj.type,
+            species=[SpeciesSchema.from_orm(species) for species in obj.species.all()],
+            comments=obj.comments,
+            id=obj.id,
+            owner_email=owner_email,  # Include owner_email in the schema
+        )
+
+
+class UpdateSequenceAnnotationSchema(Schema):
+    start_time: int = None
+    end_time: int = None
+    type: str | None = None
+    comments: str | None = None
+
+
 @router.post("/")
 def create_recording(
     request: HttpRequest,