move watch playlist normalization into model

Author: cosven

fuo_ytmusic/models.py

@@ -236,9 +236,17 @@ def v2_model(self) -> SongModelV2:
 
 class YtmusicWatchPlaylistSong(YtmusicSearchSong):
     year: str  # This field exists in get_watch_playlist API.
+    length: str  # watch playlist uses `length` instead of `duration`.
+    watch_thumbnail: List[SearchNestedThumbnail] = Field(
+        default_factory=list, alias="thumbnail"
+    )  # watch playlist uses singular key.
 
     def v2_model(self) -> SongModelV2:
         song = super().v2_model()
+        if song.duration <= 0 and self.length:
+            song.duration = int(timeparse(self.length) * 1000)
+        if not song.pic_url and self.watch_thumbnail:
+            song.pic_url = self.watch_thumbnail[-1].url or ""
         song.date = self.year or ""
         return song
 
@@ -418,18 +426,6 @@ def v2_model(self, identifier) -> ArtistModelV2:
         # Note that the channelId is different from the identifier.
         # Though the channelId also refers to the artist,
         # it's songs is a empty list.
-        album_count = -1
-        if self.albums and self.albums.browseId is None:
-            album_count = len(self.albums.results or [])
-
-        song_count = -1
-        if self.songs and self.songs.browseId is None:
-            song_count = len(self.songs.results or [])
-
-        mv_count = -1
-        if self.videos and self.videos.browseId is None:
-            mv_count = len(self.videos.results or [])
-
         return ArtistModelV2(
             identifier=identifier,
             source=self.source,
@@ -441,9 +437,9 @@ def v2_model(self, identifier) -> ArtistModelV2:
                 for song in (self.songs.results if self.songs else []) or []
             ],
             description=self.description or "",
-            song_count=song_count,
-            album_count=album_count,
-            mv_count=mv_count,
+            song_count=-1,
+            album_count=-1,
+            mv_count=-1,
         )
 
 
@@ -525,12 +521,6 @@ class Format(BaseModel):
     videoDetails: VideoDetails
     streamingData: StreamingData
 
-    def get_pic_url(self) -> str:
-        thumbnails = self.videoDetails.thumbnail if self.videoDetails else None
-        if thumbnails is None:
-            return ""
-        return thumbnails.cover or ""
-
     def list_formats(self) -> List[Quality.Audio]:
         qualities = set()
         if self.streamingData is None:

fuo_ytmusic/provider.py

@@ -472,26 +472,12 @@ def song_get_media(
     def song_get_web_url(self, song) -> str:
         return f"https://music.youtube.com/watch?v={song.identifier}"
 
-    @staticmethod
-    def _normalize_watch_playlist_track(track: dict) -> dict:
-        normalized = dict(track)
-        # get_watch_playlist uses `thumbnail`/`length`, while search-like models
-        # expect `thumbnails`/`duration`.
-        if "thumbnails" not in normalized and isinstance(normalized.get("thumbnail"), list):
-            normalized["thumbnails"] = normalized["thumbnail"]
-        if not normalized.get("duration") and normalized.get("length"):
-            normalized["duration"] = normalized["length"]
-        return normalized
-
     def song_get(self, identifier):
         # ytmusicapi has not api to get song detail.
         # hack(cosven): we use get_watch_playlist to try to get song detail.
         # It works for song like '如愿-王菲'.
         result = self.service.api.get_watch_playlist(identifier)
-        songs = [
-            YtmusicWatchPlaylistSong(**self._normalize_watch_playlist_track(track)).v2_model()
-            for track in result["tracks"]
-        ]
+        songs = [YtmusicWatchPlaylistSong(**track).v2_model() for track in result["tracks"]]
         for song in songs:
             if song.identifier == identifier:
                 return song
@@ -501,7 +487,7 @@ def song_get(self, identifier):
     def song_list_similar(self, song):
         result = self.service.api.get_watch_playlist(song.identifier)
         songs = [
-            YtmusicWatchPlaylistSong(**self._normalize_watch_playlist_track(track)).v2_model()
+            YtmusicWatchPlaylistSong(**track).v2_model()
             for track in result["tracks"]
             if track["videoId"] != song.identifier
         ]

tests/test_models_fields.py

@@ -49,7 +49,9 @@ def test_artist_info_v2_model_sets_hot_songs():
 
     assert len(model.hot_songs) == len(data["songs"]["results"])
     assert model.hot_songs[0].identifier
-    assert model.album_count == len(data["albums"]["results"])
+    assert model.song_count == -1
+    assert model.album_count == -1
+    assert model.mv_count == -1
 
 
 def test_song_info_supports_audio_quality_and_media_mapping():
@@ -68,10 +70,3 @@ def test_song_info_supports_audio_quality_and_media_mapping():
     if Quality.Audio.sq in audio_qualities:
         sq_itag, _, _ = song.get_media(Quality.Audio.sq)
         assert sq_itag is not None
-
-
-def test_song_info_extracts_pic_url_from_video_details():
-    data = _load_fixture("model_fields_get_song_xqoantj5pny.json")
-    song = SongInfo(**data)
-
-    assert song.get_pic_url() == data["videoDetails"]["thumbnail"]["thumbnails"][-1]["url"]

tests/test_provider_song_get.py

@@ -3,7 +3,7 @@
 from fuo_ytmusic.provider import YtmusicProvider
 
 
-def test_song_get_normalizes_watch_playlist_cover_and_duration():
+def test_song_get_handles_watch_playlist_thumbnail_and_length_fields():
     song_id = "vid-1"
     expected_pic_url = "https://example.com/song-544.jpg"
 
@@ -41,10 +41,6 @@ def get_watch_playlist(identifier):
     class _ServiceStub:
         api = _ApiStub()
 
-        @staticmethod
-        def song_info(_identifier):
-            raise AssertionError("song_info fallback should not be used")
-
     provider = YtmusicProvider()
     provider.service = _ServiceStub()
 
@@ -55,7 +51,7 @@ def song_info(_identifier):
     assert song.duration > 0
 
 
-def test_song_list_similar_reuses_watch_playlist_normalization():
+def test_song_list_similar_handles_watch_playlist_thumbnail_and_length_fields():
     seed_song_id = "seed-song"
 
     class _ApiStub: