capmonstercloudclient 1.6.0__py3-none-any.whl → 3.0.0__py3-none-any.whl

capmonstercloudclient/requests/TurnstileRequest.py

@@ -1,13 +1,51 @@
-from typing import Dict
-from pydantic import Field
-from .TurnstileRequestBase import TurnstileRequestBase
-from .proxy_info import ProxyInfo
+from typing import Dict, Optional
+from pydantic import Field, validator, model_validator
+from .baseRequestWithProxy import BaseRequestWithProxy
 
 
-class TurnstileRequest(TurnstileRequestBase, ProxyInfo):
+class TurnstileRequest(BaseRequestWithProxy):
     
     type: str = Field(default="TurnstileTask")
+    websiteURL: str
+    websiteKey: str
+    pageAction: Optional[str] = Field(default=None)
+    data: Optional[str] = Field(default=None)
+    pageData: Optional[str] = Field(default=None)
+    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):
+        if value is not None:
+            if value not in ['cf_clearance', 'token']:
+                raise ValueError(f'cloudflareTaskType could be "cf_clearance" if you need cookie or ' \
+                                 f'"token" if required token from Turnstile.')
+        return value
+    
+    @model_validator(mode='before')
+    def validate_cloudflare_type_token(self):
+        
+        if self.get('htmlPageBase64') is None:
+            if self.get('cloudflareTaskType') == 'cf_clearance':
+                raise RuntimeError(f'Expect that "htmlPageBase64" will be filled ' \
+                    f'when cloudflareTaskType is "cf_clearance"')
+        
+        if self.get('cloudflareTaskType') == 'token':
+            for field in ['pageAction', 'pageData', 'data']:
+                if self.get(field) is None:
+                    raise RuntimeError(f'Expect that "{field}" will be filled ' \
+                    f'when "cloudflareTaskType" = "token".')
+        
+        if self.get('cloudflareTaskType') is not None:
+            if self.get('cloudflareTaskType') in ['cf_clearance', 'token']:
+                if self.get('userAgent') is None:
+                    raise RuntimeError(f'Expect that userAgent will be filled ' \
+                        f'when cloudflareTaskType specified.')
+                    
+        return self
+    
     def getTaskDict(self) -> Dict[str, str]:
         return {k: v for k, v in self.model_dump().items() if v is not None}
     

capmonstercloudclient/requests/__init__.py

@@ -1,41 +1,35 @@
 from .ImageToTextRequest import ImageToTextRequest
-from .RecaptchaV2ProxylessRequest import RecaptchaV2ProxylessRequest
 from .RecaptchaV2Request import RecaptchaV2Request
-from .RecaptchaV2EnterpriseProxylessRequest import RecaptchaV2EnterpriseProxylessRequest
 from .RecaptchaV2EnterpiseRequest import RecaptchaV2EnterpriseRequest
 from .RecaptchaV3ProxylessRequest import RecaptchaV3ProxylessRequest
-from .HcaptchaProxylessRequest import HcaptchaProxylessRequest
+from .RecaptchaComplexImageTask import RecaptchaComplexImageTaskRequest
 from .HcaptchaRequest import HcaptchaRequest
-from .FuncaptchaProxylessRequest import FuncaptchaProxylessRequest
 from .FuncaptchaRequest import FuncaptchaRequest
 from .FuncaptchaComplexImageTask import FunCaptchaComplexImageTaskRequest
-from .GeetestProxylessRequest import GeetestProxylessRequest
 from .GeetestRequest import GeetestRequest
-from .TurnstileProxylessRequest import TurnstileProxylessRequest
 from .TurnstileRequest import TurnstileRequest
 from .HcaptchaComplexImageTask import HcaptchaComplexImageTaskRequest
 from .RecaptchaComplexImageTask import RecaptchaComplexImageTaskRequest
 from .baseRequest import BaseRequest
 from .DataDomeCustomTaskRequest import DataDomeCustomTaskRequest
