qqmusic-api-python 0.3.2__tar.gz → 0.3.4__tar.gz

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qqmusic-api-python
-Version: 0.3.2
+Version: 0.3.4
 Summary: QQ音乐API封装库
 Project-URL: homepage, https://luren-dc.github.io/QQMusicApi/
 Project-URL: repository, https://github.com/luren-dc/QQMusicApi
@@ -69,8 +69,10 @@ Description-Content-Type: text/markdown
 
 ## 依赖
 
-- [Cryptography](https://cryptography.io/)
-- [HTTPX](https://github.com/encode/httpx/)
+- Cryptography
+- HTTPX
+- aiocache
+- orjson
 
 ## 快速上手
 
@@ -96,11 +98,7 @@ async def main():
 asyncio.run(main())
 ```
 
-## Web API
-```
-docker build . -t qq-music-api
-docker run -d -p 8000:8000 qq-music-api
-```
+## [Web API](./web/README.md)
 
 ## Licence
 

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/README.md

@@ -39,8 +39,10 @@
 
 ## 依赖
 
-- [Cryptography](https://cryptography.io/)
-- [HTTPX](https://github.com/encode/httpx/)
+- Cryptography
+- HTTPX
+- aiocache
+- orjson
 
 ## 快速上手
 
@@ -66,11 +68,7 @@ async def main():
 asyncio.run(main())
 ```
 
-## Web API
-```
-docker build . -t qq-music-api
-docker run -d -p 8000:8000 qq-music-api
-```
+## [Web API](./web/README.md)
 
 ## Licence
 

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/qqmusic_api/__init__.py

@@ -4,7 +4,7 @@ from . import album, login, lyric, mv, search, singer, song, songlist, top, user
 from .utils.credential import Credential
 from .utils.session import Session, get_session, set_session
 
-__version__ = "0.3.2"
+__version__ = "0.3.4"
 
 logger = logging.getLogger("qqmusicapi")
 

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/qqmusic_api/mv.py

@@ -43,7 +43,7 @@ async def get_detail(vids: list[str]):
     }, NO_PROCESSOR
 
 
-@api_request("music.stream.MvUrlProxy", "GetMvUrls")
+@api_request("music.stream.MvUrlProxy", "GetMvUrls", exclude_params=["guid"])
 async def get_mv_urls(vids: list[str]):
     """获取 MV 播放链接
 

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/qqmusic_api/singer.py

@@ -3,7 +3,7 @@
 from enum import Enum
 from typing import Any, Literal, cast
 
-from .utils.network import RequestGroup, api_request
+from .utils.network import NO_PROCESSOR, RequestGroup, api_request
 
 
 class AreaType(Enum):
@@ -133,7 +133,7 @@ async def get_singer_list(
     )
 
 
-@api_request("music.musichallSinger.SingerList", "GetSingerListIndex")
+@api_request("music.musichallSinger.SingerList", "GetSingerListIndex", catch_error_code=[104500])
 async def get_singer_list_index(
     area: int | AreaType = AreaType.ALL,
     sex: int | SexType = SexType.ALL,
@@ -164,10 +164,7 @@ async def get_singer_list_index(
         "index": index,
         "sin": sin,
         "cur_page": cur_page,
-    }, lambda data: cast(
-        dict[str, Any],
-        data,
-    )
+    }, NO_PROCESSOR
 
 
 async def get_singer_list_index_all(
@@ -175,7 +172,7 @@ async def get_singer_list_index_all(
     sex: int | SexType = SexType.ALL,
     genre: int | GenreType = GenreType.ALL,
     index: int | IndexType = IndexType.ALL,
-):
+) -> list[dict[str, Any]]:
     """获取所有歌手列表
 
     Args:
@@ -206,7 +203,7 @@ async def get_singer_list_index_all(
 
     for data in await rg.execute():
         singer_list.extend(data["singerlist"])
-    return cast(list[dict[str, Any]], singer_list)
+    return singer_list
 
 
 @api_request("music.UnifiedHomepage.UnifiedHomepageSrv", "GetHomepageHeader")
@@ -216,7 +213,7 @@ async def get_info(mid: str):
     Args:
         mid: 歌手 mid
     """
-    return {"SingerMid": mid}, lambda data: data
+    return {"SingerMid": mid}, NO_PROCESSOR
 
 
 @api_request("music.UnifiedHomepage.UnifiedHomepageSrv", "GetHomepageTabDetail")
@@ -305,13 +302,10 @@ async def get_songs_list(mid: str, number: int = 10, begin: int = 0):
         "order": 1,
         "number": number,
         "begin": begin,
-    }, lambda data: cast(
-        dict[str, Any],
-        data,
-    )
+    }, NO_PROCESSOR
 
 
-async def get_songs_list_all(mid: str):
+async def get_songs_list_all(mid: str) -> list[dict[str, Any]]:
     """获取歌手所有歌曲列表
 
     Args:
@@ -332,7 +326,7 @@ async def get_songs_list_all(mid: str):
     for res in response:
         songs.extend([song["songInfo"] for song in res["songList"]])
 
-    return cast(list[dict[str, Any]], songs)
+    return songs
 
 
 @api_request("music.musichallAlbum.AlbumListServer", "GetAlbumList")
@@ -349,13 +343,10 @@ async def get_album_list(mid: str, number: int = 10, begin: int = 0):
         "order": 1,
         "number": number,
         "begin": begin,
-    }, lambda data: cast(
-        dict[str, Any],
-        data,
-    )
+    }, NO_PROCESSOR
 
 
-async def get_album_list_all(mid: str):
+async def get_album_list_all(mid: str) -> list[dict[str, Any]]:
     """获取歌手所有专辑列表
 
     Args:
@@ -376,7 +367,7 @@ async def get_album_list_all(mid: str):
     for res in response:
         albums.extend(res["albumList"])
 
-    return cast(list[dict[str, Any]], albums)
+    return albums
 
 
 @api_request("MvService.MvInfoProServer", "GetSingerMvList")
@@ -393,13 +384,10 @@ async def get_mv_list(mid: str, number: int = 10, begin: int = 0):
         "order": 1,
         "count": number,
         "start": begin,
-    }, lambda data: cast(
-        dict[str, Any],
-        data,
-    )
+    }, NO_PROCESSOR
 
 
-async def get_mv_list_all(mid: str):
+async def get_mv_list_all(mid: str) -> list[dict[str, Any]]:
     """获取歌手所有专辑列表
 
     Args:
