thordata-sdk 0.7.0__py3-none-any.whl → 0.8.0__py3-none-any.whl

thordata/__init__.py

@@ -35,7 +35,7 @@ Async Usage:
     >>> asyncio.run(main())
 """
 
-__version__ = "0.7.0"
+__version__ = "0.8.0"
 __author__ = "Thordata Developer Team"
 __email__ = "support@thordata.com"
 
@@ -78,14 +78,20 @@ from .exceptions import (
 
 # Models
 from .models import (
+    CommonSettings,
     ProxyConfig,
     ProxyProduct,
+    ProxyServer,
+    ProxyUser,
+    ProxyUserList,
     ScraperTaskConfig,
     SerpRequest,
     StaticISPProxy,
     StickySession,
     TaskStatusResponse,
     UniversalScrapeRequest,
+    UsageStatistics,
+    VideoTaskConfig,
 )
 
 # Retry utilities
@@ -117,11 +123,17 @@ __all__ = [
     # Models
     "ProxyConfig",
     "ProxyProduct",
+    "ProxyServer",
+    "ProxyUser",
+    "ProxyUserList",
+    "UsageStatistics",
     "StaticISPProxy",
     "StickySession",
     "SerpRequest",
     "UniversalScrapeRequest",
     "ScraperTaskConfig",
+    "CommonSettings",
+    "VideoTaskConfig",
     "TaskStatusResponse",
     # Exceptions
     "ThordataError",

thordata/_utils.py

@@ -70,18 +70,61 @@ def decode_base64_image(png_str: str) -> bytes:
         raise ValueError(f"Failed to decode base64 image: {e}") from e
 
 
-def build_auth_headers(token: str) -> Dict[str, str]:
+def build_auth_headers(token: str, mode: str = "bearer") -> Dict[str, str]:
     """
     Build authorization headers for API requests.
 
+    Supports two modes:
+    - bearer: Authorization: Bearer <token> (Thordata Docs examples)
+    - header_token: token: <token> (Interface documentation)
+
     Args:
         token: The scraper token.
+        mode: Authentication mode ("bearer" or "header_token").
+
+    Returns:
+        Headers dict with Authorization/token and Content-Type.
+    """
+    headers = {
+        "Content-Type": "application/x-www-form-urlencoded",
+    }
+
+    if mode == "bearer":
+        headers["Authorization"] = f"Bearer {token}"
+    elif mode == "header_token":
+        headers["token"] = token
+    else:
+        # Fallback to bearer for compatibility
+        headers["Authorization"] = f"Bearer {token}"
+
+    return headers
+
+
+def build_builder_headers(
+    scraper_token: str,
+    public_token: str,
+    public_key: str,
+) -> Dict[str, str]:
+    """
+    Build headers for Web Scraper builder API.
+
+    Builder requires THREE auth headers per official docs:
+    - token: public token
+    - key: public key
+    - Authorization: Bearer scraper_token
+
+    Args:
+        scraper_token: The scraper API token.
+        public_token: The public API token.
+        public_key: The public API key.
 
     Returns:
-        Headers dict with Authorization and Content-Type.
+        Headers dict with all required auth headers.
     """
     return {
-        "Authorization": f"Bearer {token}",
+        "token": public_token,
+        "key": public_key,
+        "Authorization": f"Bearer {scraper_token}",
         "Content-Type": "application/x-www-form-urlencoded",
     }
 
@@ -142,3 +185,23 @@ def build_user_agent(sdk_version: str, http_client: str) -> str:
     py = platform.python_version()
     system = platform.system()
     return f"thordata-python-sdk/{sdk_version} (python {py}; {system}; {http_client})"
+
+
+def build_sign_headers(sign: str, api_key: str) -> Dict[str, str]:
+    """
+    Build headers for Public API NEW (sign + apiKey authentication).
+
+    This is a different authentication system from token+key.
+
+    Args:
+        sign: The sign value from Dashboard (immutable).
+        api_key: The apiKey value from Dashboard (can be changed).
+
+    Returns:
+        Headers dict with sign, apiKey, and Content-Type.
+    """
+    return {
+        "sign": sign,
+        "apiKey": api_key,
+        "Content-Type": "application/x-www-form-urlencoded",
+    }