Fix CoreController init signature to match model (#2594)

diff --git a/music_assistant/controllers/metadata.py b/music_assistant/controllers/metadata.py
index 6560d23ef27ea8333661c85fa5238852deb923b1..f37ffc6ebb7dc67341d6acdbab30bf61ba029a6f 100644 (file)
--- a/music_assistant/controllers/metadata.py
+++ b/music_assistant/controllers/metadata.py
@@ -11,7 +11,7 @@ import urllib.parse
 from base64 import b64encode
 from contextlib import suppress
 from time import time
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, cast
 from uuid import uuid4
 
 import aiofiles
@@ -59,6 +59,7 @@ from music_assistant.models.core_controller import CoreController
 if TYPE_CHECKING:
     from music_assistant_models.config_entries import CoreConfig
 
+    from music_assistant import MusicAssistant
     from music_assistant.models.metadata_provider import MetadataProvider
     from music_assistant.providers.musicbrainz import MusicbrainzProvider
 
@@ -119,9 +120,9 @@ class MetaDataController(CoreController):
     domain: str = "metadata"
     config: CoreConfig
 
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
+    def __init__(self, mass: MusicAssistant) -> None:
         """Initialize class."""
-        super().__init__(*args, **kwargs)
+        super().__init__(mass)
         self.cache = self.mass.cache
         self._pref_lang: str | None = None
         self.manifest.name = "Metadata controller"

diff --git a/music_assistant/controllers/music.py b/music_assistant/controllers/music.py
index 8084501b7cccb825dabc0c0504b728fc50fcf653..6472226268be84d49ff6d94904cb85da1fca894f 100644 (file)
--- a/music_assistant/controllers/music.py
+++ b/music_assistant/controllers/music.py
@@ -85,6 +85,8 @@ if TYPE_CHECKING:
     from music_assistant_models.config_entries import CoreConfig
     from music_assistant_models.media_items import Audiobook, PodcastEpisode
 
+    from music_assistant import MusicAssistant
+
 
 CONF_RESET_DB = "reset_db"
 DEFAULT_SYNC_INTERVAL = 12 * 60  # default sync interval in minutes
@@ -102,9 +104,9 @@ class MusicController(CoreController):
     database: DatabaseConnection | None = None
     config: CoreConfig
 
-    def __init__(self, *args, **kwargs) -> None:
+    def __init__(self, mass: MusicAssistant) -> None:
         """Initialize class."""
-        super().__init__(*args, **kwargs)
+        super().__init__(mass)
         self.cache = self.mass.cache
         self.artists = ArtistsController(self.mass)
         self.albums = AlbumsController(self.mass)

diff --git a/music_assistant/controllers/player_queues.py b/music_assistant/controllers/player_queues.py
index a92484f382d90c4e4e64794dc8dd27e5c6a864f3..5398a1e7a227a7fa528864a2b6ad2436e88f4f83 100644 (file)
--- a/music_assistant/controllers/player_queues.py
+++ b/music_assistant/controllers/player_queues.py
@@ -81,6 +81,7 @@ if TYPE_CHECKING:
         UniqueList,
     )
 
+    from music_assistant import MusicAssistant
     from music_assistant.models.player import Player
 
 
@@ -127,9 +128,9 @@ class PlayerQueuesController(CoreController):
 
     domain: str = "player_queues"
 
-    def __init__(self, *args, **kwargs) -> None:
+    def __init__(self, mass: MusicAssistant) -> None:
         """Initialize core controller."""
-        super().__init__(*args, **kwargs)
+        super().__init__(mass)
         self._queues: dict[str, PlayerQueue] = {}
         self._queue_items: dict[str, list[QueueItem]] = {}
         self._prev_states: dict[str, CompareState] = {}

diff --git a/music_assistant/controllers/players/player_controller.py b/music_assistant/controllers/players/player_controller.py
index 24cd9950e033b52795c37547268ab080e4b9566f..319bc88ed62b1e4df8c661ba9d976eb3c0d9bd4d 100644 (file)
--- a/music_assistant/controllers/players/player_controller.py
+++ b/music_assistant/controllers/players/player_controller.py
@@ -88,6 +88,8 @@ if TYPE_CHECKING:
     from music_assistant_models.config_entries import CoreConfig, PlayerConfig
     from music_assistant_models.player_queue import PlayerQueue
 
+    from music_assistant import MusicAssistant
+
 CACHE_CATEGORY_PLAYER_POWER = 1
 
 
@@ -136,9 +138,9 @@ class PlayerController(CoreController):
 
     domain: str = "players"
 
-    def __init__(self, *args: Any, **kwargs: Any) -> None:
+    def __init__(self, mass: MusicAssistant) -> None:
         """Initialize core controller."""
-        super().__init__(*args, **kwargs)
+        super().__init__(mass)
         self._players: dict[str, Player] = {}
         self._controls: dict[str, PlayerControl] = {}
         self.manifest.name = "Player Controller"