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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: qqmusic-api-python
-Version: 0.3.3
+Version: 0.3.4
 Summary: QQ音乐API封装库
 Project-URL: homepage, https://luren-dc.github.io/QQMusicApi/
 Project-URL: repository, https://github.com/luren-dc/QQMusicApi
@@ -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.4}/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.4}/qqmusic_api/__init__.py

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

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

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

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

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

qqmusic_api_python-0.3.4/web/README.md

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