-from .DataDomeCustomTaskProxylessRequest import DataDomeCustomTaskProxylessRequest
 from .TenDiCustomTaskRequest import TenDiCustomTaskRequest
-from .TenDiCustomTaskProxylessRequest import TenDiCustomTaskProxylessRequest
 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
+from .RecognitionComplexImageTaskRequest import RecognitionComplexImageTaskRequest
 
 
-REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2EnterpriseProxylessRequest', 
-            'RecaptchaV2ProxylessRequest', 'RecaptchaV2Request', 'RecaptchaV3ProxylessRequest',
-            'ImageToTextRequest', 'FuncaptchaProxylessRequest', 'FuncaptchaRequest',
-            'GeetestRequest', 'GeetestProxylessRequest', 'HcaptchaProxylessRequest',
-            'HcaptchaRequest', 'DataDomeCustomTaskRequest', 'DataDomeCustomTaskProxylessRequest',
-            'TenDiCustomTaskRequest', 'TenDiCustomTaskProxylessRequest', 'BasiliskCustomTaskRequest',
-            'BasiliskCustomTaskProxylessRequest', 'AmazonWafRequest', 'AmazonWafProxylessRequest',
-            'BinanceTaskRequest', 'BinanceTaskProxylessRequest', 'ImpervaCustomTaskProxylessRequest',
-            'ImpervaCustomTaskRequest']
+REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2Request', 'RecaptchaV3ProxylessRequest', 'RecaptchaComplexImageTaskRequest'
+            'ImageToTextRequest', 
+            'FuncaptchaRequest', 'FunCaptchaComplexImageTaskRequest',
+            'HcaptchaRequest', 'HcaptchaComplexImageTaskRequest'
+            'GeetestRequest',
+            'DataDomeCustomTaskRequest',
+            'TenDiCustomTaskRequest',
+            'BasiliskCustomTaskRequest',
+            'AmazonWafRequest',
+            'BinanceTaskRequest',
+            'ImpervaCustomTaskRequest',
+            'TurnstileRequest',
+            'RecognitionComplexImageTaskRequest']

capmonstercloudclient/requests/baseRequest.py

@@ -4,7 +4,8 @@ from abc import ABC, abstractmethod
 
 class BaseRequest(BaseModel, ABC):
     no_cache: bool = Field(default=False)
-
+    type: str = Field(default='')
+    
     @abstractmethod
     def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
         pass

capmonstercloudclient/requests/baseRequestWithProxy.py

@@ -0,0 +1,7 @@
+from typing import Dict, Union, Optional
+from pydantic import BaseModel, Field
+from .baseRequest import BaseRequest
+from .proxy_info import ProxyInfo
+
+class BaseRequestWithProxy(BaseRequest):
+    proxy: Optional[ProxyInfo] = None

capmonstercloudclient/version.txt

@@ -1 +1 @@
-1.6.0
+3.0.0