@@ -420,4 +408,4 @@ async def get_mv_list_all(mid: str):
     for res in response:
         mvs.extend(res["list"])
 
-    return cast(list[dict[str, Any]], mvs)
+    return mvs

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/qqmusic_api/song.py

@@ -16,7 +16,7 @@ def _get_extract_func(key: str):
 
 
 @api_request("music.trackInfo.UniformRuleCtrl", "CgiGetTrackInfo")
-async def query_song(value: list[str] | list[int]):
+async def query_song(value: list[int] | list[str]):
     """根据 id 或 mid 获取歌曲信息
 
     Args:
@@ -114,6 +114,7 @@ class EncryptedSongFileType(BaseSongFileType):
 async def get_song_urls(
     mid: list[str],
     file_type: SongFileType = SongFileType.MP3_128,
+    *,
     credential: Credential | None = None,
 ) -> dict[str, str]: ...
 
@@ -122,6 +123,7 @@ async def get_song_urls(
 async def get_song_urls(
     mid: list[str],
     file_type: EncryptedSongFileType,
+    *,
     credential: Credential | None = None,
 ) -> dict[str, tuple[str, str]]: ...
 
@@ -129,6 +131,7 @@ async def get_song_urls(
 async def get_song_urls(
     mid: list[str],
     file_type: SongFileType | EncryptedSongFileType = SongFileType.MP3_128,
+    *,
     credential: Credential | None = None,
 ) -> dict[str, str] | dict[str, tuple[str, str]]:
     """获取歌曲文件链接

qqmusic_api_python-0.3.4/qqmusic_api/songlist.py

