qqmusic-api-python 0.3.0__tar.gz → 0.3.1__tar.gz

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qqmusic-api-python
-Version: 0.3.0
+Version: 0.3.1
 Summary: QQ音乐API封装库
 Project-URL: homepage, https://luren-dc.github.io/QQMusicApi/
 Project-URL: repository, https://github.com/luren-dc/QQMusicApi
@@ -23,7 +23,8 @@ 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: httpx>=0.27.0
+Requires-Dist: httpx[http2]>=0.27.0
+Requires-Dist: orjson>=3.10.15
 Requires-Dist: typing-extensions>=4.12.2
 Description-Content-Type: text/markdown
 
@@ -32,7 +33,7 @@ Description-Content-Type: text/markdown
         <img src="https://socialify.git.ci/luren-dc/QQMusicApi/image?description=1&font=Source%20Code%20Pro&language=1&logo=https%3A%2F%2Fy.qq.com%2Fmediastyle%2Fmod%2Fmobile%2Fimg%2Flogo.svg&name=1&pattern=Overlapping%20Hexagons&theme=Auto">
     </a>
     <a href="https://www.python.org">
-        <img src="https://img.shields.io/badge/Python-3.10|3.11|3.12-blue" alt="Python">
+        <img src="https://img.shields.io/badge/Python-3.10|3.11|3.12|3.13-blue" alt="Python">
     </a>
     <a href="https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file">
         <img src="https://img.shields.io/github/license/luren-dc/QQMusicApi" alt="GitHub license">

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/README.md

@@ -3,7 +3,7 @@
         <img src="https://socialify.git.ci/luren-dc/QQMusicApi/image?description=1&font=Source%20Code%20Pro&language=1&logo=https%3A%2F%2Fy.qq.com%2Fmediastyle%2Fmod%2Fmobile%2Fimg%2Flogo.svg&name=1&pattern=Overlapping%20Hexagons&theme=Auto">
     </a>
     <a href="https://www.python.org">
-        <img src="https://img.shields.io/badge/Python-3.10|3.11|3.12-blue" alt="Python">
+        <img src="https://img.shields.io/badge/Python-3.10|3.11|3.12|3.13-blue" alt="Python">
     </a>
     <a href="https://github.com/luren-dc/QQMusicApi?tab=MIT-1-ov-file">
         <img src="https://img.shields.io/github/license/luren-dc/QQMusicApi" alt="GitHub license">

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/pyproject.toml

