updated usage of older models (#550)

birdnet_analyzer/analyze.py

@@ -853,6 +853,10 @@ def __call__(self, parser, args, values, option_string=None):
 
         if args.classifier.endswith(".tflite"):
             cfg.LABELS_FILE = args.classifier.replace(".tflite", "_Labels.txt")  # same for labels file
+
+            if not os.path.isfile(cfg.LABELS_FILE):
+                cfg.LABELS_FILE = args.classifier.replace("Model_FP32.tflite", "Labels.txt")
+
             cfg.LABELS = utils.readLines(cfg.LABELS_FILE)
         else:
             cfg.APPLY_SIGMOID = False

birdnet_analyzer/checkpoints/README.md

@@ -2,13 +2,11 @@
 
 This repository contains only the latest version of the BirdNET-Analyzer model. We will track the changes in this document and also provide permanent download links to previous versions for testing and/or other use cases. 
 
-You can download and unzip previous model versions, make sure to update the `MODEL_PATH` and `LABELS_FILE` variable in the `config.py` file to the version you want to use.
+Older models can also be used as custom classifiers in the GUI or using the `--classifier` argument in the `birdnet_analyzer.analyze` command line.
 
-Older models can also be used as custom classifiers in the GUI.
-
-To do this download und unzip the model version you wish to use, then copy the model variant (e.g. FP32) and the labels file into a separate folder.
-Then rename the labels file to match the name of the model file + "_Labels" (e.g. "model.tflite" and "model_Labels.txt").
-After that you can select the model as a custom classifier in the GUI.
+Just download your desired model version and unzip.  
+GUI: Select the `*_Model_FP32.tflite` file under **Species selection** > **Custom classifier**  
+CLI: `python -m birdnet_analyzer ... --classifier <path_to_*_Model_FP32.tflite>`
 
 Model update history:
 

birdnet_analyzer/gui/analysis.py

@@ -121,6 +121,10 @@ def runAnalysis(
             custom_classifier_file  # we treat this as absolute path, so no need to join with dirname
         )
         cfg.LABELS_FILE = custom_classifier_file.replace(".tflite", "_Labels.txt")  # same for labels file
+
+        if not os.path.isfile(cfg.LABELS_FILE):
+            cfg.LABELS_FILE = custom_classifier_file.replace("Model_FP32.tflite", "Labels.txt")
+
         cfg.LABELS = utils.readLines(cfg.LABELS_FILE)
         cfg.LATITUDE = -1
         cfg.LONGITUDE = -1

birdnet_analyzer/gui/utils.py

@@ -476,6 +476,9 @@ def on_custom_classifier_selection_click():
                     if file:
                         labels = os.path.splitext(file)[0] + "_Labels.txt"
 
+                        if not os.path.isfile(labels):
+                            labels = file.replace("Model_FP32.tflite", "Labels.txt")
+
                         return file, gr.File(value=[file, labels], visible=True)
 
                     return None, None