feat: let each model set the default taxon rank of results

Author: mihow

trapdata/api/api.py

@@ -67,15 +67,14 @@ def should_filter_detections(Classifier: type[APIMothClassifier]) -> bool:
 
 def make_category_map_response(
     model: APIMothDetector | APIMothClassifier,
-    default_taxon_rank: str = "SPECIES",
 ) -> AlgorithmCategoryMapResponse:
     categories_sorted_by_index = sorted(model.category_map.items(), key=lambda x: x[0])
     # as list of dicts:
     categories_sorted_by_index = [
         {
             "index": index,
             "label": label,
-            "taxon_rank": default_taxon_rank,
+            "taxon_rank": model.default_taxon_rank,
         }
         for index, label in categories_sorted_by_index
     ]

trapdata/ml/models/base.py

@@ -76,6 +76,7 @@ class InferenceBaseClass:
     category_map = {}
     num_classes: Union[int, None] = None  # Will use len(category_map) if None
     lookup_gbif_names: bool = False
+    default_taxon_rank: str = "SPECIES"
     model: torch.nn.Module
     normalization = tensorflow_normalization
     transforms: torchvision.transforms.Compose

trapdata/ml/models/classification.py

@@ -293,6 +293,7 @@ class BinaryClassifier(Resnet50ClassifierLowRes):
     type = "binary_classification"
     positive_binary_label: str = constants.POSITIVE_BINARY_LABEL
     negative_binary_label: str = constants.NEGATIVE_BINARY_LABEL
+    default_taxon_rank = "SUPERFAMILY"
 
     def get_queue(self) -> DetectedObjectQueue:
         return DetectedObjectQueue(self.db_path, self.image_base_path)
@@ -564,3 +565,4 @@ class InsectOrderClassifier2025(SpeciesClassifier, ConvNeXtOrderClassifier):
     description = "ConvNeXt-T based insect order classifier for 16 classes trained by Mila in January 2025"
     weights_path = "https://object-arbutus.cloud.computecanada.ca/ami-models/insect_orders/convnext_tiny_in22k_worder0.5_wbinary0.5_run2_checkpoint.pt"
     labels_path = "https://object-arbutus.cloud.computecanada.ca/ami-models/insect_orders/insect_order_category_map.json"
+    default_taxon_rank = "ORDER"