Cc with slist (#827)

* Custom classifier with custom species list

* Added species list dataframe to gui

* .

* i8n

* Update tests/analyze/test_analyze.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Update tests/analyze/test_analyze.py

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* timeout????

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

Author: Josef-Haupt

birdnet_analyzer/analyze/core.py

@@ -242,28 +242,26 @@ def _set_params(
     if overlap >= cfg.SIG_LENGTH:
         raise ValueError(f"Overlap must be less than {cfg.SIG_LENGTH} seconds.")
 
-    # Custom classifier trained with the Analyzer, not arbitrary models, meaning; A a tflite model or B a raven model
-    if custom_classifier is None:
-        # TODO: does species list even make sense with Perch?
-        cfg.LATITUDE, cfg.LONGITUDE, cfg.WEEK = lat, lon, week
-        cfg.CUSTOM_CLASSIFIER = None
-
-        if cfg.LATITUDE == -1 and cfg.LONGITUDE == -1:
-            if not slist:
-                cfg.SPECIES_LIST_FILE = None
-            else:
-                cfg.SPECIES_LIST_FILE = slist
-
-                if os.path.isdir(cfg.SPECIES_LIST_FILE):
-                    cfg.SPECIES_LIST_FILE = os.path.join(cfg.SPECIES_LIST_FILE, "species_list.txt")
+    cfg.CUSTOM_CLASSIFIER = custom_classifier  # we treat this as absolute path, so no need to join with dirname
+    cfg.LATITUDE, cfg.LONGITUDE, cfg.WEEK = lat, lon, week
 
-            cfg.SPECIES_LIST = read_lines(cfg.SPECIES_LIST_FILE, trim=True, fail_on_blank_lines=True)
-        else:
+    # TODO: Should really be None instead of -1
+    if cfg.LATITUDE == -1 and cfg.LONGITUDE == -1:
+        if not slist:
             cfg.SPECIES_LIST_FILE = None
-            cfg.SPECIES_LIST = get_species_list(cfg.LATITUDE, cfg.LONGITUDE, cfg.WEEK, cfg.LOCATION_FILTER_THRESHOLD)
+        else:
+            cfg.SPECIES_LIST_FILE = slist
+
+            if os.path.isdir(cfg.SPECIES_LIST_FILE):
+                cfg.SPECIES_LIST_FILE = os.path.join(cfg.SPECIES_LIST_FILE, "species_list.txt")
+
+        cfg.SPECIES_LIST = read_lines(cfg.SPECIES_LIST_FILE, trim=True, fail_on_blank_lines=True)
     else:
-        cfg.CUSTOM_CLASSIFIER = custom_classifier  # we treat this as absolute path, so no need to join with dirname
+        # TODO: What if only one of the two is given?
+        cfg.SPECIES_LIST_FILE = None
+        cfg.SPECIES_LIST = get_species_list(cfg.LATITUDE, cfg.LONGITUDE, cfg.WEEK, cfg.LOCATION_FILTER_THRESHOLD)
 
+    if custom_classifier:
         if custom_classifier.endswith(".tflite"):
             cfg.LABELS_FILE = custom_classifier.replace(".tflite", "_Labels.txt")  # same for labels file
 

birdnet_analyzer/gui/analysis.py

@@ -52,6 +52,7 @@ def run_analysis(
     week: int,
     use_yearlong: bool,
     sf_thresh: float,
+    selected_model: str,
     custom_classifier_file,
     output_types: str,
     additional_columns: list[str] | None,
@@ -101,8 +102,8 @@ def run_analysis(
     from birdnet_analyzer.analyze.core import _set_params
 
     locale = locale.lower()
-    custom_classifier = custom_classifier_file if species_list_choice == gu._CUSTOM_CLASSIFIER else None
-    use_perch = species_list_choice == gu._USE_PERCH
+    custom_classifier = custom_classifier_file if selected_model == gu._CUSTOM_CLASSIFIER else None
+    use_perch = selected_model == gu._USE_PERCH
     slist = species_list_file if species_list_choice == gu._CUSTOM_SPECIES else None
     lat = lat if species_list_choice == gu._PREDICT_SPECIES else -1
     lon = lon if species_list_choice == gu._PREDICT_SPECIES else -1

birdnet_analyzer/gui/embeddings.py

@@ -256,7 +256,7 @@ def select_file_output_directory_and_update_tb(current):
             show_progress="hidden",
         )
 
-        progress_plot = gr.Plot()
+        progress_plot = gr.Plot(show_label=False)
         start_btn = gr.Button(loc.localize("embeddings-tab-start-button-label"), variant="huggingface")
 
         start_btn.click(

birdnet_analyzer/gui/multi_file.py

@@ -41,6 +41,7 @@ def run_batch_analysis(
     week,
     use_yearlong,
     sf_thresh,
+    selected_model,
     custom_classifier_file,
     output_type,
     additional_columns,
@@ -83,6 +84,7 @@ def run_batch_analysis(
         week,
         use_yearlong,
         sf_thresh,
+        selected_model,
         custom_classifier_file,
         output_type,
         additional_columns,
@@ -146,7 +148,7 @@ def select_directory_wrapper():  # Nishant - Function modified for For Folder se
                     show_progress="hidden",
                 )
 
-        sample_settings, species_settings = gu.sample_and_species_settings(opened=False)
+        sample_settings, species_settings, model_settings = gu.sample_species_model_settings(opened=False)
 
         with gr.Accordion(loc.localize("multi-tab-output-accordion-label"), open=True), gr.Group():
             output_type_radio = gr.CheckboxGroup(
@@ -220,7 +222,8 @@ def select_directory_wrapper():  # Nishant - Function modified for For Folder se
             species_settings["week_number"],
             species_settings["yearlong_checkbox"],
             species_settings["sf_thresh_number"],
-            species_settings["selected_classifier_state"],
+            model_settings["model_selection_radio"],
+            model_settings["selected_classifier_state"],
             output_type_radio,
             additional_columns_,
             combine_tables_checkbox,

birdnet_analyzer/gui/review.py

@@ -142,7 +142,7 @@ def create_log_plot(positives, negatives, fig_num=None):
 
             with gr.Column() as review_item_col, gr.Row():
                 with gr.Column(), gr.Group():
-                    spectrogram_image = gr.Plot(label=loc.localize("review-tab-spectrogram-plot-label"), show_label=False)
+                    spectrogram_image = gr.Plot(show_label=False)
                     spectrogram_dl_btn = gr.Button("Download spectrogram", size="sm")
 
                 with gr.Column():

birdnet_analyzer/gui/single_file.py

@@ -29,6 +29,7 @@ def run_single_file_analysis(
     week,
     use_yearlong,
     sf_thresh,
+    selected_model,
     custom_classifier_file,
     locale,
 ):
@@ -64,6 +65,7 @@ def run_single_file_analysis(
         week=week,
         use_yearlong=use_yearlong,
         sf_thresh=sf_thresh,
+        selected_model=selected_model,
         custom_classifier_file=custom_classifier_file,
         output_types="csv",
         additional_columns=None,
@@ -113,7 +115,7 @@ def build_single_analysis_tab():
             )
         audio_path_state = gr.State()
         table_path_state = gr.State()
-        sample_settings, species_settings = gu.sample_and_species_settings(opened=False)
+        sample_settings, species_settings, model_settings = gu.sample_species_model_settings(opened=False)
         locale_radio = gu.locale()
 
         single_file_analyze = gr.Button(loc.localize("analyze-start-button-label"), variant="huggingface", interactive=False)
@@ -195,7 +197,8 @@ def try_generate_spectrogram(audio_path, generate_spectrogram):
             species_settings["week_number"],
             species_settings["yearlong_checkbox"],
             species_settings["sf_thresh_number"],
-            species_settings["selected_classifier_state"],
+            model_settings["model_selection_radio"],
+            model_settings["selected_classifier_state"],
             locale_radio,
         ]
 

birdnet_analyzer/gui/train.py

@@ -597,7 +597,7 @@ def on_autotune_change(value):
             info=loc.localize("training-tab-model-save-mode-radio-info"),
         )
 
-        train_history_plot = gr.Plot()
+        train_history_plot = gr.Plot(show_label=False)
         metrics_table = gr.Dataframe(
             headers=["Class", "Precision", "Recall", "F1 Score", "AUPRC", "AUROC", "Samples"],
             visible=False,