capmonstercloudclient 4.2.0__tar.gz → 4.3.1__tar.gz

capmonstercloudclient-4.3.1/PKG-INFO

@@ -0,0 +1,252 @@
+Metadata-Version: 2.4
+Name: capmonstercloudclient
+Version: 4.3.1
+Summary: Official CapMonsterCloud Client: https://capmonster.cloud/
+Home-page: https://github.com/ZennoLab/capmonstercloud-client-python
+Author: Andrey Ilyin
+Author-email: andrey.ilyin@zennolab.com
+License: AGPL-3.0
+Keywords: captcha,recaptcha,geetest,hcaptcha,funcaptcha,python3,python-library,capmonster,capmonstercloud,capmonstercloudclient
+Classifier: License :: OSI Approved :: GNU Affero General Public License v3 or later (AGPLv3+)
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3.6
+Classifier: Programming Language :: Python :: 3.7
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Development Status :: 5 - Production/Stable
+Classifier: Framework :: AsyncIO
+Classifier: Operating System :: Unix
+Classifier: Operating System :: Microsoft :: Windows
+Classifier: Operating System :: MacOS
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: aiohappyeyeballs==2.4.4; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: aiohttp==3.11.10; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: aiosignal==1.3.1; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: annotated-types==0.7.0; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: async-timeout==5.0.1; python_version >= "3.9" and python_version <= "3.11"
+Requires-Dist: attrs==24.2.0; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: frozenlist==1.5.0; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: idna==3.10; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: multidict==6.1.0; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: propcache==0.2.1; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: pydantic-core==2.27.1; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: pydantic==2.10.3; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: typing-extensions==4.12.2; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: yarl==1.18.3; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: aiohttp==3.7.4; python_version >= "3.6" and python_version <= "3.8"
+Requires-Dist: pydantic==2.10.3; python_version >= "3.8" and python_version < "3.9"
+Requires-Dist: pydantic==2.5.3; python_version >= "3.7" and python_version < "3.8"
+Requires-Dist: pydantic==2.1.*; python_version < "3.7"
+Requires-Dist: aiohappyeyeballs==2.7.1; python_version == "3.14"
+Requires-Dist: aiohttp==3.14.3; python_version == "3.14"
+Requires-Dist: aiosignal==1.4.0; python_version == "3.14"
+Requires-Dist: annotated-types==0.8.0; python_version == "3.14"
+Requires-Dist: attrs==26.1.0; python_version == "3.14"
+Requires-Dist: frozenlist==1.8.0; python_version == "3.14"
+Requires-Dist: idna==3.18; python_version == "3.14"
+Requires-Dist: multidict==6.7.1; python_version == "3.14"
+Requires-Dist: propcache==0.5.2; python_version == "3.14"
+Requires-Dist: pydantic-core==2.46.4; python_version == "3.14"
+Requires-Dist: pydantic==2.13.4; python_version == "3.14"
+Requires-Dist: typing-extensions==4.16.0; python_version == "3.14"
+Requires-Dist: typing-inspection==0.4.2; python_version == "3.14"
+Requires-Dist: yarl==1.24.5; python_version == "3.14"
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
+# CapMonster Cloud Python SDK: AI Captcha Solver & Anti-Bot Bypass
+
+<p align="center">
+  <a href="https://capmonster.cloud/en/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme">
+    <img src="https://img.shields.io/badge/CapMonster%20Cloud-Python%20Captcha%20Solver-00B2FF?style=for-the-badge&logo=python&logoColor=white" alt="CapMonster Cloud Python SDK" height="40">
+  </a>
+</p>
+
+<p align="center">
+  <strong>Fast, AI-driven CAPTCHA solving client for Python. Seamlessly bypass Cloudflare Turnstile, reCAPTCHA v2/v3/Enterprise, DataDome, GeeTest, and Amazon WAF in web scraping and browser automation.</strong>
+</p>
+
+<p align="center">
+  <a href="https://pypi.org/project/capmonstercloudclient/"><img src="https://img.shields.io/pypi/v/capmonstercloudclient.svg?style=flat-square&color=blue" alt="PyPI version"></a>
+  <a href="https://pepy.tech/project/capmonstercloudclient"><img src="https://static.pepy.tech/badge/capmonstercloudclient/month" alt="PyPI downloads"></a>
+  <a href="https://pypi.org/project/capmonstercloudclient/"><img src="https://img.shields.io/pypi/pyversions/capmonstercloudclient.svg?style=flat-square" alt="Python Versions"></a>
+  <a href="https://github.com/CapMonsterCloud/capmonster-python-captcha-solver/stargazers"><img src="https://img.shields.io/github/stars/CapMonsterCloud/capmonster-python-captcha-solver?style=flat-square&color=yellow" alt="GitHub Stars"></a>
+  <a href="./LICENSE"><img src="https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square" alt="License: MIT"></a>
+</p>
+
+---
+
+Official asynchronous Python SDK for [CapMonster Cloud](https://capmonster.cloud/en/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme). Easily plug ultra-fast AI captcha recognition into **Playwright, Selenium, Puppeteer, Scrapy, BeautifulSoup, and Requests** automation workflows without human-in-the-loop delays.
+
+**[👉 Get your Free API Key & Free Trial Balance on CapMonster Cloud](https://dash.capmonster.cloud/Account/SignUp?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)**
+
+---
+
+## ⚡ Highlights & Benchmarks
+
+- ⚡ **Sub-Second Speed:** Automated AI models solve captchas in 300 ms to 6 seconds depending on the system load.
+- 🤖 **Zero Human Workers:** 100% automated machine learning pipeline with no manual latencies.
+- 🌐 **Browser Automation Ready:** Works out-of-the-box with **Playwright, Selenium, and Puppeteer**.
+- 🛡️ **Modern Anti-Bot Bypass:** Full support for Cloudflare Turnstile, reCAPTCHA Enterprise, GeeTest, and Amazon WAF.
+- 💰 **Cost-Effective:** Low-cost pricing structure based on pay-as-you-go balance.
+
+---
+
+## 📦 Installation
+
+```bash
+pip install capmonstercloudclient
+```
+
+---
+
+## 🚀 Quick Start & Usage Examples
+
+### 1. Asynchronous reCAPTCHA v2 Solving
+
+```python
+import asyncio
+from capmonstercloudclient import CapMonsterClient, ClientOptions
+from capmonstercloudclient.requests import RecaptchaV2Request
+
+# Initialize client with your API key from dashboard
+options = ClientOptions(api_key="YOUR_CAPMONSTER_API_KEY")
+client = CapMonsterClient(options=options)
+
+async def main():
+    # Build the task payload
+    request = RecaptchaV2Request(
+        websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
+        websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd"
+    )
+    
+    # Send task and receive token
+    result = await client.solve_captcha(request)
+    print("reCAPTCHA Token:", result.get("gRecaptchaResponse"))
+
+if __name__ == "__main__":
+    asyncio.run(main())
+```
+
+### 2. Browser Automation (Playwright + Cloudflare Turnstile)
+
+```python
+import asyncio
+from playwright.async_api import async_playwright
+from capmonstercloudclient import CapMonsterClient, ClientOptions
+from capmonstercloudclient.requests import TurnstileRequest
+
+options = ClientOptions(api_key="YOUR_CAPMONSTER_API_KEY")
+client = CapMonsterClient(options=options)
+
+async def run_scraper():
+    # Solve Turnstile challenge via CapMonster Cloud
+    turnstile_req = TurnstileRequest(
+        websiteURL="https://target-website.com/login",
+        websiteKey="0x4AAAAAAABnPIDnK2k_e-2"
+    )
+    solution = await client.solve_captcha(turnstile_req)
+    token = solution.get("token")
+
+    # Inject token into Playwright browser session
+    async with async_playwright() as p:
+        browser = await p.chromium.launch(headless=False)
+        page = await browser.new_page()
+        await page.goto("https://target-website.com/login")
+        
+        await page.evaluate(f'document.querySelector("[name=cf-turnstile-response]").value = "{token}";')
+        await page.click("#submit-button")
+        await browser.close()
+
+if __name__ == "__main__":
+    asyncio.run(run_scraper())
+```
+
+---
+
+## 🛡️ Supported CAPTCHA Types
+
+All task types conform to the official [CapMonster Cloud API Documentation](https://docs.capmonster.cloud/docs/captchas/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme):
+
+| Protection Type | Task Request Class | Proxyless Mode |
+| :--- | :--- | :---: |
+| **Cloudflare Turnstile** | `TurnstileRequest` | ✅ Supported |
+| **reCAPTCHA v2** | `RecaptchaV2Request` | ✅ Supported |
+| **reCAPTCHA v3** | `RecaptchaV3ProxylessRequest` | ✅ Supported |
+| **reCAPTCHA Enterprise** | `RecaptchaV2EnterpriseProxylessRequest` / `RecaptchaV2EnterpriseRequest` | ✅ Supported |
+| **GeeTest (v3, v4)** | `GeeTestProxylessRequest` / `GeeTestRequest` | ✅ Supported |
+| **Amazon WAF** | `AmazonWafRequest` | ✅ Supported |
+| **DataDome** | `DataDomeCustomTaskRequest` | 🌐 Proxy Required |
+| **Imperva / Incapsula** | `ImpervaCustomTaskRequest` / `ImpervaCustomTaskProxylessRequest` | ✅ Supported |
+| **Binance CAPTCHA** | `BinanceTaskRequest` / `BinanceTaskProxylessRequest` | ✅ Supported |
+| **Standard Text CAPTCHA** | `ImageToTextRequest` | ✅ Supported |
+| **Complex Image Tasks** | `RecaptchaComplexImageTaskRequest` | ✅ Supported |
+
+---
+
+## 🛠️ How It Works
+
+```text
+[ Script / Scraper ]
+         │
+         ▼
+[ Extract sitekey & website URL ]
+         │
+         ▼
+[ CapMonsterClient API ] ──► POST createTask to https://api.capmonster.cloud
+         │
+         ▼
+[ Neural Network Processing ] ──► Poll getTaskResult (300ms - 6s)
+         │
+         ▼
+[ Receive Token & Autosubmit ] ──► Complete bypass
+```
+
+---
+
+## ⚙️ Best Practices
+
+- **Token Expiration:** Most tokens (reCAPTCHA, Turnstile) remain valid for 120 seconds. Inject and submit the solution immediately after receiving the response.
+- **Proxy Usage:** For custom tasks and strict protections, use the same proxy in your scraping session and the CapMonster task payload.
+- **Balance Monitoring:** Ensure your account balance remains positive in the [Dashboard](https://dash.capmonster.cloud/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme).
+
+---
+
+## 📚 Official Documentation & Links
+
+- 📖 [Getting Started Guide](https://docs.capmonster.cloud/docs/getting-start/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)
+- 🎯 [Supported Captchas Overview](https://docs.capmonster.cloud/docs/captchas/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)
+- ⚙️ [API Methods Reference](https://docs.capmonster.cloud/docs/methods/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)
+- 💬 [Support & Community](https://capmonster.cloud/en/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme#support)
+
+## Other official SDKs
+
+- [.NET](https://github.com/CapMonsterCloud/capmonster-dotnet-captcha-solver)
+- [Node.js](https://github.com/CapMonsterCloud/capmonster-nodejs-captcha-solver)
+- [n8n](https://github.com/CapMonsterCloud/capmonster-n8n-captcha-solver)
+- [API Docs](https://github.com/CapMonsterCloud/capmonster-captcha-solver-docs)
+
+---
+
+## 📄 License
+
+[MIT](./LICENSE) © [ZennoLab](https://zennolab.com/) / [CapMonster Cloud](https://capmonster.cloud/en/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)

capmonstercloudclient-4.3.1/README.md

@@ -0,0 +1,177 @@
+# CapMonster Cloud Python SDK: AI Captcha Solver & Anti-Bot Bypass
+
+<p align="center">
+  <a href="https://capmonster.cloud/en/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme">
+    <img src="https://img.shields.io/badge/CapMonster%20Cloud-Python%20Captcha%20Solver-00B2FF?style=for-the-badge&logo=python&logoColor=white" alt="CapMonster Cloud Python SDK" height="40">
+  </a>
+</p>
+
+<p align="center">
+  <strong>Fast, AI-driven CAPTCHA solving client for Python. Seamlessly bypass Cloudflare Turnstile, reCAPTCHA v2/v3/Enterprise, DataDome, GeeTest, and Amazon WAF in web scraping and browser automation.</strong>
+</p>
+
+<p align="center">
+  <a href="https://pypi.org/project/capmonstercloudclient/"><img src="https://img.shields.io/pypi/v/capmonstercloudclient.svg?style=flat-square&color=blue" alt="PyPI version"></a>
+  <a href="https://pepy.tech/project/capmonstercloudclient"><img src="https://static.pepy.tech/badge/capmonstercloudclient/month" alt="PyPI downloads"></a>
+  <a href="https://pypi.org/project/capmonstercloudclient/"><img src="https://img.shields.io/pypi/pyversions/capmonstercloudclient.svg?style=flat-square" alt="Python Versions"></a>
+  <a href="https://github.com/CapMonsterCloud/capmonster-python-captcha-solver/stargazers"><img src="https://img.shields.io/github/stars/CapMonsterCloud/capmonster-python-captcha-solver?style=flat-square&color=yellow" alt="GitHub Stars"></a>
+  <a href="./LICENSE"><img src="https://img.shields.io/badge/License-MIT-orange.svg?style=flat-square" alt="License: MIT"></a>
+</p>
+
+---
+
+Official asynchronous Python SDK for [CapMonster Cloud](https://capmonster.cloud/en/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme). Easily plug ultra-fast AI captcha recognition into **Playwright, Selenium, Puppeteer, Scrapy, BeautifulSoup, and Requests** automation workflows without human-in-the-loop delays.
+
+**[👉 Get your Free API Key & Free Trial Balance on CapMonster Cloud](https://dash.capmonster.cloud/Account/SignUp?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)**
+
+---
+
+## ⚡ Highlights & Benchmarks
+
+- ⚡ **Sub-Second Speed:** Automated AI models solve captchas in 300 ms to 6 seconds depending on the system load.
+- 🤖 **Zero Human Workers:** 100% automated machine learning pipeline with no manual latencies.
+- 🌐 **Browser Automation Ready:** Works out-of-the-box with **Playwright, Selenium, and Puppeteer**.
+- 🛡️ **Modern Anti-Bot Bypass:** Full support for Cloudflare Turnstile, reCAPTCHA Enterprise, GeeTest, and Amazon WAF.
+- 💰 **Cost-Effective:** Low-cost pricing structure based on pay-as-you-go balance.
+
+---
+
+## 📦 Installation
+
+```bash
+pip install capmonstercloudclient
+```
+
+---
+
+## 🚀 Quick Start & Usage Examples
+
+### 1. Asynchronous reCAPTCHA v2 Solving
+
+```python
+import asyncio
+from capmonstercloudclient import CapMonsterClient, ClientOptions
+from capmonstercloudclient.requests import RecaptchaV2Request
+
+# Initialize client with your API key from dashboard
+options = ClientOptions(api_key="YOUR_CAPMONSTER_API_KEY")
+client = CapMonsterClient(options=options)
+
+async def main():
+    # Build the task payload
+    request = RecaptchaV2Request(
+        websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
+        websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd"
+    )
+    
+    # Send task and receive token
+    result = await client.solve_captcha(request)
+    print("reCAPTCHA Token:", result.get("gRecaptchaResponse"))
+
+if __name__ == "__main__":
+    asyncio.run(main())
+```
+
+### 2. Browser Automation (Playwright + Cloudflare Turnstile)
+
+```python
+import asyncio
+from playwright.async_api import async_playwright
+from capmonstercloudclient import CapMonsterClient, ClientOptions
+from capmonstercloudclient.requests import TurnstileRequest
+
+options = ClientOptions(api_key="YOUR_CAPMONSTER_API_KEY")
+client = CapMonsterClient(options=options)
+
+async def run_scraper():
+    # Solve Turnstile challenge via CapMonster Cloud
+    turnstile_req = TurnstileRequest(
+        websiteURL="https://target-website.com/login",
+        websiteKey="0x4AAAAAAABnPIDnK2k_e-2"
+    )
+    solution = await client.solve_captcha(turnstile_req)
+    token = solution.get("token")
+
+    # Inject token into Playwright browser session
+    async with async_playwright() as p:
+        browser = await p.chromium.launch(headless=False)
+        page = await browser.new_page()
+        await page.goto("https://target-website.com/login")
+        
+        await page.evaluate(f'document.querySelector("[name=cf-turnstile-response]").value = "{token}";')
+        await page.click("#submit-button")
+        await browser.close()
+
+if __name__ == "__main__":
+    asyncio.run(run_scraper())
+```
+
+---
+
+## 🛡️ Supported CAPTCHA Types
+
+All task types conform to the official [CapMonster Cloud API Documentation](https://docs.capmonster.cloud/docs/captchas/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme):
+
+| Protection Type | Task Request Class | Proxyless Mode |
+| :--- | :--- | :---: |
+| **Cloudflare Turnstile** | `TurnstileRequest` | ✅ Supported |
+| **reCAPTCHA v2** | `RecaptchaV2Request` | ✅ Supported |
+| **reCAPTCHA v3** | `RecaptchaV3ProxylessRequest` | ✅ Supported |
+| **reCAPTCHA Enterprise** | `RecaptchaV2EnterpriseProxylessRequest` / `RecaptchaV2EnterpriseRequest` | ✅ Supported |
+| **GeeTest (v3, v4)** | `GeeTestProxylessRequest` / `GeeTestRequest` | ✅ Supported |
+| **Amazon WAF** | `AmazonWafRequest` | ✅ Supported |
+| **DataDome** | `DataDomeCustomTaskRequest` | 🌐 Proxy Required |
+| **Imperva / Incapsula** | `ImpervaCustomTaskRequest` / `ImpervaCustomTaskProxylessRequest` | ✅ Supported |
+| **Binance CAPTCHA** | `BinanceTaskRequest` / `BinanceTaskProxylessRequest` | ✅ Supported |
+| **Standard Text CAPTCHA** | `ImageToTextRequest` | ✅ Supported |
+| **Complex Image Tasks** | `RecaptchaComplexImageTaskRequest` | ✅ Supported |
+
+---
+
+## 🛠️ How It Works
+
+```text
+[ Script / Scraper ]
+         │
+         ▼
+[ Extract sitekey & website URL ]
+         │
+         ▼
+[ CapMonsterClient API ] ──► POST createTask to https://api.capmonster.cloud
+         │
+         ▼
+[ Neural Network Processing ] ──► Poll getTaskResult (300ms - 6s)
+         │
+         ▼
+[ Receive Token & Autosubmit ] ──► Complete bypass
+```
+
+---
+
+## ⚙️ Best Practices
+
+- **Token Expiration:** Most tokens (reCAPTCHA, Turnstile) remain valid for 120 seconds. Inject and submit the solution immediately after receiving the response.
+- **Proxy Usage:** For custom tasks and strict protections, use the same proxy in your scraping session and the CapMonster task payload.
+- **Balance Monitoring:** Ensure your account balance remains positive in the [Dashboard](https://dash.capmonster.cloud/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme).
+
+---
+
+## 📚 Official Documentation & Links
+
+- 📖 [Getting Started Guide](https://docs.capmonster.cloud/docs/getting-start/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)
+- 🎯 [Supported Captchas Overview](https://docs.capmonster.cloud/docs/captchas/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)
+- ⚙️ [API Methods Reference](https://docs.capmonster.cloud/docs/methods/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)
+- 💬 [Support & Community](https://capmonster.cloud/en/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme#support)
+
+## Other official SDKs
+
+- [.NET](https://github.com/CapMonsterCloud/capmonster-dotnet-captcha-solver)
+- [Node.js](https://github.com/CapMonsterCloud/capmonster-nodejs-captcha-solver)
+- [n8n](https://github.com/CapMonsterCloud/capmonster-n8n-captcha-solver)
+- [API Docs](https://github.com/CapMonsterCloud/capmonster-captcha-solver-docs)
+
+---
+
+## 📄 License
+
+[MIT](./LICENSE) © [ZennoLab](https://zennolab.com/) / [CapMonster Cloud](https://capmonster.cloud/en/?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)

{capmonstercloudclient-4.2.0 → capmonstercloudclient-4.3.1}/capmonstercloud_client/requests/AlibabaCustomTaskRequest.py

@@ -5,7 +5,7 @@ from .CustomTaskRequestBase import CustomTaskRequestBase
 
 ALLOWED_METADATA_KEYS = {
     'sceneId', 'prefix', 'userId', 'userUserId', 'verifyType',
-    'region', 'UserCertifyId', 'apiGetLib', 'cookieRequired',
+    'region', 'UserCertifyId', 'apiGetLib', 'cookieRequired', 'punishUrl',
 }
 
 class AlibabaCustomTaskRequest(CustomTaskRequestBase):
@@ -15,29 +15,35 @@ class AlibabaCustomTaskRequest(CustomTaskRequestBase):
     Attributes:
         captchaClass: The constant string value identifying the captcha
             class as "alibaba".
-        metadata: A dictionary of Alibaba-specific parameters. Requires sceneId
-            and prefix; userId, userUserId, verifyType, region, UserCertifyId,
-            apiGetLib, and cookieRequired are optional, needed only for sites
-            that use them.
+        metadata: A dictionary of Alibaba-specific parameters. Standard mode
+            requires sceneId and prefix; userId, userUserId, verifyType, region,
+            UserCertifyId, apiGetLib, and cookieRequired are optional, needed
+            only for sites that use them. Alternatively, for websites that
+            trigger verification through a separate "/punish" URL, pass only
+            punishUrl (the full punish page URL) instead of sceneId/prefix.
     """
     captchaClass: str = Field(default='alibaba', description='The constant string value identifying the captcha class as "alibaba".')
-    metadata: Dict[str, Union[str, bool]] = Field(..., description='A dictionary of Alibaba-specific parameters. Requires sceneId and prefix; userId, userUserId, verifyType, region, UserCertifyId, apiGetLib, and cookieRequired are optional, needed only for sites that use them.')
+    metadata: Dict[str, Union[str, bool]] = Field(..., description='A dictionary of Alibaba-specific parameters. Requires sceneId and prefix, unless punishUrl is provided instead. userId, userUserId, verifyType, region, UserCertifyId, apiGetLib, and cookieRequired are optional, needed only for sites that use them.')
 
     @field_validator('metadata')
     @classmethod
     def validate_metadata(cls, value):
         if not set(value.keys()).issubset(ALLOWED_METADATA_KEYS):
             raise TypeError(f'Allowed keys for metadata are {sorted(ALLOWED_METADATA_KEYS)}')
-        if value.get('sceneId') is None:
-            raise TypeError(f'sceneId must be defined inside metadata.')
+        if value.get('punishUrl') is not None:
+            if not isinstance(value.get('punishUrl'), str):
+                raise TypeError(f'punishUrl must be str.')
         else:
-            if not isinstance(value.get('sceneId'), str):
-                raise TypeError(f'sceneId must be str.')
-        if value.get('prefix') is None:
-            raise TypeError(f'prefix must be defined inside metadata.')
-        else:
-            if not isinstance(value.get('prefix'), str):
-                raise TypeError(f'prefix must be str.')
+            if value.get('sceneId') is None:
+                raise TypeError(f'sceneId must be defined inside metadata (unless punishUrl is used).')
+            else:
+                if not isinstance(value.get('sceneId'), str):
+                    raise TypeError(f'sceneId must be str.')
+            if value.get('prefix') is None:
+                raise TypeError(f'prefix must be defined inside metadata (unless punishUrl is used).')
+            else:
+                if not isinstance(value.get('prefix'), str):
+                    raise TypeError(f'prefix must be str.')
         if value.get('cookieRequired') is not None and not isinstance(value.get('cookieRequired'), bool):
             raise TypeError(f'cookieRequired must be bool.')
         return value

{capmonstercloudclient-4.2.0 → capmonstercloudclient-4.3.1}/capmonstercloud_client/requests/FuncaptchaRequest.py

@@ -1,5 +1,5 @@
 from typing import Dict, Union, Optional
-from pydantic import Field
+from pydantic import Field, model_validator
 
 from .baseRequestWithProxy import BaseRequestWithProxy
 
@@ -22,6 +22,7 @@ class FuncaptchaRequest(BaseRequestWithProxy):
             provided as a string of key-value pairs.
         userAgent: Browser User-Agent to emulate. Pass only a current
             Windows OS UA.
+        proxy: Required. Your own proxy used to solve the task.
     """
     type: str = Field(default='FunCaptchaTask', description='The task type identifier, "FunCaptchaTask".')
     websiteUrl: str = Field(..., description='The URL of the webpage containing the FunCaptcha challenge.')
@@ -31,18 +32,23 @@ class FuncaptchaRequest(BaseRequestWithProxy):
     cookies: Optional[str] = Field(default=None, description='Cookies to be used when accessing the target webpage, provided as a string of key-value pairs.')
     userAgent: Optional[str] = Field(default=None, description='Browser User-Agent to emulate. Pass only a current Windows OS UA.')
 
+    @model_validator(mode='before')
+    def validate_funcaptcha_proxy(cls, values):
+        if values.get('proxy') is None:
+            raise RuntimeError(f'You are required to use your own proxies to solve FunCaptcha.')
+        return values
+
     def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
         task = {}
         task['type'] = self.type
         task['websiteURL'] = self.websiteUrl
         task['websitePublicKey'] = self.websitePublicKey
-        if self.proxy:
-            task['proxyType'] = self.proxy.proxyType
-            task['proxyAddress'] = self.proxy.proxyAddress
-            task['proxyPort'] = self.proxy.proxyPort
-            task['proxyLogin'] = self.proxy.proxyLogin
-            task['proxyPassword'] = self.proxy.proxyPassword
-        
+        task['proxyType'] = self.proxy.proxyType
+        task['proxyAddress'] = self.proxy.proxyAddress
+        task['proxyPort'] = self.proxy.proxyPort
+        task['proxyLogin'] = self.proxy.proxyLogin
+        task['proxyPassword'] = self.proxy.proxyPassword
+
         if self.funcaptchaApiJSSubdomain is not None:
             task['funcaptchaApiJSSubdomain'] = self.funcaptchaApiJSSubdomain
         if self.data is not None:

{capmonstercloudclient-4.2.0 → capmonstercloudclient-4.3.1}/capmonstercloud_client/requests/HuntCustomTaskRequest.py

@@ -12,13 +12,14 @@ class HuntCustomTaskRequest(CustomTaskRequestBase):
             captcha class as "HUNT".
         metadata: A dictionary of parameters required by the HUNT solver.
             Always requires "apiGetLib" (the URL of the HUNT JS script on
-            the page). HUNT has two solving modes: fingerprint generation
-            (only "apiGetLib" needed) and captcha solving (also requires
-            "data", which must hold the "meta.token" value extracted from
-            the page).
+            the page). HUNT has three solving modes: fingerprint generation
+            (only "apiGetLib" needed), captcha solving via "data" (which must
+            hold the "meta.token" value extracted from the page), and captcha
+            solving via "widgetUrl" (the full Hunt CAPTCHA widget URL). "data"
+            and "widgetUrl" must not be used together.
     """
     captchaClass: str = Field(default='HUNT', description='The constant string value identifying the underlying captcha class as "HUNT".')
-    metadata: Dict[str, str] = Field(..., description='Dictionary of HUNT parameters. Always requires "apiGetLib". Also requires "data" (the "meta.token" value from the page) when solving a captcha rather than just generating a fingerprint.')
+    metadata: Dict[str, str] = Field(..., description='Dictionary of HUNT parameters. Always requires "apiGetLib". Also requires exactly one of "data" (the "meta.token" value from the page) or "widgetUrl" (the full Hunt CAPTCHA widget URL) when solving a captcha rather than just generating a fingerprint.')
 
     @field_validator('metadata')
     @classmethod
@@ -30,6 +31,10 @@ class HuntCustomTaskRequest(CustomTaskRequestBase):
                 raise TypeError(f'apiGetLib must be str.')
         if value.get('data') is not None and not isinstance(value.get('data'), str):
             raise TypeError(f'data must be str.')
+        if value.get('widgetUrl') is not None and not isinstance(value.get('widgetUrl'), str):
+            raise TypeError(f'widgetUrl must be str.')
+        if value.get('data') is not None and value.get('widgetUrl') is not None:
+            raise TypeError(f'"data" and "widgetUrl" must not be used together.')
         return value
 
     @model_validator(mode='before')

{capmonstercloudclient-4.2.0 → capmonstercloudclient-4.3.1}/capmonstercloud_client/requests/RecaptchaComplexImageTask.py

@@ -10,26 +10,27 @@ class RecaptchaComplexImageTaskRequest(ComplexImageTaskRequestBase):
     image classification challenges.
 
     Attributes:
-        metadata: A dictionary describing the challenge. Must contain
-            "Task" (English task name, e.g. "Click on traffic lights") and
-            "TaskDefinition" (its technical identifier, e.g. "/m/015qff") —
-            both required together — along with "Grid" (e.g. "3x3", "4x4",
-            "1x1") specifying the image grid layout.
+        metadata: A dictionary describing the challenge. Must contain at
+            least one of "Task" (English task name, e.g. "Click on traffic
+            lights") or "TaskDefinition" (its technical identifier, e.g.
+            "/m/015qff") — each is required only if the other is not filled —
+            along with "Grid" (e.g. "3x3", "4x4", "1x1") specifying the image
+            grid layout.
         captchaClass: The constant string identifying the captcha family
             as "recaptcha".
         imagesUrls: A collection of image URLs to be recognized. Must be
             populated if imagesBase64 is not.
     """
 
-    metadata : Dict[str, str] = Field(..., description='Dictionary describing the challenge. Must contain "Task" and "TaskDefinition" (both required together) plus "Grid".')
+    metadata : Dict[str, str] = Field(..., description='Dictionary describing the challenge. Must contain at least one of "Task" or "TaskDefinition" (each required only if the other is not filled) plus "Grid".')
     captchaClass: str = Field(default='recaptcha', description='Constant string identifying the captcha family as "recaptcha".')
     imagesUrls: Optional[List[str]] = Field(default=None, description='Collection with image urls. Must be populated if imagesBase64 is not.')
 
     @field_validator('metadata')
     @classmethod
     def validate_metadata(cls, value):
-        if value.get('Task') is None or value.get('TaskDefinition') is None:
-            raise TaskNotDefinedError(f'"Task" and "TaskDefinition" must both be filled.')
+        if value.get('Task') is None and value.get('TaskDefinition') is None:
+            raise TaskNotDefinedError(f'At least one of "Task" or "TaskDefinition" must be filled.')
         elif value.get('Grid') is None:
             raise TaskNotDefinedError(f'"Grid" must be filled (3x3, 4x4, 1x1).')
         else:

{capmonstercloudclient-4.2.0 → capmonstercloudclient-4.3.1}/capmonstercloud_client/requests/TenDiCustomTaskRequest.py

@@ -13,20 +13,25 @@ class TenDiCustomTaskRequest(CustomTaskRequestBase):
         websiteKey: The captchaAppId (the "aid" value, e.g. "189123456") for
             the target website, found in the page HTML or network traffic.
         metadata: Optional additional parameters for the task. Currently
-            supports the "captchaUrl" key, whose value must be a string.
+            supports the "captchaUrl" key and the "aidEncrypted" key, whose
+            values must be strings. "aidEncrypted" is the single-use Aid value
+            obtained from the target website before creating the task; pass it
+            only if the website uses Aid.
     """
     captchaClass: str = Field(default='TenDI', description='The identifier of the custom captcha class to solve.')
     websiteKey: str = Field(description='The captchaAppId (the "aid" value, e.g. "189123456") for the target website, found in the page HTML or network traffic.')
-    metadata: Optional[Dict[str, str]] = Field(default=None, description='Optional additional parameters for the task; supports the "captchaUrl" key with a string value.')
+    metadata: Optional[Dict[str, str]] = Field(default=None, description='Optional additional parameters for the task; supports the "captchaUrl" and "aidEncrypted" keys with string values.')
 
     @field_validator('metadata')
     @classmethod
     def validate_metadata(cls, value):
         if value is not None:
-            if not set(value.keys()).issubset(set(["captchaUrl"])):
-                raise TypeError(f'Allowed keys for metadata are "captchaUrl"')
+            if not set(value.keys()).issubset(set(["captchaUrl", "aidEncrypted"])):
+                raise TypeError(f'Allowed keys for metadata are "captchaUrl", "aidEncrypted"')
             if value.get('captchaUrl') is not None and not isinstance(value.get('captchaUrl'), str):
                 raise TypeError(f'captchaUrl must be str.')
+            if value.get('aidEncrypted') is not None and not isinstance(value.get('aidEncrypted'), str):
+                raise TypeError(f'aidEncrypted must be str.')
         return value
 
     def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:

capmonstercloudclient-4.3.1/capmonstercloud_client/version.txt

@@ -0,0 +1 @@
+4.3.1