capmonstercloudclient 4.0.0__tar.gz → 4.2.0__tar.gz

capmonstercloudclient-4.2.0/PKG-INFO

@@ -0,0 +1,177 @@
+Metadata-Version: 2.4
+Name: capmonstercloudclient
+Version: 4.2.0
+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 Python Captcha Solver & Anti-Bot Bypass API Library
+
+[![PyPI version](https://img.shields.io/pypi/v/capmonstercloudclient.svg?style=flat-square)](https://pypi.org/project/capmonstercloudclient/)
+[![PyPI downloads](https://img.shields.io/pypi/dm/capmonstercloudclient.svg?style=flat-square)](https://pypi.org/project/capmonstercloudclient/)
+[![Python version](https://img.shields.io/pypi/pyversions/capmonstercloudclient.svg?style=flat-square)](https://pypi.org/project/capmonstercloudclient/)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://opensource.org/licenses/MIT)
+
+Official Python 3 package for easy integration with the [CapMonster Cloud](https://capmonster.cloud/) API — the fastest and most reliable automated captcha-solving service.
+
+This wrapper allows you to seamlessly integrate high-speed AI captcha recognition into your Python web scraping, data extraction, and testing workflows. It is fully compatible with popular browser automation frameworks like **Selenium, Playwright, Puppeteer, Scrapy, and BeautifulSoup**.
+
+🔥 **[Create a Free Account & Get Your API Key](https://dash.capmonster.cloud/Account/SignUp?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)** to start bypassing bot protections instantly!
+
+## 🛠️ Key Features
+
+- ⚡ **Fast & Fully Automated:** Solve captchas in seconds without human intervention.
+- 🤖 **100% AI-Powered:** Machine learning algorithms ensure the highest success rate.
+- 🌐 **Browser Automation Ready:** Easily plug into your Selenium or Playwright scripts.
+- 🛡️ **Advanced WAF Bypass:** Effortlessly bypass Cloudflare Turnstile, DataDome, Amazon WAF, and Imperva.
+- 💰 **Cost-Effective:** One of the most affordable solutions on the market for scale.
+
+## ⚙️ Installation
+
+Install the CapMonster Cloud Python client using pip:
+
+```bash
+pip install capmonstercloudclient
+```
+
+## 🚀 Quick Start & Usage Example
+
+**Prerequisite:** You need an active CapMonster API key. [Grab it from your dashboard](https://dash.capmonster.cloud/Account/SignUp?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme).
+
+Below is a standard example of solving a reCAPTCHA v2 (Proxyless) using `asyncio`. You can easily pass the resulting token into your Selenium or Playwright browser instances.
+
+```python
+import asyncio
+
+from capmonstercloudclient import CapMonsterClient, ClientOptions
+from capmonstercloudclient.requests import RecaptchaV2ProxylessRequest
+
+# Initialize the client with your CapMonster Cloud API key
+client_options = ClientOptions(api_key="<YOUR_API_KEY>")
+cap_monster_client = CapMonsterClient(options=client_options)
+
+async def solve_captcha():
+    # Setup the reCAPTCHA v2 request
+    recaptcha2request = RecaptchaV2ProxylessRequest(
+        websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
+        websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd"
+    )
+    # Await the solution token
+    return await cap_monster_client.solve_captcha(recaptcha2request)
+
+if __name__ == "__main__":
+    responses = asyncio.run(solve_captcha())
+    print("Captcha Solved! Token:", responses)
+```
+
+## 🧩 Supported Captcha Recognition Types
+
+Our Python API wrapper supports almost all modern anti-bot challenges. Click on the links below to view detailed API documentation and payload examples.
+
+### 🔹 Classic Captchas
+- [AmazonWafRequest](https://docs.capmonster.cloud/docs/captchas/amazon-task) - Amazon WAF Bypass
+- [BinanceTaskRequest](https://docs.capmonster.cloud/docs/captchas/binance) - Binance Captcha Solver
+- [BinanceTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [GeeTestProxylessRequest](https://zenno.link/doc-geetest-en) - GeeTest Solver
+- [GeeTestRequest](https://zenno.link/doc-geetest-proxy-en)
+- [ImageToTextRequest](https://zenno.link/doc-ImageToTextTask-en) - Standard OCR (Image-to-Text)
+- [RecaptchaV2ProxylessRequest](https://zenno.link/doc-recaptcha2-en) - Google reCAPTCHA v2
+- [RecaptchaV2Request](https://zenno.link/doc-recaptcha2-proxy-en)
+- [RecaptchaV3ProxylessRequest](https://zenno.link/doc-recaptcha3-en) - Google reCAPTCHA v3
+- [RecaptchaV2EnterpriseProxylessRequest](https://zenno.link/doc-recaptcha2e-en)
+- [RecaptchaV2EnterpriseRequest](https://zenno.link/doc-recaptcha2e-proxy-en)
+- [TurnstileProxylessRequest](https://zenno.link/doc-turnstile-en) - Cloudflare Turnstile Challenge
+- [TurnstileRequest](https://zenno.link/doc-turnstile-proxy-en)
+
+### 🔹 Custom Tasks (Anti-Bot & Advanced WAFs)
+- [BasiliskCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/Basilisk-task)
+- [DataDomeCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/datadome) - DataDome Slider & Interstitial bypass
+- [ImpervaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/incapsula) - Imperva / Incapsula bypass
+- [ImpervaCustomTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
+- [TenDiCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tendi)
+
+### 🔹 Complex Image Tasks
+- [RecaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-rc-en) (Grid / Dynamic Image Selection)
+
+---
+
+### 💡 Ready to supercharge your web automation?
+Join thousands of developers effortlessly bypassing captchas.  
+👉 **[Sign up for CapMonster Cloud](https://capmonster.cloud/) today and boost your scraper's success rate!**

capmonstercloudclient-4.2.0/README.md

@@ -0,0 +1,93 @@
+# CapMonster Python Captcha Solver & Anti-Bot Bypass API Library
+
+[![PyPI version](https://img.shields.io/pypi/v/capmonstercloudclient.svg?style=flat-square)](https://pypi.org/project/capmonstercloudclient/)
+[![PyPI downloads](https://img.shields.io/pypi/dm/capmonstercloudclient.svg?style=flat-square)](https://pypi.org/project/capmonstercloudclient/)
+[![Python version](https://img.shields.io/pypi/pyversions/capmonstercloudclient.svg?style=flat-square)](https://pypi.org/project/capmonstercloudclient/)
+[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg?style=flat-square)](https://opensource.org/licenses/MIT)
+
+Official Python 3 package for easy integration with the [CapMonster Cloud](https://capmonster.cloud/) API — the fastest and most reliable automated captcha-solving service.
+
+This wrapper allows you to seamlessly integrate high-speed AI captcha recognition into your Python web scraping, data extraction, and testing workflows. It is fully compatible with popular browser automation frameworks like **Selenium, Playwright, Puppeteer, Scrapy, and BeautifulSoup**.
+
+🔥 **[Create a Free Account & Get Your API Key](https://dash.capmonster.cloud/Account/SignUp?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme)** to start bypassing bot protections instantly!
+
+## 🛠️ Key Features
+
+- ⚡ **Fast & Fully Automated:** Solve captchas in seconds without human intervention.
+- 🤖 **100% AI-Powered:** Machine learning algorithms ensure the highest success rate.
+- 🌐 **Browser Automation Ready:** Easily plug into your Selenium or Playwright scripts.
+- 🛡️ **Advanced WAF Bypass:** Effortlessly bypass Cloudflare Turnstile, DataDome, Amazon WAF, and Imperva.
+- 💰 **Cost-Effective:** One of the most affordable solutions on the market for scale.
+
+## ⚙️ Installation
+
+Install the CapMonster Cloud Python client using pip:
+
+```bash
+pip install capmonstercloudclient
+```
+
+## 🚀 Quick Start & Usage Example
+
+**Prerequisite:** You need an active CapMonster API key. [Grab it from your dashboard](https://dash.capmonster.cloud/Account/SignUp?utm_source=github&utm_medium=referral&utm_campaign=python_repo_readme).
+
+Below is a standard example of solving a reCAPTCHA v2 (Proxyless) using `asyncio`. You can easily pass the resulting token into your Selenium or Playwright browser instances.
+
+```python
+import asyncio
+
+from capmonstercloudclient import CapMonsterClient, ClientOptions
+from capmonstercloudclient.requests import RecaptchaV2ProxylessRequest
+
+# Initialize the client with your CapMonster Cloud API key
+client_options = ClientOptions(api_key="<YOUR_API_KEY>")
+cap_monster_client = CapMonsterClient(options=client_options)
+
+async def solve_captcha():
+    # Setup the reCAPTCHA v2 request
+    recaptcha2request = RecaptchaV2ProxylessRequest(
+        websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
+        websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd"
+    )
+    # Await the solution token
+    return await cap_monster_client.solve_captcha(recaptcha2request)
+
+if __name__ == "__main__":
+    responses = asyncio.run(solve_captcha())
+    print("Captcha Solved! Token:", responses)
+```
+
+## 🧩 Supported Captcha Recognition Types
+
+Our Python API wrapper supports almost all modern anti-bot challenges. Click on the links below to view detailed API documentation and payload examples.
+
+### 🔹 Classic Captchas
+- [AmazonWafRequest](https://docs.capmonster.cloud/docs/captchas/amazon-task) - Amazon WAF Bypass
+- [BinanceTaskRequest](https://docs.capmonster.cloud/docs/captchas/binance) - Binance Captcha Solver
+- [BinanceTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [GeeTestProxylessRequest](https://zenno.link/doc-geetest-en) - GeeTest Solver
+- [GeeTestRequest](https://zenno.link/doc-geetest-proxy-en)
+- [ImageToTextRequest](https://zenno.link/doc-ImageToTextTask-en) - Standard OCR (Image-to-Text)
+- [RecaptchaV2ProxylessRequest](https://zenno.link/doc-recaptcha2-en) - Google reCAPTCHA v2
+- [RecaptchaV2Request](https://zenno.link/doc-recaptcha2-proxy-en)
+- [RecaptchaV3ProxylessRequest](https://zenno.link/doc-recaptcha3-en) - Google reCAPTCHA v3
+- [RecaptchaV2EnterpriseProxylessRequest](https://zenno.link/doc-recaptcha2e-en)
+- [RecaptchaV2EnterpriseRequest](https://zenno.link/doc-recaptcha2e-proxy-en)
+- [TurnstileProxylessRequest](https://zenno.link/doc-turnstile-en) - Cloudflare Turnstile Challenge
+- [TurnstileRequest](https://zenno.link/doc-turnstile-proxy-en)
+
+### 🔹 Custom Tasks (Anti-Bot & Advanced WAFs)
+- [BasiliskCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/Basilisk-task)
+- [DataDomeCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/datadome) - DataDome Slider & Interstitial bypass
+- [ImpervaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/incapsula) - Imperva / Incapsula bypass
+- [ImpervaCustomTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
+- [TenDiCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tendi)
+
+### 🔹 Complex Image Tasks
+- [RecaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-rc-en) (Grid / Dynamic Image Selection)
+
+---
+
+### 💡 Ready to supercharge your web automation?
+Join thousands of developers effortlessly bypassing captchas.  
+👉 **[Sign up for CapMonster Cloud](https://capmonster.cloud/) today and boost your scraper's success rate!**

{capmonstercloudclient-4.0.0 → capmonstercloudclient-4.2.0}/capmonstercloud_client/CapMonsterCloudClient.py

@@ -32,7 +32,7 @@ _instance_config = (
     ((BinanceTaskRequest,), getBinanceTimeouts),
     ((ImpervaCustomTaskRequest,), getImpervaTimeouts),
     ((RecognitionComplexImageTaskRequest,), getCITTimeouts),
-    ((MTCaptchaRequest,), getImage2TextTimeouts),
+    ((MTCaptchaRequest,), getMTCaptchaTimeouts),
     ((YidunRequest,), getYidunTimeouts),
     ((TemuCustomTaskRequest,), getTemuTimeouts),
     ((ProsopoTaskRequest,), getProsopoTimeouts),
@@ -40,6 +40,8 @@ _instance_config = (
     ((CastleCustomTaskRequest,), getCastleTimeouts),
     ((TspdCustomTaskRequest,), getTspdTimeouts),
     ((HuntCustomTaskRequest,), getHuntTimeouts),
+    ((AlibabaCustomTaskRequest,), getAlibabaTimeouts),
+    ((FriendlyCustomTaskRequest,), getFriendlyTimeouts),
 )
 
 
@@ -106,7 +108,9 @@ class CapMonsterClient:
                                                  AltchaCustomTaskRequest,
                                                  CastleCustomTaskRequest,
                                                  TspdCustomTaskRequest,
-                                                 HuntCustomTaskRequest],
+                                                 HuntCustomTaskRequest,
+                                                 AlibabaCustomTaskRequest,
+                                                 FriendlyCustomTaskRequest],
                             ) -> Dict[str, str]:
         '''
         Non-blocking method for captcha solving. 
@@ -145,7 +149,12 @@ class CapMonsterClient:
                                           YidunRequest,
                                           TemuCustomTaskRequest,
                                           ProsopoTaskRequest,
-                                          AltchaCustomTaskRequest],
+                                          AltchaCustomTaskRequest,
+                                          CastleCustomTaskRequest,
+                                          TspdCustomTaskRequest,
+                                          HuntCustomTaskRequest,
+                                          AlibabaCustomTaskRequest,
+                                          FriendlyCustomTaskRequest],
                            timeouts: GetResultTimeouts,
                            ) -> Dict[str, str]:
 

{capmonstercloudclient-4.0.0 → capmonstercloudclient-4.2.0}/capmonstercloud_client/GetResultTimeouts.py

@@ -36,7 +36,7 @@ def getTurnstileTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 80)
 
 def getDatadomeTimeouts() -> GetResultTimeouts:
-    return GetResultTimeouts(1, 0, 1, 80)
+    return GetResultTimeouts(1, 0, 3, 180)
 
 def getTenDiTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
@@ -51,7 +51,7 @@ def getBinanceTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 20)
 
 def getImpervaTimeouts() -> GetResultTimeouts:
-    return GetResultTimeouts(1, 0, 1, 20)
+    return GetResultTimeouts(1, 0, 1, 15)
 
 def getAltchaTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 50)
@@ -63,11 +63,20 @@ def getTspdTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 60)
 
 def getHuntTimeouts() -> GetResultTimeouts:
-    return GetResultTimeouts(1, 0, 1, 60)
+    return GetResultTimeouts(1, 0, 3, 180)
+
+def getAlibabaTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 0, 3, 120)
+
+def getFriendlyTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 0, 3, 180)
 
 def getCITTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(0.35, 0, 0.2, 10)
 
+def getMTCaptchaTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 10, 3, 180)
+
 def getYidunTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 

{capmonstercloudclient-4.0.0 → capmonstercloudclient-4.2.0}/capmonstercloud_client/clientOptions.py

@@ -1,4 +1,4 @@
-from pydantic import BaseModel, validator, Field
+from pydantic import BaseModel, field_validator, Field
 from .requests import ClientProxyInfo
 from typing import Optional
 
@@ -10,19 +10,22 @@ class ClientOptions(BaseModel):
     client_timeout: float = Field(default=20.0)
     
 
-    @validator('api_key')
+    @field_validator('api_key')
+    @classmethod
     def validate_api_key(cls, value):
         if not isinstance(value, str):
             raise TypeError(f'Api Key must be <str> type, got {type(value)}')
         return value
     
-    @validator('service_url')
+    @field_validator('service_url')
+    @classmethod
     def validate_service_url(cls, value):
         if not isinstance(value, str):
             raise TypeError(f'Service url must be <str> type, got {type(value)}')
         return value
 
-    @validator('default_soft_id')
+    @field_validator('default_soft_id')
+    @classmethod
     def validate_soft_id(cls, value):
         if not isinstance(value, int):
             raise TypeError(f'Soft id must be <int> type, got {type(value)}')

capmonstercloudclient-4.2.0/capmonstercloud_client/requests/AlibabaCustomTaskRequest.py

@@ -0,0 +1,59 @@
+from typing import Dict, Optional, Union
+from pydantic import Field, field_validator
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+ALLOWED_METADATA_KEYS = {
+    'sceneId', 'prefix', 'userId', 'userUserId', 'verifyType',
+    'region', 'UserCertifyId', 'apiGetLib', 'cookieRequired',
+}
+
+class AlibabaCustomTaskRequest(CustomTaskRequestBase):
+    """
+    Represents a payload structure for solving Alibaba custom captcha challenges.
+
+    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.
+    """
+    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.')
+
+    @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.')
+        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('cookieRequired') is not None and not isinstance(value.get('cookieRequired'), bool):
+            raise TypeError(f'cookieRequired must be bool.')
+        return value
+
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
+        task = {}
+        task['type'] = self.type
+        task['class'] = self.captchaClass
+        task['websiteURL'] = self.websiteUrl
+        task['metadata'] = self.metadata
+        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
+        if self.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        return task

capmonstercloudclient-4.2.0/capmonstercloud_client/requests/AltchaCustomTaskRequest.py

@@ -0,0 +1,51 @@
+from typing import Dict, Union
+from pydantic import Field, field_validator
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+class AltchaCustomTaskRequest(CustomTaskRequestBase):
+    """
+    Represents a payload structure for solving Altcha proof-of-work
+    captcha challenges via a custom module.
+
+    Attributes:
+        captchaClass: The class (subtype) identifier of the custom
+            module, constant "altcha" for this task.
+        websiteKey: The site key associated with the Altcha challenge
+            on the webpage. An empty string is allowed for this task.
+        metadata: A dictionary containing the Altcha challenge parameters
+            (challenge, iterations, salt, signature) extracted from the
+            webpage.
+    """
+
+    captchaClass: str = Field(default='altcha', description='Class (subtype) identifier of the custom module, constant "altcha".')
+    websiteKey: str = Field(description='Site key associated with the Altcha challenge on the webpage. An empty string is allowed for this task.')
+    metadata: Dict[str, str] = Field(description='Altcha challenge parameters: challenge, iterations, salt, and signature.')
+    
+    @field_validator('metadata')
+    @classmethod
+    def validate_metadata(cls, value):
+        for key in ['challenge', 'iterations', 'salt', 'signature']:
+            if value.get(key) is None:
+                raise TypeError(f'{key} must be defined inside metadata.')
+            else:
+                if not isinstance(value.get(key), str):
+                    raise TypeError(f'{key} must be str.')
+        return value
+    
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
+        task = {}
+        task['type'] = self.type
+        task['class'] = self.captchaClass
+        task['websiteURL'] = self.websiteUrl
+        task['websiteKey'] = self.websiteKey
+        task['metadata'] = self.metadata
+        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
+        if self.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        return task

capmonstercloudclient-4.2.0/capmonstercloud_client/requests/AmazonWafRequest.py

@@ -0,0 +1,98 @@
+from typing import Dict, Union, Optional
+from pydantic import Field, model_validator
+
+from .baseRequestWithProxy import BaseRequestWithProxy
+
+class AmazonWafRequest(BaseRequestWithProxy):
+    """
+    Represents a payload structure for solving Amazon AWS WAF captcha challenges.
+
+    The live API accepts three mutually exclusive parameter sets:
+        Option 1 (visible captcha): websiteUrl, websiteKey, captchaScript
+            required; challengeScript/context/iv must not be set.
+        Option 2 (challenge + captcha): websiteUrl, challengeScript, websiteKey,
+            context, iv required; captchaScript optional.
+        Option 3 (invisible/challenge-only): websiteUrl, challengeScript
+            required; context and iv must be empty strings; websiteKey and
+            captchaScript must not be set.
+
+    Attributes:
+        type: The constant string value identifying the task type as "AmazonTask".
+        websiteUrl: The URL of the webpage where the Amazon AWS WAF challenge
+            is presented.
+        challengeScript: Link to challenge.js served by AWS WAF on the target
+            page. Required for Options 2 and 3; must not be set for Option 1.
+        captchaScript: Link to captcha.js / jsapi.js served by AWS WAF on the
+            target page. Required for Option 1, optional for Option 2, must
+            not be set for Option 3.
+        websiteKey: The site key associated with the AWS WAF challenge.
+            Required for Options 1 and 2; must not be set for Option 3.
+        context: The context token provided by AWS WAF, used to correlate
+            the challenge with a specific session. Required for Option 2;
+            must be an empty string for Option 3; must not be set for Option 1.
+        iv: The initialization vector value provided by AWS WAF as part
+            of the challenge payload. Required for Option 2; must be an
+            empty string for Option 3; must not be set for Option 1.
+        cookieSolution: When set to True, requests the solution to be
+            returned as a ready-to-use cookie instead of a token.
+        userAgent: Browser User-Agent to emulate. Only used for Option 1.
+            Pass only a current Windows OS UA.
+    """
+    type: str = Field(default='AmazonTask', description='The constant string value identifying the task type as "AmazonTask".')
+    websiteUrl: str = Field(..., description='The URL of the webpage where the Amazon AWS WAF challenge is presented.')
+    challengeScript: Optional[str] = Field(default=None, description='Link to challenge.js served by AWS WAF on the target page. Required for Options 2 and 3; must not be set for Option 1.')
+    captchaScript: Optional[str] = Field(default=None, description='Link to captcha.js / jsapi.js served by AWS WAF on the target page. Required for Option 1, optional for Option 2, must not be set for Option 3.')
+    websiteKey: Optional[str] = Field(default=None, description='The site key associated with the AWS WAF challenge. Required for Options 1 and 2; must not be set for Option 3.')
+    context: Optional[str] = Field(default=None, description='The context token provided by AWS WAF, used to correlate the challenge with a specific session. Required for Option 2; must be an empty string for Option 3; must not be set for Option 1.')
+    iv: Optional[str] = Field(default=None, description='The initialization vector value provided by AWS WAF as part of the challenge payload. Required for Option 2; must be an empty string for Option 3; must not be set for Option 1.')
+    cookieSolution: Optional[bool] = Field(default=None, description='When set to True, requests the solution to be returned as a ready-to-use cookie instead of a token.')
+    userAgent: Optional[str] = Field(default=None, description='Browser User-Agent to emulate. Only used for Option 1. Pass only a current Windows OS UA.')
+
+    @model_validator(mode='after')
+    def validate_amazon_waf_variant(self):
+        if self.challengeScript is None:
+            # Option 1: visible captcha, no challenge.js involved.
+            if self.websiteKey is None or self.captchaScript is None:
+                raise ValueError('"websiteKey" and "captchaScript" must be filled '
+                                  'when "challengeScript" is not provided (Option 1).')
+            if self.context is not None or self.iv is not None:
+                raise ValueError('"context" and "iv" are not used when "challengeScript" is not provided (Option 1).')
+        elif self.websiteKey is None and self.captchaScript is None:
+            # Option 3: invisible/challenge-only captcha.
+            if self.context != '' or self.iv != '':
+                raise ValueError('"context" and "iv" must be empty strings '
+                                  'when only "challengeScript" is provided (Option 3).')
+        else:
+            # Option 2: challenge + captcha.
+            if self.websiteKey is None or self.context is None or self.iv is None:
+                raise ValueError('"websiteKey", "context" and "iv" must be filled '
+                                  'when "challengeScript" is provided together with "websiteKey" (Option 2).')
+        return self
+
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
+        task = {}
+        task['type'] = self.type
+        task['websiteURL'] = self.websiteUrl
+        if self.challengeScript is not None:
+            task['challengeScript'] = self.challengeScript
+        if self.captchaScript is not None:
+            task['captchaScript'] = self.captchaScript
+        if self.websiteKey is not None:
+            task['websiteKey'] = self.websiteKey
+        if self.context is not None:
+            task['context'] = self.context
+        if self.iv is not None:
+            task['iv'] = self.iv
+
+        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
+
+        if self.cookieSolution is not None:
+            task['cookieSolution'] = self.cookieSolution
+        if self.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        return task

{capmonstercloudclient-4.0.0 → capmonstercloudclient-4.2.0}/capmonstercloud_client/requests/BasiliskCustomTaskRequest.py

@@ -4,8 +4,19 @@ from pydantic import Field
 from .CustomTaskRequestBase import CustomTaskRequestBase
 
 class BasiliskCustomTaskRequest(CustomTaskRequestBase):
-    captchaClass: str = Field(default='Basilisk')
-    websiteKey: str = Field()
+    """
+    Represents a payload structure for solving Basilisk custom captcha
+    challenges.
+
+    Attributes:
+        captchaClass: The class (subtype) identifier of the custom module,
+            fixed to "Basilisk" for this task type.
+        websiteKey: The site key associated with the Basilisk captcha on
+            the webpage.
+    """
+
+    captchaClass: str = Field(default='Basilisk', description='Class (subtype) identifier of the custom module, fixed to "Basilisk".')
+    websiteKey: str = Field(..., description='Site key associated with the Basilisk captcha on the webpage.')
     
     def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
         task = {}