capmonstercloudclient 3.4.0__tar.gz → 4.1.0__tar.gz

{capmonstercloudclient-3.4.0 → capmonstercloudclient-4.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capmonstercloudclient
-Version: 3.4.0
+Version: 4.1.0
 Summary: Official CapMonsterCloud Client: https://capmonster.cloud/
 Home-page: https://github.com/ZennoLab/capmonstercloud-client-python
 Author: Andrey Ilyin
@@ -9,7 +9,6 @@ License: AGPL-3.0
 Keywords: captcha 
 				recaptcha
 				geetest
-				hcaptcha
 				funcaptcha
 				python3
 				python-library
@@ -64,53 +63,78 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# Zennolab.CapMonsterCloud.Client
+# CapMonster Cloud Python SDK
 
-Official python client library for [capmonster.cloud](https://capmonster.cloud/) captcha recognition service
+[![PyPI version](https://img.shields.io/pypi/v/capmonstercloudclient)](https://pypi.org/project/capmonstercloudclient/)
+
+Official Python SDK for the CapMonster Cloud API.
+Use this package when you want to create tasks and retrieve solutions from Python applications or scripts.
+
+## Links
+
+- Package: [capmonstercloudclient on PyPI](https://pypi.org/project/capmonstercloudclient/)
+- Documentation: [docs.capmonster.cloud](https://docs.capmonster.cloud/)
+- Dashboard / API key: [dash.capmonster.cloud](https://dash.capmonster.cloud/)
 
 ## Installation
 
-    python3 -m pip install capmonstercloudclient
+```bash
+python3 -m pip install capmonstercloudclient
+```
 
-## Usage
+Need to test before depositing? Contact support and we’ll add trial credits to your account.
 
-***
-    import asyncio
+## Minimal async example
 
-    from capmonstercloudclient import CapMonsterClient, ClientOptions
-    from capmonstercloudclient.requests import RecaptchaV2ProxylessRequest
+```python
+import asyncio
 
-    client_options = ClientOptions(api_key=<YOUR_API_KEY>)
-    cap_monster_client = CapMonsterClient(options=client_options)
+from capmonstercloudclient import CapMonsterClient, ClientOptions
+from capmonstercloudclient.requests import RecaptchaV2Request
 
-    async def solve_captcha():
-        return await cap_monster_client.solve_captcha(recaptcha2request)
+client_options = ClientOptions(api_key="<YOUR_API_KEY>")
+cap_monster_client = CapMonsterClient(options=client_options)
 
-    recaptcha2request = RecaptchaV2ProxylessRequest(websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
-                                                    websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd")
+recaptcha2request = RecaptchaV2Request(
+    websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
+    websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd",
+)
 
-    responses = asyncio.run(solve_captcha())
-    print(responses)
-***
+async def solve_captcha():
+    return await cap_monster_client.solve_captcha(recaptcha2request)
 
-Supported captcha recognition requests:
+response = asyncio.run(solve_captcha())
+print(response)
+```
 
-- [GeeTestProxylessRequest](https://zenno.link/doc-geetest-en)
-- [GeeTestRequest](https://zenno.link/doc-geetest-proxy-en)
-- [ImageToTextRequest](https://zenno.link/doc-ImageToTextTask-en)
-- [RecaptchaV2ProxylessRequest](https://zenno.link/doc-recaptcha2-en)
-- [RecaptchaV2Request](https://zenno.link/doc-recaptcha2-proxy-en)
-- [RecaptchaV3ProxylessRequest](https://zenno.link/doc-recaptcha3-en)
-- [RecaptchaV2EnterpriseProxylessRequest](https://zenno.link/doc-recaptcha2e-en)
-- [RecaptchaV2EnterpriseRequest](https://zenno.link/doc-recaptcha2e-proxy-en)
-- [TurnstileProxylessRequest](https://zenno.link/doc-turnstile-en)
-- [TurnstileRequest](https://zenno.link/doc-turnstile-proxy-en)
-- [RecaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-rc-en)
-- [DataDomeCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/datadome)
-- [TenDiCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tendi)
-- [BasiliskCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/Basilisk-task)
+Supported task families include reCAPTCHA, GeeTest, Turnstile, image-to-text, and additional task types documented in the public docs.
+
+Supported request classes:
+
+- [AltchaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/altcha-task)
+- [AlibabaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/alibaba-task)
 - [AmazonWafRequest](https://docs.capmonster.cloud/docs/captchas/amazon-task)
+- [BasiliskCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/Basilisk-task)
 - [BinanceTaskRequest](https://docs.capmonster.cloud/docs/captchas/binance)
-- [BinanceTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [CastleCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/castle-task)
+- [DataDomeCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/datadome)
+- [FriendlyCaptchaRequest](https://docs.capmonster.cloud/docs/captchas/friendly-task)
+- [FuncaptchaRequest](https://docs.capmonster.cloud/docs/captchas/funcaptcha-task)
+- [FunCaptchaComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/ComplexImageTask-Recognition)
+- [GeetestRequest](https://docs.capmonster.cloud/docs/captchas/geetest-task)
+- [HuntCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/hunt-task)
+- [ImageToTextRequest](https://docs.capmonster.cloud/docs/captchas/image-to-text)
 - [ImpervaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
-- [ImpervaCustomTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
+- [MTCaptchaRequest](https://docs.capmonster.cloud/docs/captchas/mtcaptcha-task)
+- [ProsopoTaskRequest](https://docs.capmonster.cloud/docs/captchas/prosopo-task)
+- [RecognitionComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/ComplexImageTask-Recognition)
+- [RecaptchaComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-click)
+- [RecaptchaV2EnterpriseRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v2-enterprise-task)
+- [RecaptchaV2Request](https://docs.capmonster.cloud/docs/captchas/no-captcha-task)
+- [RecaptchaV3EnterpriseRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v3-enterprise-task)
+- [RecaptchaV3ProxylessRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v3-task)
+- [TemuCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/temu-task)
+- [TenDiCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tendi)
+- [TspdCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tspd-task)
+- [TurnstileRequest](https://docs.capmonster.cloud/docs/captchas/turnstile-task)
+- [YidunRequest](https://docs.capmonster.cloud/docs/captchas/yidun-task)

capmonstercloudclient-4.1.0/README.md

@@ -0,0 +1,75 @@
+# CapMonster Cloud Python SDK
+
+[![PyPI version](https://img.shields.io/pypi/v/capmonstercloudclient)](https://pypi.org/project/capmonstercloudclient/)
+
+Official Python SDK for the CapMonster Cloud API.
+Use this package when you want to create tasks and retrieve solutions from Python applications or scripts.
+
+## Links
+
+- Package: [capmonstercloudclient on PyPI](https://pypi.org/project/capmonstercloudclient/)
+- Documentation: [docs.capmonster.cloud](https://docs.capmonster.cloud/)
+- Dashboard / API key: [dash.capmonster.cloud](https://dash.capmonster.cloud/)
+
+## Installation
+
+```bash
+python3 -m pip install capmonstercloudclient
+```
+
+Need to test before depositing? Contact support and we’ll add trial credits to your account.
+
+## Minimal async example
+
+```python
+import asyncio
+
+from capmonstercloudclient import CapMonsterClient, ClientOptions
+from capmonstercloudclient.requests import RecaptchaV2Request
+
+client_options = ClientOptions(api_key="<YOUR_API_KEY>")
+cap_monster_client = CapMonsterClient(options=client_options)
+
+recaptcha2request = RecaptchaV2Request(
+    websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
+    websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd",
+)
+
+async def solve_captcha():
+    return await cap_monster_client.solve_captcha(recaptcha2request)
+
+response = asyncio.run(solve_captcha())
+print(response)
+```
+
+Supported task families include reCAPTCHA, GeeTest, Turnstile, image-to-text, and additional task types documented in the public docs.
+
+Supported request classes:
+
+- [AltchaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/altcha-task)
+- [AlibabaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/alibaba-task)
+- [AmazonWafRequest](https://docs.capmonster.cloud/docs/captchas/amazon-task)
+- [BasiliskCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/Basilisk-task)
+- [BinanceTaskRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [CastleCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/castle-task)
+- [DataDomeCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/datadome)
+- [FriendlyCaptchaRequest](https://docs.capmonster.cloud/docs/captchas/friendly-task)
+- [FuncaptchaRequest](https://docs.capmonster.cloud/docs/captchas/funcaptcha-task)
+- [FunCaptchaComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/ComplexImageTask-Recognition)
+- [GeetestRequest](https://docs.capmonster.cloud/docs/captchas/geetest-task)
+- [HuntCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/hunt-task)
+- [ImageToTextRequest](https://docs.capmonster.cloud/docs/captchas/image-to-text)
+- [ImpervaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
+- [MTCaptchaRequest](https://docs.capmonster.cloud/docs/captchas/mtcaptcha-task)
+- [ProsopoTaskRequest](https://docs.capmonster.cloud/docs/captchas/prosopo-task)
+- [RecognitionComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/ComplexImageTask-Recognition)
+- [RecaptchaComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-click)
+- [RecaptchaV2EnterpriseRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v2-enterprise-task)
+- [RecaptchaV2Request](https://docs.capmonster.cloud/docs/captchas/no-captcha-task)
+- [RecaptchaV3EnterpriseRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v3-enterprise-task)
+- [RecaptchaV3ProxylessRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v3-task)
+- [TemuCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/temu-task)
+- [TenDiCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tendi)
+- [TspdCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tspd-task)
+- [TurnstileRequest](https://docs.capmonster.cloud/docs/captchas/turnstile-task)
+- [YidunRequest](https://docs.capmonster.cloud/docs/captchas/yidun-task)

{capmonstercloudclient-3.4.0 → capmonstercloudclient-4.1.0}/capmonstercloud_client/CapMonsterCloudClient.py

@@ -16,27 +16,30 @@ from .utils import parseVersion
 _instance_config = (
     ((RecaptchaV2Request,), getRecaptchaV2Timeouts),
     ((RecaptchaV2EnterpriseRequest,), getRecaptchaV2EnterpriseTimeouts),
-    ((RecaptchaV3ProxylessRequest), getRecaptchaV3Timeouts),
-    ((RecaptchaV3EnterpriseRequest), getRecaptchaV3Timeouts),
-    ((ImageToTextRequest), getImage2TextTimeouts),
+    ((RecaptchaV3ProxylessRequest,), getRecaptchaV3Timeouts),
+    ((RecaptchaV3EnterpriseRequest,), getRecaptchaV3Timeouts),
+    ((ImageToTextRequest,), getImage2TextTimeouts),
     ((FuncaptchaRequest,), getFuncaptchaTimeouts),
-    ((HcaptchaRequest,), getHcaptchaTimeouts),
     ((GeetestRequest,), getGeetestTimeouts),
     ((TurnstileRequest,), getTurnstileTimeouts),
-    ((RecaptchaComplexImageTaskRequest, HcaptchaComplexImageTaskRequest, 
-      FunCaptchaComplexImageTaskRequest), getImage2TextTimeouts),
+    ((RecaptchaComplexImageTaskRequest, FunCaptchaComplexImageTaskRequest), getImage2TextTimeouts),
     ((DataDomeCustomTaskRequest,), getDatadomeTimeouts),
     ((TenDiCustomTaskRequest,), getTenDiTimeouts),
     ((BasiliskCustomTaskRequest,), getBasiliskTimeouts),
     ((AmazonWafRequest,), getAmazonWafTimeouts),
     ((BinanceTaskRequest,), getBinanceTimeouts),
     ((ImpervaCustomTaskRequest,), getImpervaTimeouts),
-    ((RecognitionComplexImageTaskRequest), getCITTimeouts),
-    ((MTCaptchaRequest), getImage2TextTimeouts),
-    ((YidunRequest), getYidunTimeouts),
-    ((TemuCustomTaskRequest), getTemuTimeouts),
-    ((ProsopoTaskRequest), getProsopoTimeouts),
-    ((AltchaCustomTaskRequest), getAltchaTimeouts),
+    ((RecognitionComplexImageTaskRequest,), getCITTimeouts),
+    ((MTCaptchaRequest,), getImage2TextTimeouts),
+    ((YidunRequest,), getYidunTimeouts),
+    ((TemuCustomTaskRequest,), getTemuTimeouts),
+    ((ProsopoTaskRequest,), getProsopoTimeouts),
+    ((AltchaCustomTaskRequest,), getAltchaTimeouts),
+    ((CastleCustomTaskRequest,), getCastleTimeouts),
+    ((TspdCustomTaskRequest,), getTspdTimeouts),
+    ((HuntCustomTaskRequest,), getHuntTimeouts),
+    ((FriendlyCaptchaRequest,), getFriendlyCaptchaTimeouts),
+    ((AlibabaCustomTaskRequest,), getAlibabaTimeouts),
 )
 
 
@@ -85,8 +88,6 @@ class CapMonsterClient:
                                                  ImageToTextRequest, 
                                                  FuncaptchaRequest,
                                                  FunCaptchaComplexImageTaskRequest,
-                                                 HcaptchaRequest,
-                                                 HcaptchaComplexImageTaskRequest,
                                                  GeetestRequest,
                                                  DataDomeCustomTaskRequest,
                                                  TenDiCustomTaskRequest,
@@ -100,7 +101,12 @@ class CapMonsterClient:
                                                  YidunRequest,
                                                  TemuCustomTaskRequest,
                                                  ProsopoTaskRequest,
-                                                 AltchaCustomTaskRequest],
+                                                 AltchaCustomTaskRequest,
+                                                 CastleCustomTaskRequest,
+                                                 TspdCustomTaskRequest,
+                                                 HuntCustomTaskRequest,
+                                                 FriendlyCaptchaRequest,
+                                                 AlibabaCustomTaskRequest],
                             ) -> Dict[str, str]:
         '''
         Non-blocking method for captcha solving. 
@@ -124,8 +130,6 @@ class CapMonsterClient:
                                           ImageToTextRequest, 
                                           FuncaptchaRequest,
                                           FunCaptchaComplexImageTaskRequest,
-                                          HcaptchaRequest,
-                                          HcaptchaComplexImageTaskRequest,
                                           GeetestRequest,
                                           DataDomeCustomTaskRequest,
                                           TenDiCustomTaskRequest,
@@ -139,7 +143,9 @@ class CapMonsterClient:
                                           YidunRequest,
                                           TemuCustomTaskRequest,
                                           ProsopoTaskRequest,
-                                          AltchaCustomTaskRequest],
+                                          AltchaCustomTaskRequest,
+                                          FriendlyCaptchaRequest,
+                                          AlibabaCustomTaskRequest],
                            timeouts: GetResultTimeouts,
                            ) -> Dict[str, str]:
 
@@ -148,6 +154,7 @@ class CapMonsterClient:
             raise GetTaskError(f'[{getTaskResponse.get("errorCode")}] ' \
                                f'{getTaskResponse.get("errorDescription")}.')
         timer = RequestController(timeout=timeouts.timeout)
+        timer.run()
         await asyncio.sleep(timeouts.firstRequestDelay)
         result = CaptchaResult()
         while not timer.cancel:
@@ -165,13 +172,10 @@ class CapMonsterClient:
             elif getResultResponse.get('status') == 'ready':
                 timer.stop()
                 result.solution = getResultResponse.get('solution')
-                break
-        
-        if result != None:
-            return result.solution
-        else:
-            raise TimeoutError('Failed to get a solution within the maximum ' \
-                               f'response waiting interval: {timeouts.timeout:0.1f} sec.')
+                return result.solution
+
+        raise TimeoutError('Failed to get a solution within the maximum ' \
+                           f'response waiting interval: {timeouts.timeout:0.1f} sec.')
         
 
     async def _getTaskResult(self, task_id: str) -> Dict[str, Union[int, str, None]]:
@@ -211,4 +215,4 @@ class CapMonsterClient:
                     raise HTTPException(f'Cannot create task. Status code: {resp.status}.')
                 else:
                     return await resp.json(content_type=None)
-        
+        

{capmonstercloudclient-3.4.0 → capmonstercloudclient-4.1.0}/capmonstercloud_client/GetResultTimeouts.py

@@ -1,69 +1,106 @@
 from typing import Union
 from dataclasses import dataclass
 
+
 @dataclass
 class GetResultTimeouts:
     firstRequestDelay: Union[int, float]
     firstRequestNoCacheDelay: Union[int, float]
-    requestsInterval: Union[int, float] 
+    requestsInterval: Union[int, float]
     timeout: Union[int, float]
 
+
 def getRecaptchaV2Timeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getRecaptchaV2EnterpriseTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getRecaptchaV3Timeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getRecaptchaV3EnterpriseTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 150)
 
+
 def getImage2TextTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(0.35, 0, 0.2, 10)
 
+
 def getFuncaptchaTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 1, 80)
 
-def getHcaptchaTimeouts() -> GetResultTimeouts:
-    return GetResultTimeouts(1, 10, 3, 180)
 
 def getGeetestTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 80)
 
+
 def getTurnstileTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 80)
 
+
 def getDatadomeTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 80)
 
+
 def getTenDiTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getBasiliskTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 100)
 
+
 def getAmazonWafTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getBinanceTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 20)
 
+
 def getImpervaTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 20)
 
+
 def getAltchaTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 50)
 
+
+def getCastleTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 0, 1, 60)
+
+
+def getTspdTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 0, 1, 60)
+
+
+def getHuntTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 0, 1, 60)
+
+
 def getCITTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(0.35, 0, 0.2, 10)
 
+
 def getYidunTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getProsopoTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getTemuTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
+
+
+def getFriendlyCaptchaTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 0, 1, 180)
+
+
+def getAlibabaTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 0, 1, 180)

capmonstercloudclient-4.1.0/capmonstercloud_client/requests/AlibabaCustomTaskRequest.py

@@ -0,0 +1,42 @@
+from typing import Dict, Union
+from pydantic import Field, validator
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+
+class AlibabaCustomTaskRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='alibaba')
+    metadata: Dict[str, str]
+
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        allowed_keys = {'sceneId', 'prefix', 'userId', 'userUserId', 'verifyType',
+                        'region', 'UserCertifyId', 'apiGetLib'}
+        unknown = set(value.keys()) - allowed_keys
+        if unknown:
+            raise TypeError(f'Unexpected metadata keys: {unknown}. Allowed: {allowed_keys}')
+        for key in ['sceneId', 'prefix']:
+            if value.get(key) is None:
+                raise TypeError(f'Expect that {key} will be defined.')
+            if not isinstance(value[key], str):
+                raise TypeError(f'Expect that {key} will be str.')
+        for key in ['userId', 'userUserId', 'verifyType', 'region', 'UserCertifyId', 'apiGetLib']:
+            if key in value and not isinstance(value[key], str):
+                raise TypeError(f'Expect that {key} will 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['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.1.0/capmonstercloud_client/requests/CastleCustomTaskRequest.py

@@ -0,0 +1,42 @@
+from typing import Dict, Union
+from pydantic import Field, validator
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+class CastleCustomTaskRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='Castle')
+    websiteKey: str = Field()
+    metadata: Dict[str, Union[str, int]]
+
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        if value.get('wUrl') is None:
+            raise TypeError(f'Expected that wUrl is defined.')
+        else:
+            if not isinstance(value.get('wUrl'), str):
+                raise TypeError(f'Expected that wUrl is str.')
+        if value.get('swUrl') is None:
+            raise TypeError(f'Expected that swUrl is defined.')
+        else:
+            if not isinstance(value.get('swUrl'), str):
+                raise TypeError(f'Expected that swUrl is str.')
+        if value.get('count') is not None and not isinstance(value.get('count'), int):
+            raise TypeError(f'Expected that count is int.')
+        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-3.4.0 → capmonstercloudclient-4.1.0}/capmonstercloud_client/requests/DataDomeCustomTaskRequest.py

@@ -1,15 +1,17 @@
 from typing import Dict, Union
-from pydantic import Field, validator
+from pydantic import Field, validator, model_validator
 from .CustomTaskRequestBase import CustomTaskRequestBase
 
 class DataDomeCustomTaskRequest(CustomTaskRequestBase):
     captchaClass: str = Field(default='DataDome')
     metadata : Dict[str, str]
-    
+
     @validator('metadata')
     def validate_metadata(cls, value):
         if value.get('datadomeCookie') is None:
             raise TypeError(f'Expect that datadomeCookie will be defined.')
+        if value.get('datadomeVersion') is not None and not isinstance(value.get('datadomeVersion'), str):
+            raise TypeError(f'Expected datadomeVersion to be str')
         if value.get('captchaUrl') and value.get('htmlPageBase64'):
             raise TypeError(f'Expected only one of [captchaUrl, htmlPageBase64]')
         elif value.get('captchaUrl'):
@@ -18,22 +20,24 @@ class DataDomeCustomTaskRequest(CustomTaskRequestBase):
             return {i: value[i] for i in value if i != 'captchaUrl'}
         else:
             raise TypeError(f'Expected one of [captchaUrl, htmlPageBase64]')
-        if value.get('datadomeVersion') and not isinstance(value.get('datadomeVersion'), str):
-            raise TypeError(f'Expected datadomeVersion to be str')
 
-    
+    @model_validator(mode='before')
+    def validate_datadome_proxy(cls, values):
+        proxy = values.get('proxy')
+        if proxy is None:
+            raise RuntimeError(f'You are required to use your own proxies.')
+        return values
+
     def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
         task = {}
         task['type'] = self.type
         task['class'] = self.captchaClass
         task['websiteURL'] = self.websiteUrl
-        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['domains'] = self.domains
+        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['metadata'] = self.metadata
         if self.userAgent is not None:
             task['userAgent'] = self.userAgent

capmonstercloudclient-3.4.0/capmonstercloud_client/requests/TenDiCustomTaskRequest.py → capmonstercloudclient-4.1.0/capmonstercloud_client/requests/FriendlyCaptchaRequest.py

@@ -1,11 +1,21 @@
 from typing import Dict, Union
-from pydantic import Field
+from pydantic import Field, validator
 
 from .CustomTaskRequestBase import CustomTaskRequestBase
 
-class TenDiCustomTaskRequest(CustomTaskRequestBase):
-    captchaClass: str = Field(default='TenDI')
+
+class FriendlyCaptchaRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='friendly')
     websiteKey: str = Field()
+    metadata: Dict[str, str]
+
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        if value.get('apiGetLib') is None:
+            raise TypeError('Expect that apiGetLib will be defined.')
+        if not isinstance(value['apiGetLib'], str):
+            raise TypeError('Expect that apiGetLib will be str.')
+        return value
 
     def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
         task = {}
@@ -13,6 +23,7 @@ class TenDiCustomTaskRequest(CustomTaskRequestBase):
         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
@@ -21,4 +32,4 @@ class TenDiCustomTaskRequest(CustomTaskRequestBase):
             task['proxyPassword'] = self.proxy.proxyPassword
         if self.userAgent is not None:
             task['userAgent'] = self.userAgent
-        return task
+        return task

capmonstercloudclient-4.1.0/capmonstercloud_client/requests/HuntCustomTaskRequest.py

@@ -0,0 +1,41 @@
+from typing import Dict, Union
+from pydantic import Field, validator, model_validator
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+class HuntCustomTaskRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='HUNT')
+    metadata: Dict[str, str]
+
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        if value.get('apiGetLib') is None:
+            raise TypeError(f'Expect that apiGetLib will be defined.')
+        else:
+            if not isinstance(value.get('apiGetLib'), str):
+                raise TypeError(f'Expect that apiGetLib will be str.')
+        if value.get('data') is not None and not isinstance(value.get('data'), str):
+            raise TypeError(f'Expect that data will be str.')
+        return value
+
+    @model_validator(mode='before')
+    def validate_hunt_proxy(cls, values):
+        proxy = values.get('proxy')
+        if proxy is None:
+            raise RuntimeError(f'You are required to use your own proxies.')
+        return values
+
+    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
+        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