capmonstercloudclient 2.0.0__tar.gz → 3.0.0__tar.gz

{capmonstercloudclient-2.0.0 → capmonstercloudclient-3.0.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capmonstercloudclient
-Version: 2.0.0
+Version: 3.0.0
 Summary: Official CapMonsterCloud Client: https://capmonster.cloud/
 Home-page: https://github.com/ZennoLab/capmonstercloud-client-python
 Author: Andrey Ilyin

{capmonstercloudclient-2.0.0 → capmonstercloudclient-3.0.0}/capmonstercloud_client/CapMonsterCloudClient.py

@@ -14,22 +14,22 @@ from .utils import parseVersion
 
 
 _instance_config = (
-    ((RecaptchaV2ProxylessRequest, RecaptchaV2Request), getRecaptchaV2Timeouts),
-    ((RecaptchaV2EnterpriseProxylessRequest, RecaptchaV2EnterpriseRequest), getRecaptchaV2EnterpriseTimeouts),
+    ((RecaptchaV2Request,), getRecaptchaV2Timeouts),
+    ((RecaptchaV2EnterpriseRequest,), getRecaptchaV2EnterpriseTimeouts),
     ((RecaptchaV3ProxylessRequest), getRecaptchaV3Timeouts),
     ((ImageToTextRequest), getImage2TextTimeouts),
-    ((FuncaptchaProxylessRequest, FuncaptchaRequest), getFuncaptchaTimeouts),
-    ((HcaptchaProxylessRequest, HcaptchaRequest), getHcaptchaTimeouts),
-    ((GeetestProxylessRequest, GeetestRequest), getGeetestTimeouts),
-    ((TurnstileProxylessRequest, TurnstileRequest), getTurnstileTimeouts),
+    ((FuncaptchaRequest,), getFuncaptchaTimeouts),
+    ((HcaptchaRequest,), getHcaptchaTimeouts),
+    ((GeetestRequest,), getGeetestTimeouts),
+    ((TurnstileRequest,), getTurnstileTimeouts),
     ((RecaptchaComplexImageTaskRequest, HcaptchaComplexImageTaskRequest, 
       FunCaptchaComplexImageTaskRequest), getImage2TextTimeouts),
-    ((DataDomeCustomTaskRequest, DataDomeCustomTaskProxylessRequest), getDatadomeTimeouts),
-    ((TenDiCustomTaskRequest, TenDiCustomTaskProxylessRequest), getTenDiTimeouts),
-    ((BasiliskCustomTaskRequest, BasiliskCustomTaskProxylessRequest), getBasiliskTimeouts),
-    ((AmazonWafRequest, AmazonWafProxylessRequest), getAmazonWafTimeouts),
-    ((BinanceTaskRequest, BinanceTaskProxylessRequest), getBinanceTimeouts),
-    ((ImpervaCustomTaskRequest, ImpervaCustomTaskProxylessRequest), getImpervaTimeouts),
+    ((DataDomeCustomTaskRequest,), getDatadomeTimeouts),
+    ((TenDiCustomTaskRequest,), getTenDiTimeouts),
+    ((BasiliskCustomTaskRequest,), getBasiliskTimeouts),
+    ((AmazonWafRequest,), getAmazonWafTimeouts),
+    ((BinanceTaskRequest,), getBinanceTimeouts),
+    ((ImpervaCustomTaskRequest,), getImpervaTimeouts),
     ((RecognitionComplexImageTaskRequest), getCITTimeouts)
 )
 
@@ -61,29 +61,24 @@ class CapMonsterClient:
                 return result
 
 
-    async def solve_captcha(self, request: Union[RecaptchaV2EnterpriseProxylessRequest,
+    async def solve_captcha(self, request: Union[
                                                  RecaptchaV2EnterpriseRequest, 
                                                  RecaptchaV2Request,
-                                                 RecaptchaV2ProxylessRequest, 
                                                  RecaptchaV3ProxylessRequest,
-                                                 ImageToTextRequest, 
-                                                 FuncaptchaProxylessRequest,
-                                                 FuncaptchaRequest, 
-                                                 HcaptchaRequest, 
-                                                 HcaptchaProxylessRequest,
-                                                 GeetestProxylessRequest, 
-                                                 GeetestRequest,
-                                                 TurnstileProxylessRequest, 
-                                                 TurnstileRequest,
-                                                 HcaptchaComplexImageTaskRequest, 
                                                  RecaptchaComplexImageTaskRequest,
+                                                 ImageToTextRequest, 
+                                                 FuncaptchaRequest,
                                                  FunCaptchaComplexImageTaskRequest,
-                                                 DataDomeCustomTaskProxylessRequest,
+                                                 HcaptchaRequest,
+                                                 HcaptchaComplexImageTaskRequest,
+                                                 GeetestRequest,
                                                  DataDomeCustomTaskRequest,
+                                                 TenDiCustomTaskRequest,
+                                                 BasiliskCustomTaskRequest,
+                                                 AmazonWafRequest,
                                                  BinanceTaskRequest,
-                                                 BinanceTaskProxylessRequest,
                                                  ImpervaCustomTaskRequest,
-                                                 ImpervaCustomTaskProxylessRequest,
+                                                 TurnstileRequest,
                                                  RecognitionComplexImageTaskRequest],
                             ) -> Dict[str, str]:
         '''
@@ -99,27 +94,25 @@ class CapMonsterClient:
         raise UnknownRequestInstanceError(f'Unknown request instance "{type(request)}", ' \
                                             f'expected that request will belong next instances: {rs_all}')
         
-    async def _solve(self, request: Union[RecaptchaV2EnterpriseProxylessRequest,
+    async def _solve(self, request: Union[
                                           RecaptchaV2EnterpriseRequest, 
                                           RecaptchaV2Request,
-                                          RecaptchaV2ProxylessRequest, 
                                           RecaptchaV3ProxylessRequest,
-                                          ImageToTextRequest, 
-                                          FuncaptchaProxylessRequest,
-                                          FuncaptchaRequest, 
-                                          HcaptchaRequest, 
-                                          HcaptchaProxylessRequest,
-                                          GeetestProxylessRequest, 
-                                          GeetestRequest,
-                                          TurnstileProxylessRequest, 
-                                          TurnstileRequest,
-                                          HcaptchaComplexImageTaskRequest, 
                                           RecaptchaComplexImageTaskRequest,
+                                          ImageToTextRequest, 
+                                          FuncaptchaRequest,
                                           FunCaptchaComplexImageTaskRequest,
+                                          HcaptchaRequest,
+                                          HcaptchaComplexImageTaskRequest,
+                                          GeetestRequest,
+                                          DataDomeCustomTaskRequest,
+                                          TenDiCustomTaskRequest,
+                                          BasiliskCustomTaskRequest,
+                                          AmazonWafRequest,
                                           BinanceTaskRequest,
-                                          BinanceTaskProxylessRequest,
                                           ImpervaCustomTaskRequest,
-                                          ImpervaCustomTaskProxylessRequest],
+                                          TurnstileRequest,
+                                          RecognitionComplexImageTaskRequest],
                            timeouts: GetResultTimeouts,
                            ) -> Dict[str, str]:
 

capmonstercloudclient-3.0.0/capmonstercloud_client/requests/AmazonWafRequest.py

@@ -0,0 +1,35 @@
+from typing import Dict, Union, Optional
+from pydantic import Field
+
+from .baseRequestWithProxy import BaseRequestWithProxy
+
+class AmazonWafRequest(BaseRequestWithProxy):
+    type: str = 'AmazonTask'
+    websiteUrl: str
+    challengeScript: str
+    captchaScript: str
+    websiteKey: str
+    context: str
+    iv: str
+    cookieSolution: Optional[bool] = Field(default=None)
+
+    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.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
+        return task

capmonstercloudclient-3.0.0/capmonstercloud_client/requests/BasiliskCustomTaskRequest.py

@@ -0,0 +1,24 @@
+from typing import Dict, Union
+from pydantic import Field
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+class BasiliskCustomTaskRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='Basilisk')
+    websiteKey: str = Field()
+    
+    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.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.0.0/capmonstercloud_client/requests/BinanceTaskRequest.py

@@ -0,0 +1,29 @@
+from typing import Dict, Union, Optional
+from pydantic import Field
+
+from .baseRequestWithProxy import BaseRequestWithProxy
+
+class BinanceTaskRequest(BaseRequestWithProxy):
+    type: str = Field(default='BinanceTask')
+    websiteKey: str = Field()
+    websiteUrl: str = Field()
+    validateId: str = Field()
+    userAgent: Optional[str] = None
+
+    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.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-2.0.0 → capmonstercloudclient-3.0.0}/capmonstercloud_client/requests/CustomTaskRequestBase.py

@@ -1,8 +1,8 @@
-from typing import Optional, List, Dict
+from typing import Optional, List
 
-from .baseRequest import BaseRequest
+from .baseRequestWithProxy import BaseRequestWithProxy
 
-class CustomTaskRequestBase(BaseRequest):
+class CustomTaskRequestBase(BaseRequestWithProxy):
     captchaClass: str # Class(subtype) of ComplexImageTask
     type: str = "CustomTask" # Recognition task type
     websiteUrl: str # Address of a webpage with captcha

{capmonstercloudclient-2.0.0 → capmonstercloudclient-3.0.0}/capmonstercloud_client/requests/DataDomeCustomTaskRequest.py

@@ -1,9 +1,9 @@
 from typing import Dict, Union
 from pydantic import Field, validator
-from .DataDomeCustomTaskRequestBase import DataDomeCustomTaskRequestBase
-from .proxy_info import ProxyInfo
+from .CustomTaskRequestBase import CustomTaskRequestBase
 
-class DataDomeCustomTaskRequest(DataDomeCustomTaskRequestBase, ProxyInfo):
+class DataDomeCustomTaskRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='DataDome')
     metadata : Dict[str, str]
     
     @validator('metadata')
@@ -28,11 +28,12 @@ class DataDomeCustomTaskRequest(DataDomeCustomTaskRequestBase, ProxyInfo):
         task['type'] = self.type
         task['class'] = self.captchaClass
         task['websiteURL'] = self.websiteUrl
-        task['proxyType'] = self.proxyType
-        task['proxyAddress'] = self.proxyAddress
-        task['proxyPort'] = self.proxyPort
-        task['proxyLogin'] = self.proxyLogin
-        task['proxyPassword'] = self.proxyPassword
+        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['metadata'] = self.metadata
         if self.userAgent is not None:

capmonstercloudclient-3.0.0/capmonstercloud_client/requests/FuncaptchaRequest.py

@@ -0,0 +1,29 @@
+from typing import Dict, Union, Optional
+from pydantic import Field
+
+from .baseRequestWithProxy import BaseRequestWithProxy
+
+class FuncaptchaRequest(BaseRequestWithProxy):
+    type: str = Field(default='FunCaptchaTask')
+    websiteUrl: str
+    websitePublicKey: str
+    funcaptchaApiJSSubdomain: Optional[str] = Field(default=None)
+    data: Optional[str] = Field(default=None)
+    
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
+        task = {}
+        task['type'] = self.type
+        task['websiteURL'] = self.websiteUrl
+        task['websitePublicKey'] = self.websitePublicKey
+        if self.proxy:
+            task['proxyType'] = self.proxy.proxyType
+            task['proxyAddress'] = self.proxy.proxyAddress
+            task['proxyPort'] = self.proxy.proxyPort
+            task['proxyLogin'] = self.proxy.proxyLogin
+            task['proxyPassword'] = self.proxy.proxyPassword
+        
+        if self.funcaptchaApiJSSubdomain is not None:
+            task['funcaptchaApiJSSubdomain'] = self.funcaptchaApiJSSubdomain
+        if self.data is not None:
+            task['data'] = self.data
+        return task

capmonstercloudclient-3.0.0/capmonstercloud_client/requests/GeetestRequest.py

@@ -0,0 +1,53 @@
+from pydantic import Field, validator
+from typing import Dict, Union, Optional
+
+from .baseRequestWithProxy import BaseRequestWithProxy
+
+
+class GeetestRequest(BaseRequestWithProxy):
+    type: str = Field(default='GeeTestTask')
+    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
+    
+    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
+        
+        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
+        return task

capmonstercloudclient-3.0.0/capmonstercloud_client/requests/HcaptchaRequest.py

@@ -0,0 +1,39 @@
+from pydantic import Field
+from typing import Dict, Union, Optional
+
+from .baseRequestWithProxy import BaseRequestWithProxy
+
+class HcaptchaRequest(BaseRequestWithProxy):
+    type: str = Field(default='HCaptchaTask')
+    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)
+
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
+
+        task = {}       
+        task['type'] = self.type
+        task['websiteURL'] = self.websiteUrl
+        task['websiteKey'] = self.websiteKey
+        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.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-2.0.0 → capmonstercloudclient-3.0.0}/capmonstercloud_client/requests/ImageToTextRequest.py

@@ -1,6 +1,6 @@
 import base64
 
-from pydantic import validator, Field, BaseModel
+from pydantic import validator, Field
 from typing import Optional, Dict, Union
 from .baseRequest import BaseRequest
 from .enums import TextModules

{capmonstercloudclient-2.0.0 → capmonstercloudclient-3.0.0}/capmonstercloud_client/requests/ImpervaCustomTaskRequest.py

@@ -1,10 +1,10 @@
 from typing import Dict, Union
 from pydantic import Field, validator
 
-from .proxy_info import ProxyInfo
-from .ImpervaCustomTaskRequestBase import ImpervaCustomTaskRequestBase
+from .CustomTaskRequestBase import CustomTaskRequestBase
 
-class ImpervaCustomTaskRequest(ImpervaCustomTaskRequestBase, ProxyInfo):
+class ImpervaCustomTaskRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='Imperva')
     metadata : Dict[str, str]
     
     @validator('metadata')
@@ -29,11 +29,12 @@ class ImpervaCustomTaskRequest(ImpervaCustomTaskRequestBase, ProxyInfo):
         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.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-2.0.0 → capmonstercloudclient-3.0.0}/capmonstercloud_client/requests/RecaptchaComplexImageTask.py

@@ -1,4 +1,4 @@
-from typing import Dict, Union, Optional
+from typing import Dict, Union
 from pydantic import Field, validator
 
 from .ComplexImageTaskBase import ComplexImageTaskRequestBase

capmonstercloudclient-3.0.0/capmonstercloud_client/requests/RecaptchaV2EnterpiseRequest.py

@@ -0,0 +1,28 @@
+from typing import Dict, Union, Optional
+from pydantic import Field
+
+from .baseRequestWithProxy import BaseRequestWithProxy
+
+class RecaptchaV2EnterpriseRequest(BaseRequestWithProxy):
+    type: str = Field(default='RecaptchaV2EnterpriseTask')
+    websiteUrl: str
+    websiteKey: str
+    enterprisePayload: Optional[str] = Field(default=None)
+    apiDomain: Optional[str] = Field(default=None)
+    
+    def getTaskDict(self) -> Dict[str, Union[str, int]]:
+        task = {}
+        task['type'] = self.type
+        task['websiteURL'] = self.websiteUrl
+        task['websiteKey'] = self.websiteKey
+        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.enterprisePayload is not None:
+            task['enterprisePayload'] = {'s': self.enterprisePayload}
+        if self.apiDomain is not None:
+            task['apiDomain'] = self.apiDomain
+        return task

capmonstercloudclient-3.0.0/capmonstercloud_client/requests/RecaptchaV2Request.py

@@ -0,0 +1,37 @@
+from typing import Dict, Union, Optional
+from pydantic import Field
+from .baseRequestWithProxy import BaseRequestWithProxy
+
+
+class RecaptchaV2Request(BaseRequestWithProxy):
+    
+    type: str = Field(default="NoCaptchaTask")
+    websiteUrl: str
+    websiteKey: str
+    dataSValue: Optional[str] = Field(default=None)
+    userAgent: Optional[str] = Field(default=None)
+    cookies: Optional[str] = Field(default=None)
+
+    def getTaskDict(self) -> Dict[str, Union[str, int]]:
+        task = {}
+        task['type'] = self.type
+        task['websiteURL'] = self.websiteUrl
+        task['websiteKey'] = self.websiteKey
+        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.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-2.0.0 → capmonstercloudclient-3.0.0}/capmonstercloud_client/requests/RecognitionComplexImageTaskRequest.py

@@ -1,7 +1,7 @@
-from typing import Optional, List, Dict, Union
+from typing import Dict, Union
 from pydantic import validator
 from .ComplexImageTaskBase import ComplexImageTaskRequestBase
-from ..exceptions import NumbersImagesErrors, ZeroImagesErrors, TaskNotDefinedError
+from ..exceptions import ZeroImagesErrors, TaskNotDefinedError
 
 
 class RecognitionComplexImageTaskRequest(ComplexImageTaskRequestBase):

capmonstercloudclient-3.0.0/capmonstercloud_client/requests/TenDiCustomTaskRequest.py

@@ -0,0 +1,24 @@
+from typing import Dict, Union
+from pydantic import Field
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+class TenDiCustomTaskRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='TenDI')
+    websiteKey: str = Field()
+
+    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.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-2.0.0/capmonstercloud_client/requests/TurnstileRequestBase.py → capmonstercloudclient-3.0.0/capmonstercloud_client/requests/TurnstileRequest.py

@@ -1,10 +1,11 @@
-from .baseRequest import BaseRequest, Field
-from typing import Optional
-from pydantic import validator, model_validator
+from typing import Dict, Optional
+from pydantic import Field, validator, model_validator
+from .baseRequestWithProxy import BaseRequestWithProxy
 
 
-class TurnstileRequestBase(BaseRequest):
+class TurnstileRequest(BaseRequestWithProxy):
     
+    type: str = Field(default="TurnstileTask")
     websiteURL: str
     websiteKey: str
     pageAction: Optional[str] = Field(default=None)
@@ -14,7 +15,7 @@ class TurnstileRequestBase(BaseRequest):
     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:
@@ -44,4 +45,7 @@ class TurnstileRequestBase(BaseRequest):
                         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-3.0.0/capmonstercloud_client/requests/__init__.py

@@ -0,0 +1,35 @@
+from .ImageToTextRequest import ImageToTextRequest
+from .RecaptchaV2Request import RecaptchaV2Request
+from .RecaptchaV2EnterpiseRequest import RecaptchaV2EnterpriseRequest
+from .RecaptchaV3ProxylessRequest import RecaptchaV3ProxylessRequest
+from .RecaptchaComplexImageTask import RecaptchaComplexImageTaskRequest
+from .HcaptchaRequest import HcaptchaRequest
+from .FuncaptchaRequest import FuncaptchaRequest
+from .FuncaptchaComplexImageTask import FunCaptchaComplexImageTaskRequest
+from .GeetestRequest import GeetestRequest
+from .TurnstileRequest import TurnstileRequest
+from .HcaptchaComplexImageTask import HcaptchaComplexImageTaskRequest
+from .RecaptchaComplexImageTask import RecaptchaComplexImageTaskRequest
+from .baseRequest import BaseRequest
+from .DataDomeCustomTaskRequest import DataDomeCustomTaskRequest
+from .TenDiCustomTaskRequest import TenDiCustomTaskRequest
+from .BasiliskCustomTaskRequest import BasiliskCustomTaskRequest
+from .AmazonWafRequest import AmazonWafRequest
+from .BinanceTaskRequest import BinanceTaskRequest
+from .ImpervaCustomTaskRequest import ImpervaCustomTaskRequest
+from .RecognitionComplexImageTaskRequest import RecognitionComplexImageTaskRequest
+
+
+REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2Request', 'RecaptchaV3ProxylessRequest', 'RecaptchaComplexImageTaskRequest'
+            'ImageToTextRequest', 
+            'FuncaptchaRequest', 'FunCaptchaComplexImageTaskRequest',
+            'HcaptchaRequest', 'HcaptchaComplexImageTaskRequest'
+            'GeetestRequest',
+            'DataDomeCustomTaskRequest',
+            'TenDiCustomTaskRequest',
+            'BasiliskCustomTaskRequest',
+            'AmazonWafRequest',
+            'BinanceTaskRequest',
+            'ImpervaCustomTaskRequest',
+            'TurnstileRequest',
+            'RecognitionComplexImageTaskRequest']

{capmonstercloudclient-2.0.0 → capmonstercloudclient-3.0.0}/capmonstercloud_client/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-3.0.0/capmonstercloud_client/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-3.0.0/capmonstercloud_client/version.txt

@@ -0,0 +1 @@
+3.0.0

{capmonstercloudclient-2.0.0 → capmonstercloudclient-3.0.0}/capmonstercloudclient.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capmonstercloudclient
-Version: 2.0.0
+Version: 3.0.0
 Summary: Official CapMonsterCloud Client: https://capmonster.cloud/
 Home-page: https://github.com/ZennoLab/capmonstercloud-client-python
 Author: Andrey Ilyin