Replace core with birdnet library

.vscode/extensions.json

@@ -1,6 +1,7 @@
 // See https://go.microsoft.com/fwlink/?LinkId=827846
 {
     "recommendations": [
-        "charliermarsh.ruff"
+        "charliermarsh.ruff",
+        "astral-sh.ty"
     ]
 }

birdnet_analyzer/__init__.py

@@ -8,7 +8,7 @@
 from birdnet_analyzer.species import species
 from birdnet_analyzer.train import train
 
-__version__ = "2.3.0"
+__version__ = "2.4.0"
 __all__ = ["analyze", "embeddings", "search", "segments", "species", "train"]
 os.environ["TF_CPP_MIN_LOG_LEVEL"] = "3"
 os.environ["WRAPT_DISABLE_EXTENSIONS"] = "true"

birdnet_analyzer/analyze/__init__.py

@@ -1,19 +1,26 @@
-import os
+from birdnet_analyzer.analyze.core import (
+    analyze,
+    save_as_audacity,
+    save_as_csv,
+    save_as_kaleidoscope,
+    save_as_rtable,
+)
 
-import birdnet_analyzer.config as cfg
-from birdnet_analyzer.analyze.core import analyze
-
-POSSIBLE_ADDITIONAL_COLUMNS_MAP = {
-    "lat": lambda: cfg.LATITUDE,
-    "lon": lambda: cfg.LONGITUDE,
-    "week": lambda: cfg.WEEK,
-    "overlap": lambda: cfg.SIG_OVERLAP,
-    "sensitivity": lambda: cfg.SIGMOID_SENSITIVITY,
-    "min_conf": lambda: cfg.MIN_CONFIDENCE,
-    "species_list": lambda: cfg.SPECIES_LIST_FILE or "",
-    "model": lambda: os.path.basename(cfg.MODEL_PATH),
-}
+POSSIBLE_ADDITIONAL_COLUMNS = [
+    "lat",
+    "lon",
+    "week",
+    "overlap",
+    "sensitivity",
+    "min_conf",
+    "species_list",
+    "model",
+]
 
 __all__ = [
     "analyze",
+    "save_as_audacity",
+    "save_as_csv",
+    "save_as_kaleidoscope",
+    "save_as_rtable",
 ]

birdnet_analyzer/analyze/cli.py

@@ -1,3 +1,5 @@
+import contextlib
+
 from birdnet_analyzer import analyze
 from birdnet_analyzer.utils import runtime_error_handler
 
@@ -9,21 +11,30 @@ def main():
 
     from birdnet_analyzer import cli
 
-    # Freeze support for executable
     freeze_support()
 
     parser = cli.analyzer_parser()
     args = parser.parse_args()
 
-    try:
+    with contextlib.suppress(Exception):
         if os.get_terminal_size().columns >= 64:
             print(cli.ASCII_LOGO, flush=True)
-    except Exception:
-        pass
 
-    if "additional_columns" in args and args.additional_columns and "csv" not in args.rtype:
+    if args.additional_columns and "csv" not in args.rtype:
         import warnings
 
-        warnings.warn("The --additional_columns argument is only valid for CSV output. It will be ignored.", stacklevel=1)
+        warnings.warn(
+            "The --additional_columns argument is only valid for CSV output."
+            "It will be ignored.",
+            stacklevel=1,
+        )
+
+    if args.use_perch and args.classifier:
+        raise ValueError(
+            "The --use_perch and --classifier arguments cannot be used together."
+        )
+
+    analyze_args = vars(args)
+    analyze_args.pop("use_perch")  # handled via model param
 
-    analyze(**vars(args))
+    analyze(**analyze_args)