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

{qqmusic_api_python-0.3.4 → qqmusic_api_python-0.3.6}/.gitignore

@@ -30,6 +30,7 @@ share/python-wheels/
 .installed.cfg
 *.egg
 MANIFEST
+tools
 
 # PyInstaller
 #  Usually these files are written by a python script from a template
@@ -164,7 +165,7 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+.idea/
 
 ### Python Patch ###
 # Poetry local configuration file - https://python-poetry.org/docs/configuration/#local-configuration

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qqmusic-api-python
-Version: 0.3.4
+Version: 0.3.6
 Summary: QQ音乐API封装库
 Project-URL: homepage, https://luren-dc.github.io/QQMusicApi/
 Project-URL: repository, https://github.com/luren-dc/QQMusicApi
@@ -17,12 +17,12 @@ Classifier: License :: OSI Approved :: MIT License
 Classifier: Natural Language :: Chinese (Simplified)
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3 :: Only
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Requires-Python: >=3.10
 Requires-Dist: aiocache>=0.12.3
-Requires-Dist: cryptography<44.0.2,>=44.0.1
+Requires-Dist: cryptography<45.0.6,>=45.0.5
 Requires-Dist: httpx[http2]>=0.27.0
 Requires-Dist: orjson>=3.10.15
 Requires-Dist: typing-extensions>=4.12.2
@@ -100,7 +100,7 @@ asyncio.run(main())
 
 ## [Web API](./web/README.md)
 
-## Licence
+## License
 
 本项目基于 **[MIT License](https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file)** 许可证发行。
 

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

@@ -70,7 +70,7 @@ asyncio.run(main())
 
 ## [Web API](./web/README.md)
 
-## Licence
+## License
 
 本项目基于 **[MIT License](https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file)** 许可证发行。
 

{qqmusic_api_python-0.3.4 → qqmusic_api_python-0.3.6}/pyproject.toml

