Fix types in all edited files

Author: snejus

beets/autotag/hooks.py

@@ -55,7 +55,7 @@ def __hash__(self):
         return id(self)
 
 
-class AlbumInfo(AttrDict):
+class AlbumInfo(AttrDict[Any]):
     """Describes a canonical release that may be used to match a release
     in the library. Consists of these data members:
 
@@ -165,7 +165,7 @@ def copy(self) -> AlbumInfo:
         return dupe
 
 
-class TrackInfo(AttrDict):
+class TrackInfo(AttrDict[Any]):
     """Describes a canonical track present on a release. Appears as part
     of an AlbumInfo's ``tracks`` list. Consists of these data members:
 
@@ -356,8 +356,8 @@ class Distance:
     for each individual penalty.
     """
 
-    def __init__(self):
-        self._penalties = {}
+    def __init__(self) -> None:
+        self._penalties: dict[str, list[float]] = {}
         self.tracks: dict[TrackInfo, Distance] = {}
 
     @cached_classproperty

beets/autotag/match.py

@@ -604,8 +604,8 @@ def tag_item(
             return Proposal([], Recommendation.none)
 
     # Search terms.
-    if not (search_artist and search_title):
-        search_artist, search_title = item.artist, item.title
+    search_artist = search_artist or item.artist
+    search_title = search_title or item.title
     log.debug("Item search terms: {0} - {1}", search_artist, search_title)
 
     # Get and evaluate candidate metadata.

beets/plugins.py

@@ -51,10 +51,12 @@
 
     from beets.autotag import AlbumInfo, Distance, TrackInfo
     from beets.dbcore import Query
-    from beets.dbcore.db import FieldQueryType, SQLiteType
+    from beets.dbcore.db import FieldQueryType
+    from beets.dbcore.types import Type
     from beets.importer import ImportSession, ImportTask
     from beets.library import Album, Item, Library
     from beets.ui import Subcommand
+    from beets.util.id_extractors import RegexDict
 
     # TYPE_CHECKING guard is needed for any derived type
     # which uses an import from `beets.library` and `beets.imported`
@@ -225,7 +227,7 @@ def track_distance(
 
     def album_distance(
         self,
-        items: list[Item],
+        items: Sequence[Item],
         album_info: AlbumInfo,
         mapping: dict[Item, TrackInfo],
     ) -> Distance:
@@ -430,10 +432,10 @@ def queries() -> dict[str, type[Query]]:
     return out
 
 
-def types(model_cls: type[AnyModel]) -> dict[str, type[SQLiteType]]:
+def types(model_cls: type[AnyModel]) -> dict[str, Type]:
     # Gives us `item_types` and `album_types`
     attr_name = f"{model_cls.__name__.lower()}_types"
-    types: dict[str, type[SQLiteType]] = {}
+    types: dict[str, Type] = {}
     for plugin in find_plugins():
         plugin_types = getattr(plugin, attr_name, {})
         for field in plugin_types:
@@ -470,7 +472,7 @@ def track_distance(item: Item, info: TrackInfo) -> Distance:
 
 
 def album_distance(
-    items: list[Item],
+    items: Sequence[Item],
     album_info: AlbumInfo,
     mapping: dict[Item, TrackInfo],
 ) -> Distance:
@@ -768,15 +770,6 @@ class Response(TypedDict):
     id: str
 
 
-class RegexDict(TypedDict):
-    """A dictionary containing a regex pattern and the number of the
-    match group.
-    """
-
-    pattern: str
-    match_group: int
-
-
 R = TypeVar("R", bound=Response)
 
 
@@ -924,7 +917,7 @@ def item_candidates(
 
     def album_distance(
         self,
-        items: list[Item],
+        items: Sequence[Item],
         album_info: AlbumInfo,
         mapping: dict[Item, TrackInfo],
     ) -> Distance:

beets/test/helper.py

@@ -448,6 +448,11 @@ class PluginMixin(ConfigMixin):
     plugin: ClassVar[str]
     preload_plugin: ClassVar[bool] = True
 
+    original_item_types = dict(Item._types)
+    original_album_types = dict(Album._types)
+    original_item_queries = dict(Item._queries)
+    original_album_queries = dict(Album._queries)
+
     def setup_beets(self):
         super().setup_beets()
         if self.preload_plugin:
@@ -471,13 +476,8 @@ def load_plugins(self, *plugins: str) -> None:
 
         # Take a backup of the original _types and _queries to restore
         # when unloading.
-        Item._original_types = dict(Item._types)
-        Album._original_types = dict(Album._types)
         Item._types.update(beets.plugins.types(Item))
         Album._types.update(beets.plugins.types(Album))
-
-        Item._original_queries = dict(Item._queries)
-        Album._original_queries = dict(Album._queries)
         Item._queries.update(beets.plugins.named_queries(Item))
         Album._queries.update(beets.plugins.named_queries(Album))
 
@@ -489,10 +489,10 @@ def unload_plugins(self) -> None:
         self.config["plugins"] = []
         beets.plugins._classes = set()
         beets.plugins._instances = {}
-        Item._types = getattr(Item, "_original_types", {})
-        Album._types = getattr(Album, "_original_types", {})
-        Item._queries = getattr(Item, "_original_queries", {})
-        Album._queries = getattr(Album, "_original_queries", {})
+        Item._types = self.original_item_types
+        Album._types = self.original_album_types
+        Item._queries = self.original_item_queries
+        Album._queries = self.original_album_queries
 
     @contextmanager
     def configure_plugin(self, config: Any):

beets/util/id_extractors.py

@@ -15,20 +15,31 @@
 """Helpers around the extraction of album/track ID's from metadata sources."""
 
 import re
