capmonstercloudclient 1.5.1__tar.gz → 1.6.0__tar.gz

{capmonstercloudclient-1.5.1/capmonstercloudclient.egg-info → capmonstercloudclient-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: capmonstercloudclient
-Version: 1.5.1
+Version: 1.6.0
 Summary: Official CapMonsterCloud Client: https://capmonster.cloud/
 Home-page: https://github.com/ZennoLab/capmonstercloud-client-python
 Author: Andrey Ilyin
@@ -35,6 +35,17 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.7.4
 Requires-Dist: pydantic==2.1.*
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Zennolab.CapMonsterCloud.Client
 
@@ -69,8 +80,6 @@ Supported captcha recognition requests:
 
 - [GeeTestProxylessRequest](https://zenno.link/doc-geetest-en)
 - [GeeTestRequest](https://zenno.link/doc-geetest-proxy-en)
-- [HCaptchaProxylessRequest](https://zenno.link/doc-hcaptcha-en)
-- [HCaptchaRequest](https://zenno.link/doc-hcaptcha-proxy-en)
 - [ImageToTextRequest](https://zenno.link/doc-ImageToTextTask-en)
 - [RecaptchaV2ProxylessRequest](https://zenno.link/doc-recaptcha2-en)
 - [RecaptchaV2Request](https://zenno.link/doc-recaptcha2-proxy-en)
@@ -80,8 +89,11 @@ Supported captcha recognition requests:
 - [TurnstileProxylessRequest](https://zenno.link/doc-turnstile-en)
 - [TurnstileRequest](https://zenno.link/doc-turnstile-proxy-en)
 - [RecaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-rc-en)
-- [HcaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-hc-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)
 - [AmazonWafRequest](https://docs.capmonster.cloud/docs/captchas/amazon-task)
+- [BinanceTaskRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [BinanceTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [ImpervaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
+- [ImpervaCustomTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)

{capmonstercloudclient-1.5.1 → capmonstercloudclient-1.6.0}/README.md

@@ -31,8 +31,6 @@ Supported captcha recognition requests:
 
 - [GeeTestProxylessRequest](https://zenno.link/doc-geetest-en)
 - [GeeTestRequest](https://zenno.link/doc-geetest-proxy-en)
-- [HCaptchaProxylessRequest](https://zenno.link/doc-hcaptcha-en)
-- [HCaptchaRequest](https://zenno.link/doc-hcaptcha-proxy-en)
 - [ImageToTextRequest](https://zenno.link/doc-ImageToTextTask-en)
 - [RecaptchaV2ProxylessRequest](https://zenno.link/doc-recaptcha2-en)
 - [RecaptchaV2Request](https://zenno.link/doc-recaptcha2-proxy-en)
@@ -42,8 +40,11 @@ Supported captcha recognition requests:
 - [TurnstileProxylessRequest](https://zenno.link/doc-turnstile-en)
 - [TurnstileRequest](https://zenno.link/doc-turnstile-proxy-en)
 - [RecaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-rc-en)
-- [HcaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-hc-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)
 - [AmazonWafRequest](https://docs.capmonster.cloud/docs/captchas/amazon-task)
+- [BinanceTaskRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [BinanceTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [ImpervaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
+- [ImpervaCustomTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)

{capmonstercloudclient-1.5.1 → capmonstercloudclient-1.6.0}/capmonstercloud_client/CapMonsterCloudClient.py

@@ -28,7 +28,8 @@ _instance_config = (
     ((TenDiCustomTaskRequest, TenDiCustomTaskProxylessRequest), getTenDiTimeouts),
     ((BasiliskCustomTaskRequest, BasiliskCustomTaskProxylessRequest), getBasiliskTimeouts),
     ((AmazonWafRequest, AmazonWafProxylessRequest), getAmazonWafTimeouts),
-
+    ((BinanceTaskRequest, BinanceTaskProxylessRequest), getBinanceTimeouts),
+    ((ImpervaCustomTaskRequest, ImpervaCustomTaskProxylessRequest), getImpervaTimeouts)
 )
 
 
@@ -77,7 +78,11 @@ class CapMonsterClient:
                                                  RecaptchaComplexImageTaskRequest,
                                                  FunCaptchaComplexImageTaskRequest,
                                                  DataDomeCustomTaskProxylessRequest,
-                                                 DataDomeCustomTaskRequest],
+                                                 DataDomeCustomTaskRequest,
+                                                 BinanceTaskRequest,
+                                                 BinanceTaskProxylessRequest,
+                                                 ImpervaCustomTaskRequest,
+                                                 ImpervaCustomTaskProxylessRequest],
                             ) -> Dict[str, str]:
         '''
         Non-blocking method for captcha solving. 
@@ -108,7 +113,11 @@ class CapMonsterClient:
                                           TurnstileRequest,
                                           HcaptchaComplexImageTaskRequest, 
                                           RecaptchaComplexImageTaskRequest,
-                                          FunCaptchaComplexImageTaskRequest],
+                                          FunCaptchaComplexImageTaskRequest,
+                                          BinanceTaskRequest,
+                                          BinanceTaskProxylessRequest,
+                                          ImpervaCustomTaskRequest,
+                                          ImpervaCustomTaskProxylessRequest],
                            timeouts: GetResultTimeouts,
                            ) -> Dict[str, str]:
 

{capmonstercloudclient-1.5.1 → capmonstercloudclient-1.6.0}/capmonstercloud_client/GetResultTimeouts.py

@@ -43,3 +43,9 @@ def getBasiliskTimeouts() -> GetResultTimeouts:
 
 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)

capmonstercloudclient-1.6.0/capmonstercloud_client/requests/BinanceTaskProxylessRequest.py

@@ -0,0 +1,17 @@
+from typing import Dict, Union
+
+from .BinanceTaskRequestBase import BinanceTaskRequestBase
+
+
+class BinanceTaskProxylessRequest(BinanceTaskRequestBase):
+    type: str = 'BinanceTaskProxyless'
+
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
+        task = {}
+        task['type'] = self.type
+        task['validateId'] = self.validateId
+        task['websiteURL'] = self.websiteUrl
+        task['websiteKey'] = self.websiteKey
+        if self.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        return task

capmonstercloudclient-1.6.0/capmonstercloud_client/requests/BinanceTaskRequest.py

@@ -0,0 +1,22 @@
+from typing import Dict, Union
+from pydantic import Field, validator
+
+from .proxy_info import ProxyInfo
+from .BinanceTaskRequestBase import BinanceTaskRequestBase
+
+class BinanceTaskRequest(BinanceTaskRequestBase, ProxyInfo):
+    
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
+        task = {}
+        task['type'] = self.type
+        task['validateId'] = self.validateId
+        task['websiteURL'] = self.websiteUrl
+        task['websiteKey'] = self.websiteKey
+        task['proxyType'] = self.proxyType
+        task['proxyAddress'] = self.proxyAddress
+        task['proxyPort'] = self.proxyPort
+        task['proxyLogin'] = self.proxyLogin
+        task['proxyPassword'] = self.proxyPassword
+        if self.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        return task

capmonstercloudclient-1.6.0/capmonstercloud_client/requests/BinanceTaskRequestBase.py

@@ -0,0 +1,11 @@
+from .baseRequest import BaseRequest, Field
+from typing import Optional
+
+
+class BinanceTaskRequestBase(BaseRequest):
+    
+    type: str = Field(default='BinanceTask')
+    websiteKey: str = Field()
+    websiteUrl: str = Field()
+    validateId: str = Field()
+    userAgent: Optional[str] = None

capmonstercloudclient-1.6.0/capmonstercloud_client/requests/ImpervaCustomTaskProxylessRequest.py

@@ -0,0 +1,33 @@
+from typing import Dict, Union
+from pydantic import Field, validator
+
+from .ImpervaCustomTaskRequestBase import ImpervaCustomTaskRequestBase
+
+class ImpervaCustomTaskProxylessRequest(ImpervaCustomTaskRequestBase):
+    metadata : Dict[str, str]
+    
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        if value.get('incapsulaScriptBase64') is None:
+            raise TypeError(f'Expect that incapsulaScriptBase64 will be defined.')
+        else:
+            if not isinstance(value.get('incapsulaScriptBase64'), str):
+                raise TypeError(f'Expect that incapsulaScriptBase64 will be str.')
+        if value.get('incapsulaSessionCookie') is None:
+            raise TypeError(f'Expect that incapsulaSessionCookie will be defined.')
+        else:
+            if not isinstance(value.get('incapsulaSessionCookie'), str):
+                raise TypeError(f'Expect that incapsulaSessionCookie will be str.')
+        if value.get('reese84UrlEndpoint') is not None and not isinstance(value.get('incapsulaSessionCookie'), str):
+            raise TypeError(f'Expect that reese84UrlEndpoint 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.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        return task

capmonstercloudclient-1.6.0/capmonstercloud_client/requests/ImpervaCustomTaskRequest.py

@@ -0,0 +1,39 @@
+from typing import Dict, Union
+from pydantic import Field, validator
+
+from .proxy_info import ProxyInfo
+from .ImpervaCustomTaskRequestBase import ImpervaCustomTaskRequestBase
+
+class ImpervaCustomTaskRequest(ImpervaCustomTaskRequestBase, ProxyInfo):
+    metadata : Dict[str, str]
+    
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        if value.get('incapsulaScriptBase64') is None:
+            raise TypeError(f'Expect that incapsulaScriptBase64 will be defined.')
+        else:
+            if not isinstance(value.get('incapsulaScriptBase64'), str):
+                raise TypeError(f'Expect that incapsulaScriptBase64 will be str.')
+        if value.get('incapsulaSessionCookie') is None:
+            raise TypeError(f'Expect that incapsulaSessionCookie will be defined.')
+        else:
+            if not isinstance(value.get('incapsulaSessionCookie'), str):
+                raise TypeError(f'Expect that incapsulaSessionCookie will be str.')
+        if value.get('reese84UrlEndpoint') is not None and not isinstance(value.get('incapsulaSessionCookie'), str):
+            raise TypeError(f'Expect that reese84UrlEndpoint 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
+        task['proxyType'] = self.proxyType
+        task['proxyAddress'] = self.proxyAddress
+        task['proxyPort'] = self.proxyPort
+        task['proxyLogin'] = self.proxyLogin
+        task['proxyPassword'] = self.proxyPassword
+        if self.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        return task

capmonstercloudclient-1.6.0/capmonstercloud_client/requests/ImpervaCustomTaskRequestBase.py

@@ -0,0 +1,8 @@
+from typing import Dict, Union
+from pydantic import Field
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+class ImpervaCustomTaskRequestBase(CustomTaskRequestBase):
+    type: str = Field(default='CustomTask')
+    captchaClass: str = Field(default='Imperva')

{capmonstercloudclient-1.5.1 → capmonstercloudclient-1.6.0}/capmonstercloud_client/requests/TurnstileRequestBase.py

@@ -13,6 +13,7 @@ class TurnstileRequestBase(BaseRequest):
     userAgent: Optional[str] = Field(default=None)
     cloudflareTaskType: Optional[str] = Field(default=None)
     htmlPageBase64: Optional[str] = Field(default=None)
+    apiJsUrl: Optional[str] = Field(default=None)
     
     @validator('cloudflareTaskType')
     def validate_cloudflare_task(cls, value):

{capmonstercloudclient-1.5.1 → capmonstercloudclient-1.6.0}/capmonstercloud_client/requests/__init__.py

@@ -24,6 +24,11 @@ from .BasiliskCustomTaskRequest import BasiliskCustomTaskRequest
 from .BasiliskCustomTaskProxylessRequest import BasiliskCustomTaskProxylessRequest
 from .AmazonWafRequest import AmazonWafRequest
 from .AmazonWafProxylessRequest import AmazonWafProxylessRequest
+from .BinanceTaskRequest import BinanceTaskRequest
+from .BinanceTaskProxylessRequest import BinanceTaskProxylessRequest
+from .ImpervaCustomTaskRequest import ImpervaCustomTaskRequest
+from .ImpervaCustomTaskProxylessRequest import ImpervaCustomTaskProxylessRequest
+
 
 REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2EnterpriseProxylessRequest', 
             'RecaptchaV2ProxylessRequest', 'RecaptchaV2Request', 'RecaptchaV3ProxylessRequest',
@@ -31,4 +36,6 @@ REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2EnterpriseProxylessReques
             'GeetestRequest', 'GeetestProxylessRequest', 'HcaptchaProxylessRequest',
             'HcaptchaRequest', 'DataDomeCustomTaskRequest', 'DataDomeCustomTaskProxylessRequest',
             'TenDiCustomTaskRequest', 'TenDiCustomTaskProxylessRequest', 'BasiliskCustomTaskRequest',
-            'BasiliskCustomTaskProxylessRequest', 'AmazonWafRequest', 'AmazonWafProxylessRequest']
+            'BasiliskCustomTaskProxylessRequest', 'AmazonWafRequest', 'AmazonWafProxylessRequest',
+            'BinanceTaskRequest', 'BinanceTaskProxylessRequest', 'ImpervaCustomTaskProxylessRequest',
+            'ImpervaCustomTaskRequest']

capmonstercloudclient-1.6.0/capmonstercloud_client/version.txt

@@ -0,0 +1 @@
+1.6.0

{capmonstercloudclient-1.5.1 → capmonstercloudclient-1.6.0/capmonstercloudclient.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: capmonstercloudclient
-Version: 1.5.1
+Version: 1.6.0
 Summary: Official CapMonsterCloud Client: https://capmonster.cloud/
 Home-page: https://github.com/ZennoLab/capmonstercloud-client-python
 Author: Andrey Ilyin
@@ -35,6 +35,17 @@ Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: aiohttp>=3.7.4
 Requires-Dist: pydantic==2.1.*
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # Zennolab.CapMonsterCloud.Client
 
@@ -69,8 +80,6 @@ Supported captcha recognition requests:
 
 - [GeeTestProxylessRequest](https://zenno.link/doc-geetest-en)
 - [GeeTestRequest](https://zenno.link/doc-geetest-proxy-en)
-- [HCaptchaProxylessRequest](https://zenno.link/doc-hcaptcha-en)
-- [HCaptchaRequest](https://zenno.link/doc-hcaptcha-proxy-en)
 - [ImageToTextRequest](https://zenno.link/doc-ImageToTextTask-en)
 - [RecaptchaV2ProxylessRequest](https://zenno.link/doc-recaptcha2-en)
 - [RecaptchaV2Request](https://zenno.link/doc-recaptcha2-proxy-en)
@@ -80,8 +89,11 @@ Supported captcha recognition requests:
 - [TurnstileProxylessRequest](https://zenno.link/doc-turnstile-en)
 - [TurnstileRequest](https://zenno.link/doc-turnstile-proxy-en)
 - [RecaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-rc-en)
-- [HcaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-hc-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)
 - [AmazonWafRequest](https://docs.capmonster.cloud/docs/captchas/amazon-task)
+- [BinanceTaskRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [BinanceTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [ImpervaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
+- [ImpervaCustomTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)

{capmonstercloudclient-1.5.1 → capmonstercloudclient-1.6.0}/capmonstercloudclient.egg-info/SOURCES.txt

@@ -19,6 +19,9 @@ capmonstercloud_client/requests/AmazonWafRequestBase.py
 capmonstercloud_client/requests/BasiliskCustomTaskProxylessRequest.py
 capmonstercloud_client/requests/BasiliskCustomTaskRequest.py
 capmonstercloud_client/requests/BasiliskCustomTaskRequestBase.py
+capmonstercloud_client/requests/BinanceTaskProxylessRequest.py
+capmonstercloud_client/requests/BinanceTaskRequest.py
+capmonstercloud_client/requests/BinanceTaskRequestBase.py
 capmonstercloud_client/requests/ComplexImageTaskBase.py
 capmonstercloud_client/requests/CustomTaskRequestBase.py
 capmonstercloud_client/requests/DataDomeCustomTaskProxylessRequest.py
@@ -36,6 +39,9 @@ capmonstercloud_client/requests/HcaptchaProxylessRequest.py
 capmonstercloud_client/requests/HcaptchaRequest.py
 capmonstercloud_client/requests/HcaptchaRequestBase.py
 capmonstercloud_client/requests/ImageToTextRequest.py
+capmonstercloud_client/requests/ImpervaCustomTaskProxylessRequest.py
+capmonstercloud_client/requests/ImpervaCustomTaskRequest.py
+capmonstercloud_client/requests/ImpervaCustomTaskRequestBase.py
 capmonstercloud_client/requests/RecaptchaComplexImageTask.py
 capmonstercloud_client/requests/RecaptchaV2EnterpiseRequest.py
 capmonstercloud_client/requests/RecaptchaV2EnterpriseProxylessRequest.py

capmonstercloudclient-1.5.1/capmonstercloud_client/version.txt

@@ -1 +0,0 @@
-1.5.1