qqmusic-api-python 0.3.3__tar.gz → 0.3.5__tar.gz

{qqmusic_api_python-0.3.3 → qqmusic_api_python-0.3.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qqmusic-api-python
-Version: 0.3.3
+Version: 0.3.5
 Summary: QQ音乐API封装库
 Project-URL: homepage, https://luren-dc.github.io/QQMusicApi/
 Project-URL: repository, https://github.com/luren-dc/QQMusicApi
@@ -98,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.3 → qqmusic_api_python-0.3.5}/README.md

@@ -68,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.3 → qqmusic_api_python-0.3.5}/pyproject.toml

@@ -60,7 +60,7 @@ include = ["/qqmusic_api", "/tests", "LISENCE", "README.md"]
 [dependency-groups]
 testing = [
   "pytest<9.0.0,>=8.2.0",
-  "pytest-asyncio<1.0.0,>=0.23.6",
+  "pytest-asyncio<1.1.0,>=1.0.0",
   "pytest-sugar<2.0.0,>=1.0.0",
 ]
 docs = [

{qqmusic_api_python-0.3.3 → qqmusic_api_python-0.3.5}/qqmusic_api/__init__.py

@@ -1,10 +1,10 @@
 import logging
 
-from . import album, login, lyric, mv, search, singer, song, songlist, top, user
+from . import album, comment, 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.3"
+__version__ = "0.3.5"
 
 logger = logging.getLogger("qqmusicapi")
 
@@ -13,6 +13,7 @@ __all__ = [
     "Credential",
     "Session",
     "album",
+    "comment",
     "get_session",
     "login",
     "lyric",

qqmusic_api_python-0.3.5/qqmusic_api/comment.py

@@ -0,0 +1,91 @@
+"""评论 API"""
+
+from typing import Any
+
+from qqmusic_api.utils.network import api_request
+
+
+@api_request("music.globalComment.CommentRead", "GetHotCommentList")
+async def get_hot_comments(
+    biz_id: str,
+    page_num: int = 1,
+    page_size: int = 15,
+    last_comment_seq_no: str = "",
+):
+    """获取歌曲热评
+
+    Args:
+        biz_id: 歌曲 ID
+        page_num: 页码
+        page_size: 每页数量
+        last_comment_seq_no: 上一页最后一条评论 ID(可选)
+    """
+    params = {
+        "BizType": 1,
+        "BizId": biz_id,
+        "LastCommentSeqNo": last_comment_seq_no,
+        "PageSize": page_size,
+        "PageNum": page_num,
+        "HotType": 1,
+        "WithAirborne": 0,
+        "PicEnable": 1,
+    }
+
+    def _processor(data: dict[str, Any]):
+        """处理并返回结构化评论数据:
+
+        返回结构:
+        [
+            {
+                "Avatar": str,          # 用户头像 URL
+                "CmId": str,            # 评论 ID (后续需要获取全部子评论时需用到)
+                "PraiseNum": int,       # 点赞数
+                "Nick": str,            # 昵称
+                "Pic": str,             # 评论配图 (可能为空)
+                "Content": str,         # 评论内容
+                "SeqNo": str,           # 评论序号 ID 可以用于传递给 参数: last_comment_seq_no
+                "SubComments": [        # 子评论列表
+                    {
+                        "Avatar": str,
+                        "Nick": str,
+                        "Content": str,
+                        "Pic": str,
+                        "PraiseNum": int,
+                        "SeqNo": str
+                    }
+                ]
+            },
+            ...
+        ]
+        """
+        comments = data.get("CommentList", {}).get("Comments", [])
+        result = []
+
+        for comment in comments:
+            item = {
+                "Avatar": comment.get("Avatar"),
+                "CmId": comment.get("CmId"),
+                "PraiseNum": comment.get("PraiseNum"),
+                "Nick": comment.get("Nick"),
+                "Pic": comment.get("Pic"),
+                "Content": comment.get("Content"),
+                "SeqNo": comment.get("SeqNo"),
+                "SubComments": [],
+            }
+
+            for sub in comment.get("SubComments", []):
+                sub_item = {
+                    "Avatar": sub.get("Avatar"),
+                    "Nick": sub.get("Nick"),
+                    "Content": sub.get("Content"),
+                    "Pic": sub.get("Pic"),
+                    "PraiseNum": sub.get("PraiseNum"),
+                    "SeqNo": sub.get("SeqNo"),
+                }
+                item["SubComments"].append(sub_item)
+
+            result.append(item)
+
+        return result
+
+    return params, _processor

{qqmusic_api_python-0.3.3 → qqmusic_api_python-0.3.5}/qqmusic_api/login.py

@@ -12,7 +12,7 @@ from uuid import uuid4
 
 import httpx
 
-from .exceptions.api_exception import CredentialExpiredError, LoginError
+from .exceptions.api_exception import CredentialExpiredError, LoginError, ResponseCodeError
 from .utils.common import hash33
 from .utils.credential import Credential
 from .utils.network import ApiRequest
@@ -339,7 +339,7 @@ async def _authorize_qq_qr(uin: str, sigx: str) -> Credential:
         data={
             "response_type": "code",
             "client_id": "100497308",
-            "redirect_uri": "https://y.qq.com/portal/wx_redirect.html?login_type=1&surl=https%3A%252F%252Fy.qq.com%252F",
+            "redirect_uri": "https://y.qq.com/portal/wx_redirect.html?login_type=1&surl=https://y.qq.com/",
             "scope": "get_user_info,get_app_friends",
             "state": "state",
             "switch": "",
@@ -359,8 +359,8 @@ async def _authorize_qq_qr(uin: str, sigx: str) -> Credential:
         raise LoginError("[QQLogin] 获取 code 失败")
     try:
         api = ApiRequest[[], dict[str, Any]](
-            "music.login.LoginServer",
-            "Login",
+            "QQConnectLogin.LoginServer",
+            "QQLogin",
             common={"tmeLoginType": "2"},
             params={"code": code},
             cacheable=False,
@@ -368,6 +368,10 @@ async def _authorize_qq_qr(uin: str, sigx: str) -> Credential:
         return Credential.from_cookies_dict(await api())
     except CredentialExpiredError:
         raise LoginError("[QQLogin] 无法重复鉴权")
+    except ResponseCodeError as e:
+        if e.code == 20274:
+            raise LoginError("[QQLogin] 设备数量限制")
+        raise LoginError(f"[QQLogin] 未知错误: {e.code} - {e.message}")
 
 
 async def _authorize_wx_qr(code: str) -> Credential:
@@ -431,6 +435,8 @@ async def phone_authorize(phone: int, auth_code: int, country_code: int = 86) ->
         cacheable=False,
     )()
     match resp["code"]:
+        case 20274:
+            raise LoginError("[PhoneLogin] 设备数量限制")
         case 20271:
             raise LoginError("[PhoneLogin] 验证码错误或已鉴权")
         case 0:

{qqmusic_api_python-0.3.3 → qqmusic_api_python-0.3.5}/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.3 → qqmusic_api_python-0.3.5}/qqmusic_api/songlist.py

@@ -79,7 +79,7 @@ async def get_songlist(
 
 
 @api_request("music.musicasset.PlaylistBaseWrite", "AddPlaylist", verify=True, cacheable=False)
-async def create(dirname: str, credential: Credential | None = None):
+async def create(dirname: str, *, credential: Credential | None = None):
     """添加歌单, 重名会在名称后面添加时间戳
 
     Args:
@@ -95,7 +95,7 @@ async def create(dirname: str, credential: Credential | None = None):
 
 
 @api_request("music.musicasset.PlaylistBaseWrite", "DelPlaylist", verify=True, cacheable=False)
-async def delete(dirid: int, credential: Credential | None = None):
+async def delete(dirid: int, *, credential: Credential | None = None):
     """删除歌单
 
     Args:
@@ -111,7 +111,7 @@ async def delete(dirid: int, credential: Credential | None = None):
 
 
 @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):
+async def add_songs(dirid: int = 1, song_ids: list[int] = [], *, credential: Credential | None = None):
     """添加歌曲到歌单
 
     Args:
@@ -129,7 +129,7 @@ async def add_songs(dirid: int = 1, song_ids: list[int] = [], credential: Creden
 
 
 @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):
+async def del_songs(dirid: int = 1, song_ids: list[int] = [], *, credential: Credential | None = None):
     """删除歌单歌曲
 
     Args:

{qqmusic_api_python-0.3.3 → qqmusic_api_python-0.3.5}/qqmusic_api/user.py

@@ -93,7 +93,7 @@ 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, cacheable=False)

{qqmusic_api_python-0.3.3 → qqmusic_api_python-0.3.5}/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.3 → qqmusic_api_python-0.3.5}/qqmusic_api/utils/network.py

