From 816d06f160e3057690b98139f02eedced6debd70 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0ar=C5=ABnas=20Nejus?= <snejus@protonmail.com>
Date: Sun, 13 Jul 2025 23:18:32 +0100
Subject: [PATCH] Fix plugin types

---
 beetsplug/autobpm.py            |  7 +++++--
 beetsplug/lastgenre/__init__.py |  2 +-
 beetsplug/replaygain.py         | 13 +++++++------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/beetsplug/autobpm.py b/beetsplug/autobpm.py
index 9c953f711..46d7e672a 100644
--- a/beetsplug/autobpm.py
+++ b/beetsplug/autobpm.py
@@ -15,10 +15,10 @@
 
 from __future__ import annotations
 
-from collections.abc import Iterable
 from typing import TYPE_CHECKING
 
 import librosa
+import numpy as np
 
 from beets.plugins import BeetsPlugin
 from beets.ui import Subcommand, should_write
@@ -76,7 +76,10 @@ class AutoBPMPlugin(BeetsPlugin):
                 self._log.error("Failed to measure BPM for {}: {}", path, exc)
                 continue
 
-            bpm = round(tempo[0] if isinstance(tempo, Iterable) else tempo)
+            bpm = round(
+                float(tempo[0] if isinstance(tempo, np.ndarray) else tempo)
+            )
+
             item["bpm"] = bpm
             self._log.info("Computed BPM for {}: {}", path, bpm)
 
diff --git a/beetsplug/lastgenre/__init__.py b/beetsplug/lastgenre/__init__.py
index b67f1fae2..dbab96cf8 100644
--- a/beetsplug/lastgenre/__init__.py
+++ b/beetsplug/lastgenre/__init__.py
@@ -401,7 +401,7 @@ class LastGenrePlugin(plugins.BeetsPlugin):
                 label = "album"
 
         if not new_genres and "artist" in self.sources:
-            new_genres = None
+            new_genres = []
             if isinstance(obj, library.Item):
                 new_genres = self.fetch_artist_genre(obj)
                 label = "artist"
diff --git a/beetsplug/replaygain.py b/beetsplug/replaygain.py
index 00b651d99..96c854314 100644
--- a/beetsplug/replaygain.py
+++ b/beetsplug/replaygain.py
@@ -1161,7 +1161,9 @@ class ExceptionWatcher(Thread):
     Once an exception occurs, raise it and execute a callback.
     """
 
-    def __init__(self, queue: queue.Queue, callback: Callable[[], None]):
+    def __init__(
+        self, queue: queue.Queue[Exception], callback: Callable[[], None]
+    ):
         self._queue = queue
         self._callback = callback
         self._stopevent = Event()
@@ -1197,7 +1199,9 @@ BACKENDS: dict[str, type[Backend]] = {b.NAME: b for b in BACKEND_CLASSES}
 class ReplayGainPlugin(BeetsPlugin):
     """Provides ReplayGain analysis."""
 
-    def __init__(self):
+    pool: ThreadPool | None = None
+
+    def __init__(self) -> None:
         super().__init__()
 
         # default backend is 'command' for backward-compatibility.
@@ -1261,9 +1265,6 @@ class ReplayGainPlugin(BeetsPlugin):
         except (ReplayGainError, FatalReplayGainError) as e:
             raise ui.UserError(f"replaygain initialization failed: {e}")
 
-        # Start threadpool lazily.
-        self.pool = None
-
     def should_use_r128(self, item: Item) -> bool:
         """Checks the plugin setting to decide whether the calculation
         should be done using the EBU R128 standard and use R128_ tags instead.
@@ -1420,7 +1421,7 @@ class ReplayGainPlugin(BeetsPlugin):
         """Open a `ThreadPool` instance in `self.pool`"""
         if self.pool is None and self.backend_instance.do_parallel:
             self.pool = ThreadPool(threads)
-            self.exc_queue: queue.Queue = queue.Queue()
+            self.exc_queue: queue.Queue[Exception] = queue.Queue()
 
             signal.signal(signal.SIGINT, self._interrupt)