@@ -5,7 +5,7 @@ authors = [
   { name = "Luren", email = "68656403+luren-dc@users.noreply.github.com" },
 ]
 dependencies = [
-  "cryptography>=44.0.1,<44.0.2",
+  "cryptography>=45.0.5,<45.0.6",
   "typing-extensions>=4.12.2",
   "httpx[http2]>=0.27.0",
   "aiocache>=0.12.3",
@@ -26,7 +26,7 @@ classifiers = [
   "Framework :: aiohttp",
   "Programming Language :: Python",
   "Programming Language :: Python :: 3 :: Only",
-  "Programming Language :: Python :: 3.9",
+  "Programming Language :: Python :: 3.10",
   "Programming Language :: Python :: Implementation :: CPython",
   "Topic :: Software Development :: Libraries :: Python Modules",
 ]
@@ -55,12 +55,12 @@ path = "qqmusic_api/__init__.py"
 packages = ["qqmusic_api"]
 
 [tool.hatch.build.targets.sdist]
-include = ["/qqmusic_api", "/tests", "LISENCE", "README.md"]
+include = ["/qqmusic_api", "/tests", "LICENSE", "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 = [
@@ -81,7 +81,7 @@ web = [
 [tool.commitizen]
 name = "cz_gitmoji"
 
-[tool.basedpyright]
+[tool.pyright]
 venvPath = "."
 venv = ".venv"
 include = ["qqmusic_api"]
@@ -104,10 +104,9 @@ extend-select = [
   "ASYNC",
   "C4",
   "FURB",
-  "R",
   "PERF",
 ]
-ignore = ["D105", "D107", "D205", "D415"]
+ignore = ["D105", "D107", "D205", "D415", "RUF029"]
 pydocstyle = { convention = "google" }
 
 [tool.ruff.lint.per-file-ignores]

{qqmusic_api_python-0.3.4 → qqmusic_api_python-0.3.6}/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.4"
+__version__ = "0.3.6"
 
 logger = logging.getLogger("qqmusicapi")
 
@@ -13,6 +13,7 @@ __all__ = [
     "Credential",
     "Session",
     "album",
+    "comment",
     "get_session",
     "login",
     "lyric",

qqmusic_api_python-0.3.6/qqmusic_api/comment.py

@@ -0,0 +1,183 @@
+"""评论 API"""
+
+from typing import Any, cast
+
+from .utils.network import api_request
+
+
+@api_request("music.globalComment.CommentCountSrv", "GetCmCount")
+async def get_comment_count(biz_id: str):
+    """获取歌曲评论数量
+
+    Args:
+        biz_id: 歌曲 ID
+    """
+    return {
+        "request": {
+            "biz_id": biz_id,
+            "biz_type": 1,
+            "biz_sub_type": 2,
+        },
+    }, lambda data: cast(dict[str, Any], data.get("response", {}))
+
+
+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
+
+
+@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 - 1,
+        "HotType": 1,
+        "WithAirborne": 0,
+        "PicEnable": 1,
+    }
+
+    return params, _processor
+
+
+@api_request("music.globalComment.CommentRead", "GetNewCommentList")
+async def get_new_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 = {
+        # "LastRspVer": "",
+        # "LastTotalVer": "1755832873618224522",
+        "PageSize": page_size,
+        "PageNum": page_num - 1,
+        "HashTagID": "",
+        "BizType": 1,
+        # "LastCommentId": "",
+        "PicEnable": 1,
+        "LastCommentSeqNo": last_comment_seq_no,
+        "SelfSeeEnable": 1,
+        # "LastTotal": 325,
+        # "CmListUIVer": 1,
+        "BizId": biz_id,
+        "AudioEnable": 1,
+    }
+
+    return params, _processor
+
+
+@api_request("music.globalComment.CommentRead", "GetRecCommentList")
+async def get_recommend_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 = {
+        # "FromParentCmId": "",
+        # "LastRspVer": "1755834843787200911",
+        # "LastTotalVer": "1755834843679664122",
+        # "RecOffset": 0,
+        # "LastHotScore": "",
+        # "FromCommentId": "",
+        # "HashTagID": "",
+        # "CommentIds": [],
+        # "LastRecScore": "",
+        # "LastTotal": 325,
+        "PageSize": page_size,
+        "PageNum": page_num - 1,
+        "BizType": 1,
+        "PicEnable": 1,
+        "Flag": 1,
+        "LastCommentSeqNo": last_comment_seq_no,
+        "CmListUIVer": 1,
+        "BizId": biz_id,
+        "AudioEnable": 1,
+    }
+
+    return params, _processor

{qqmusic_api_python-0.3.4 → qqmusic_api_python-0.3.6}/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.6/qqmusic_api/recommend.py

@@ -0,0 +1,52 @@
+"""推荐相关 API"""
+
+from .utils.network import NO_PROCESSOR, api_request
+
+
+@api_request("music.recommend.RecommendFeed", "get_recommend_feed")
+async def get_home_feed():
+    """获取主页推荐"""
+    return {
+        "direction": 0,
+        "page": 1,
+        "s_num": 0,
+    }, NO_PROCESSOR
+
+
+@api_request("music.radioProxy.MbTrackRadioSvr", "get_radio_track")
+async def get_guess_recommend():
+    """获取猜你喜欢"""
+    return {
+        "id": 99,
+        "num": 5,
+        "from": 0,
+        "scene": 0,
+        "song_ids": [],
+        "ext": {"bluetooth": ""},
+        "should_count_down": 1,
+    }, NO_PROCESSOR
+
+
+@api_request("music.recommend.TrackRelationServer", "GetRadarSong")
+async def get_radar_recommend():
+    """获取雷达推荐"""
+    return {
+        "Page": 1,
+        # "LastToastTime": 1755782480,
+        "ReqType": 0,
+        "FavSongs": [],
+        "EntranceSongs": [],
+        # "ext": {"bluetooth": ""},
+    }, NO_PROCESSOR
+
+
+@api_request("music.playlist.PlaylistSquare", "GetRecommendFeed")
+async def get_recommend_songlist():
+    """获取推荐歌单"""
+    return {"From": 0, "Size": 25}, NO_PROCESSOR
+
+
+@api_request("newsong.NewSongServer", "get_new_song_info")
+async def get_recommend_newsong():
+    """获取推荐新歌"""
+    return {"type": 5}, NO_PROCESSOR

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

@@ -182,6 +182,7 @@ async def get_song_urls(
             params=params,
             credential=credential,
             exclude_params=["guid"],
+            cacheable=False,
         )
         req.processor = _processor
         rg.add_request(req)

{qqmusic_api_python-0.3.4 → qqmusic_api_python-0.3.6}/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.6/qqmusic_api/utils/sign.py

@@ -0,0 +1,36 @@
+"""QQ音乐 sign"""
+
+import re
+from base64 import b64encode
+from hashlib import sha1
+
+import orjson as json
+
+PART_1_INDEXES = [23, 14, 6, 36, 16, 40, 7, 19]
+PART_2_INDEXES = [16, 1, 32, 12, 19, 27, 8, 5]
+SCRAMBLE_VALUES = [89, 39, 179, 150, 218, 82, 58, 252, 177, 52, 186, 123, 120, 64, 242, 133, 143, 161, 121, 179]
+
+# JavaScript quirks emulation
+PART_1_INDEXES = filter(lambda x: x < 40, PART_1_INDEXES)
+
+
+def sign(request: dict) -> str:
+    """QQ音乐 请求签名
+
+    Args:
+        request: 请求数据
+
+    Returns:
+        签名结果
+    """
+    hash = sha1(json.dumps(request)).hexdigest().upper()
+
+    part1 = "".join(hash[i] for i in PART_1_INDEXES)
+    part2 = "".join(hash[i] for i in PART_2_INDEXES)
+
+    part3 = bytearray(20)
+    for i, v in enumerate(SCRAMBLE_VALUES):
+        value = v ^ int(hash[i * 2 : i * 2 + 2], 16)
+        part3[i] = value
+    b64_part = re.sub(rb"[\\/+=]", b"", b64encode(part3)).decode("utf-8")
+    return f"zzc{part1}{b64_part}{part2}".lower()

qqmusic_api_python-0.3.6/tests/test_comment.py

@@ -0,0 +1,19 @@
+import pytest
+
+from qqmusic_api.comment import get_comment_count, 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"]
+
+
+async def test_get_comment_count():
+    assert await get_comment_count("103540151")

qqmusic_api_python-0.3.6/tests/test_recommend.py

@@ -0,0 +1,25 @@
+import pytest
+
+from qqmusic_api import recommend
+
+pytestmark = pytest.mark.asyncio(loop_scope="session")
+
+
+async def test_get_home_feed():
+    assert await recommend.get_home_feed()
+
+
+async def test_get_guess_recommend():
+    assert await recommend.get_guess_recommend()
+
+
+async def test_get_radar_recommend():
+    assert await recommend.get_radar_recommend()
+
+
+async def test_get_recommend_songlist():
+    assert await recommend.get_recommend_songlist()
+
+
+async def test_get_recommend_newsong():
+    assert await recommend.get_recommend_newsong()

{qqmusic_api_python-0.3.4 → qqmusic_api_python-0.3.6}/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.4/qqmusic_api/utils/sign.py

@@ -1,68 +0,0 @@
-"""QQ音乐 sign"""
-
-import base64
-
-import orjson as json
-
-from .common import calc_md5
-
-
-def _head(b: bytes) -> list:
-    p = [21, 4, 9, 26, 16, 20, 27, 30]
-    return [b[x] for x in p]
-
-
-def _tail(b: bytes) -> list:
-    p = [18, 11, 3, 2, 1, 7, 6, 25]
-    return [b[x] for x in p]
-
-
-def _middle(b: bytes) -> list:
-    zd = {
-        "0": 0,
-        "1": 1,
-        "2": 2,
-        "3": 3,
-        "4": 4,
-        "5": 5,
-        "6": 6,
-        "7": 7,
-        "8": 8,
-        "9": 9,
-        "A": 10,
-        "B": 11,
-        "C": 12,
-        "D": 13,
-        "E": 14,
-        "F": 15,
-    }
-    ol = [212, 45, 80, 68, 195, 163, 163, 203, 157, 220, 254, 91, 204, 79, 104, 6]
-    res = []
-    j = 0
-    for i in range(0, len(b), 2):
-        one = zd[chr(b[i])]
-        two = zd[chr(b[i + 1])]
-        r = one * 16 ^ two
-        res.append(r ^ ol[j])
-        j += 1
-    return res
-
-
-def sign(request: dict) -> str:
-    """QQ音乐 请求签名
-
-    Args:
-        request: 请求数据
-
-    Returns:
-        签名结果
-    """
-    md5_str = calc_md5(json.dumps(request)).upper().encode("utf-8")
-
-    h = _head(md5_str)
-    e = _tail(md5_str)
-    ls = _middle(md5_str)
-    m = base64.b64encode(bytes(ls)).decode("utf-8")
-
-    res = "zzb" + "".join(map(chr, h)) + m + "".join(map(chr, e))
-    return res.lower().replace("/", "").replace("+", "").replace("=", "")