@@ -7,8 +7,9 @@ authors = [
 dependencies = [
   "cryptography>=44.0.1,<44.0.2",
   "typing-extensions>=4.12.2",
-  "httpx>=0.27.0",
+  "httpx[http2]>=0.27.0",
   "aiocache>=0.12.3",
+  "orjson>=3.10.15",
 ]
 requires-python = ">=3.10"
 readme = "README.md"
@@ -43,6 +44,10 @@ build-backend = "hatchling.build"
 [tool.uv]
 package = true
 
+[[tool.uv.index]]
+url = "https://mirrors.tuna.tsinghua.edu.cn/pypi/web/simple"
+default = true
+
 [tool.hatch.version]
 path = "qqmusic_api/__init__.py"
 

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/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.0"
+__version__ = "0.3.1"
 
 logger = logging.getLogger("qqmusicapi")
 

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/qqmusic_api/login.py

@@ -103,8 +103,6 @@ class QRCodeLoginEvents(Enum):
                 return member
         return cls.OTHER
 
-    ""
-
 
 class PhoneLoginEvents(Enum):
     """手机登录状态

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/qqmusic_api/singer.py

@@ -3,7 +3,7 @@
 from enum import Enum
 from typing import Any, Literal, cast
 
-from .utils.network import api_request
+from .utils.network import RequestGroup, api_request
 
 
 class AreaType(Enum):
@@ -63,21 +63,46 @@ class TabType(Enum):
         self.tab_name = tab_name
 
 
-# 动态生成 A-Z 的枚举值
-letters = {chr(i): idx for idx, i in enumerate(range(ord('A'), ord('Z') + 1), start=1)}
-letters.update({"ALL": -100, "HASH": 27})
-# 创建枚举类 IndexType
-IndexType = Enum('IndexType', letters)
+class IndexType(Enum):
+    """首字母索引枚举"""
+
+    A = 1
+    B = 2
+    C = 3
+    D = 4
+    E = 5
+    F = 6
+    G = 7
+    H = 8
+    I = 9  # noqa: E741
+    J = 10
+    K = 11
+    L = 12
+    M = 13
+    N = 14
+    O = 15  # noqa: E741
+    P = 16
+    Q = 17
+    R = 18
+    S = 19
+    T = 20
+    U = 21
+    V = 22
+    W = 23
+    X = 24
+    Y = 25
+    Z = 26
+    ALL = -100
+    HASH = 27
 
 
 def validate_int_enum(value: int | Enum, enum_type: type[Enum]) -> int:
     """确保传入的值符合指定的枚举类型"""
     if isinstance(value, enum_type):
-        return value.value  # 如果是枚举成员，返回对应的整数值
-    elif value in {item.value for item in enum_type}:
-        return value  # 如果是合法整数值，直接返回
-    else:
-        raise ValueError(f"Invalid value: {value} for {enum_type.__name__}")
+        return value.value  # 如果是枚举成员,返回对应的整数值
+    if value in {item.value for item in enum_type}:
+        return cast(int, value)  # 如果是合法整数值,直接返回
+    raise ValueError(f"Invalid value: {value} for {enum_type.__name__}")
 
 
 @api_request("music.musichallSinger.SingerList", "GetSingerList")
@@ -93,7 +118,6 @@ async def get_singer_list(
         sex: 性别
         genre: 风格
     """
-
     area = validate_int_enum(area, AreaType)
     sex = validate_int_enum(sex, SexType)
     genre = validate_int_enum(genre, GenreType)
@@ -110,7 +134,7 @@ async def get_singer_list(
 
 
 @api_request("music.musichallSinger.SingerList", "GetSingerListIndex")
-async def get_singer_list_index_raw(
+async def get_singer_list_index(
     area: int | AreaType = AreaType.ALL,
     sex: int | SexType = SexType.ALL,
     genre: int | GenreType = GenreType.ALL,
@@ -128,7 +152,6 @@ async def get_singer_list_index_raw(
         sin: 跳过数量
         cur_page: 当前页
     """
-
     area = validate_int_enum(area, AreaType)
     sex = validate_int_enum(sex, SexType)
     genre = validate_int_enum(genre, GenreType)
@@ -147,29 +170,6 @@ async def get_singer_list_index_raw(
     )
 
 
-async def get_singer_list_index(
-    area: int | AreaType = AreaType.ALL,
-    sex: int | SexType = SexType.ALL,
-    genre: int | GenreType = GenreType.ALL,
-    index: int | IndexType = IndexType.ALL,
-    sin: int = 0,
-    cur_page: int = 1,
-):
-    """获取自定义页歌手列表
-    """
-
-    area = validate_int_enum(area, AreaType)
-    sex = validate_int_enum(sex, SexType)
-    genre = validate_int_enum(genre, GenreType)
-    index = validate_int_enum(index, IndexType)
-
-    data = await get_singer_list_index_raw(
-        area = area, sex = sex, genre = genre, index = index, sin = sin, cur_page = cur_page
-    )
-
-    return cast(list[dict[str, Any]], data["singerlist"])
-
-
 async def get_singer_list_index_all(
     area: int | AreaType = AreaType.ALL,
     sex: int | SexType = SexType.ALL,
@@ -177,32 +177,35 @@ async def get_singer_list_index_all(
     index: int | IndexType = IndexType.ALL,
 ):
     """获取所有歌手列表
-    """
 
+    Args:
+        area: 地区
+        sex: 性别
+        genre: 风格
+        index: 索引
+    """
     area = validate_int_enum(area, AreaType)
     sex = validate_int_enum(sex, SexType)
     genre = validate_int_enum(genre, GenreType)
     index = validate_int_enum(index, IndexType)
 
-    data = await get_singer_list_index_raw(
-        area = area, sex = sex, genre = genre, index = index, sin = 0, cur_page = 1
-    )
+    data = await get_singer_list_index(area=area, sex=sex, genre=genre, index=index, sin=0, cur_page=1)
 
     singer_list = data["singerlist"]
     total = data["total"]
     if total <= 80:
         return cast(list[dict[str, Any]], singer_list)
 
-    # 每页80个歌手，向下取整
+    # 每页80个歌手,向下取整
     pages = total // 80
     sin = 80
+    rg = RequestGroup()
     for page in range(2, pages + 2):
-        data = await get_singer_list_index_raw(
-            area = area, sex = sex, genre = genre, index = index, sin = sin, cur_page = page
-        )
-        singer_list.extend(data["singerlist"])
+        rg.add_request(get_singer_list_index, area=area, sex=sex, genre=genre, index=index, sin=sin, cur_page=page)
         sin += 80
 
+    for data in await rg.execute():
+        singer_list.extend(data["singerlist"])
     return cast(list[dict[str, Any]], singer_list)
 
 
@@ -252,6 +255,17 @@ async def get_desc(mids: list[str]):
     return {"singer_mids": mids, "groups": 1, "wikis": 1}, lambda data: cast(list[dict[str, Any]], data["singer_list"])
 
 
+@api_request("music.SimilarSingerSvr", "GetSimilarSingerList")
+async def get_similar(mid: str, number: int = 10):
+    """获取类似歌手列表
+
+    Args:
+        mid: 歌手 mid
+        number: 类似歌手数量
+    """
+    return {"singerMid": mid, "number": number}, lambda data: cast(list[dict[str, Any]], data["singerlist"])
+
+
 async def get_songs(
     mid: str,
     tab_type: Literal[
@@ -275,3 +289,135 @@ async def get_songs(
         num:  返回数量
     """
     return await get_tab_detail(mid, tab_type, page, num)
+
+
+@api_request("musichall.song_list_server", "GetSingerSongList")
+async def get_songs_list(mid: str, number: int = 10, begin: int = 0):
+    """获取歌手歌曲原始数据
+
+    Args:
+        mid: 歌手 mid
+        number: 每次获取数量,最大30
+        begin: 从第几个开始
+    """
+    return {
+        "singerMid": mid,
+        "order": 1,
+        "number": number,
+        "begin": begin,
+    }, lambda data: cast(
+        dict[str, Any],
+        data,
+    )
+
+
+async def get_songs_list_all(mid: str):
+    """获取歌手所有歌曲列表
+
+    Args:
+        mid: 歌手 mid
+    """
+    response = await get_songs_list(mid=mid, number=30, begin=0)
+
+    total = response["totalNum"]
+    songs = [song["songInfo"] for song in response["songList"]]
+    if total <= 30:
+        return cast(list[dict[str, Any]], songs)
+
+    rg = RequestGroup()
+    for num in range(30, total, 30):
+        rg.add_request(get_songs_list, mid=mid, number=30, begin=num)
+
+    response = await rg.execute()
+    for res in response:
+        songs.extend([song["songInfo"] for song in res["songList"]])
+
+    return cast(list[dict[str, Any]], songs)
+
+
+@api_request("music.musichallAlbum.AlbumListServer", "GetAlbumList")
+async def get_album_list(mid: str, number: int = 10, begin: int = 0):
+    """获取歌手专辑
+
+    Args:
+        mid: 歌手 mid
+        number: 每次获取数量,不足30个的时候直接全部返回
+        begin: 从第几个开始
+    """
+    return {
+        "singerMid": mid,
+        "order": 1,
+        "number": number,
+        "begin": begin,
+    }, lambda data: cast(
+        dict[str, Any],
+        data,
+    )
+
+
+async def get_album_list_all(mid: str):
+    """获取歌手所有专辑列表
+
+    Args:
+        mid: 歌手 mid
+    """
+    response = await get_album_list(mid=mid, number=30, begin=0)
+
+    total = response["total"]
+    albums = response["albumList"]
+    if total <= 30:
+        return cast(list[dict[str, Any]], albums)
+
+    rg = RequestGroup()
+    for num in range(30, total, 30):
+        rg.add_request(get_album_list, mid=mid, number=30, begin=num)
+
+    response = await rg.execute()
+    for res in response:
+        albums.extend(res["albumList"])
+
+    return cast(list[dict[str, Any]], albums)
+
+
+@api_request("MvService.MvInfoProServer", "GetSingerMvList")
+async def get_mv_list(mid: str, number: int = 10, begin: int = 0):
+    """获取歌手mv原始数据
+
+    Args:
+        mid: 歌手 mid
+        number: 每次获取数量,每次最大100
+        begin: 从第几个开始
+    """
+    return {
+        "singermid": mid,
+        "order": 1,
+        "count": number,
+        "start": begin,
+    }, lambda data: cast(
+        dict[str, Any],
+        data,
+    )
+
+
+async def get_mv_list_all(mid: str):
+    """获取歌手所有专辑列表
+
+    Args:
+        mid: 歌手 mid
+    """
+    response = await get_mv_list(mid=mid, number=100, begin=0)
+
+    total = response["total"]
+    mvs = response["list"]
+    if total <= 100:
+        return cast(list[dict[str, Any]], mvs)
+
+    rg = RequestGroup()
+    for num in range(100, total, 100):
+        rg.add_request(get_mv_list, mid=mid, number=100, begin=num)
+
+    response = await rg.execute()
+    for res in response:
+        mvs.extend(res["list"])
+
+    return cast(list[dict[str, Any]], mvs)

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/qqmusic_api/song.py

@@ -179,7 +179,6 @@ 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.0 → qqmusic_api_python-0.3.1}/qqmusic_api/utils/credential.py

@@ -1,10 +1,12 @@
 """凭据类,用于请求验证"""
 
-import json
 import sys
 from dataclasses import asdict, dataclass, field
+from time import time
 from typing import Any
 
+import orjson as json
+
 if sys.version_info >= (3, 11):
     from typing import Self
 else:
@@ -87,6 +89,12 @@ class Credential:
 
     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
+
         from ..login import check_expired
 
         return await check_expired(self)
@@ -102,7 +110,7 @@ class Credential:
         """获取凭据 JSON 字符串"""
         data = self.as_dict()
         data.update(data.pop("extra_fields"))
-        return json.dumps(data, indent=4, ensure_ascii=False)
+        return json.dumps(data).decode()
 
     @classmethod
     def from_cookies_dict(cls, cookies: dict[str, Any]) -> Self:
@@ -112,7 +120,7 @@ class Credential:
             refresh_token=cookies.pop("refresh_token", ""),
             access_token=cookies.pop("access_token", ""),
             expired_at=cookies.pop("expired_at", 0),
-            musicid=cookies.pop("musicid", 0),
+            musicid=int(cookies.pop("musicid", 0)),
             musickey=cookies.pop("musickey", ""),
             unionid=cookies.pop("unionid", ""),
             str_musicid=cookies.pop(

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/qqmusic_api/utils/device.py

@@ -2,7 +2,6 @@
 
 import binascii
 import hashlib
-import json
 import random
 import string
 from dataclasses import asdict, dataclass, field
@@ -10,6 +9,8 @@ from pathlib import Path
 from typing import ClassVar
 from uuid import uuid4
 
+import orjson as json
+
 device_path = Path(__file__).parent.parent / ".cache" / "device.json"
 
 
@@ -97,4 +98,4 @@ def get_cached_device() -> Device:
 def save_device(device: Device):
     """缓存 Device"""
     device_path.parent.mkdir(parents=True, exist_ok=True)
-    device_path.write_text(json.dumps(asdict(device)))
+    device_path.write_text(json.dumps(asdict(device)).decode())

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/qqmusic_api/utils/network.py

@@ -1,6 +1,5 @@
 """网络请求"""
 
-import json
 import logging
 from abc import ABC, abstractmethod
 from collections import defaultdict
@@ -8,6 +7,7 @@ from collections.abc import Callable, Coroutine
 from typing import Any, ClassVar, Generic, ParamSpec, TypedDict, TypeVar, cast
 
 import httpx
+import orjson as json
 from typing_extensions import override
 
 from ..exceptions import CredentialExpiredError, ResponseCodeError, SignInvalidError
@@ -246,7 +246,7 @@ class ApiRequest(BaseRequest, Generic[_P, _R]):
             params.pop(key, None)
         if self.credential:
             params["credential"] = f"{self.credential.musicid}{self.credential.musickey}"
-        sorted_params = json.dumps(params, sort_keys=True, ensure_ascii=False)
+        sorted_params = json.dumps(params, option=json.OPT_SORT_KEYS)
         return calc_md5(sorted_params)
 
     @override
@@ -255,7 +255,7 @@ class ApiRequest(BaseRequest, Generic[_P, _R]):
         if not resp.content:
             return {}
         try:
-            data = resp.json()
+            data = json.loads(resp.content)
         except json.JSONDecodeError:
             return {"data": resp.text}
         req_data = data.get(f"{self.module}.{self.method}", {})
@@ -327,9 +327,11 @@ class RequestGroup(BaseRequest):
         self,
         common: dict[str, Any] | None = None,
         credential: Credential | None = None,
+        limit: int = 30,
     ):
         super().__init__(common, credential)
         self._requests: list[RequestItem] = []
+        self.limit = limit
         self._key_counter = defaultdict(int)
         self._results = []
 
@@ -358,11 +360,11 @@ class RequestGroup(BaseRequest):
             if not resp.content:
                 return []
 
-            data = resp.json()
+            res_data = json.loads(resp.content)
 
             for req_item in self._requests:
                 req = req_item["request"]
-                req_data = data.get(req_item["key"], {})
+                req_data = res_data.get(req_item["key"], {})
                 req._validate_response(req_data)
                 if req_item["processor"]:
                     data = req_item["processor"](req_data.get("data", req_data))
@@ -403,7 +405,7 @@ class RequestGroup(BaseRequest):
                 remove_index.append(idx)
         self._requests = [req for idx, req in enumerate(self._requests) if idx not in remove_index]
 
-    async def execute(self) -> list[Any]:
+    async def _execute(self) -> list[Any]:
         """执行合并请求并返回各请求结果"""
         if not self._requests:
             return []
@@ -418,3 +420,33 @@ class RequestGroup(BaseRequest):
         resp = await self.request()
         await self._process_response(resp)
         return self._results
+
+    async def execute(self) -> list[Any]:
+        """执行合并请求"""
+        if not self._requests:
+            return []
+
+        # 未设置 limit 或请求数未超过 limit 时直接处理
+        if self.limit <= 0 or len(self._requests) <= self.limit:
+            return await self._execute()
+
+        # 分批次处理
+        batches = [self._requests[i : i + self.limit] for i in range(0, len(self._requests), self.limit)]
+        all_results = []
+
+        for batch in batches:
+            # 创建新 RequestGroup 处理当前批次
+            batch_group = RequestGroup(
+                common=self.common.copy(),
+                credential=self.credential,
+            )
+
+            # 添加当前批次的请求
+            for req_item in batch:
+                batch_group.add_request(req_item["request"], *req_item["args"], **req_item["kwargs"])
+
+            # 执行并收集结果
+            batch_results = await batch_group._execute()
+            all_results.extend(batch_results)
+
+        return all_results

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/qqmusic_api/utils/qimei.py

@@ -1,7 +1,6 @@
 """QIMEI 获取"""
 
 import base64
-import json
 import logging
 import random
 from datetime import datetime, timedelta
@@ -9,6 +8,7 @@ from time import time
 from typing import TypedDict, cast
 
 import httpx
+import orjson as json
 from cryptography.hazmat.primitives import serialization
 from cryptography.hazmat.primitives.asymmetric import padding
 from cryptography.hazmat.primitives.asymmetric.rsa import RSAPublicKey
@@ -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, separators=(",", ":"), ensure_ascii=False),
+        "reserved": json.dumps(reserved),
     }
 
 
@@ -125,7 +125,7 @@ def get_qimei(version: str) -> QimeiResult:
         nonce = "".join(random.choices("adbcdef1234567890", k=16))
         ts = int(time())
         key = base64.b64encode(rsa_encrypt(crypt_key.encode())).decode()
-        params = base64.b64encode(aes_encrypt(crypt_key.encode(), json.dumps(payload).encode())).decode()
+        params = base64.b64encode(aes_encrypt(crypt_key.encode(), json.dumps(payload))).decode()
         extra = '{"appKey":"' + APP_KEY + '"}'
         sign = calc_md5(key, params, str(ts * 1000), nonce, SECRET, extra)
         res = httpx.post(
@@ -154,7 +154,7 @@ def get_qimei(version: str) -> QimeiResult:
             timeout=5,
         )
         logger.debug("获取 QIMEI 成功: %s", res.json())
-        data = json.loads(res.json()["data"])["data"]
+        data = json.loads(json.loads(res.content)["data"])["data"]
         device.qimei = data["q36"]
         save_device(device)
         return QimeiResult(q16=data["q16"], q36=data["q36"])

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/qqmusic_api/utils/session.py

@@ -4,8 +4,9 @@ import contextvars
 from typing import TypedDict
 
 import httpx
+import orjson as json
 from aiocache import Cache
-from aiocache.serializers import JsonSerializer
+from aiocache.serializers import BaseSerializer
 
 from .credential import Credential
 from .qimei import get_qimei
@@ -21,6 +22,20 @@ class ApiConfig(TypedDict):
     enc_endpoint: str
 
 
+class ORJsonSerializer(BaseSerializer):
+    """Transform data to json string with json.dumps and json.loads to retrieve it back."""
+
+    def dumps(self, value):
+        """Serialize the received value using ``json.dumps``."""
+        return json.dumps(value, option=json.OPT_NON_STR_KEYS).decode()
+
+    def loads(self, value):
+        """Deserialize value using ``json.loads``."""
+        if value is None:
+            return None
+        return json.loads(value)
+
+
 class Session(httpx.AsyncClient):
     """Session 类,用于管理 QQ 音乐的登录态和 API 请求
 
@@ -41,9 +56,10 @@ class Session(httpx.AsyncClient):
         enable_sign: bool = False,
         enable_cache: bool = True,
         cache_ttl: int = 120,
+        http2: bool = True,
         **kwargs,
     ) -> None:
-        super().__init__(**kwargs)
+        super().__init__(**kwargs, http2=http2)
         self.credential = credential
         self.headers.update(
             {
@@ -59,9 +75,15 @@ class Session(httpx.AsyncClient):
             enc_endpoint="https://u.y.qq.com/cgi-bin/musics.fcg",
         )
         self.enable_cache = enable_cache
-        self._cache = Cache(serializer=JsonSerializer(), ttl=cache_ttl)
+        self._cache = Cache(serializer=ORJsonSerializer(), ttl=cache_ttl)
         self.qimei = get_qimei(self.api_config["version"])["q36"]
 
+    async def clear_cache(self):
+        """清除API请求缓存"""
+        if not self.enable_cache:
+            return
+        await self._cache.clear()
+
     async def __aenter__(self) -> "Session":
         """进入 async with 上下文时调用"""
         self._previous_session = _session_context.set(self)

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/qqmusic_api/utils/sign.py

@@ -1,7 +1,8 @@
 """QQ音乐 sign"""
 
 import base64
-import json
+
+import orjson as json
 
 from .common import calc_md5
 
@@ -56,7 +57,7 @@ def sign(request: dict) -> str:
     Returns:
         签名结果
     """
-    md5_str = calc_md5(json.dumps(request, ensure_ascii=False, separators=(",", ":"))).upper().encode("utf-8")
+    md5_str = calc_md5(json.dumps(request)).upper().encode("utf-8")
 
     h = _head(md5_str)
     e = _tail(md5_str)

{qqmusic_api_python-0.3.0 → qqmusic_api_python-0.3.1}/tests/test_session.py

@@ -41,7 +41,7 @@ def test_same_thread_different_loops():
 
     async def use_session(session):
         assert global_session == session
-        await session.get("https://baidu.com")
+        await session.get("https://m.baidu.com/")
 
     loop = asyncio.new_event_loop()
     try:

qqmusic_api_python-0.3.1/tests/test_singer.py

@@ -0,0 +1,62 @@
+import pytest
+
+from qqmusic_api import singer
+
+pytestmark = pytest.mark.asyncio(loop_scope="session")
+
+
+async def test_get_singer_list():
+    assert await singer.get_singer_list()
+
+
+async def test_get_singer_list_index():
+    assert await singer.get_singer_list_index()
+
+
+async def test_get_singer_list_index_all():
+    assert await singer.get_singer_list_index_all(index=1, area=5, sex=0)
+
+
+async def test_get_info():
+    assert await singer.get_info(mid="0025NhlN2yWrP4")
+
+
+async def test_get_tab_detail():
+    for tab_type in singer.TabType:
+        assert await singer.get_tab_detail(mid="0025NhlN2yWrP4", tab_type=tab_type)
+
+
+async def test_get_desc():
+    assert await singer.get_desc(mids=["0025NhlN2yWrP4"])
+
+
+async def test_get_similar():
+    assert await singer.get_similar(mid="003zdDsO1e1ZXu")
+
+
+async def test_get_song():
+    assert await singer.get_songs(mid="0025NhlN2yWrP4")
+
+
+async def test_get_songs_list():
+    assert await singer.get_songs_list(mid="003zdDsO1e1ZXu", number=20, begin=0)
+
+
+async def test_get_songs_list_all():
+    assert await singer.get_songs_list_all(mid="003zdDsO1e1ZXu")
+
+
+async def test_get_album_list():
+    assert await singer.get_album_list(mid="0025NhlN2yWrP4")
+
+
+async def test_get_album_list_all():
+    assert await singer.get_album_list_all(mid="0025NhlN2yWrP4")
+
+
+async def test_get_mv_list():
+    assert await singer.get_mv_list(mid="001orhmd37wwf2")
+
+
+async def test_get_mv_list_all():
+    assert await singer.get_mv_list_all(mid="001orhmd37wwf2")

qqmusic_api_python-0.3.0/tests/test_network.py

@@ -1,51 +0,0 @@
-import httpx
-import pytest
-
-from qqmusic_api.utils.network import ApiRequest, RequestGroup
-
-pytestmark = pytest.mark.asyncio(loop_scope="session")
-
-
-@pytest.fixture
-def mock_client(monkeypatch):
-    async def mock_post(*args, **kwargs):
-        class MockResponse:
-            def __init__(self, json_data, status_code=200):
-                self.json_data = json_data
-                self.status_code = status_code
-                self.content = json_data
-
-            def json(self):
-                return self.json_data
-
-            def raise_for_status(self):
-                pass
-
-        data = kwargs.get("json", {})
-        data.pop("comm", None)
-        return MockResponse({key: {"code": 0, "data": {"result": "success"}} for key in data.keys()})
-
-    monkeypatch.setattr(httpx.AsyncClient, "post", mock_post)
-
-
-async def test_api_request(mock_client):
-    api = ApiRequest(
-        module="music.smartboxCgi.SmartBoxCgi",
-        method="GetSmartBoxResult",
-        params={"query": "test"},
-    )
-    response = await api()
-    assert response == {"result": "success"}
-
-
-async def test_request_group(mock_client):
-    group = RequestGroup()
-    api = ApiRequest(
-        module="music.smartboxCgi.SmartBoxCgi",
-        method="GetSmartBoxResult",
-        params={"query": "test"},
-    )
-    group.add_request(api)
-    group.add_request(api)
-    results = await group.execute()
-    assert results == [{"result": "success"}, {"result": "success"}]

qqmusic_api_python-0.3.0/tests/test_singer.py

@@ -1,34 +0,0 @@
-import pytest
-
-from qqmusic_api import singer
-
-pytestmark = pytest.mark.asyncio(loop_scope="session")
-
-
-async def test_get_singer_list():
-    assert await singer.get_singer_list()
-
-
-async def test_get_singer_list_index():
-    assert await singer.get_singer_list_index()
-
-
-async def test_get_singer_list_index_all():
-    assert await singer.get_singer_list_index_all(index = 1, area = 5, sex = 0)
-
-
-async def test_get_info():
-    assert await singer.get_info(mid="0025NhlN2yWrP4")
-
-
-async def test_get_tab_detail():
-    for tab_type in singer.TabType:
-        assert await singer.get_tab_detail(mid="0025NhlN2yWrP4", tab_type=tab_type)
-
-
-async def test_get_desc():
-    assert await singer.get_desc(mids=["0025NhlN2yWrP4"])
-
-
-async def test_get_song():
-    assert await singer.get_songs(mid="0025NhlN2yWrP4")