V1.0.7 beta

Evil0ctal · Evil0ctal · commit 2f2b4acb8d42 · 2024-05-30T05:19:20.000-07:00
diff --git a/setup.py b/setup.py
@@ -13,7 +13,7 @@
 
 setup(
     name="tikhub",
-    version="1.0.6",
+    version="1.0.7",
     author="TikHub.io",
     author_email="tikhub.io@proton.me",
     description="A Python SDK for TikHub RESTful API",
diff --git a/tikhub/__init__.py b/tikhub/__init__.py
@@ -0,0 +1,4 @@
+# __init__.py
+from .client import Client
+
+__all__ = ["Client"]
diff --git a/tikhub/api/v1/endpoints/captcha/captcha_solver.py b/tikhub/api/v1/endpoints/captcha/captcha_solver.py
@@ -1,5 +1,5 @@
 # 导入API SDK Client
-from tikhub.client.api_client import APIClient
+from tikhub.http_client.api_client import APIClient
 
 @router.get("/test", response_model=ResponseModel, summary="测试接口")
 async def test(request: Request):
diff --git a/tikhub/api/v1/endpoints/douyin/app/douyin_app_v1.py b/tikhub/api/v1/endpoints/douyin/app/douyin_app_v1.py
@@ -1,6 +1,6 @@
 # 导入API SDK Client类
 
-from tikhub.client.api_client import APIClient
+from tikhub.http_client.api_client import APIClient
 
 
 class DouyinAppV1:
diff --git a/tikhub/api/v1/endpoints/douyin/app/douyin_app_v2.py b/tikhub/api/v1/endpoints/douyin/app/douyin_app_v2.py
@@ -1,9 +1,9 @@
 # 导入API SDK Client类
 
-from tikhub.client.api_client import APIClient
+from tikhub.http_client.api_client import APIClient
 
 # 标记已废弃的方法
-from tikhub.client.deprecated import deprecated
+from tikhub.http_client.deprecated import deprecated
 
 
 class DouyinAppV2:
diff --git a/tikhub/api/v1/endpoints/douyin/app/douyin_app_v3.py b/tikhub/api/v1/endpoints/douyin/app/douyin_app_v3.py
@@ -1,9 +1,9 @@
 # 导入API SDK Client类
 
-from tikhub.client.api_client import APIClient
+from tikhub.http_client.api_client import APIClient
 
 # 标记已废弃的方法
-from tikhub.client.deprecated import deprecated
+from tikhub.http_client.deprecated import deprecated
 
 
 class DouyinAppV3:
diff --git a/tikhub/api/v1/endpoints/douyin/web/douyin_web.py b/tikhub/api/v1/endpoints/douyin/web/douyin_web.py
@@ -1,7 +1,7 @@
 # 导入API SDK Client类
 import json
 
-from tikhub.client.api_client import APIClient
+from tikhub.http_client.api_client import APIClient
 
 
 class DouyinWeb:
diff --git a/tikhub/api/v1/endpoints/instagram/web/instagram_web.py b/tikhub/api/v1/endpoints/instagram/web/instagram_web.py
@@ -1,7 +1,7 @@
 # 导入API SDK Client类
 import json
 
-from tikhub.client.api_client import APIClient
+from tikhub.http_client.api_client import APIClient
 
 
 class InstagramWeb:
diff --git a/tikhub/api/v1/endpoints/tikhub/tikhub_user.py b/tikhub/api/v1/endpoints/tikhub/tikhub_user.py
@@ -1,7 +1,7 @@
 # 导入API SDK Client类
 import json
 
-from tikhub.client.api_client import APIClient
+from tikhub.http_client.api_client import APIClient
 
 
 class TikHubUser:
diff --git a/tikhub/api/v1/endpoints/tiktok/app/tiktok_app_v2.py b/tikhub/api/v1/endpoints/tiktok/app/tiktok_app_v2.py
@@ -1,7 +1,7 @@
 # 导入API SDK Client类
 import json
 
-from tikhub.client.api_client import APIClient
+from tikhub.http_client.api_client import APIClient
 
 
 class TikTokAppV2:
diff --git a/tikhub/api/v1/endpoints/tiktok/app/tiktok_app_v3.py b/tikhub/api/v1/endpoints/tiktok/app/tiktok_app_v3.py
@@ -1,7 +1,7 @@
 # 导入API SDK Client类
 import json
 
-from tikhub.client.api_client import APIClient
+from tikhub.http_client.api_client import APIClient
 
 
 class TikTokAppV3:
diff --git a/tikhub/api/v1/endpoints/tiktok/web/tiktok_web.py b/tikhub/api/v1/endpoints/tiktok/web/tiktok_web.py
@@ -1,7 +1,7 @@
 # 导入API SDK Client类
 import json
 
-from tikhub.client.api_client import APIClient
+from tikhub.http_client.api_client import APIClient
 
 
 class TikTokWeb:
diff --git a/tikhub/api/v1/endpoints/weibo/web/weibo_web.py b/tikhub/api/v1/endpoints/weibo/web/weibo_web.py
@@ -1,7 +1,7 @@
 # 导入API SDK Client类
 import json
 
-from tikhub.client.api_client import APIClient
+from tikhub.http_client.api_client import APIClient
 
 class WeiboWeb:
 
diff --git a/tikhub/client.py b/tikhub/client.py
@@ -1,10 +1,9 @@
-# sdk.py
-from tikhub.client.api_client import APIClient
+# http_client
+from tikhub.http_client.api_client import APIClient
 
 # TikHub
 from tikhub.api.v1.endpoints.tikhub.tikhub_user import TikHubUser
 
-
 # Douyin
 from tikhub.api.v1.endpoints.douyin.web.douyin_web import DouyinWeb
 from tikhub.api.v1.endpoints.douyin.app.douyin_app_v1 import DouyinAppV1
@@ -24,7 +23,15 @@
 
 
 class Client:
-    def __init__(self, base_url: str = 'https://beta.tikhub.io', api_key: str = None):
+    def __init__(self,
+                 base_url: str = 'https://beta.tikhub.io',
+                 api_key: str = None,
+                 proxies: dict = None,
+                 max_retries: int = 3,
+                 max_connections: int = 50,
+                 timeout: int = 10,
+                 max_tasks: int = 50
+                 ):
         # Base URL
         self.base_url = base_url
 
@@ -37,11 +44,11 @@ def __init__(self, base_url: str = 'https://beta.tikhub.io', api_key: str = None
         self.client = APIClient(
             base_url=self.base_url,
             client_headers={"Authorization": f"Bearer {self.api_key}"},
-            proxies=None,
-            max_retries=3,
-            max_connections=50,
-            timeout=10,
-            max_tasks=50,
+            proxies=proxies,
+            max_retries=max_retries,
+            max_connections=max_connections,
+            timeout=timeout,
+            max_tasks=max_tasks
         )
 
         # TikHub
diff --git a/tikhub/http_client/__init__.py b/tikhub/http_client/__init__.py
diff --git a/tikhub/http_client/api_client.py b/tikhub/http_client/api_client.py
@@ -4,7 +4,7 @@
 import httpx
 from httpx import Response
 
-from tikhub.client.api_exceptions import (
+from tikhub.http_client.api_exceptions import (
     APIError,
     APIConnectionError,
     APIResponseError,
@@ -15,12 +15,12 @@
     APIRateLimitError,
     APIRetryExhaustedError,
 )
-from tikhub.client.api_logger import logger
+from tikhub.http_client.api_logger import logger
 
 
 class APIClient:
     """
-    基础API客户端 (Base API client)
+    基础API客户端 (Base API http_client)
     """
 
     def __init__(
@@ -60,7 +60,7 @@ def __init__(
         # 超时等待时间 / Timeout waiting time
         self._timeout = timeout
         self.timeout = httpx.Timeout(timeout)
-        # 异步客户端 / Asynchronous client
+        # 异步客户端 / Asynchronous http_client
         self.aclient = httpx.AsyncClient(
             headers=self.client_headers,
             proxies=self.proxies,
diff --git a/tikhub/http_client/api_exceptions.py b/tikhub/http_client/api_exceptions.py
diff --git a/tikhub/http_client/api_logger.py b/tikhub/http_client/api_logger.py
diff --git a/tikhub/http_client/deprecated.py b/tikhub/http_client/deprecated.py
diff --git a/tikhub/test/test.py b/tikhub/test/test.py
@@ -1,5 +1,5 @@
 import asyncio
-from tikhub.sdk import Client
+from tikhub import Client
 
 
 async def main():
