add stats to artist and album endpoints

return artist albums and other versions

app/api/album.py

@@ -3,6 +3,7 @@ Contains all the album routes.
 """
 
 from dataclasses import asdict
+from pprint import pprint
 import random
 
 from pydantic import BaseModel, Field
@@ -21,15 +22,44 @@ from app.utils.hashing import create_hash
 from app.lib.albumslib import sort_by_track_no
 from app.serializers.album import serialize_for_card_many
 from app.serializers.track import serialize_tracks
+from app.utils.stats import get_track_group_stats
 
 
 bp_tag = Tag(name="Album", description="Single album")
 api = APIBlueprint("album", __name__, url_prefix="/album", abp_tags=[bp_tag])
 
 
+class GetAlbumVersionsBody(BaseModel):
+    og_album_title: str = Field(
+        description="The original album title (album.og_title)",
+        example=Defaults.API_ALBUMNAME,
+    )
+
+    albumhash: str = Field(
+        description="The album hash of the album to exclude from the results.",
+        example=Defaults.API_ALBUMHASH,
+    )
+
+
+class GetMoreFromArtistsBody(AlbumLimitSchema):
+    albumartists: list = Field(
+        description="The artist hashes to get more albums from",
+    )
+
+    base_title: str = Field(
+        description="The base title of the album to exclude from the results.",
+        example=Defaults.API_ALBUMNAME,
+        default=None,
+    )
+
+
+class GetAlbumInfoBody(AlbumHashSchema, AlbumLimitSchema):
+    pass
+
+
 # NOTE: Don't use "/" as it will cause redirects (failure)
 @api.post("")
-def get_album_tracks_and_info(body: AlbumHashSchema):
+def get_album_tracks_and_info(body: GetAlbumInfoBody):
     """
     Get album and tracks
 
@@ -52,7 +82,22 @@ def get_album_tracks_and_info(body: AlbumHashSchema):
     track_total = sum({int(t.extra.get("track_total", 1) or 1) for t in tracks})
     avg_bitrate = sum(t.bitrate for t in tracks) // (len(tracks) or 1)
 
+    more_from_data = GetMoreFromArtistsBody(
+        albumartists=[a["artisthash"] for a in album.albumartists],
+        albumlimit=body.limit,
+        base_title=album.base_title,
+    )
+    other_versions_data = GetAlbumVersionsBody(
+        albumhash=albumhash,
+        og_album_title=album.og_title,
+    )
+
+
+    more_from_albums = get_more_from_artist(more_from_data)
+    other_versions = get_album_versions(other_versions_data)
+
     return {
+        "stats": get_track_group_stats(tracks, is_album=True),
         "info": {
             **asdict(album),
             "is_favorite": album.is_favorite,
@@ -67,6 +112,8 @@ def get_album_tracks_and_info(body: AlbumHashSchema):
         },
         "copyright": tracks[0].copyright,
         "tracks": serialize_tracks(tracks, remove_disc=False),
+        "more_from": more_from_albums,
+        "other_versions": other_versions,
     }
 
 
@@ -84,18 +131,6 @@ def get_album_tracks(path: AlbumHashSchema):
     return serialize_tracks(tracks)
 
 
-class GetMoreFromArtistsBody(AlbumLimitSchema):
-    albumartists: list = Field(
-        description="The artist hashes to get more albums from",
-    )
-
-    base_title: str = Field(
-        description="The base title of the album to exclude from the results.",
-        example=Defaults.API_ALBUMNAME,
-        default=None,
-    )
-
-
 @api.post("/from-artist")
 def get_more_from_artist(body: GetMoreFromArtistsBody):
     """
@@ -135,18 +170,6 @@ def get_more_from_artist(body: GetMoreFromArtistsBody):
     return all_albums
 
 
-class GetAlbumVersionsBody(BaseModel):
-    og_album_title: str = Field(
-        description="The original album title (album.og_title)",
-        example=Defaults.API_ALBUMNAME,
-    )
-
-    albumhash: str = Field(
-        description="The album hash of the album to exclude from the results.",
-        example=Defaults.API_ALBUMHASH,
-    )
-
-
 @api.post("/other-versions")
 def get_album_versions(body: GetAlbumVersionsBody):
     """

app/api/apischemas.py

@@ -80,6 +80,7 @@ class AlbumLimitSchema(BaseModel):
         description="The number of albums to return",
         example=Defaults.API_CARD_LIMIT,
         default=Defaults.API_CARD_LIMIT,
+        alias="albumlimit",
     )
 
 
@@ -92,4 +93,5 @@ class ArtistLimitSchema(BaseModel):
         description="The number of artists to return",
         example=Defaults.API_CARD_LIMIT,
         default=Defaults.API_CARD_LIMIT,
+        alias="artistlimit",
     )

app/api/artist.py

@@ -28,6 +28,7 @@ from app.serializers.track import serialize_track
 from app.store.albums import AlbumStore
 from app.store.artists import ArtistStore
 from app.store.tracks import TrackStore
+from app.utils.stats import get_track_group_stats
 
 bp_tag = Tag(name="Artist", description="Single artist")
 api = APIBlueprint("artist", __name__, url_prefix="/artist", abp_tags=[bp_tag])
@@ -80,9 +81,9 @@ def get_artist(path: ArtistHashSchema, query: GetArtistQuery):
     if decade:
         artist.genres.insert(0, {"name": decade, "genrehash": decade})
 
+    stats = get_track_group_stats(tracks)
     duration = sum(t.duration for t in tracks) if tracks else 0
     tracks = tracks[:limit] if (limit and limit != -1) else tracks
-
     tracks = [
         {
             **serialize_track(t),
@@ -109,6 +110,7 @@ def get_artist(path: ArtistHashSchema, query: GetArtistQuery):
         },
         "tracks": tracks,
         "albums": albums,
+        "stats": stats,
     }