[Do Not Merge] OOD Features

.env.example

@@ -8,3 +8,4 @@ AMI_CLASSIFICATION_THRESHOLD=0.6
 AMI_LOCALIZATION_BATCH_SIZE=2
 AMI_CLASSIFICATION_BATCH_SIZE=20
 AMI_NUM_WORKERS=1
+PYTORCH_ENABLE_MPS_FALLBACK=1

pyproject.toml

@@ -36,7 +36,7 @@ pyobjus = [
     { version = "^1.2.1", platform = "darwin" },
     { version = "^1.2.1", platform = "linux" },
 ]
-
+scikit-learn = "^1.3.0"
 # [tool.poetry.group.dev.dependencies] # Can't install these dev deps with pip, so they're in the main deps
 black = "^23.3.0"
 flake8 = "^6.0.0"

trapdata/api/api.py

@@ -19,6 +19,8 @@
     MothClassifierGlobal,
     MothClassifierPanama,
     MothClassifierPanama2024,
+    MothClassifierPanamaPlus2025,
+    MothClassifierPanamaPlus2025v2,
     MothClassifierQuebecVermont,
     MothClassifierTuringAnguilla,
     MothClassifierTuringCostaRica,
@@ -41,6 +43,8 @@
 
 
 CLASSIFIER_CHOICES = {
+    "panama_plus_moths_2025v2": MothClassifierPanamaPlus2025v2,
+    "panama_plus_moths_2025": MothClassifierPanamaPlus2025,
     "panama_moths_2023": MothClassifierPanama,
     "panama_moths_2024": MothClassifierPanama2024,
     "quebec_vermont_moths_2023": MothClassifierQuebecVermont,
@@ -308,6 +312,7 @@ async def process(data: PipelineRequest) -> PipelineResponse:
         detections=detections_to_return,
         total_time=seconds_elapsed,
     )
+    logger.debug(response.model_dump_json(indent=2))
     return response
 
 

trapdata/api/demo.py

@@ -14,6 +14,7 @@
     MothClassifierGlobal,
     MothClassifierPanama,
     MothClassifierPanama2024,
+    MothClassifierPanamaPlus2025v2,
     MothClassifierQuebecVermont,
     MothClassifierTuringAnguilla,
     MothClassifierTuringCostaRica,
@@ -33,6 +34,12 @@ class ClassifierChoice:
 
 
 CLASSIFIER_CHOICES = [
+    ClassifierChoice(
+        key=MothClassifierPanamaPlus2025v2.get_key(),
+        tab_title="Panama 2025 New",
+        example_images_dir_names=["panama"],
+        classifier=MothClassifierPanamaPlus2025v2,
+    ),
     ClassifierChoice(
         key=MothClassifierPanama.get_key(),
         tab_title="Panama 2023",