@@ -38,8 +38,8 @@ def api_request(
     process_bool: bool = True,
     cache_ttl: int | None = None,
     cacheable: bool = True,
-    exclude_params: list[str] = [],
-    catch_error_code: list[int] = [],
+    exclude_params: list[str] | None = None,
+    catch_error_code: list[int] | None = None,
 ):
     """API请求"""
 
@@ -111,7 +111,7 @@ class BaseRequest(ABC):
         return common
 
     @common.setter
-    def commom(self, value: dict[str, Any]):
+    def common(self, value: dict[str, Any]):
         """设置公共参数"""
         self._common = value
 
@@ -194,8 +194,8 @@ class ApiRequest(BaseRequest, Generic[_P, _R]):
         process_bool: bool = True,
         cache_ttl: int | None = None,
         cacheable: bool = True,
-        exclude_params: list[str] = [],
-        catch_error_code: list[int] = [],
+        exclude_params: list[str] | None = None,
+        catch_error_code: list[int] | None = None,
     ) -> None:
         super().__init__(common, credential, verify, ignore_code)
         self.module = module
@@ -206,8 +206,8 @@ class ApiRequest(BaseRequest, Generic[_P, _R]):
         self.processor: Callable[[dict[str, Any]], Any] = NO_PROCESSOR
         self.cacheable = cacheable
         self.cache_ttl = cache_ttl