+from typing import TypedDict
+
+
+class RegexDict(TypedDict):
+    """A dictionary containing a regex pattern and the number of the
+    match group.
+    """
+
+    pattern: str
+    match_group: int
+
 
 # Spotify IDs consist of 22 alphanumeric characters
 # (zero-left-padded base62 representation of randomly generated UUID4)
-spotify_id_regex = {
+spotify_id_regex: RegexDict = {
     "pattern": r"(^|open\.spotify\.com/{}/)([0-9A-Za-z]{{22}})",
     "match_group": 2,
 }
 
-deezer_id_regex = {
+deezer_id_regex: RegexDict = {
     "pattern": r"(^|deezer\.com/)([a-z]*/)?({}/)?(\d+)",
     "match_group": 4,
 }
 
-beatport_id_regex = {
+beatport_id_regex: RegexDict = {
     "pattern": r"(^|beatport\.com/release/.+/)(\d+)$",
     "match_group": 2,
 }

beetsplug/musicbrainz.py

@@ -21,9 +21,6 @@
 from collections import Counter
 from itertools import product
 from typing import TYPE_CHECKING, Any
-from collections.abc import Sequence
-from itertools import product
-from typing import TYPE_CHECKING, Any
 from urllib.parse import urljoin
 
 import musicbrainzngs
@@ -44,6 +41,8 @@
 
     from beets.library import Item
 
+    from ._typing import JSONDict
+
 VARIOUS_ARTISTS_ID = "89ad4ac3-39f7-470e-963a-56509c546377"
 
 BASE_URL = "https://musicbrainz.org/"
@@ -124,7 +123,7 @@ def get_message(self):
 BROWSE_MAXTRACKS = 500
 
 
-def _preferred_alias(aliases: list):
+def _preferred_alias(aliases: list[JSONDict]):
     """Given an list of alias structures for an artist credit, select
     and return the user's preferred alias alias or None if no matching
     alias is found.
@@ -133,7 +132,7 @@ def _preferred_alias(aliases: list):
         return
 
     # Only consider aliases that have locales set.
-    aliases = [a for a in aliases if "locale" in a]
+    valid_aliases = [a for a in aliases if "locale" in a]
 
     # Get any ignored alias types and lower case them to prevent case issues
     ignored_alias_types = config["import"]["ignored_alias_types"].as_str_seq()
@@ -144,13 +143,13 @@ def _preferred_alias(aliases: list):
         # Find matching primary aliases for this locale that are not
         # being ignored
         matches = []
-        for a in aliases:
+        for alias in valid_aliases:
             if (
-                a["locale"] == locale
-                and "primary" in a
-                and a.get("type", "").lower() not in ignored_alias_types
+                alias["locale"] == locale
+                and "primary" in alias
+                and alias.get("type", "").lower() not in ignored_alias_types
             ):
-                matches.append(a)
+                matches.append(alias)
 
         # Skip to the next locale if we have no matches
         if not matches:
@@ -160,7 +159,7 @@ def _preferred_alias(aliases: list):
 
 
 def _multi_artist_credit(
-    credit: list[dict], include_join_phrase: bool
+    credit: list[JSONDict], include_join_phrase: bool
 ) -> tuple[list[str], list[str], list[str]]:
     """Given a list representing an ``artist-credit`` block, accumulate
     data into a triple of joined artist name lists: canonical, sort, and
@@ -212,7 +211,7 @@ def track_url(trackid: str) -> str:
     return urljoin(BASE_URL, "recording/" + trackid)
 
 
-def _flatten_artist_credit(credit: list[dict]) -> tuple[str, str, str]:
+def _flatten_artist_credit(credit: list[JSONDict]) -> tuple[str, str, str]:
     """Given a list representing an ``artist-credit`` block, flatten the
     data into a triple of joined artist name strings: canonical, sort, and
     credit.
@@ -227,7 +226,7 @@ def _flatten_artist_credit(credit: list[dict]) -> tuple[str, str, str]:
     )
 
 
-def _artist_ids(credit: list[dict]) -> list[str]:
+def _artist_ids(credit: list[JSONDict]) -> list[str]:
     """
     Given a list representing an ``artist-credit``,
     return a list of artist IDs
@@ -320,8 +319,8 @@ def _is_translation(r):
 
 
 def _find_actual_release_from_pseudo_release(
-    pseudo_rel: dict,
-) -> dict | None:
+    pseudo_rel: JSONDict,
+) -> JSONDict | None:
     try:
         relations = pseudo_rel["release"]["release-relation-list"]
     except KeyError:
@@ -417,7 +416,7 @@ def __init__(self):
 
     def track_info(
         self,
-        recording: dict,
+        recording: JSONDict,
         index: int | None = None,
         medium: int | None = None,
         medium_index: int | None = None,
@@ -518,7 +517,7 @@ def track_info(
 
         return info
 
-    def album_info(self, release: dict) -> beets.autotag.hooks.AlbumInfo:
+    def album_info(self, release: JSONDict) -> beets.autotag.hooks.AlbumInfo:
         """Takes a MusicBrainz release result dictionary and returns a beets
         AlbumInfo object containing the interesting data about that release.
         """