From bff33a6b4baa7c8e40365901cb7f74f4d809c4c0 Mon Sep 17 00:00:00 2001
From: OzGav <gavnosp@hotmail.com>
Date: Thu, 6 Nov 2025 01:27:17 +1000
Subject: [PATCH] Fix CoreController init signature to match model (#2594)

---
 music_assistant/controllers/metadata.py                  | 7 ++++---
 music_assistant/controllers/music.py                     | 6 ++++--
 music_assistant/controllers/player_queues.py             | 5 +++--
 music_assistant/controllers/players/player_controller.py | 6 ++++--
 4 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/music_assistant/controllers/metadata.py b/music_assistant/controllers/metadata.py
index 6560d23e..f37ffc6e 100644
--- 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 8084501b..64722262 100644
--- 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 a92484f3..5398a1e7 100644
--- 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 24cd9950..319bc88e 100644
--- 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"
-- 
2.34.1