-        self.exclude_params = exclude_params
-        self.catch_error_code = catch_error_code
+        self.exclude_params = exclude_params or []
+        self.catch_error_code = catch_error_code or []
 
     def copy(self) -> "ApiRequest[_P, _R]":
         """创建当前 ApiRequest 实例的副本"""
@@ -353,7 +353,7 @@ class RequestGroup(BaseRequest):
 
         self._requests.append(
             RequestItem(
-                id=len(self._requests) - 1,
+                id=len(self._requests),
                 key=unique_key,
                 request=request,
                 args=args,
@@ -422,7 +422,6 @@ class RequestGroup(BaseRequest):
 
         if not self._requests:
             return self._results
-
         resp = await self.request()
         await self._process_response(resp)
         return self._results

qqmusic_api_python-0.3.5/tests/test_comments.py

@@ -0,0 +1,15 @@
+import pytest
+
+from qqmusic_api.comment import get_hot_comments
+
+pytestmark = pytest.mark.asyncio(loop_scope="session")
+
+
+async def test_get_comment():
+    comment = await get_hot_comments(
+        "542574330",
+        1,
+        10,
+    )
+
+    assert comment[0]["Content"]

{qqmusic_api_python-0.3.3 → qqmusic_api_python-0.3.5}/tests/test_song.py

@@ -50,4 +50,4 @@ async def test_get_song_urls():
 
 
 async def test_get_fav_num():
-    assert await song.get_fav_num(songid = [438910555, 9063002])
+    assert await song.get_fav_num(songid=[438910555, 9063002])

qqmusic_api_python-0.3.5/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` | 枚举名或值（见具体模块定义）         |