{capmonstercloudclient-1.6.0.dist-info → capmonstercloudclient-3.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: capmonstercloudclient
-Version: 1.6.0
+Version: 3.0.0
 Summary: Official CapMonsterCloud Client: https://capmonster.cloud/
 Home-page: https://github.com/ZennoLab/capmonstercloud-client-python
 Author: Andrey Ilyin
@@ -33,8 +33,24 @@ Classifier: Operating System :: MacOS
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.7.4
-Requires-Dist: pydantic==2.1.*
+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"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -43,6 +59,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

capmonstercloudclient-3.0.0.dist-info/RECORD

@@ -0,0 +1,39 @@
+capmonstercloudclient/CapMonsterCloudClient.py,sha256=0IWzHunUgTsD2QqR1gbOuil4vMEDC5D4g5561W8Zl5o,9101
+capmonstercloudclient/GetResultTimeouts.py,sha256=wgCXitjTsC6BYP3xjLqpW58xS55hsbqcf28IylxRS1E,1661
+capmonstercloudclient/__init__.py,sha256=XkfS_v1jZUx7HTUhdi-5uiZhvjvd9aLvt31jXXpVxeA,92
+capmonstercloudclient/captchaResult.py,sha256=qBRmadO9n6DMnG-IwJSzZEt54Z5OAXvWIC5Jvzd7OfI,314
+capmonstercloudclient/clientOptions.py,sha256=kd2CXnmz2_crZd85SoOHOjp1zBklEbu9OWDpk-JfBf4,895
+capmonstercloudclient/exceptions.py,sha256=9iTzO0ymBo7eAJwv7qtoPZTmb4yaQ6Fvi69VqBXTcwk,925
+capmonstercloudclient/requestController.py,sha256=9t31zNN4z1UBw4Q0N9ZIy47CwSQl2VaxD1eqDTDIr9w,497
+capmonstercloudclient/utils.py,sha256=hP090ddzDCLknr5wGCR7sIALDbOtWbiSzgZPvPnDC3c,609
+capmonstercloudclient/version.txt,sha256=yRY_8h8fKwOQ3Ei92kcXlxj3cvUHp8687KWc4acSkCk,5
+capmonstercloudclient/requests/AmazonWafRequest.py,sha256=8SrbFTcZg3YI-Fac19Ap1iVT3n3mFBFKB38K1Y9QrWo,1195
+capmonstercloudclient/requests/BasiliskCustomTaskRequest.py,sha256=GJ7OCsdF-xlnsV6kOI3fdb8C7CyLE7Kr5W4oK_nGn18,913
+capmonstercloudclient/requests/BinanceTaskRequest.py,sha256=9kD9y_4hZYXKOj2AYoiv--Z0De0Y7JChF9X09snMbZs,1013
+capmonstercloudclient/requests/ComplexImageTaskBase.py,sha256=7784BontlIxldtIEy9O4Id1nRo6abGpNJZl5z2KwusY,675
+capmonstercloudclient/requests/CustomTaskRequestBase.py,sha256=_e9pz7EmI-9cjIvvJOmWuEdimxuRoUnq5tvO5_S92IQ,539
+capmonstercloudclient/requests/DataDomeCustomTaskRequest.py,sha256=ghsRcRmccdEh_DVsORG4IwnvydSP_pJLK59xPHmbE8Q,2068
+capmonstercloudclient/requests/FuncaptchaComplexImageTask.py,sha256=5Mo9mBAXUuAx2Cv_lGfNaZLrsEwfrqxSz3ZPDy2KXvY,3074
+capmonstercloudclient/requests/FuncaptchaRequest.py,sha256=R9BJQTR82Awet2cKAklcsb7pFHUbZD1S816mO647lMg,1133
+capmonstercloudclient/requests/GeetestRequest.py,sha256=ZHwlHLaL68xa6TJk9LYwtQOcCxW6Xk0fu0ZlB7gxPKI,2034
+capmonstercloudclient/requests/HcaptchaComplexImageTask.py,sha256=HGVJefD2h9GX4ILyCYNrew64ZkpFGf0UG1hxXIrg7v0,5240
+capmonstercloudclient/requests/HcaptchaRequest.py,sha256=sa0FRLf-H-9MWlFrowMNED19EfkI_xbkNC6CMsR_pwg,1502
+capmonstercloudclient/requests/ImageToTextRequest.py,sha256=1F7Gzq0qTuxjbl9XfFbszQUHNG7W5PthuiJBAO_VEug,2481
+capmonstercloudclient/requests/ImpervaCustomTaskRequest.py,sha256=3NW5MXbcluusLVMw-Ac99csoz_0W5RqqJ58B-DA44rg,1821
+capmonstercloudclient/requests/RecaptchaComplexImageTask.py,sha256=v7cqgTF5L2ADYHoskveB8v2h6cW68Av60tH7ek3hWNg,3281
+capmonstercloudclient/requests/RecaptchaV2EnterpiseRequest.py,sha256=TiIV0-SWLUT4mwK8ZzChL3FCZwaizzVsZhzZo0KRgfk,1121
+capmonstercloudclient/requests/RecaptchaV2Request.py,sha256=wq9IFNehhcVZ-bDzu1Yfq1oD_4I4KbtwRdUwwNaQNm8,1219
+capmonstercloudclient/requests/RecaptchaV3ProxylessRequest.py,sha256=0IYCgNruZrVr0L7E4dfHE_Pv8DimkrH4PBkEPEv7dxw,1078
+capmonstercloudclient/requests/RecognitionComplexImageTaskRequest.py,sha256=TzWoKqEAOrgll1LlEFTzB_7dbOKJywRScZCpLUgSMS8,1970
+capmonstercloudclient/requests/TenDiCustomTaskRequest.py,sha256=OIhLd_ODD6MsvBl6wSVcOHuBn0rv-Cg4sEFd6Y0zrY4,903
+capmonstercloudclient/requests/TurnstileRequest.py,sha256=-nB7ULt2qke4z4_m7rUzhL1wjjMXwJ3NS_rDGM3UBtY,2199
+capmonstercloudclient/requests/__init__.py,sha256=svvVJKE6X1C6jpwgOlI84QYICAT_gNpUu-qZl1clNhA,1824
+capmonstercloudclient/requests/baseRequest.py,sha256=wHYDtEoJbAiJQDFOKWSezLvlxTLO9LCD5v7t3dvfgSg,317
+capmonstercloudclient/requests/baseRequestWithProxy.py,sha256=RwF1FXH19T9IyR4bbj-fC73huAgKewtJMJy2IvWurpA,230
+capmonstercloudclient/requests/enums.py,sha256=itJ95OEzwous9zOe4n411w5LeBw4yCpCCTMomlT3LU0,1000
+capmonstercloudclient/requests/proxy_info.py,sha256=ctmxvykMflsym-snO449t9mOZ1jxpUFTnxcI8koACUw,678
+capmonstercloudclient-3.0.0.dist-info/licenses/LICENSE,sha256=VIIsA4331arqJBp_QqiY2cjVszTfuSt3I7uEUr4ouYw,1065
+capmonstercloudclient-3.0.0.dist-info/METADATA,sha256=129S-u21SG1yVmpwu0XKOhpiA29xt2lCCulCMc0ZvE4,5462
+capmonstercloudclient-3.0.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+capmonstercloudclient-3.0.0.dist-info/top_level.txt,sha256=_rR6-Wb02PxobU8D33r_0OONJgybsros2e9H8opYGnA,22
+capmonstercloudclient-3.0.0.dist-info/RECORD,,

{capmonstercloudclient-1.6.0.dist-info → capmonstercloudclient-3.0.0.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (78.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

capmonstercloudclient/requests/AmazonWafProxylessRequest.py

@@ -1,22 +0,0 @@
-from typing import Dict, Union
-from pydantic import Field, validator
-
-from .proxy_info import ProxyInfo
-from .AmazonWafRequestBase import AmazonWafRequestBase
-
-class AmazonWafProxylessRequest(AmazonWafRequestBase):
-    type: str = 'AmazonTaskProxyless'
-
-    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
-        task = {}
-        task['type'] = self.type
-        task['websiteURL'] = self.websiteUrl
-        task['challengeScript'] = self.challengeScript
-        task['captchaScript'] = self.captchaScript
-        task['websiteKey'] = self.websiteKey
-        task['context'] = self.context
-        task['iv'] = self.iv
-
-        if self.cookieSolution is not None:
-            task['cookieSolution'] = self.cookieSolution
-        return task

capmonstercloudclient/requests/AmazonWafRequestBase.py

@@ -1,13 +0,0 @@
-from pydantic import Field
-from typing import Optional
-
-from .baseRequest import BaseRequest
-
-class AmazonWafRequestBase(BaseRequest):
-    websiteUrl: str
-    challengeScript: str
-    captchaScript: str
-    websiteKey: str
-    context: str
-    iv: str
-    cookieSolution: Optional[bool] = Field(default=None)

capmonstercloudclient/requests/BasiliskCustomTaskProxylessRequest.py

@@ -1,16 +0,0 @@
-from typing import Dict, Union
-from pydantic import Field, validator
-
-from .BasiliskCustomTaskRequestBase import BasiliskCustomTaskRequestBase
-
-class BasiliskCustomTaskProxylessRequest(BasiliskCustomTaskRequestBase):
-    
-    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
-        if self.userAgent is not None:
-            task['userAgent'] = self.userAgent
-        return task

capmonstercloudclient/requests/BasiliskCustomTaskRequestBase.py

@@ -1,11 +0,0 @@
-from .baseRequest import BaseRequest, Field
-from typing import Optional
-from pydantic import validator, model_validator
-from .CustomTaskRequestBase import CustomTaskRequestBase
-
-
-class BasiliskCustomTaskRequestBase(CustomTaskRequestBase):
-    
-    type: str = Field(default='CustomTask')
-    captchaClass: str = Field(default='Basilisk')
-    websiteKey: str = Field()

capmonstercloudclient/requests/BinanceTaskProxylessRequest.py

@@ -1,17 +0,0 @@
-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/requests/BinanceTaskRequestBase.py

@@ -1,11 +0,0 @@
-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/requests/DataDomeCustomTaskProxylessRequest.py

@@ -1,36 +0,0 @@
-from typing import Dict, Union
-from pydantic import Field, validator
-
-from .DataDomeCustomTaskRequestBase import DataDomeCustomTaskRequestBase
-
-class DataDomeCustomTaskProxylessRequest(DataDomeCustomTaskRequestBase):
-    metadata : Dict[str, str]
-    
-    @validator('metadata')
-    def validate_metadata(cls, value):
-        if value.get('datadomeCookie') is None:
-            raise ValueError(f'Expect that datadomeCookie will be defined.')
-        if value.get('captchaUrl') and value.get('htmlPageBase64'):
-            raise ValueError(f'Expected only one of [captchaUrl, htmlPageBase64]')
-        elif value.get('captchaUrl'):
-            if not isinstance(value.get('captchaUrl'), str):
-                raise ValueError(f'Expect that type imagesUrls array will be <str>, got {type(value.get("captchaUrl"))}')
-            return {i: value[i] for i in value if i != 'htmlPageBase64'}
-        elif value.get('htmlPageBase64'):
-            if not isinstance(value.get('htmlPageBase64'), str):
-                raise ValueError(f'Expect that type imagesUrls array will be <str>, got {type(value.get("htmlPageBase64"))}')
-            return {i: value[i] for i in value if i != 'captchaUrl'}
-        else:
-            raise ValueError(f'Expected one of [captchaUrl, htmlPageBase64]')
-    
-    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
-        if self.domains is not None:
-            task['domains'] = self.domains
-        return task

capmonstercloudclient/requests/DataDomeCustomTaskRequestBase.py

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

capmonstercloudclient/requests/FuncaptchaProxylessRequest.py

@@ -1,18 +0,0 @@
-from pydantic import Field
-from typing import Dict, Union
-
-from .FuncaptchaRequestBase import FuncaptchaRequestBase
-
-class FuncaptchaProxylessRequest(FuncaptchaRequestBase):
-    type: str = Field(default='FunCaptchaTaskProxyless')
-
-    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
-        task = {}
-        task['type'] = self.type
-        task['websiteURL'] = self.websiteUrl
-        task['websitePublicKey'] = self.websitePublicKey
-        if self.funcaptchaApiJSSubdomain is not None:
-            task['funcaptchaApiJSSubdomain'] = self.funcaptchaApiJSSubdomain
-        if self.data is not None:
-            task['data'] = self.data
-        return task

capmonstercloudclient/requests/FuncaptchaRequestBase.py

@@ -1,10 +0,0 @@
-from pydantic import Field
-from typing import Optional
-
-from .baseRequest import BaseRequest
-
-class FuncaptchaRequestBase(BaseRequest):
-    websiteUrl: str
-    websitePublicKey: str
-    funcaptchaApiJSSubdomain: Optional[str] = Field(default=None)
-    data: Optional[str] = Field(default=None)

capmonstercloudclient/requests/GeetestProxylessRequest.py

@@ -1,31 +0,0 @@
-from pydantic import Field
-from typing import Dict, Union
-
-from .GeetestRequestBase import GeetestRequestBase
-
-class GeetestProxylessRequest(GeetestRequestBase):
-    type: str = Field(default='GeeTestTaskProxyless')
-
-    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
-        task = {}
-        task['type'] = self.type
-        task['websiteURL'] = self.websiteUrl
-        task['gt'] = self.gt
-        task['version'] = self.version
-        
-        if self.version == 3:
-            if self.challenge is None:
-                raise ValueError(f'Challenge value is required for 3 version Geetest.')
-            task['challenge'] = self.challenge
-        
-        if self.version == 4:
-            if self.initParameters is not None:
-                task['initParameters'] = self.initParameters
-                
-        if self.geetestApiServerSubdomain is not None:
-            task['geetestApiServerSubdomain'] = self.geetestApiServerSubdomain
-        if self.geetestGetLib is not None:
-            task['geetestGetLib'] = self.geetestGetLib
-        if self.user_agent is not None:
-            task['userAgent'] = self.user_agent
-        return task

capmonstercloudclient/requests/GeetestRequestBase.py

@@ -1,20 +0,0 @@
-from pydantic import Field, validator
-from typing import Dict, Optional
-
-from .baseRequest import BaseRequest
-
-class GeetestRequestBase(BaseRequest):
-    websiteUrl: str
-    gt: str
-    challenge: Optional[str] = Field(default=None)
-    version: int = Field(default=3)
-    initParameters: Optional[Dict] = Field(default=None)
-    geetestApiServerSubdomain: Optional[str] = Field(default=None)
-    geetestGetLib: Optional[str] = Field(default=None)
-    user_agent: Optional[str] = Field(default=None)
-    
-    @validator('version')
-    def validate_version(cls, value):
-        if value not in [3, 4]:
-            raise ValueError(f"Geetest version could be 3 or 4, not {value}")
-        return value

capmonstercloudclient/requests/HcaptchaProxylessRequest.py

@@ -1,25 +0,0 @@
-from typing import Dict, Union
-from pydantic import Field
-
-from .HcaptchaRequestBase import HcaptchaRequestBase
-
-
-class HcaptchaProxylessRequest(HcaptchaRequestBase):
-    type: str = Field(default='HCaptchaTaskProxyless')
-
-    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
-        task = {}
-        task['type'] = self.type
-        task['websiteURL'] = self.websiteUrl
-        task['websiteKey'] = self.websiteKey
-        if self.is_invisible is not None:
-            task['isInvisible'] = self.is_invisible
-        if self.data is not None:
-            task['data'] = self.data
-        if self.user_agent is not None:
-            task['userAgent'] = self.user_agent
-        if self.cookies is not None:
-            task['cookies'] = self.cookies
-        if self.fallbackToActualUA is not None:
-            task['fallbackToActualUA'] = self.fallbackToActualUA
-        return task

capmonstercloudclient/requests/HcaptchaRequestBase.py

@@ -1,13 +0,0 @@
-from pydantic import Field
-from typing import Optional
-
-from .baseRequest import BaseRequest
-
-class HcaptchaRequestBase(BaseRequest):
-    websiteUrl: str
-    websiteKey: str
-    is_invisible: Optional[bool] = Field(default=None)
-    data: Optional[str] = Field(default=None)
-    user_agent: Optional[str] = Field(default=None)
-    cookies: Optional[str] = Field(default=None)
-    fallbackToActualUA: Optional[bool] = Field(default=None)

capmonstercloudclient/requests/ImpervaCustomTaskProxylessRequest.py

@@ -1,33 +0,0 @@
-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/requests/ImpervaCustomTaskRequestBase.py

@@ -1,8 +0,0 @@
-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/requests/RecaptchaV2EnterpriseProxylessRequest.py

@@ -1,18 +0,0 @@
-from typing import Dict, Union
-from pydantic import Field
-
-from .RecaptchaV2EnterpriseRequestBase import RecaptchaV2EnterpriseRequestBase
-
-class RecaptchaV2EnterpriseProxylessRequest(RecaptchaV2EnterpriseRequestBase):
-    type: str = Field(default='RecaptchaV2EnterpriseTaskProxyless')
-
-    def getTaskDict(self) -> Dict[str, Union[str, Dict[str, str]]]:
-        task = {}
-        task['type'] = self.type
-        task['websiteURL'] = self.websiteUrl
-        task['websiteKey'] = self.websiteKey
-        if self.enterprisePayload is not None:
-            task['enterprisePayload'] = {'s': self.enterprisePayload}
-        if self.apiDomain is not None:
-            task['apiDomain'] = self.apiDomain
-        return task

capmonstercloudclient/requests/RecaptchaV2EnterpriseRequestBase.py

@@ -1,11 +0,0 @@
-from typing import Optional
-from pydantic import Field
-
-from .baseRequest import BaseRequest
-
-
-class RecaptchaV2EnterpriseRequestBase(BaseRequest):
-    websiteUrl: str
-    websiteKey: str
-    enterprisePayload: Optional[str] = Field(default=None)
-    apiDomain: Optional[str] = Field(default=None)

capmonstercloudclient/requests/RecaptchaV2ProxylessRequest.py

@@ -1,30 +0,0 @@
-from pydantic import Field, validator
-from typing import Dict
-from .RecaptchaV2RequestBase import RecaptchaV2RequestBase
-
-class RecaptchaV2ProxylessRequest(RecaptchaV2RequestBase):
-    type: str = Field(default="NoCaptchaTaskProxyless")
-
-    @validator('*')
-    def check_data(cls, value):
-        if value is not None:
-            if not isinstance(value, str):
-                raise TypeError(f'Expect that type {value} will be "str", got {type(value)}')
-        return value
-
-    def getTaskDict(self) -> Dict[str, str]:
-        task = {}
-        task['type'] = self.type
-        task['websiteURL'] = self.websiteUrl
-        task['websiteKey'] = self.websiteKey
-
-        if self.dataSValue is not None:
-           task['recaptchaDataSValue'] = self.dataSValue
-        
-        if self.userAgent is not None:
-            task['userAgent'] = self.userAgent
-
-        if self.cookies is not None:
-            task['cookies'] = self.cookies
-        
-        return task

capmonstercloudclient/requests/RecaptchaV2RequestBase.py

@@ -1,12 +0,0 @@
-from pydantic import Field
-from typing import Optional
-
-from .baseRequest import BaseRequest
-
-
-class RecaptchaV2RequestBase(BaseRequest):
-    websiteUrl: str
-    websiteKey: str
-    dataSValue: Optional[str] = Field(default=None)
-    userAgent: Optional[str] = Field(default=None)
-    cookies: Optional[str] = Field(default=None)

capmonstercloudclient/requests/TenDiCustomTaskProxylessRequest.py

@@ -1,16 +0,0 @@
-from typing import Dict, Union
-from pydantic import Field, validator
-
-from .TenDiCustomTaskRequestBase import TenDiCustomTaskRequestBase
-
-class TenDiCustomTaskProxylessRequest(TenDiCustomTaskRequestBase):
-    
-    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
-        if self.userAgent is not None:
-            task['userAgent'] = self.userAgent
-        return task