@@ -0,0 +1,146 @@
+"""歌单相关 API"""
+
+from typing import Any, cast
+
+from .utils.credential import Credential
+from .utils.network import RequestGroup, api_request
+
+
+@api_request("music.srfDissInfo.DissInfo", "CgiGetDiss")
+async def get_detail(
+    songlist_id: int,
+    dirid: int = 0,
+    num: int = 10,
+    page: int = 1,
+    onlysong: bool = False,
+    tag: bool = True,
+    userinfo: bool = True,
+):
+    """获取歌单详细信息和歌曲
+
+    Args:
+        songlist_id: 歌单 ID
+        dirid: 歌单 dirid
+        num: 返回数量
+        page: 页码
+        onlysong: 是否仅返回歌曲信息(优先级最大)
+        tag: 是否返回歌单的标签信息
+        userinfo: 是否返回歌单创建者的用户信息
+    """
+
+    def _processsor(data: dict[str, Any]):
+        return {
+            "dirinfo": data.get("dirinfo", {}),
+            "total_song_num": data.get("total_song_num", 0),
+            "songlist_size": data.get("songlist_size", 0),
+            "songlist": data.get("songlist", []),
+            "songtag": data.get("songtag", []),
+            "orderlist": data.get("orderlist", []),
+        }
+
+    return {
+        "disstid": songlist_id,
+        "dirid": dirid,
+        "tag": tag,
+        "song_begin": num * (page - 1),
+        "song_num": num,
+        "userinfo": userinfo,
+        "orderlist": True,
+        "onlysonglist": onlysong,
+    }, _processsor
+
+
+async def get_songlist(
+    songlist_id: int,
+    dirid: int = 0,
+) -> list[dict[str, Any]]:
+    """获取歌单中所有歌曲列表
+
+    Args:
+        songlist_id: 歌单 ID
+        dirid: 歌单 dirid
+    """
+    response = await get_detail(songlist_id=songlist_id, dirid=dirid, num=100, onlysong=True)
+
+    total = response["total_song_num"]
+    songs = response["songlist"]
+    if total <= 100:
+        return cast(list[dict[str, Any]], songs)
+
+    rg = RequestGroup()
+    for p, num in enumerate(range(100, total, 100), start=2):
+        rg.add_request(get_detail, songlist_id=songlist_id, dirid=dirid, num=100, page=p, onlysong=True)
+
+    response = await rg.execute()
+    for res in response:
+        songs.extend(res["songlist"])
+
+    return songs
+
+
+@api_request("music.musicasset.PlaylistBaseWrite", "AddPlaylist", verify=True, cacheable=False)
+async def create(dirname: str, *, credential: Credential | None = None):
+    """添加歌单, 重名会在名称后面添加时间戳
+
+    Args:
+        dirname: 歌单名称
+        credential: 凭证
+
+    Returns:
+        创建的歌单基本信息
+    """
+    return {
+        "dirName": dirname,
+    }, lambda data: cast(dict[str, Any], data["result"])
+
+
+@api_request("music.musicasset.PlaylistBaseWrite", "DelPlaylist", verify=True, cacheable=False)
+async def delete(dirid: int, *, credential: Credential | None = None):
+    """删除歌单
+
+    Args:
+        dirid: 歌单id
+        credential: 凭证
+
+    Returns:
+        是否删除成功若不存在则返回False
+    """
+    return {
+        "dirId": dirid,
+    }, lambda data: data["result"]["dirId"] == dirid
+
+
+@api_request("music.musicasset.PlaylistDetailWrite", "AddSonglist", verify=True, cacheable=False)
+async def add_songs(dirid: int = 1, song_ids: list[int] = [], *, credential: Credential | None = None):
+    """添加歌曲到歌单
+
+    Args:
+        dirid: 歌单 dirid
+        song_ids: 歌曲 ID 列表
+        credential: 凭证
+
+    Returns:
+        是否添加成功, 歌曲已存在返回False
+    """
+    return {
+        "dirId": dirid,
+        "v_songInfo": [{"songType": 0, "songId": songid} for songid in song_ids],
+    }, lambda data: bool(data["result"]["updateTime"])
+
+
+@api_request("music.musicasset.PlaylistDetailWrite", "DelSonglist", verify=True, cacheable=False)
+async def del_songs(dirid: int = 1, song_ids: list[int] = [], *, credential: Credential | None = None):
+    """删除歌单歌曲
+
+    Args:
+        dirid: 歌单 dirid
+        song_ids: 歌曲 ID 列表
+        credential: 凭证
+
+    Returns:
+        是否删除成功, 歌曲不存在返回False
+    """
+    return {
+        "dirId": dirid,
+        "v_songInfo": [{"songType": 0, "songId": songid} for songid in song_ids],
+    }, lambda data: bool(data["result"]["updateTime"])

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/qqmusic_api/user.py

