fixed bug that saves faulty custom classifier if 'both' was selected (#783)

Author: Josef-Haupt

birdnet_analyzer/model.py

@@ -816,7 +816,7 @@ def _focal_loss(y_true, y_pred):
     return classifier, history
 
 
-def save_linear_classifier(classifier, model_path: str, labels: list[str], mode="replace"):
+def save_linear_classifier(classifier, model_path: str, labels: list[str], mode="replace", pop_last_layer=True):
     """Saves the classifier as a tflite model, as well as the used labels in a .txt.
 
     Args:
@@ -836,7 +836,8 @@ def save_linear_classifier(classifier, model_path: str, labels: list[str], mode=
     saved_model = PBMODEL
 
     # Remove activation layer
-    classifier.pop()
+    if pop_last_layer:
+        classifier.pop()
 
     if mode == "replace":
         combined_model = tf.keras.Sequential([saved_model.embeddings_model, classifier], "basic")

birdnet_analyzer/train/utils.py

@@ -573,7 +573,7 @@ def run_trial(self, trial, *args, **kwargs):
     try:
         if cfg.TRAINED_MODEL_OUTPUT_FORMAT == "both":
             model.save_raven_model(classifier, cfg.CUSTOM_CLASSIFIER, labels, mode=cfg.TRAINED_MODEL_SAVE_MODE)
-            model.save_linear_classifier(classifier, cfg.CUSTOM_CLASSIFIER, labels, mode=cfg.TRAINED_MODEL_SAVE_MODE)
+            model.save_linear_classifier(classifier, cfg.CUSTOM_CLASSIFIER, labels, mode=cfg.TRAINED_MODEL_SAVE_MODE, pop_last_layer=False)
         elif cfg.TRAINED_MODEL_OUTPUT_FORMAT == "tflite":
             model.save_linear_classifier(classifier, cfg.CUSTOM_CLASSIFIER, labels, mode=cfg.TRAINED_MODEL_SAVE_MODE)
         elif cfg.TRAINED_MODEL_OUTPUT_FORMAT == "raven":