Store track artist in playlog

music_assistant/controllers/music/constants.py

@@ -9,7 +9,7 @@
 CONF_SYNC_INTERVAL = "sync_interval"
 CONF_DELETED_PROVIDERS = "deleted_providers"
 
-DB_SCHEMA_VERSION: Final[int] = 43
+DB_SCHEMA_VERSION: Final[int] = 44
 
 # tracks longer that this will not be included in radio mode
 RADIO_TRACK_MAX_DURATION_SECS: Final[int] = 20 * 60

music_assistant/controllers/music/controller.py

@@ -10,7 +10,7 @@
 from copy import deepcopy
 from datetime import datetime
 from itertools import zip_longest
-from typing import TYPE_CHECKING, Any, cast
+from typing import TYPE_CHECKING, Any, NamedTuple, cast
 
 from music_assistant_models.background_task import BackgroundTask, TaskMetadata, TaskSchedule
 from music_assistant_models.config_entries import ConfigEntry, ConfigValueType
@@ -110,6 +110,15 @@
     from music_assistant.providers.builtin import BuiltinProvider
 
 
+class RecentPlayedTrack(NamedTuple):
+    """A recently played track from the playlog, with the artist recorded at play time."""
+
+    item_id: str
+    provider: str
+    name: str
+    artist: str | None
+
+
 class MusicController(MusicDatabaseSetupMixin, CoreController):
     """Several helpers around the musicproviders."""
 
@@ -727,6 +736,45 @@ async def recently_played(
             )
         return result
 
+    async def recently_played_tracks(
+        self,
+        limit: int,
+        played_after_timestamp: int,
+        userid: str | None = None,
+    ) -> list[RecentPlayedTrack]:
+        """
+        Return recently played, fully played tracks with their recorded artist, most recent first.
+
+        :param limit: Maximum number of plays to return.
+        :param played_after_timestamp: Only include plays at or after this epoch-seconds timestamp.
+        :param userid: Restrict to this user (defaults to the current session user, else all users).
+        """
+        query = (
+            f"SELECT item_id, provider, name, artist FROM {DB_TABLE_PLAYLOG} "
+            "WHERE media_type = 'track' AND fully_played = 1 "
+            "AND timestamp >= :played_after_timestamp "
+        )
+        params: dict[str, Any] = {"played_after_timestamp": played_after_timestamp}
+        if userid:
+            query += "AND userid = :userid "
+            params["userid"] = userid
+        elif user := get_current_user():
+            query += "AND userid = :userid "
+            params["userid"] = user.user_id
+        query += "ORDER BY timestamp DESC"
+        db_rows = await self.mass.music.database.get_rows_from_query(
+            query, params=params, limit=limit
+        )
+        return [
+            RecentPlayedTrack(
+                item_id=db_row["item_id"],
+                provider=db_row["provider"],
+                name=db_row["name"],
+                artist=db_row["artist"],
+            )
+            for db_row in db_rows
+        ]
+
     @api_command("music/recently_added_tracks")
     async def recently_added_tracks(self, limit: int = 10) -> list[Track]:
         """Return a list of the last added tracks."""
@@ -1358,11 +1406,16 @@ async def mark_item_played(
             # one-off items like TTS or some sound effect etc.
             return
 
+        # store the primary artist so streaming plays not in the library remain seedable
+        item_artists = getattr(media_item, "artists", None)
+        artist = item_artists[0].name if item_artists else None
+
         params = {
             "item_id": media_item.item_id,
             "provider": media_item.provider,
             "media_type": media_item.media_type.value,
             "name": media_item.name,
+            "artist": artist,
             "image": serialize_to_json(media_item.image.to_dict()) if media_item.image else None,
             "fully_played": fully_played,
             "seconds_played": seconds_played,

music_assistant/controllers/music/database.py

@@ -239,6 +239,7 @@ async def __create_database_tables(self) -> None:
                 [provider] TEXT NOT NULL,
                 [media_type] TEXT NOT NULL,
                 [name] TEXT NOT NULL,
+                [artist] TEXT,
                 [image] json,
                 [timestamp] INTEGER DEFAULT 0,
                 [fully_played] BOOLEAN,

music_assistant/controllers/music/migrations.py

@@ -673,6 +673,15 @@ async def _get_or_create_genre(
                 if "duplicate column" not in str(err):
                     raise
 
+    if prev_version <= 43:
+        # add artist column to playlog so recommendation seeds remain available for
+        # streaming plays that were never added to the library
+        try:
+            await database.execute(f"ALTER TABLE {DB_TABLE_PLAYLOG} ADD COLUMN artist TEXT")
+        except Exception as err:
+            if "duplicate column" not in str(err):
+                raise
+
     # save changes
     await database.commit()