@@ -32,7 +32,7 @@ async def get_musicid(euin: str):
     )
 
 
-@api_request("music.UnifiedHomepage.UnifiedHomepageSrv", "GetHomepageHeader")
+@api_request("music.UnifiedHomepage.UnifiedHomepageSrv", "GetHomepageHeader", cacheable=False)
 async def get_homepage(euin: str, *, credential: Credential | None = None):
     """获取用户主页信息(包含音乐基因、歌单等)
 
@@ -49,7 +49,7 @@ async def get_vip_info(*, credential: Credential | None = None):
     return {}, NO_PROCESSOR
 
 
-@api_request("music.concern.RelationList", "GetFollowSingerList", verify=True)
+@api_request("music.concern.RelationList", "GetFollowSingerList", verify=True, cacheable=False)
 async def get_follow_singers(euin: str, page: int = 1, num: int = 10, *, credential: Credential | None = None):
     """获取关注歌手列表
 
@@ -65,7 +65,7 @@ async def get_follow_singers(euin: str, page: int = 1, num: int = 10, *, credent
     }
 
 
-@api_request("music.concern.RelationList", "GetFansList", verify=True)
+@api_request("music.concern.RelationList", "GetFansList", verify=True, cacheable=False)
 async def get_fans(euin: str, page: int = 1, num: int = 10, *, credential: Credential | None = None):
     """获取粉丝列表
 
@@ -81,7 +81,7 @@ async def get_fans(euin: str, page: int = 1, num: int = 10, *, credential: Crede
     }
 
 
-@api_request("music.homepage.Friendship", "GetFriendList", verify=True)
+@api_request("music.homepage.Friendship", "GetFriendList", verify=True, cacheable=False)
 async def get_friend(page: int = 1, num: int = 10, *, credential: Credential | None = None):
     """获取好友列表
 
@@ -93,10 +93,10 @@ async def get_friend(page: int = 1, num: int = 10, *, credential: Credential | N
     return {
         "PageSize": num,
         "Page": page - 1,
-    }, lambda data: {"total": data.get("Total", 0), "list": data.get("List", [])}
+    }, lambda data: {"total": len(data.get("Friends", [])), "list": data.get("Friends", [])}
 
 
-@api_request("music.concern.RelationList", "GetFollowUserList", verify=True)
+@api_request("music.concern.RelationList", "GetFollowUserList", verify=True, cacheable=False)
 async def get_follow_user(euin: str, page: int = 1, num: int = 10, *, credential: Credential | None = None):
     """获取关注用户列表
 
@@ -112,7 +112,7 @@ async def get_follow_user(euin: str, page: int = 1, num: int = 10, *, credential
     }
 
 
-@api_request("music.musicasset.PlaylistBaseRead", "GetPlaylistByUin")
+@api_request("music.musicasset.PlaylistBaseRead", "GetPlaylistByUin", cacheable=False)
 async def get_created_songlist(uin: str, *, credential: Credential | None = None):
     """获取创建的歌单
 
