diff --git a/trapdata/api/api.py b/trapdata/api/api.py index d980503..370d9ff 100644 --- a/trapdata/api/api.py +++ b/trapdata/api/api.py @@ -22,6 +22,7 @@ MothClassifierQuebecVermont, MothClassifierTuringAnguilla, MothClassifierTuringCostaRica, + MothClassifierTuringKenyaUganda, MothClassifierUKDenmark, ) from .models.localization import APIMothDetector @@ -46,6 +47,7 @@ "uk_denmark_moths_2023": MothClassifierUKDenmark, "costa_rica_moths_turing_2024": MothClassifierTuringCostaRica, "anguilla_moths_turing_2024": MothClassifierTuringAnguilla, + "kenya-uganda_moths_turing_2024": MothClassifierTuringKenyaUganda, "global_moths_2024": MothClassifierGlobal, "moth_binary": MothClassifierBinary, "insect_orders_2025": InsectOrderClassifier, diff --git a/trapdata/api/models/classification.py b/trapdata/api/models/classification.py index a6ffdbb..2bbc808 100644 --- a/trapdata/api/models/classification.py +++ b/trapdata/api/models/classification.py @@ -15,6 +15,7 @@ QuebecVermontMothSpeciesClassifier2024, TuringAnguillaSpeciesClassifier, TuringCostaRicaSpeciesClassifier, + TuringKenyaUgandaSpeciesClassifier, UKDenmarkMothSpeciesClassifier2024, ) @@ -187,6 +188,12 @@ class MothClassifierTuringAnguilla(APIMothClassifier, TuringAnguillaSpeciesClass pass +class MothClassifierTuringKenyaUganda( + APIMothClassifier, TuringKenyaUgandaSpeciesClassifier +): + pass + + class MothClassifierGlobal(APIMothClassifier, GlobalMothSpeciesClassifier): pass diff --git a/trapdata/ml/models/classification.py b/trapdata/ml/models/classification.py index 965955d..b7bf833 100644 --- a/trapdata/ml/models/classification.py +++ b/trapdata/ml/models/classification.py @@ -406,8 +406,27 @@ class TuringCostaRicaSpeciesClassifier(SpeciesClassifier, Resnet50Classifier_Tur class TuringAnguillaSpeciesClassifier(SpeciesClassifier, Resnet50Classifier_Turing): name = "Turing Anguilla Species Classifier" description = "Trained on 28th June 2024 by Turing team using Resnet50 model." - weights_path = "https://object-arbutus.cloud.computecanada.ca/ami-models/moths/classification/turing-anguilla_v01_resnet50_2024-06-28-17-01_state.pt" - labels_path = "https://object-arbutus.cloud.computecanada.ca/ami-models/moths/classification/01_anguilla_data_category_map.json" + weights_path = ( + "https://object-arbutus.cloud.computecanada.ca/ami-models/moths/classification/" + "turing-anguilla_v01_resnet50_2024-06-28-17-01_state.pt" + ) + labels_path = ( + "https://object-arbutus.cloud.computecanada.ca/ami-models/moths/classification/" + "01_anguilla_data_category_map.json" + ) + + +class TuringKenyaUgandaSpeciesClassifier(SpeciesClassifier, Resnet50Classifier_Turing): + name = "Turing Kenya and Uganda Species Classifier" + description = "Trained on 19th November 2024 by Turing team using Resnet50 model." + weights_path = ( + "https://object-arbutus.cloud.computecanada.ca/ami-models/moths/classification/" + "turing-kenya-uganda_v01_resnet50_2024-11-19-18-44_state.pt" + ) + labels_path = ( + "https://object-arbutus.cloud.computecanada.ca/ami-models/moths/classification/" + "01_kenya-uganda_data_category_map.json" + ) class TuringUKSpeciesClassifier(SpeciesClassifier, Resnet50Classifier_Turing):