Activate strict mode in mypy and fix new typing errors

.pre-commit-config.yaml

@@ -21,4 +21,4 @@ repos:
     rev: v1.4.1
     hooks:
       - id: mypy
-        additional_dependencies: [types-requests, types-python-dateutil]
+        additional_dependencies: [types-requests, types-python-dateutil, pytest, responses]

pyproject.toml

@@ -28,10 +28,7 @@ build-backend = "poetry.core.masonry.api"
 select = ["E", "F", "I001"]
 
 [tool.mypy]
-disallow_untyped_defs = true
-warn_unused_ignores = true
-warn_return_any = true
-warn_unused_configs = true
+strict = true
 
 [[tool.mypy.overrides]]
 module = "tests.*"

src/knuckles/__init__.py

@@ -1,8 +1,11 @@
 from .api import RequestMethod
+from .models.album import Album
+from .models.artist import Artist
 from .models.chat_message import ChatMessage
+from .models.cover_art import CoverArt
 from .models.jukebox import Jukebox
 from .models.scan_status import ScanStatus
-from .models.song import Album, Artist, CoverArt, Song
+from .models.song import Song
 from .models.system import License, SubsonicResponse
 from .subsonic import Subsonic
 

src/knuckles/models/playlist.py

@@ -2,8 +2,9 @@
 
 from dateutil import parser
 
+from .cover_art import CoverArt
 from .model import Model
-from .song import CoverArt, Song
+from .song import Song
 from .user import User
 
 if TYPE_CHECKING:

tests/api/test_media_retrieval.py

@@ -128,7 +128,7 @@ def test_get_captions_with_a_given_filename(
     placeholder_data: str,
     video: dict[str, Any],
     vtt_metadata: FileMetadata,
-):
+) -> None:
     add_responses(mock_get_captions_vtt)
 
     response = subsonic.media_retrieval.get_captions(
@@ -159,7 +159,7 @@ def test_get_captions_without_a_given_filename(
     placeholder_data: str,
     video: dict[str, Any],
     metadata: str,
-):
+) -> None:
     # Retrieve the mocks dynamically as their tests are equal
     get_mock: list[Response] = request.getfixturevalue(mock)
     get_metadata: FileMetadata = request.getfixturevalue(metadata)
@@ -193,7 +193,7 @@ def test_get_captions_with_a_preferred_file_format(
     video: dict[str, Any],
     metadata: str,
     file_format: SubtitlesFileFormat,
-):
+) -> None:
     # Retrieve the mocks dynamically as their tests are equal
     get_mock: list[Response] = request.getfixturevalue(mock)
     get_metadata: FileMetadata = request.getfixturevalue(metadata)

tests/api/test_system.py

@@ -12,7 +12,7 @@
 def test_ping(
     add_responses: AddResponses,
     subsonic: Subsonic,
-    subsonic_response,
+    subsonic_response: dict[str, Any],
     mock_ping: list[Response],
 ) -> None:
 

tests/mocks/internet_radio.py

@@ -18,7 +18,7 @@ def internet_radio_station() -> dict[str, Any]:
 
 @pytest.fixture
 def mock_get_internet_radio_stations(
-    mock_generator: MockGenerator, internet_radio_station
+    mock_generator: MockGenerator, internet_radio_station: dict[str, Any]
 ) -> list[Response]:
     return mock_generator(
         "getInternetRadioStations",
@@ -29,7 +29,7 @@ def mock_get_internet_radio_stations(
 
 @pytest.fixture
 def mock_create_internet_radio_station(
-    mock_generator: MockGenerator, internet_radio_station
+    mock_generator: MockGenerator, internet_radio_station: dict[str, Any]
 ) -> list[Response]:
     return mock_generator(
         "createInternetRadioStation",
@@ -43,7 +43,7 @@ def mock_create_internet_radio_station(
 
 @pytest.fixture
 def mock_update_internet_radio_station(
-    mock_generator: MockGenerator, internet_radio_station
+    mock_generator: MockGenerator, internet_radio_station: dict[str, Any]
 ) -> list[Response]:
     return mock_generator(
         "updateInternetRadioStation",
@@ -58,7 +58,7 @@ def mock_update_internet_radio_station(
 
 @pytest.fixture
 def mock_delete_internet_radio_station(
-    mock_generator: MockGenerator, internet_radio_station
+    mock_generator: MockGenerator, internet_radio_station: dict[str, Any]
 ) -> list[Response]:
     return mock_generator(
         "deleteInternetRadioStation",

tests/mocks/searching.py

@@ -21,7 +21,9 @@ def mock_search_song(
 
 @pytest.fixture
 def mock_search_album(
-    mock_generator: MockGenerator, music_folders, album: dict[str, Any]
+    mock_generator: MockGenerator,
+    music_folders: list[dict[str, Any]],
+    album: dict[str, Any],
 ) -> list[Response]:
     return mock_generator(
         "search3",
@@ -32,7 +34,9 @@ def mock_search_album(
 
 @pytest.fixture
 def mock_search_artist(
-    mock_generator: MockGenerator, music_folders, artist: dict[str, Any]
+    mock_generator: MockGenerator,
+    music_folders: list[dict[str, Any]],
+    artist: dict[str, Any],
 ) -> list[Response]:
     return mock_generator(
         "search3",

tests/models/test_user.py

@@ -79,7 +79,7 @@ def test_user_delete(
 def test_user_change_password(
     add_responses: AddResponses,
     subsonic: Subsonic,
-    mock_get_user,
+    mock_get_user: list[Response],
     mock_change_password: list[Response],
     user: dict[str, Any],
     new_password: str,