Fix typing issues

Author: snejus

beetsplug/mbpseudo.py

@@ -41,7 +41,6 @@
     from beets.autotag.distance import Distance
     from beets.autotag.hooks import AlbumMatch
     from beets.library import Item
-    from beetsplug._typing import JSONDict
 
     from ._utils.musicbrainz import (
         Release,
@@ -179,7 +178,9 @@ def _intercept_mb_release(self, data: Release) -> list[str]:
             is not None
         ]
 
-    def _has_desired_script(self, release: Release) -> bool:
+    def _has_desired_script(
+        self, release: Release | ReleaseRelationRelease
+    ) -> bool:
         if len(self._scripts) == 0:
             return False
         elif script := release.get("text_representation", {}).get("script"):
@@ -212,9 +213,7 @@ def _wanted_pseudo_release_id(
             return None
 
     def _replace_artist_with_alias(
-        self,
-        raw_pseudo_release: JSONDict,
-        pseudo_release: AlbumInfo,
+        self, raw_pseudo_release: Release, pseudo_release: AlbumInfo
     ):
         """Use the pseudo-release's language to search for artist
         alias if the user hasn't configured import languages."""

beetsplug/musicbrainz.py

@@ -379,17 +379,17 @@ def track_info(
             if r["type"] == "remixer"
         ] or None
 
-        if recording.get("length"):
-            info.length = int(recording["length"]) / 1000.0
+        if length := recording.get("length"):
+            info.length = length / 1000.0
 
         info.trackdisambig = recording.get("disambiguation")
 
         if recording.get("isrcs"):
             info.isrc = ";".join(recording["isrcs"])
 
-        lyricists = []
-        composer = []
-        composer_sort = []
+        lyricists: list[str] = []
+        composers: list[str] = []
+        composer_sort: list[str] = []
         for work_relation in recording.get("work_relations", ()):
             if work_relation["type"] != "performance":
                 continue
@@ -406,14 +406,14 @@ def track_info(
                     if type == "lyricist":
                         lyricists.append(artist_relation["artist"]["name"])
                     elif type == "composer":
-                        composer.append(artist_relation["artist"]["name"])
+                        composers.append(artist_relation["artist"]["name"])
                         composer_sort.append(
                             artist_relation["artist"]["sort_name"]
                         )
         if lyricists:
             info.lyricists = lyricists
-        if composer:
-            info.composers = composer
+        if composers:
+            info.composers = composers
             info.composer_sort = ", ".join(composer_sort)
 
         arrangers = []
@@ -547,8 +547,8 @@ def album_info(self, release: Release) -> AlbumInfo:
 
                     ti.artists_ids = _artist_ids(track["artist_credit"])
                     ti.artist_id = ti.artists_ids[0]
-                if track.get("length"):
-                    ti.length = int(track["length"]) / (1000.0)
+                if length := track.get("length"):
+                    ti.length = length / 1000.0
 
                 track_infos.append(ti)
 
@@ -614,7 +614,7 @@ def album_info(self, release: Release) -> AlbumInfo:
 
         # Release events.
         info.country, release_date = _preferred_release_event(release)
-        release_group_date = release["release_group"].get("first_release_date")
+        release_group_date = release["release_group"]["first_release_date"]
         if not release_date:
             # Fall back if release-specific date is not available.
             release_date = release_group_date
@@ -682,9 +682,11 @@ def album_info(self, release: Release) -> AlbumInfo:
                         url_source.capitalize(),
                     )
 
-            for source, url in urls.items():
+            for url_source, url in urls.items():
                 setattr(
-                    info, f"{source}_album_id", extract_release_id(source, url)
+                    info,
+                    f"{url_source}_album_id",
+                    extract_release_id(url_source, url),
                 )
 
         extra_albumdatas = plugins.send("mb_album_extract", data=release)

test/plugins/test_mbpseudo.py

@@ -20,6 +20,7 @@
     import pathlib
 
     from beetsplug._typing import JSONDict
+    from beetsplug._utils.musicbrainz import Release
 
 
 @pytest.fixture(scope="module")
@@ -28,13 +29,13 @@ def rsrc_dir(pytestconfig: pytest.Config):
 
 
 @pytest.fixture
-def official_release(rsrc_dir: pathlib.Path) -> JSONDict:
+def official_release(rsrc_dir: pathlib.Path) -> Release:
     info_json = (rsrc_dir / "official_release.json").read_text(encoding="utf-8")
     return json.loads(info_json)
 
 
 @pytest.fixture
-def pseudo_release(rsrc_dir: pathlib.Path) -> JSONDict:
+def pseudo_release(rsrc_dir: pathlib.Path) -> Release:
     info_json = (rsrc_dir / "pseudo_release.json").read_text(encoding="utf-8")
     return json.loads(info_json)
 
@@ -141,7 +142,7 @@ def test_extract_id_uses_music_brainz_pattern(
     def test_album_info_for_pseudo_release(
         self,
         mbpseudo_plugin: MusicBrainzPseudoReleasePlugin,
-        pseudo_release: JSONDict,
+        pseudo_release: Release,
     ):
         album_info = mbpseudo_plugin.album_info(pseudo_release)
         assert not isinstance(album_info, PseudoAlbumInfo)
@@ -159,10 +160,10 @@ def test_album_info_for_pseudo_release(
     def test_interception_skip_when_rel_values_dont_match(
         self,
         mbpseudo_plugin: MusicBrainzPseudoReleasePlugin,
-        official_release: JSONDict,
+        official_release: Release,
         json_key: str,
     ):
-        del official_release["release_relations"][0][json_key]
+        del official_release["release_relations"][0][json_key]  # type: ignore[misc]
 
         album_info = mbpseudo_plugin.album_info(official_release)
         assert not isinstance(album_info, PseudoAlbumInfo)
@@ -171,7 +172,7 @@ def test_interception_skip_when_rel_values_dont_match(
     def test_interception_skip_when_script_doesnt_match(
         self,
         mbpseudo_plugin: MusicBrainzPseudoReleasePlugin,
-        official_release: JSONDict,
+        official_release: Release,
     ):
         official_release["release_relations"][0]["release"][
             "text_representation"
@@ -184,7 +185,7 @@ def test_interception_skip_when_script_doesnt_match(
     def test_interception(
         self,
         mbpseudo_plugin: MusicBrainzPseudoReleasePlugin,
-        official_release: JSONDict,
+        official_release: Release,
     ):
         album_info = mbpseudo_plugin.album_info(official_release)
         assert isinstance(album_info, PseudoAlbumInfo)
@@ -245,7 +246,7 @@ def test_custom_tags(
         self,
         config,
         mbpseudo_plugin: MusicBrainzPseudoReleasePlugin,
-        official_release: JSONDict,
+        official_release: Release,
     ):
         config["import"]["languages"] = ["en", "jp"]
         album_info = mbpseudo_plugin.album_info(official_release)
@@ -260,7 +261,7 @@ def test_custom_tags_with_import_languages(
         self,
         config,
         mbpseudo_plugin: MusicBrainzPseudoReleasePlugin,
-        official_release: JSONDict,
+        official_release: Release,
     ):
         config["import"]["languages"] = []
         album_info = mbpseudo_plugin.album_info(official_release)

test/plugins/test_musicbrainz.py

@@ -955,6 +955,7 @@ def test_follow_pseudo_releases(self):
                 ],
                 "release_group": {
                     "id": "another-id",
+                    "first_release_date": "2009",
                 },
                 "release_relations": [
                     {
@@ -997,6 +998,7 @@ def test_follow_pseudo_releases(self):
                 ],
                 "release_group": {
                     "id": "another-id",
+                    "first_release_date": "2009",
                 },
                 "country": "COUNTRY",
             },
@@ -1042,6 +1044,7 @@ def test_pseudo_releases_with_empty_links(self):
                 ],
                 "release_group": {
                     "id": "another-id",
+                    "first_release_date": "2009",
                 },
             }
         ]
@@ -1086,6 +1089,7 @@ def test_pseudo_releases_without_links(self):
                 ],
                 "release_group": {
                     "id": "another-id",
+                    "first_release_date": "2009",
                 },
             }
         ]
@@ -1130,6 +1134,7 @@ def test_pseudo_releases_with_unsupported_links(self):
                 ],
                 "release_group": {
                     "id": "another-id",
+                    "first_release_date": "2009",
                 },
                 "release_relations": [
                     {
@@ -1239,7 +1244,10 @@ def test_candidates(self, monkeypatch, mb):
                 "artist_credit": [
                     {"artist": {"name": "some-artist", "id": "some-id"}}
                 ],
-                "release_group": {"id": "another-id"},
+                "release_group": {
+                    "id": "another-id",
+                    "first_release_date": "2009",
+                },
             },
         )
         candidates = list(mb.candidates([], "hello", "there", False))