@@ -123,7 +123,7 @@ async def get_created_songlist(uin: str, *, credential: Credential | None = None
     return {"uin": uin}, lambda data: cast(list[dict[str, Any]], data.get("v_playlist", []))
 
 
-@api_request("music.srfDissInfo.DissInfo", "CgiGetDiss")
+@api_request("music.srfDissInfo.DissInfo", "CgiGetDiss", cacheable=False)
 async def get_fav_song(euin: str, page: int = 1, num: int = 10, *, credential: Credential | None = None):
     """获取收藏歌曲
 
@@ -156,7 +156,7 @@ async def get_fav_song(euin: str, page: int = 1, num: int = 10, *, credential: C
     }, _processsor
 
 
-@api_request("music.musicasset.PlaylistFavRead", "CgiGetPlaylistFavInfo")
+@api_request("music.musicasset.PlaylistFavRead", "CgiGetPlaylistFavInfo", cacheable=False)
 async def get_fav_songlist(euin: str, page: int = 1, num: int = 10, *, credential: Credential | None = None):
     """获取收藏歌单
 
@@ -169,7 +169,7 @@ async def get_fav_songlist(euin: str, page: int = 1, num: int = 10, *, credentia
     return {"uin": euin, "offset": (page - 1) * num, "size": num}, NO_PROCESSOR
 
 
-@api_request("music.musicasset.AlbumFavRead", "CgiGetAlbumFavInfo")
+@api_request("music.musicasset.AlbumFavRead", "CgiGetAlbumFavInfo", cacheable=False)
 async def get_fav_album(euin: str, page: int = 1, num: int = 10, *, credential: Credential | None = None):
     """获取收藏专辑
 
@@ -182,7 +182,7 @@ async def get_fav_album(euin: str, page: int = 1, num: int = 10, *, credential:
     return {"euin": euin, "offset": (page - 1) * num, "size": num}, NO_PROCESSOR
 
 
-@api_request("music.musicasset.MVFavRead", "getMyFavMV_v2", verify=True)
+@api_request("music.musicasset.MVFavRead", "getMyFavMV_v2", verify=True, cacheable=False)
 async def get_fav_mv(euin: str, page: int = 1, num: int = 10, *, credential: Credential | None = None):
     """获取收藏 MV
 
@@ -195,7 +195,7 @@ async def get_fav_mv(euin: str, page: int = 1, num: int = 10, *, credential: Cre
     return {"encuin": euin, "pagesize": num, "num": page - 1}, NO_PROCESSOR
 
 
-@api_request("music.recommend.UserProfileSettingSvr", "GetProfileReport")
+@api_request("music.recommend.UserProfileSettingSvr", "GetProfileReport", cacheable=False)
 async def get_music_gene(euin: str, *, credential: Credential | None = None):
     """获取音乐基因数据
 

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/qqmusic_api/utils/credential.py

@@ -84,16 +84,14 @@ class Credential:
         if not self.has_musicid() or not self.has_musickey():
             return False
         if await self.is_expired():
-            return bool(self.refresh_key) and bool(self.refresh_token)
+            return bool(self.refresh_key)
         return True
 
     async def is_expired(self) -> bool:
         """判断 credential 是否过期"""
         if "musickeyCreateTime" in self.extra_fields and "keyExpiresIn" in self.extra_fields:
             expired_time_stamp = self.extra_fields["musickeyCreateTime"] + self.extra_fields["keyExpiresIn"]
-            if expired_time_stamp >= time():
-                return True
-            return False
+            return expired_time_stamp <= time()
 
         from ..login import check_expired
 

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/qqmusic_api/utils/network.py

@@ -13,7 +13,7 @@ from typing_extensions import override
 from ..exceptions import CredentialExpiredError, ResponseCodeError, SignInvalidError
 from .common import calc_md5
 from .credential import Credential
-from .session import get_session
+from .session import Session, get_session
 from .sign import sign
 
 _P = ParamSpec("_P")
@@ -39,6 +39,7 @@ def api_request(
     cache_ttl: int | None = None,
     cacheable: bool = True,
     exclude_params: list[str] = [],
+    catch_error_code: list[int] = [],
 ):
     """API请求"""
 
@@ -55,6 +56,7 @@ def api_request(
             cacheable=cacheable,
             cache_ttl=cache_ttl,
             exclude_params=exclude_params,
+            catch_error_code=catch_error_code,
         )
 
     return decorator
@@ -80,17 +82,21 @@ class BaseRequest(ABC):
         verify: bool = False,
         ignore_code: bool = False,
     ) -> None:
-        self.session = get_session()
         self._common = common or {}
         self._credential = credential
         self.verify = verify
         self.ignore_code = ignore_code
         self.cache = self.session._cache
 
+    @property
+    def session(self) -> Session:
+        """获取请求会话"""
+        return get_session()
+
     @property
     def credential(self) -> Credential:
         """获取请求凭证"""
-        return self._credential or (self.session).credential or Credential()
+        return self._credential or self.session.credential or Credential()
 
     @credential.setter
     def credential(self, value: Credential):
@@ -114,7 +120,7 @@ class BaseRequest(ABC):
         common = {
             "cv": config["version_code"],
             "v": config["version_code"],
-            "QIMEI36": (self.session).qimei,
+            "QIMEI36": self.session.qimei,
         }
         common.update(self.COMMON_DEFAULTS)
         if credential.has_musicid() and credential.has_musickey():
@@ -189,7 +195,7 @@ class ApiRequest(BaseRequest, Generic[_P, _R]):
         cache_ttl: int | None = None,
         cacheable: bool = True,
         exclude_params: list[str] = [],
-        **kwargs,
+        catch_error_code: list[int] = [],
     ) -> None:
         super().__init__(common, credential, verify, ignore_code)
         self.module = module
@@ -201,6 +207,7 @@ class ApiRequest(BaseRequest, Generic[_P, _R]):
         self.cacheable = cacheable
         self.cache_ttl = cache_ttl
         self.exclude_params = exclude_params
+        self.catch_error_code = catch_error_code
 
     def copy(self) -> "ApiRequest[_P, _R]":
         """创建当前 ApiRequest 实例的副本"""
@@ -217,6 +224,7 @@ class ApiRequest(BaseRequest, Generic[_P, _R]):
             cacheable=self.cacheable,
             cache_ttl=self.cache_ttl,
             exclude_params=self.exclude_params.copy(),
+            catch_error_code=self.catch_error_code,
         )
         req.processor = self.processor
         return req
@@ -273,7 +281,7 @@ class ApiRequest(BaseRequest, Generic[_P, _R]):
             code,
         )
 
-        if code == 0:
+        if code == 0 or code in self.catch_error_code:
             return
 
         if code == 2000:

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/qqmusic_api/utils/qimei.py

@@ -112,7 +112,7 @@ def random_payload_by_device(device: Device, version: str) -> dict:
         "packageId": "com.tencent.qqmusic",
         "deviceType": "Phone",
         "sdkName": "",
-        "reserved": json.dumps(reserved),
+        "reserved": json.dumps(reserved).decode(),
     }
 
 
@@ -158,7 +158,7 @@ def get_qimei(version: str) -> QimeiResult:
         device.qimei = data["q36"]
         save_device(device)
         return QimeiResult(q16=data["q16"], q36=data["q36"])
-    except Exception:
+    except httpx.HTTPError:
         if device.qimei:
             return QimeiResult(q16="", q36=device.qimei)
         logger.exception("获取 QIMEI 失败,使用默认 QIMEI")

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/qqmusic_api/utils/session.py

@@ -1,6 +1,7 @@
 """请求 Session 管理"""
 
 import contextvars
+import logging
 from typing import TypedDict
 
 import httpx
@@ -11,6 +12,10 @@ from aiocache.serializers import BaseSerializer
 from .credential import Credential
 from .qimei import get_qimei
 
+# 配置日志记录器
+logger = logging.getLogger(__name__)
+_session_counter = 0
+
 
 class ApiConfig(TypedDict):
     """API 配置"""
@@ -102,6 +107,7 @@ def get_session() -> Session:
     """获取当前上下文的 Session"""
     session = _session_context.get()
     if session is None:
+        logger.info("创建新的默认Session")
         session = Session()
         _session_context.set(session)
     return session
@@ -109,12 +115,15 @@ def get_session() -> Session:
 
 def set_session(session: Session) -> None:
     """设置当前上下文的 Session"""
+    logger.info("设置新的Session到上下文")
     _session_context.set(session)
 
 
 def clear_session() -> None:
     """清除当前上下文的 Session"""
+    logger.info("清除当前上下文的Session")
     try:
         _session_context.set(None)
     except LookupError:
+        logger.warning("尝试清除不存在的Session上下文")
         pass

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/tests/test_songlist.py

@@ -12,3 +12,7 @@ async def test_get_detail():
         tag=True,
         userinfo=True,
     )
+
+
+async def test_get_songlist():
+    assert await songlist.get_songlist(songlist_id=9069454203)

{qqmusic_api_python-0.3.2 → qqmusic_api_python-0.3.4}/tests/test_user.py

@@ -1,5 +1,6 @@
 import pytest
 
+from qqmusic_api import songlist
 from qqmusic_api.exceptions import CredentialExpiredError
 from qqmusic_api.user import (
     Credential,
@@ -68,3 +69,18 @@ class TestUserAPI:
         """测试获取好友列表"""
         with pytest.raises(CredentialExpiredError):
             assert await get_friend(page=1, num=10, credential=self.VALID_CREDENTIAL)
+
+    async def test_create_songlist(self):
+        """测试创建歌单"""
+        with pytest.raises(CredentialExpiredError):
+            result = await songlist.create(dirname="test", credential=self.VALID_CREDENTIAL)
+
+            if not result or "dirId" not in result or not result["dirId"]:
+                pytest.fail(f"创建歌单失败, result 无效: {result}")
+
+            dir_id = result["dirId"]
+            assert await songlist.add_songs(
+                dirid=dir_id, song_ids=[438910555, 9063002], credential=self.VALID_CREDENTIAL
+            )
+            assert await songlist.del_songs(dirid=dir_id, song_ids=[438910555], credential=self.VALID_CREDENTIAL)
+            assert await songlist.delete(dirid=dir_id, credential=self.VALID_CREDENTIAL)

qqmusic_api_python-0.3.4/web/README.md

@@ -0,0 +1,46 @@
+# Web Port 使用说明
+
+## 1. 安装与运行
+
+### 克隆仓库
+
+```bash
+git clone https://github.com/luren-dc/QQMusicApi
+```
+
+### 依赖安装
+
+```bash
+uv sync --group web
+```
+
+### 启动服务
+
+```bash
+uv run uvicorn web.app:app --host 0.0.0.0 --port 8000 --reload
+```
+
+### Docker
+
+```bash
+docker build . -t qq-music-api
+docker run -d -p 8000:8000 qq-music-api
+```
+
+## 2. API Endpoint
+
+- **请求格式**: `GET /{module}/{func}`
+- **示例**:  
+  `GET /song/get_detail?id=12345`
+
+## 3. 请求参数规则
+
+### 类型转换规则
+
+| 参数类型    | 示例值                          | 说明                                 |
+| ----------- | ------------------------------- | ------------------------------------ |
+| `int`       | `count=5`                       | 整数                                 |
+| `bool`      | `is_vip=true`                   | `true`/`1`/`yes` 或 `false`/`0`/`no` |
+| `datetime`  | `date=2023-10-01T12:34`         | ISO 8601 格式                        |
+| `list[int]` | `id=1,2,3`                      | 逗号分隔的字符串                     |
+| `Enum`      | `type=SongType.HIT`or`type=HIT` | 枚举名或值（见具体模块定义）         |

qqmusic_api_python-0.3.2/qqmusic_api/songlist.py

@@ -1,49 +0,0 @@
-"""歌单相关 API"""
-
-from typing import Any
-
-from .utils.network import api_request
-
-
-@api_request("music.srfDissInfo.DissInfo", "CgiGetDiss")
-async def get_detail(
-    songlist_id: int,
-    dirid: int = 0,
-    num: int = 10,
-    page: int = 1,
-    onlysong: bool = False,
-    tag: bool = True,
-    userinfo: bool = True,
-):
-    """获取歌单详细信息和歌曲
-
-    Args:
-        songlist_id: 歌单 ID
-        dirid: 歌单 dirid
-        num: 返回数量
-        page: 页码
-        onlysong: 是否仅返回歌曲信息(优先级最大)
-        tag: 是否返回歌单的标签信息
-        userinfo: 是否返回歌单创建者的用户信息
-    """
-
-    def _processsor(data: dict[str, Any]):
-        return {
-            "dirinfo": data.get("dirinfo", {}),
-            "total_song_num": data.get("total_song_num", 0),
-            "songlist_size": data.get("songlist_size", 0),
-            "songlist": data.get("songlist", []),
-            "songtag": data.get("songtag", []),
-            "orderlist": data.get("orderlist", []),
-        }
-
-    return {
-        "disstid": songlist_id,
-        "dirid": dirid,
-        "tag": tag,
-        "song_begin": num * (page - 1),
-        "song_num": num,
-        "userinfo": userinfo,
-        "orderlist": True,
-        "onlysonglist": onlysong,
-    }, _processsor