qqmusic-api-python 0.1.0__tar.gz → 0.1.1__tar.gz

{qqmusic_api_python-0.1.0 → qqmusic_api_python-0.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: qqmusic-api-python
-Version: 0.1.0
+Version: 0.1.1
 Summary: QQ音乐API封装库
 Home-page: https://github.com/luren-dc/QQMusicApi
 License: MIT
@@ -24,15 +24,15 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Dist: aiohttp (==3.9.5)
-Requires-Dist: cryptography (==41.0.2)
-Requires-Dist: requests (==2.31.0)
+Requires-Dist: aiohttp (>=3.9.5,<4.0.0)
+Requires-Dist: cryptography (>=41.0.2,<42.0.0)
+Requires-Dist: requests (>=2.31.0,<3.0.0)
 Project-URL: Documentation, https://github.com/luren-dc/QQMusicApi
 Project-URL: Repository, https://github.com/luren-dc/QQMusicApi
 Description-Content-Type: text/markdown
 
 <div align="center">
-    <h1> QQMusicApi </h1>
+    <h1> QQMusic Api </h1>
     <p> Python QQ音乐 API 封装库 </p>
 
 ![Python Version 3.9+](https://img.shields.io/badge/Python-3.9%2B-blue)
@@ -46,6 +46,8 @@ Description-Content-Type: text/markdown
 > [!WARNING]
 > 本仓库的所有内容仅供学习和参考之用，禁止用于商业用途。
 
+文档: [https://luren-dc.github.io/QQMusicApi/](https://luren-dc.github.io/QQMusicApi/)
+
 ## 介绍
 
 使用 Python 编写的用于调用 [QQ音乐](https://y.qq.com/) 各种 API 的库.
@@ -62,13 +64,13 @@ Description-Content-Type: text/markdown
 
 ### 安装
 
-```
-$ pip3 install qqmusic-api-python
+```shell
+$ pip install qqmusic-api-python
 ```
 
 ### 使用
 
-```
+```python
 import asyncio
 
 from qqmusic_api import search
@@ -86,14 +88,16 @@ if __name__ == "__main__":
 ## TODO
 
 - [ ] 歌手 API
+- [ ] 评论 API
+- [ ] 用户 API
 
 ## 参考项目
 
-- [Rain120/qq-muisc-api](https://github.com/Rain120/qq-muisc-api)
+- [Rain120/qq-muisc-api](https://github.com/Rain120/qq-music-api)
 - [jsososo/QQMusicApi](https://github.com/jsososo/QQMusicApi)
 - [Nemo2011/bilibili-api](https://github.com/Nemo2011/bilibili-api/)
 
 ## Licence
 
-**[MIT License](https://github.com/luren-dc/QQMusicApi/blob/master/LICENSE)**
+**[MIT License](https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file)**
 

{qqmusic_api_python-0.1.0 → qqmusic_api_python-0.1.1}/README.md

@@ -1,5 +1,5 @@
 <div align="center">
-    <h1> QQMusicApi </h1>
+    <h1> QQMusic Api </h1>
     <p> Python QQ音乐 API 封装库 </p>
 
 ![Python Version 3.9+](https://img.shields.io/badge/Python-3.9%2B-blue)
@@ -13,6 +13,8 @@
 > [!WARNING]
 > 本仓库的所有内容仅供学习和参考之用，禁止用于商业用途。
 
+文档: [https://luren-dc.github.io/QQMusicApi/](https://luren-dc.github.io/QQMusicApi/)
+
 ## 介绍
 
 使用 Python 编写的用于调用 [QQ音乐](https://y.qq.com/) 各种 API 的库.
@@ -29,13 +31,13 @@
 
 ### 安装
 
-```
-$ pip3 install qqmusic-api-python
+```shell
+$ pip install qqmusic-api-python
 ```
 
 ### 使用
 
-```
+```python
 import asyncio
 
 from qqmusic_api import search
@@ -53,13 +55,15 @@ if __name__ == "__main__":
 ## TODO
 
 - [ ] 歌手 API
+- [ ] 评论 API
+- [ ] 用户 API
 
 ## 参考项目
 
-- [Rain120/qq-muisc-api](https://github.com/Rain120/qq-muisc-api)
+- [Rain120/qq-muisc-api](https://github.com/Rain120/qq-music-api)
 - [jsososo/QQMusicApi](https://github.com/jsososo/QQMusicApi)
 - [Nemo2011/bilibili-api](https://github.com/Nemo2011/bilibili-api/)
 
 ## Licence
 
-**[MIT License](https://github.com/luren-dc/QQMusicApi/blob/master/LICENSE)**
+**[MIT License](https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file)**

{qqmusic_api_python-0.1.0 → qqmusic_api_python-0.1.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "qqmusic-api-python"
-version = "0.1.0"
+version = "0.1.1"
 description = "QQ音乐API封装库"
 authors = ["Luren <dluren.c@gmail.com>"]
 packages = [{ include = "qqmusic_api" }]
@@ -26,18 +26,22 @@ classifiers = [
 
 [tool.poetry.dependencies]
 python = "^3.9"
-cryptography = "41.0.2"
-requests = "2.31.0"
-aiohttp = "3.9.5"
+cryptography = "^41.0.2"
+requests = "^2.31.0"
+aiohttp = "^3.9.5"
 
 [tool.poetry.group.dev.dependencies]
-pytest = "8.2.0"
-pytest-asyncio = "0.23.6"
-qrcode = { extras = ["pil"], version = "7.4.2" }
-pyzbar = "0.1.9"
-pytest-timeout = "2.3.1"
-pytest-sugar = "1.0.0"
-pre-commit = "3.7.0"
+pytest = "^8.2.0"
+pytest-asyncio = "^0.23.6"
+qrcode = { extras = ["pil"], version = "^7.4.2" }
+pyzbar = "^0.1.9"
+pytest-timeout = "^2.3.1"
+pytest-sugar = "^1.0.0"
+pre-commit = "^3.7.0"
+
+[build-system]
+requires = ["poetry-core"]
+build-backend = "poetry.core.masonry.api"
 
 [tool.mypy]
 disable_error_code = ["index", "arg-type", "union-attr", "return-value"]
@@ -48,8 +52,3 @@ show_column_numbers = true
 pythonpath = "./"
 timeout = 30
 testpaths = ["tests"]
-
-
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"

qqmusic_api_python-0.1.1/qqmusic_api/__init__.py

@@ -0,0 +1,14 @@
+from .api import album, mv, login, search, song, songlist, top, singer
+from .utils.credential import Credential
+
+__all__ = [
+    "album",
+    "Credential",
+    "login",
+    "mv",
+    "search",
+    "singer",
+    "song",
+    "songlist",
+    "top",
+]

{qqmusic_api_python-0.1.0 → qqmusic_api_python-0.1.1}/qqmusic_api/api/album.py

@@ -18,6 +18,9 @@ class Album:
         """
         self.mid = mid
 
+    def __repr__(self) -> str:
+        return f"Album(mid={self.mid})"
+
     async def get_detail(self) -> dict:
         """
         Returns:

{qqmusic_api_python-0.1.0 → qqmusic_api_python-0.1.1}/qqmusic_api/api/login.py

@@ -5,7 +5,6 @@ from abc import ABC, abstractmethod
 from enum import Enum
 from typing import Optional
 
-from ..exceptions import AuthcodeExpiredException, ResponseCodeException
 from ..utils.common import get_api, hash33, random_uuid
 from ..utils.credential import Credential
 from ..utils.network import Api, get_aiohttp_session
@@ -15,7 +14,7 @@ API = get_api("login")
 
 class QrCodeLoginEvents(Enum):
     """
-    二维码登录状态枚举
+    二维码登录状态
 
     + SCAN:    未扫描二维码
     + CONF:    未确认登录
@@ -35,7 +34,7 @@ class QrCodeLoginEvents(Enum):
 
 class PhoneLoginEvents(Enum):
     """
-    手机登录状态枚举
+    手机登录状态
 
     + SEND:    发送成功
     + CAPTCHA: 需要滑块验证
@@ -400,17 +399,13 @@ class PhoneLogin(Login):
         if not authcode:
             raise ValueError("authcode 为空")
         params = {"code": str(authcode), "phoneNo": str(self.phone), "loginMode": 1}
-        try:
-            res = (
-                await Api(**API["phone_login"])
-                .update_params(**params)
-                .update_extra_common(tmeLoginMethod="3")
-                .result
-            )
-            return Credential.from_cookies(res)
-        except ResponseCodeException as e:
-            if e.code == 20271:
-                raise AuthcodeExpiredException()
+        res = (
+            await Api(**API["phone_login"])
+            .update_params(**params)
+            .update_extra_common(tmeLoginMethod="3")
+            .result
+        )
+        return Credential.from_cookies(res)
 
 
 async def refresh_cookies(credential: Credential) -> Credential:

{qqmusic_api_python-0.1.0 → qqmusic_api_python-0.1.1}/qqmusic_api/api/mv.py

@@ -15,6 +15,9 @@ class MV:
     def __init__(self, vid: str):
         self.vid = vid
 
+    def __repr__(self) -> str:
+        return f"MV(vid={self.vid})"
+
     async def get_detail(self) -> dict:
         """
         获取 MV 详细信息

qqmusic_api_python-0.1.1/qqmusic_api/api/singer.py

@@ -0,0 +1,260 @@
+from enum import Enum
+from typing import Optional
+
+from ..utils.common import get_api
+from ..utils.network import Api
+from .song import Song
+
+API = get_api("singer")
+
+
+class AreaType(Enum):
+    """
+    地区
+
+    + ALL:     全部
+    + CHINA:   内地
+    + TAIWAN:  台湾
+    + AMERICA: 美国
+    + EUROPE:  欧美
+    + JAPAN:   日本
+    + KOREA:   韩国
+    """
+
+    ALL = -100
+    CHINA = 200
+    TAIWAN = 2
+    AMERICA = 5
+    EUROPE = 4
+    JAPAN = 3
+    KOREA = 1
+
+
+class GenreType(Enum):
+    """
+    风格
+
+    + ALL:           全部
+    + POP:           流行
+    + RAP:           说唱
+    + CHINESE_STYLE: 国风
+    + ROCK:          摇滚
+    + ELECTRONIC:    电子
+    + FOLK:          民谣
+    + R_AND_B:       R&B
+    + ETHNIC:        民族乐
+    + LIGHT_MUSIC:   轻音乐
+    + JAZZ:          爵士
+    + CLASSICAL:     古典
+    + COUNTRY:       乡村
+    + BLUES:         蓝调
+    """
+
+    ALL = -100
+    POP = 7
+    RAP = 3
+    CHINESE_STYLE = 19
+    ROCK = 4
+    ELECTRONIC = 2
+    FOLK = 8
+    R_AND_B = 11
+    ETHNIC = 37
+    LIGHT_MUSIC = 93
+    JAZZ = 14
+    CLASSICAL = 33
+    COUNTRY = 13
+    BLUES = 10
+
+
+class SexType(Enum):
+    """
+    性别
+
+    + ALL:    全部
+    + MALE:   男
+    + FEMALE: 女
+    + GROUP:  组合
+    """
+
+    ALL = -100
+    MALE = 0
+    FEMALE = 1
+    GROUP = 2
+
+
+class TabType(Enum):
+    """
+    Tab 类型
+
+    + WIKI:     wiki
+    + ALBUM:    专辑
+    + COMPOSER: 作曲
+    + LYRICIST: 作词
+    + PRODUCER: 制作人
+    + ARRANGER: 编曲
+    + MUSICIAN: 乐手
+    + SONG:     歌曲
+    + VIDEO:    视频
+    """
+
+    WIKI = ("wiki", "IntroductionTab")
+    ALBUM = ("album", "AlbumTab")
+    COMPOSER = ("song_composing", "SongTab")
+    LYRICIST = ("song_lyric", "SongTab")
+    PRODUCER = ("producer", "SongTab")
+    ARRANGER = ("arranger", "SongTab")
+    MUSICIAN = ("musician", "SongTab")
+    SONG = ("song_sing", "SongTab")
+    VIDEO = ("video", "VideoTab")
+
+    def __init__(self, tabID: str, tabName: str) -> None:
+        super().__init__()
+        self.tabID = tabID
+        self.tabName = tabName
+
+
+async def get_singer_list(
+    area: AreaType = AreaType.ALL,
+    sex: SexType = SexType.ALL,
+    genre: GenreType = GenreType.ALL,
+) -> list:
+    """
+    获取歌手列表
+
+    Args:
+        area:  地区.Defaluts to AreaType.ALL
+        sex:   性别.Defaluts to SexType.ALL
+        genre: 风格.Defaluts to GenreType.ALL
+
+    Returns:
+        list: 歌手列表
+    """
+    result = (
+        await Api(**API["singer_list"])
+        .update_params(
+            hastag=0,
+            area=area.value,
+            sex=sex.value,
+            genre=genre.value,
+        )
+        .result
+    )
+    return result["hotlist"]
+
+
+class Singer:
+    """
+    歌手类
+    """
+
+    def __init__(self, mid: str) -> None:
+        """
+        Args:
+            mid: 歌手 mid
+        """
+        self.mid = mid
+        self._info: Optional[dict] = None
+
+    def __repr__(self) -> str:
+        return f"Singer(mid={self.mid})"
+
+    def __str__(self) -> str:
+        if self._info:
+            return str(self._info)
+        return f"Singer(mid={self.mid})"
+
+    async def __get_info(self) -> dict:
+        """
+        获取歌手必要信息
+        """
+        if not self._info:
+            info = (
+                await Api(**API["homepage"]).update_params(SingerMid=self.mid).result
+            )["Info"]
+            self._info = {
+                "FansNum": info["FansNum"]["Num"],
+            }
+            self._info.update(info["Singer"])
+        return self._info
+
+    async def get_info(self) -> dict:
+        """
+        获取歌手信息
+
+        Returns:
+            dict: 歌手信息
+        """
+        if not self._info:
+            self._info = await self.__get_info()
+        return self._info
+
+    async def get_fans_num(self) -> int:
+        """
+        获取歌手粉丝数
+
+        Returns:
+            int: 粉丝数
+        """
+        return (await self.__get_info())["FansNum"]
+
+    async def get_tab_detail(self, tab_type: TabType, page: int = 1, num: int = 100):
+        """
+        获取歌手 Tab 详细信息
+
+        Args:
+            tab_type: Tab 类型
+            page:     页码
+            num:      返回数量
+
+        Returns:
+            list: Tab 详细信息
+        """
+        return (
+            await Api(**API["homepage_tab_detail"])
+            .update_params(
+                SingerMid=self.mid,
+                IsQueryTabDetail=1,
+                TabID=tab_type.tabID,
+                PageNum=page - 1,
+                PageSize=num,
+                Order=0,
+            )
+            .result
+        )[tab_type.tabName]
+
+    async def get_wiki(self) -> dict:
+        """
+        获取歌手WiKi
+
+        Returns:
+            dict: 歌手WiKi
+        """
+        return await self.get_tab_detail(TabType.WIKI)
+
+    async def get_song(
+        self, t: TabType = TabType.SONG, page: int = 1, num: int = 100
+    ) -> list[Song]:
+        """
+        获取歌手歌曲
+
+        Args:
+            t:    Tab 类型. Defaluts to TabType.SONG
+            page: 页码. Defaluts to 1
+            num:  返回数量. Defaluts to 100
+
+        Returns:
+            list: `Song` 列表
+        """
+        if t not in [
+            TabType.SONG,
+            TabType.COMPOSER,
+            TabType.LYRICIST,
+            TabType.PRODUCER,
+            TabType.MUSICIAN,
+            TabType.ARRANGER,
+        ]:
+            raise ValueError(
+                "t must be in [TabType.SONG, TabType.COMPOSER, TabType.LYRICIST, TabType.PRODUCER, TabType.MUSICIAN, TabType.ARRANGER]"
+            )
+        data = await self.get_tab_detail(t, page, num)
+        return Song.from_list(data["List"])

{qqmusic_api_python-0.1.0 → qqmusic_api_python-0.1.1}/qqmusic_api/api/song.py

@@ -1,5 +1,10 @@
+import asyncio
 from enum import Enum
-from typing import Optional
+from typing import TYPE_CHECKING, Optional
+
+if TYPE_CHECKING:
+    from .album import Album
+    from .singer import Singer
 
 from ..exceptions import ArgsException
 from ..utils.common import get_api, parse_song_info, random_string
@@ -73,20 +78,17 @@ class Song:
         self,
         mid: Optional[str] = None,
         id: Optional[int] = None,
-        credential: Optional[Credential] = None,
     ):
         """
         Args:
             mid:        歌曲 mid. 歌曲 id 和歌曲 mid 必须提供其中之一
             id:         歌曲 id. 歌曲 id 和歌曲 mid 必须提供其中之一
-            credential: Credential 类. Defaluts to None
         """
         # ID 检查
         if mid is None and id is None:
             raise ArgsException("请至少提供 mid 和 id 中的其中一个参数。")
         self._mid = mid
         self._id = id
-        self.credential = Credential() if credential is None else credential
         self._info: Optional[dict] = None
 
     @classmethod
@@ -105,7 +107,20 @@ class Song:
         s._info = info
         return s
 
-    async def __get_info(self):
+    @classmethod
+    def from_list(cls, data: list[dict]) -> list["Song"]:
+        """
+        从列表新建 Song
+
+        Args:
+            data: 歌曲列表
+
+        Returns:
+            list: 歌曲列表
+        """
+        return [cls.from_dict(info) for info in data]
+
+    async def __get_info(self) -> dict:
         """
         获取歌曲必要信息
         """
@@ -114,7 +129,7 @@ class Song:
                 self._info = (await query_by_mid([self._mid]))[0]
             elif self._id:
                 self._info = (await query_by_id([self._id]))[0]
-        return self._info
+        return self._info  # type: ignore
 
     @property
     async def mid(self) -> str:
@@ -140,6 +155,14 @@ class Song:
             self._id = (await self.__get_info())["info"]["id"]
         return int(self._id)
 
+    def __repr__(self) -> str:
+        return f"Song(mid={self._mid}, id={self._id})"
+
+    def __str__(self) -> str:
+        if self._info:
+            return str(self._info)
+        return self.__repr__()
+
     async def __prepare_param(self, is_mid: bool = False, is_id: bool = False) -> dict:
         """
         准备请求参数
@@ -173,6 +196,28 @@ class Song:
         """
         return (await self.__get_info())["info"]
 
+    async def get_singer(self) -> "Singer":
+        """
+        获取歌曲歌手
+
+        Returns:
+            Singer: 歌手
+        """
+        from .singer import Singer
+
+        return Singer((await self.__get_info())["singer"]["mid"])
+
+    async def get_album(self) -> "Album":
+        """
+        获取歌曲专辑
+
+        Returns:
+            Album: 专辑
+        """
+        from .album import Album
+
+        return Album((await self.__get_info())["album"]["mid"])
+
     async def get_detail(self) -> dict:
         """
         获取歌曲详细信息
@@ -208,7 +253,7 @@ class Song:
         param = await self.__prepare_param(is_id=True)
         return (await Api(**API["labels"]).update_params(**param).result)["labels"]
 
-    async def get_related_playlist(self) -> list[dict]:
+    async def get_related_songlist(self) -> list[dict]:
         """
         获取歌曲相关歌单
 
@@ -266,6 +311,7 @@ class Song:
         self,
         file_type: SongFileType = SongFileType.MP3_128,
         url_type: UrlType = UrlType.PLAY,
+        credential: Optional[Credential] = None,
     ) -> dict[str, str]:
         """
         获取歌曲文件链接
@@ -273,11 +319,12 @@ class Song:
         Args:
             file_type:  歌曲文件类型. Defaults to SongFileType.MP3_128
             url_type:   歌曲链接类型. Defaults to UrlType.PLAY
+            credential: 账号凭证. Defaults to None
 
         Returns:
             dict: 链接字典
         """
-        return await get_song_urls([await self.mid], file_type, url_type)
+        return await get_song_urls([await self.mid], file_type, url_type, credential)
 
     async def get_file_size(self, file_type: Optional[SongFileType] = None) -> dict:
         """
@@ -372,18 +419,25 @@ async def get_song_urls(
     )
     api = Api(**API[url_type.value], credential=credential)
     urls = {}
+    tasks = []
     for mid in mid_list:
-        # 构造请求参数
-        file_name = [f"{file_type.s}{_}{_}{file_type.e}" for _ in mid]
-        param = {
-            "filename": file_name,
-            "guid": random_string(32, "abcdef1234567890"),
-            "songmid": mid,
-            "songtype": [1 for _ in range(len(mid))],
-        }
-        res = await api.update_params(**param).result
-        data = res["midurlinfo"]
-        for info in data:
-            song_url = domain + info["wifiurl"] if info["wifiurl"] else ""
-            urls[info["songmid"]] = song_url
+
+        async def get_song_url(mid):
+            # 构造请求参数
+            file_name = [f"{file_type.s}{_}{_}{file_type.e}" for _ in mid]
+            param = {
+                "filename": file_name,
+                "guid": random_string(32, "abcdef1234567890"),
+                "songmid": mid,
+                "songtype": [1 for _ in range(len(mid))],
+            }
+
+            res = await api.update_params(**param).result
+            data = res["midurlinfo"]
+            for info in data:
+                song_url = domain + info["wifiurl"] if info["wifiurl"] else ""
+                urls[info["songmid"]] = song_url
+
+        tasks.append(asyncio.create_task(get_song_url(mid)))
+    await asyncio.gather(*tasks)
     return urls

{qqmusic_api_python-0.1.0 → qqmusic_api_python-0.1.1}/qqmusic_api/api/songlist.py

@@ -1,9 +1,8 @@
 from typing import Optional
 
-from qqmusic_api.api.song import Song
-
 from ..utils.common import get_api
 from ..utils.network import Api
+from .song import Song
 
 API = get_api("songlist")
 
@@ -21,6 +20,14 @@ class Songlist:
         self.id = id
         self._info: Optional[dict] = None
 
+    def __repr__(self) -> str:
+        return f"Songlist(id={self.id})"
+
+    def __str__(self) -> str:
+        if self._info:
+            return str(self._info)
+        return self.__repr__()
+
     async def __get_info(self):
         if not self._info:
             param = {
@@ -63,6 +70,7 @@ class Songlist:
     async def get_song_tag(self) -> list[dict]:
         """
         获取歌单歌曲标签
+        注：存在几率返回为空
 
         Returns:
             list: 歌单歌曲标签
@@ -70,7 +78,7 @@ class Songlist:
         result = await self.__get_info()
         return result["songtag"]
 
-    async def get_song_mid(self) -> list[dict]:
+    async def get_song_mid(self) -> list[str]:
         """
         获取歌单歌曲全部 mid
 

{qqmusic_api_python-0.1.0 → qqmusic_api_python-0.1.1}/qqmusic_api/api/top.py

@@ -1,7 +1,9 @@
+import datetime
+
 from qqmusic_api.api.song import Song
 from qqmusic_api.utils.network import Api
+
 from ..utils.common import get_api
-import datetime
 
 API = get_api("top")
 
@@ -9,10 +11,8 @@ API = get_api("top")
 async def get_top_category(show_detail: bool = False) -> list[dict]:
     """
     获取所有排行榜
-
     Args:
         show_detail: 是否显示详情(包括介绍，前三歌曲). Defaults to False
-
     Returns:
         list: 排行榜信息
     """
@@ -46,18 +46,23 @@ class Top:
         """
         Args:
             id: 排行榜 ID
-            period: 排行榜周期
+            period: 排行榜时间
         """
         self.id = id
         self.set_period(period)
 
+    def __repr__(self) -> str:
+        return f"Top(id={self.id}, period={self.period})"
+
+    def __str__(self) -> str:
+        return self.__repr__()
+
     def set_period(self, period: str):
         """
-        设置排行榜周期
+        设置排行榜时间
 
         Args:
-            year: 年
-            week: 周
+            period: 排行榜周期
         """
         time_type = "%Y-%m-%d" if self.id in [4, 27, 62] else "'%Y_%W"
         self.period = period or datetime.datetime.strftime(
@@ -95,4 +100,4 @@ class Top:
         """
         param = {"topId": self.id, "period": self.period, "offset": 0, "num": 100}
         result = await Api(**API["detail"]).update_params(**param).result
-        return [Song.from_dict(song) for song in result["songInfoList"]]
+        return [Song(id=song["songId"]) for song in result["data"]["song"]]

qqmusic_api_python-0.1.1/qqmusic_api/data/api/singer.json

@@ -0,0 +1,48 @@
+{
+    "singer_list": {
+        "module": "music.musichallSinger.SingerList",
+        "method": "GetSingerList",
+        "params": {
+            "area": "int 地区码",
+            "sex": "int 性别",
+            "genre": "int 风格",
+            "hastag": "int 返回标签"
+        },
+        "comment": "获取歌手列表"
+    },
+    "homepage": {
+        "module": "music.UnifiedHomepage.UnifiedHomepageSrv",
+        "method": "GetHomepageHeader",
+        "params": {
+            "SingerMid": "str 歌手 mid",
+            "IsQueryTabDetail": "int  是否返回 Tab 详细信息",
+            "TabID": "int TabID",
+            "Order": "int 排序"
+        },
+        "comment": "获取歌手主页信息"
+    },
+    "desc": {
+        "module": "music.musichallSinger.SingerInfoInter",
+        "method": "GetSingerDetail",
+        "params": {
+            "singer_mids": "list 歌手 mid 列表",
+            "group_singer": "int 1",
+            "wiki_singer": "int 1"
+        },
+        "comment": "获取歌手简介"
+    },
+    "homepage_tab_detail": {
+        "module": "music.UnifiedHomepage.UnifiedHomepageSrv",
+        "method": "GetHomepageTabDetail",
+        "params": {
+            "SingerMid": "str 歌手 mid",
+            "IsQueryTabDetail": "int  是否返回 Tab 详细信息",
+            "TabID": "int TabID",
+            "PageNum": "int 页码",
+            "PageSize": "int 返回数量",
+            "StartIndex": "int 开始位置",
+            "Order": "int 排序"
+        },
+        "comment": "获取歌手首页 Tab 栏信息"
+    }
+}

qqmusic_api_python-0.1.1/qqmusic_api/exceptions.py

@@ -0,0 +1,106 @@
+class ApiException(Exception):
+    """
+    API 异常基类
+    """
+
+    def __init__(self, msg: str = "未知原因"):
+        super().__init__(msg)
+        self.msg = msg
+
+    def __str__(self):
+        return self.msg
+
+
+class ArgsException(ApiException):
+    """
+    参数错误异常
+    """
+
+    pass
+
+
+class ClientException(ApiException):
+    """
+    服务器连接错误异常
+    """
+
+    def __init__(self):
+        super().__init__("连接到服务器时出现了问题")
+
+
+class NetworkException(ApiException):
+    """
+    网络错误异常
+    """
+
+    def __init__(self, status: int, msg: str):
+        full_msg = f"网络错误，状态码：{status} - {msg}"
+        super().__init__(full_msg)
+        self.status = status
+
+
+class ResponseException(ApiException):
+    """
+    API 错误异常
+    """
+
+    def __init__(self, api: list):
+        super().__init__()
+        self.api = api
+
+    def __str__(self):
+        return f"接口信息：{'.'.join(self.api)}"
+
+
+class CredentialCanNotRefreshException(ApiException):
+    """
+    Crediential 无法刷新异常
+    """
+
+    def __init__(self):
+        super().__init__("Crediential 无法刷新，请检查是否缺少必要字段")
+
+
+class CredentialNoMusicidException(ApiException):
+    """
+    Crediential 缺少 Musicid 异常
+    """
+
+    def __init__(self):
+        super().__init__("Crediential 缺少 Musicid")
+
+
+class CredentialNoMusickeyException(ApiException):
+    """
+    Crediential 缺少 Musickey 异常
+    """
+
+    def __init__(self):
+        super().__init__("Crediential 缺少 Musickey")
+
+
+class LoginDevicesFullException(ApiException):
+    """
+    登录设备已满异常
+    """
+
+    def __init__(self):
+        super().__init__("登录设备已满")
+
+
+class AuthcodeExpiredException(ApiException):
+    """
+    验证码已失效异常
+    """
+
+    def __init__(self):
+        super().__init__("验证码已失效")
+
+
+class AuthcodeGetFrequentlyException(ApiException):
+    """
+    验证码获取频繁异常
+    """
+
+    def __init__(self):
+        super().__init__("验证码获取频繁")

{qqmusic_api_python-0.1.0 → qqmusic_api_python-0.1.1}/qqmusic_api/utils/credential.py

@@ -1,28 +1,29 @@
+from dataclasses import asdict, dataclass, field
+from typing import Any, Dict
+
 from ..exceptions import (
+    CredentialCanNotRefreshException,
     CredentialNoMusicidException,
     CredentialNoMusickeyException,
-    CredientialCanNotRefreshException,
 )
 
 
+@dataclass
 class Credential:
-    def __init__(
-        self, musicid: str = "", musickey: str = "", refresh_key: str = "", **kwagrs
-    ):
-        self.musicid = musicid
-        self.musickey = musickey
-        self.refresh_key = refresh_key
-        self.login_type = 1 if "W_X" in musickey else 2
+    musicid: str = ""
+    musickey: str = ""
+    refresh_key: str = ""
+    login_type: int = field(init=False)
+    extra_fields: Dict[str, Any] = field(default_factory=dict)
 
-        for key, value in kwagrs.items():
-            setattr(self, key, value)
+    def __post_init__(self):
+        self.login_type = 1 if "W_X" in self.musickey else 2
 
     def get_dict(self) -> dict:
-        cookies = {}
-        for key, value in self.__dict__.items():
-            if key not in cookies and value is not None:
-                cookies[key] = value
-        return cookies
+        """
+        返回 Credential 的字典表示，包括所有字段。
+        """
+        return {**asdict(self), **self.extra_fields}
 
     def has_musicid(self) -> bool:
         """
@@ -44,10 +45,10 @@ class Credential:
 
     def raise_for_cannot_refresh(self):
         """
-        无法刷新 Credential 时则抛出异常
+        无法刷新 Credential 时抛出异常
         """
         if not self.can_refresh():
-            raise CredientialCanNotRefreshException()
+            raise CredentialCanNotRefreshException()
 
     def raise_for_no_musicid(self):
         """
@@ -75,18 +76,18 @@ class Credential:
         self.refresh_key = c.refresh_key
 
     @classmethod
-    def from_cookies(cls, cookies: dict = {}) -> "Credential":
+    def from_cookies(cls, cookies: dict) -> "Credential":
         """
-        从 cookies 新建 Credential
+        从 cookies 创建 Credential 实例
 
         Args:
-            cookies : Cookies.
+            cookies : Cookies 字典.
 
         Returns:
-            Credential: 凭据类
+            Credential: 凭据类实例
         """
-        c = cls()
-        c.musicid = cookies["musicid"]
-        c.musickey = cookies["musickey"]
-        c.refresh_key = cookies["refresh_key"]
-        return c
+        return cls(
+            musicid=cookies.get("musicid", ""),
+            musickey=cookies.get("musickey", ""),
+            refresh_key=cookies.get("refresh_key", ""),
+        )

{qqmusic_api_python-0.1.0 → qqmusic_api_python-0.1.1}/qqmusic_api/utils/network.py

@@ -6,8 +6,9 @@ from typing import Any
 
 import aiohttp
 
+
 from .. import settings
-from ..exceptions import ClientException, NetworkException
+from ..exceptions import ClientException, NetworkException, ResponseException
 from .credential import Credential
 
 HEADERS = {
@@ -78,28 +79,28 @@ class Api:
         self.params = {k: "" for k in self.params.keys()}
         self.headers = {k: "" for k in self.headers.keys()}
         self.extra_common = {k: "" for k in self.extra_common.keys()}
-        self.__result: str | dict | None = None
+        self.__result: dict | None = None
 
     def __setattr__(self, __name: str, __value: Any) -> None:
         """
         每次更新参数都要把 __result 清除
         """
-        if self.initialized and __name != "_Api__result":
+        if self.initialized and __name != "__Api__result":
             self.__result = None
         return super().__setattr__(__name, __value)
 
     @property
     def initialized(self):
-        return "_Api__result" in self.__dict__
+        return "__Api__result" in self.__dict__
 
     @property
-    async def result(self) -> dict | None:
+    async def result(self) -> dict:
         """
         获取请求结果
         """
         if self.__result is None:
             self.__result = await self.request()
-        return self.__result
+        return self.__result  # type: ignore
 
     def update_params(self, **kwargs) -> "Api":
         """
@@ -221,15 +222,13 @@ class Api:
                 except aiohttp.ClientResponseError as e:
                     raise NetworkException(e.status, e.message)
                 return self.__process_response(resp, await resp.text())
-        except aiohttp.client_exceptions.ClientConnectorError:
+        except aiohttp.ClientConnectionError:
             raise ClientException()
 
-    def __process_response(
-        self, resp: aiohttp.ClientResponse, resp_text: str
-    ) -> dict | None:
+    def __process_response(self, resp: aiohttp.ClientResponse, resp_text: str) -> dict:
         content_length = resp.headers.get("content-length")
         if content_length and int(content_length) == 0:
-            return None
+            raise ResponseException([self.module, self.method])
         try:
             resp_data = json.loads(resp_text)
             if self.module:
@@ -237,7 +236,7 @@ class Api:
                 return request_data["data"]
             return resp_data
         except Exception:
-            return None
+            raise ResponseException([self.module, self.method])
 
 
 @atexit.register

qqmusic_api_python-0.1.0/qqmusic_api/__init__.py

@@ -1,4 +0,0 @@
-from .api import album, mv, login, search, song, songlist, top
-from .utils.credential import Credential
-
-__all__ = ["album", "Credential", "login", "mv", "search", "song", "songlist", "top"]

qqmusic_api_python-0.1.0/qqmusic_api/data/api/singer.json

@@ -1 +0,0 @@
-{}

qqmusic_api_python-0.1.0/qqmusic_api/exceptions.py

@@ -1,121 +0,0 @@
-class ApiException(Exception):
-    """
-    API 异常基类
-    """
-
-    def __init__(self, msg: str = "未知原因"):
-        super().__init__(msg)
-        self.msg = msg
-
-    def __str__(self):
-        return self.msg
-
-
-class ArgsException(ApiException):
-    """
-    参数错误。
-    """
-
-    def __init__(self, msg: str):
-        super().__init__(msg)
-        self.msg = msg
-
-
-class ClientException(ApiException):
-    """
-    服务器连接错误
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.msg = "连接到服务器时出现了问题"
-
-
-class NetworkException(ApiException):
-    """
-    网络错误
-    """
-
-    def __init__(self, status: int, msg: str):
-        super().__init__(msg)
-        self.status = status
-        self.msg = f"网络错误，状态码：{status} - {msg}"
-
-    def __str__(self):
-        return self.msg
-
-
-class ResponseCodeException(ApiException):
-    """
-    API 返回 code 错误
-    """
-
-    def __init__(self, code: int, subcode: int, api: list):
-        super().__init__()
-        self.msg = "API 返回 code 错误"
-        self.code = code
-        self.subcode = subcode
-        self.api = api
-
-    def __str__(self):
-        return f"接口信息：{'.'.join(self.api)} 错误代码：{self.code} | {self.subcode}"
-
-
-class CredientialCanNotRefreshException(ApiException):
-    """
-    Crediential 无法刷新
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.msg = "Crediential 无法刷新，请检查是否缺少必要字段"
-
-
-class CredentialNoMusicidException(ApiException):
-    """
-    Crediential 缺少 Musicid
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.msg = "Crediential 缺少 Musicid"
-
-
-class CredentialNoMusickeyException(ApiException):
-    """
-    Crediential 缺少 Musickey
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.msg = "Crediential 缺少 Musickey"
-
-
-class LoginDevicesFullException(ApiException):
-    """
-    登录设备已满
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.msg = "登录设备已满"
-
-
-class AuthcodeExpiredException(ApiException):
-    """
-    验证码已失效
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.msg = "验证码已失效"
-
-
-class AuthcodeGetFrequentlyException(ApiException):
-    """
-    验证码获取频繁
-    """
-
-    def __init__(self):
-        super().__init__()
-        self.msg = "验证码获取频繁"