Ver Chg to V1.0.2

Author: Evil0ctal

README.md

@@ -1,6 +1,6 @@
 <div align="center">
 
-# [TikHub_PyPi](https://pypi.org/project/tikhub)
+# [TikHub_API_PyPi](https://pypi.org/project/tikhub)
 
 「[api.tikhub.io](https://api.tikhub.io/docs)」，是一个异步高性能的Douyin，TikTok数据爬取在线工具，此repo为基于该API的封装，方便各位开发者调用。
 
@@ -10,69 +10,22 @@ PyPi：[https://pypi.org/project/tikhub](https://pypi.org/project/tikhub)
 
 </div>
 
-## 注释
 
-> 本项目使用以下Emoji在开发图表中表明开发状态!
-
-| Emoji | 代表的含义 |
-| :---: | :---: |
-| 🚀 | 火箭 - 功能已编写完成并测试通过，并且已部署至生产环境。|
-| ✅ | 勾选符 - 功能已编写完成，但还有待测试，测试通过后将部署至生产环境。|
-| ❌ | 叉号符 - 功能尚未开始编写或还未编写完成。|
-| 🔜 | SOON符 - 功能已提出但尚未分配指定开发人员。|
-| ⚠️ | 警告符 - 功能出现问题待修复。|
-
-## 项目进度
-
-| 状态 | API端点路径 | 功能 |
-| :---: | :---: | :---: |
-| 🚀 | `/token` | 生成`Bearer Token` |
-| 🚀 | `/users/me/` | 获取用户信息 |
-
-> 各接口端点需求
-
-| 状态 | 支持平台 | 需求 | 开始日期 | ETA日期 | 开发者 |
-| :---: | :--- | :---: | :---: | :---: |:---: |
-| 🚀 | 抖音, TikTok | 爬取单个视频数据 | 2022/10/08 | 已完成 | @Evil0ctal |
-| 🚀 | 抖音, TikTok | 爬取单个视频评论数据 | 2022/10/08 | 已完成 | @Evil0ctal |
-| 🚀 | 抖音, TikTok | 爬取配乐作品数据 | 2022/10/08 | 已完成 | @Evil0ctal |
-| 🚀 | 抖音, TikTok | 爬取用户主页视频数据 | 2022/10/08 | 已完成 | @Evil0ctal |
-| 🚀 | 抖音, TikTok | 爬取用户主页已点赞视频数据 | 2022/10/08 | 已完成 | @Evil0ctal |
-
-> 抖音相关接口生产部署 - API tags: Douyin
-
-| 状态 | API端点路径 | 功能 | issue |
-| :---: | :---: | :---: | :---: |
-| 🚀 | `/douyin_video_data/` | 爬取单个视频数据 | 无已知问题 |
-| ⚠️ | `/douyin_video_comments/` | 爬取单个视频评论数据 | 失效待更新 |
-| ⚠️ | `/douyin_music_videos/` | 爬取配乐作品数据 | 失效待更新 |
-| 🚀 | `/douyin_profile_videos/` | 爬取用户主页视频数据 | 无已知问题 |
-| 🚀 | `/douyin_profile_liked_videos/` | 爬取用户主页已点赞视频数据 | 无已知问题 |
-
-> TikTok相关接口生产部署 - API tags: TikTok
-
-| 状态 | API端点路径 | 功能 | issue |
-| :---: | :---: | :---: | :---: |
-| 🚀 | `/tiktok_video_data/` | 爬取单个视频数据 | 无已知问题 |
-| 🚀 | `/tiktok_video_comments/` | 爬取单个视频评论数据 | 无已知问题 |
-| 🚀 | `/tiktok_music_videos/` | 爬取配乐作品数据 | 无已知问题 |
-| 🚀 | `/tiktok_profile_videos/` | 爬取用户主页视频数据 | 无已知问题 |
-| 🚀 | `/tiktok_profile_liked_videos/` | 爬取用户主页已点赞视频数据 | 无已知问题 |
+## 使用示例
 
-## 待办事宜 `Todo` 列表
+> 查看[test.py](https://github.com/TikHubIO/TikHub_PyPi/blob/main/test/test.py)
 
-- [ ] ⚠️ 修复`/douyin_video_comments/`端点
-- [ ] ⚠️ 修复`/douyin_music_videos/`端点
+- Install
 
-## 使用示例
+```bash
+pip install tikhub
+```
 
-> 查看[demo.py](https://github.com/TikHubIO/TikHub_PyPi/blob/main/demo/demo.py)
+- Usage
 
 ```python
-import asyncio
-import time
+from tikhub.api import *
 
-from tikhub.api import API
 
 async def async_test() -> None:
     # 异步测试/Async test
@@ -89,54 +42,62 @@ async def async_test() -> None:
     start_time = time.time()
 
     # 获取TikHub请求头/Get TikHub request header
-    print("Running test : API.authenticate()")
-    await api.authenticate()
+    r = await api.user_login()
+    print("Running test : API.user_login()")
+    print(r)
 
     # 获取TikHub用户信息/Get TikHub user information
     print("Running test : API.get_user_info()")
-    await api.get_user_info()
+    r = await api.get_user_info()
+    print(r)
 
     print("\nRunning ALL TikTok methods test...\n")
 
     # 获取单个视频数据/Get single video data
     print("Running test : API.get_tiktok_video_data()")
-    await api.get_tiktok_video_data(tiktok_url)
+    r = await api.get_tiktok_video_data(tiktok_url)
+    # print(r)
 
     # 获取获取用户主页的所有视频数据/Get all video data on the user's homepage
     print("Running test : API.get_tiktok_profile_videos()")
-    aweme_list = await api.get_tiktok_profile_videos(tiktok_url, 20)
-    print(f'Get {len(aweme_list)} videos from profile')
+    r = await api.get_tiktok_profile_videos(tiktok_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} videos from profile')
 
     # 获取用户主页的所有点赞视频数据/Get all liked video data on the user's homepage
     print("Running test : API.get_tiktok_profile_liked_videos()")
-    aweme_list = await api.get_tiktok_profile_liked_videos(tiktok_url, 20)
-    print(f'Get {len(aweme_list)} liked videos from profile')
+    r = await api.get_tiktok_profile_liked_videos(tiktok_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} liked videos from profile')
 
     # 获取TikTok视频的所有评论数据/Get all comment data of TikTok video
     print("Running test : API.get_tiktok_video_comments()")
-    comments_list = await api.get_tiktok_video_comments(tiktok_url, 20)
-    print(f'Get {len(comments_list)} comments from video')
+    r = await api.get_tiktok_video_comments(tiktok_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} comments from video')
 
     # 获取音乐页面上的所有(理论上能抓取到的)视频数据/Get all (theoretically) video data on the music page
     print("Running test : API.get_tiktok_music_videos()")
-    aweme_list = await api.get_tiktok_music_videos(tiktok_music_url, 20)
-    print(f'Get {len(aweme_list)} videos from music')
+    r = await api.get_tiktok_music_videos(tiktok_music_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} videos from music')
 
     print("\nRunning ALL Douyin methods test...\n")
 
     # 获取单个视频数据/Get single video data
     print("Running test : API.get_douyin_video_data()")
-    await api.get_douyin_video_data(douyin_url)
+    r = await api.get_douyin_video_data(douyin_url)
 
     # 获取获取用户主页的所有视频数据/Get all video data on the user's homepage
     print("Running test : API.get_douyin_profile_videos()")
-    aweme_list = await api.get_douyin_profile_videos(douyin_user_url, 20)
-    print(f'Get {len(aweme_list)} videos from profile')
+    r = await api.get_douyin_profile_videos(douyin_user_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} videos from profile')
 
     # 获取用户主页的所有点赞视频数据/Get all liked video data on the user's homepage
     print("Running test : API.get_douyin_profile_liked_videos()")
-    aweme_list = await api.get_douyin_profile_liked_videos(douyin_user_url, 20)
-    print(f'Get {len(aweme_list)} liked videos from profile')
+    r = await api.get_douyin_profile_liked_videos(douyin_user_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} liked videos from profile')
+
+    # 获取抖音视频的所有评论数据/Get all comment data of Douyin video
+    print("Running test : API.get_douyin_video_comments()")
+    r = await api.get_douyin_video_comments(douyin_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} comments from video')
 
     # 总耗时/Total time
     total_time = round(time.time() - start_time, 2)
@@ -145,11 +106,12 @@ async def async_test() -> None:
 
 if __name__ == '__main__':
     api = API(
-        username='test',
-        password='test',
+        email='EMAIL@EXAMPLE.COM',
+        password='PASSWORD',
         proxy=None,
     )
     asyncio.run(async_test())
+
 ```
 
 

dist/tikhub-1.0.2-py3-none-any.whl

@@ -14,7 +14,7 @@
 setuptools.setup(
     name='tikhub',
     author='TikHub.io',
-    version='1.0.1',
+    version='1.0.2',
     license='Apache V2.0 License',
     description='Douyin/TikTok async data scraper.',
     long_description=long_description,

dist/tikhub-1.0.2.tar.gz

@@ -1,7 +1,4 @@
-import asyncio
-import time
-
-from tikhub.api import API
+from tikhub.api import *
 
 
 async def async_test() -> None:
@@ -19,54 +16,62 @@ async def async_test() -> None:
     start_time = time.time()
 
     # 获取TikHub请求头/Get TikHub request header
-    print("Running test : API.authenticate()")
-    await api.authenticate()
+    r = await api.user_login()
+    print("Running test : API.user_login()")
+    print(r)
 
     # 获取TikHub用户信息/Get TikHub user information
     print("Running test : API.get_user_info()")
-    await api.get_user_info()
+    r = await api.get_user_info()
+    print(r)
 
     print("\nRunning ALL TikTok methods test...\n")
 
     # 获取单个视频数据/Get single video data
     print("Running test : API.get_tiktok_video_data()")
-    await api.get_tiktok_video_data(tiktok_url)
+    r = await api.get_tiktok_video_data(tiktok_url)
+    # print(r)
 
     # 获取获取用户主页的所有视频数据/Get all video data on the user's homepage
     print("Running test : API.get_tiktok_profile_videos()")
-    aweme_list = await api.get_tiktok_profile_videos(tiktok_url, 20)
-    print(f'Get {len(aweme_list)} videos from profile')
+    r = await api.get_tiktok_profile_videos(tiktok_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} videos from profile')
 
     # 获取用户主页的所有点赞视频数据/Get all liked video data on the user's homepage
     print("Running test : API.get_tiktok_profile_liked_videos()")
-    aweme_list = await api.get_tiktok_profile_liked_videos(tiktok_url, 20)
-    print(f'Get {len(aweme_list)} liked videos from profile')
+    r = await api.get_tiktok_profile_liked_videos(tiktok_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} liked videos from profile')
 
     # 获取TikTok视频的所有评论数据/Get all comment data of TikTok video
     print("Running test : API.get_tiktok_video_comments()")
-    comments_list = await api.get_tiktok_video_comments(tiktok_url, 20)
-    print(f'Get {len(comments_list)} comments from video')
+    r = await api.get_tiktok_video_comments(tiktok_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} comments from video')
 
     # 获取音乐页面上的所有(理论上能抓取到的)视频数据/Get all (theoretically) video data on the music page
     print("Running test : API.get_tiktok_music_videos()")
-    aweme_list = await api.get_tiktok_music_videos(tiktok_music_url, 20)
-    print(f'Get {len(aweme_list)} videos from music')
+    r = await api.get_tiktok_music_videos(tiktok_music_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} videos from music')
 
     print("\nRunning ALL Douyin methods test...\n")
 
     # 获取单个视频数据/Get single video data
     print("Running test : API.get_douyin_video_data()")
-    await api.get_douyin_video_data(douyin_url)
+    r = await api.get_douyin_video_data(douyin_url)
 
     # 获取获取用户主页的所有视频数据/Get all video data on the user's homepage
     print("Running test : API.get_douyin_profile_videos()")
-    aweme_list = await api.get_douyin_profile_videos(douyin_user_url, 20)
-    print(f'Get {len(aweme_list)} videos from profile')
+    r = await api.get_douyin_profile_videos(douyin_user_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} videos from profile')
 
     # 获取用户主页的所有点赞视频数据/Get all liked video data on the user's homepage
     print("Running test : API.get_douyin_profile_liked_videos()")
-    aweme_list = await api.get_douyin_profile_liked_videos(douyin_user_url, 20)
-    print(f'Get {len(aweme_list)} liked videos from profile')
+    r = await api.get_douyin_profile_liked_videos(douyin_user_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} liked videos from profile')
+
+    # 获取抖音视频的所有评论数据/Get all comment data of Douyin video
+    print("Running test : API.get_douyin_video_comments()")
+    r = await api.get_douyin_video_comments(douyin_url, cursor=None, count=None, get_all=False)
+    print(f'Get {len(r)} comments from video')
 
     # 总耗时/Total time
     total_time = round(time.time() - start_time, 2)
@@ -75,8 +80,8 @@ async def async_test() -> None:
 
 if __name__ == '__main__':
     api = API(
-        username='test',
-        password='test',
+        email='EMAIL@EXAMPLE.COM',
+        password='PASSWORD',
         proxy=None,
     )
     asyncio.run(async_test())

setup.py

@@ -0,0 +1,18 @@
+import aiohttp
+
+class AiohttpClient:
+    _instance = None
+
+    def __new__(cls, *args, **kwargs):
+        if cls._instance is None:
+            cls._instance = super().__new__(cls)
+        return cls._instance
+
+    async def request(self, method, url, headers=None, params=None, data=None, json=None) -> (int, str, dict):
+        async with aiohttp.ClientSession() as session:
+            async with session.request(method, url, headers=headers, params=params, data=data, json=json) as response:
+                response_text = await response.text()
+                response_json = None
+                if response_text:
+                    response_json = await response.json()
+                return response.status, response_text, response_json