capmonstercloudclient 3.3.0__tar.gz → 4.0.0__tar.gz

{capmonstercloudclient-3.3.0/capmonstercloudclient.egg-info → capmonstercloudclient-4.0.0}/PKG-INFO

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

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

@@ -16,8 +16,9 @@ from .utils import parseVersion
 _instance_config = (
     ((RecaptchaV2Request,), getRecaptchaV2Timeouts),
     ((RecaptchaV2EnterpriseRequest,), getRecaptchaV2EnterpriseTimeouts),
-    ((RecaptchaV3ProxylessRequest), getRecaptchaV3Timeouts),
-    ((ImageToTextRequest), getImage2TextTimeouts),
+    ((RecaptchaV3ProxylessRequest,), getRecaptchaV3Timeouts),
+    ((RecaptchaV3EnterpriseRequest,), getRecaptchaV3Timeouts),
+    ((ImageToTextRequest,), getImage2TextTimeouts),
     ((FuncaptchaRequest,), getFuncaptchaTimeouts),
     ((HcaptchaRequest,), getHcaptchaTimeouts),
     ((GeetestRequest,), getGeetestTimeouts),
@@ -30,11 +31,15 @@ _instance_config = (
     ((AmazonWafRequest,), getAmazonWafTimeouts),
     ((BinanceTaskRequest,), getBinanceTimeouts),
     ((ImpervaCustomTaskRequest,), getImpervaTimeouts),
-    ((RecognitionComplexImageTaskRequest), getCITTimeouts),
-    ((MTCaptchaRequest), getImage2TextTimeouts),
-    ((YidunRequest), getYidunTimeouts),
-    ((TemuCustomTaskRequest), getTemuTimeouts),
-    ((ProsopoTaskRequest), getProsopoTimeouts),
+    ((RecognitionComplexImageTaskRequest,), getCITTimeouts),
+    ((MTCaptchaRequest,), getImage2TextTimeouts),
+    ((YidunRequest,), getYidunTimeouts),
+    ((TemuCustomTaskRequest,), getTemuTimeouts),
+    ((ProsopoTaskRequest,), getProsopoTimeouts),
+    ((AltchaCustomTaskRequest,), getAltchaTimeouts),
+    ((CastleCustomTaskRequest,), getCastleTimeouts),
+    ((TspdCustomTaskRequest,), getTspdTimeouts),
+    ((HuntCustomTaskRequest,), getHuntTimeouts),
 )
 
 
@@ -44,6 +49,14 @@ class CapMonsterClient:
         self.options = options
         self._headers = {'User-Agent': 
                          f'Zennolab.CapMonsterCloud.Client.Python/{parseVersion()}'}
+        if self.options.client_proxy:
+            if self.options.client_proxy.proxyType not in ['http', 'https']:
+                raise UnsupportedProxyTypeError(f'Supported client proxy types are: [HTTP, HTTPS]')
+            if self.options.client_proxy.proxyLogin and self.options.client_proxy.proxyPassword:
+                auth = f"{self.options.client_proxy.proxyLogin}:{self.options.client_proxy.proxyPassword}@"
+            self.client_proxy_string = f"{self.options.client_proxy.proxyType}://{auth}{self.options.client_proxy.proxyAddress}:{self.options.client_proxy.proxyPort}"
+        else:
+            self.client_proxy_string = None
     
     @property
     def headers(self):
@@ -56,7 +69,8 @@ class CapMonsterClient:
         async with aiohttp.ClientSession() as session:
             async with session.post(url=self.options.service_url + '/getBalance',
                                     json=body, 
-                                    timeout=aiohttp.ClientTimeout(total=self.options.client_timeout)) as resp:
+                                    timeout=aiohttp.ClientTimeout(total=self.options.client_timeout),
+                                    proxy=self.client_proxy_string) as resp:
                 if resp.status != 200:
                     raise HTTPException(f'Cannot create task. Status code: {resp.status}.')
                 result = await resp.json(content_type=None)
@@ -69,6 +83,7 @@ class CapMonsterClient:
                                                  RecaptchaV2EnterpriseRequest, 
                                                  RecaptchaV2Request,
                                                  RecaptchaV3ProxylessRequest,
+                                                 RecaptchaV3EnterpriseRequest,
                                                  RecaptchaComplexImageTaskRequest,
                                                  ImageToTextRequest, 
                                                  FuncaptchaRequest,
@@ -87,7 +102,11 @@ class CapMonsterClient:
                                                  MTCaptchaRequest,
                                                  YidunRequest,
                                                  TemuCustomTaskRequest,
-                                                 ProsopoTaskRequest],
+                                                 ProsopoTaskRequest,
+                                                 AltchaCustomTaskRequest,
+                                                 CastleCustomTaskRequest,
+                                                 TspdCustomTaskRequest,
+                                                 HuntCustomTaskRequest],
                             ) -> Dict[str, str]:
         '''
         Non-blocking method for captcha solving. 
@@ -106,6 +125,7 @@ class CapMonsterClient:
                                           RecaptchaV2EnterpriseRequest, 
                                           RecaptchaV2Request,
                                           RecaptchaV3ProxylessRequest,
+                                          RecaptchaV3EnterpriseRequest,
                                           RecaptchaComplexImageTaskRequest,
                                           ImageToTextRequest, 
                                           FuncaptchaRequest,
@@ -124,7 +144,8 @@ class CapMonsterClient:
                                           MTCaptchaRequest,
                                           YidunRequest,
                                           TemuCustomTaskRequest,
-                                          ProsopoTaskRequest],
+                                          ProsopoTaskRequest,
+                                          AltchaCustomTaskRequest],
                            timeouts: GetResultTimeouts,
                            ) -> Dict[str, str]:
 
@@ -133,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:
@@ -150,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]]:
@@ -168,7 +187,8 @@ class CapMonsterClient:
             async with session.post(url=self.options.service_url + '/getTaskResult',
                                     json=body, 
                                     timeout=aiohttp.ClientTimeout(total=self.options.client_timeout),
-                                    headers=self.headers) as resp:
+                                    headers=self.headers,
+                                    proxy=self.client_proxy_string) as resp:
                 if resp.status != 200:
                     if resp.status == 500:
                         return {'errorId': 0, 'status': 'processing'}
@@ -184,11 +204,13 @@ class CapMonsterClient:
                 "task": task,
                 "softId": self.options.default_soft_id
                }
+        
         async with aiohttp.ClientSession() as session:
             async with session.post(url=self.options.service_url + '/createTask',
                                     json=body, 
                                     timeout=aiohttp.ClientTimeout(total=self.options.client_timeout),
-                                    headers=self.headers) as resp:
+                                    headers=self.headers,
+                                    proxy=self.client_proxy_string) as resp:
                 if resp.status != 200:
                     raise HTTPException(f'Cannot create task. Status code: {resp.status}.')
                 else:

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

@@ -17,6 +17,9 @@ def getRecaptchaV2EnterpriseTimeouts() -> GetResultTimeouts:
 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)
 
@@ -50,6 +53,18 @@ def getBinanceTimeouts() -> GetResultTimeouts:
 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)
 

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

@@ -1,11 +1,14 @@
 from pydantic import BaseModel, validator, Field
-
+from .requests import ClientProxyInfo
+from typing import Optional
 
 class ClientOptions(BaseModel):
     api_key: str
+    client_proxy: Optional[ClientProxyInfo] = None
     service_url: str = Field(default="https://api.capmonster.cloud")
     default_soft_id: int = Field(default=55)
     client_timeout: float = Field(default=20.0)
+    
 
     @validator('api_key')
     def validate_api_key(cls, value):

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/exceptions.py

@@ -24,6 +24,8 @@ class TaskNotDefinedError(BaseError):
 class ExtraParamsError(BaseError):
     pass
 
+class UnsupportedProxyTypeError(BaseError):
+    pass
 
 
 class UserAgentNotDefinedError(BaseError):

capmonstercloudclient-4.0.0/capmonstercloud_client/requests/AltchaCustomTaskRequest.py

@@ -0,0 +1,36 @@
+from typing import Dict, Union
+from pydantic import Field, validator
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+class AltchaCustomTaskRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='altcha')
+    websiteKey: str = Field()
+    metadata : Dict[str, str]
+    
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        for key in ['challenge', 'iterations', 'salt', 'signature']:
+            if value.get(key) is None:
+                raise TypeError(f'Expect that {key} will be defined.')
+            else:
+                if not isinstance(value.get(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['websiteKey'] = self.websiteKey
+        task['metadata'] = self.metadata
+        if self.proxy:
+            task['proxyType'] = self.proxy.proxyType
+            task['proxyAddress'] = self.proxy.proxyAddress
+            task['proxyPort'] = self.proxy.proxyPort
+            task['proxyLogin'] = self.proxy.proxyLogin
+            task['proxyPassword'] = self.proxy.proxyPassword
+        if self.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        return task

capmonstercloudclient-4.0.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.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/requests/CustomTaskRequestBase.py

@@ -6,5 +6,5 @@ class CustomTaskRequestBase(BaseRequestWithProxy):
     captchaClass: str # Class(subtype) of ComplexImageTask
     type: str = "CustomTask" # Recognition task type
     websiteUrl: str # Address of a webpage with captcha
-    userAgent: Optional[str] = None # It is required that you use a signature of a modern browser
-    domains: Optional[List[str]] = None # Collection with base64 encoded images. Must be populated if <see cref="ImageUrls"/> not.
+    userAgent: Optional[str] = None
+    domains: Optional[List[str]] = None

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.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,19 +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]')
-    
+
+    @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.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/requests/FuncaptchaRequest.py

@@ -9,6 +9,7 @@ class FuncaptchaRequest(BaseRequestWithProxy):
     websitePublicKey: str
     funcaptchaApiJSSubdomain: Optional[str] = Field(default=None)
     data: Optional[str] = Field(default=None)
+    cookies: Optional[str] = Field(default=None)
     
     def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
         task = {}
@@ -26,4 +27,6 @@ class FuncaptchaRequest(BaseRequestWithProxy):
             task['funcaptchaApiJSSubdomain'] = self.funcaptchaApiJSSubdomain
         if self.data is not None:
             task['data'] = self.data
+        if self.cookies is not None:
+            task['cookies'] = self.cookies
         return task

capmonstercloudclient-4.0.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

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/requests/ImpervaCustomTaskRequest.py

@@ -1,5 +1,5 @@
 from typing import Dict, Union
-from pydantic import Field, validator
+from pydantic import Field, validator, model_validator
 
 from .CustomTaskRequestBase import CustomTaskRequestBase
 
@@ -23,18 +23,24 @@ class ImpervaCustomTaskRequest(CustomTaskRequestBase):
             raise TypeError(f'Expect that reese84UrlEndpoint will be str.')
         return value
     
+    @model_validator(mode='before')
+    def validate_imperva_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
-        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['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.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/requests/RecaptchaV2EnterpiseRequest.py

@@ -9,7 +9,10 @@ class RecaptchaV2EnterpriseRequest(BaseRequestWithProxy):
     websiteKey: str
     enterprisePayload: Optional[str] = Field(default=None)
     apiDomain: Optional[str] = Field(default=None)
-    
+    pageAction: 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
@@ -25,4 +28,10 @@ class RecaptchaV2EnterpriseRequest(BaseRequestWithProxy):
             task['enterprisePayload'] = {'s': self.enterprisePayload}
         if self.apiDomain is not None:
             task['apiDomain'] = self.apiDomain
+        if self.pageAction is not None:
+            task['pageAction'] = self.pageAction
+        if self.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        if self.cookies is not None:
+            task['cookies'] = self.cookies
         return task

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/requests/RecaptchaV2Request.py

@@ -11,8 +11,9 @@ class RecaptchaV2Request(BaseRequestWithProxy):
     dataSValue: Optional[str] = Field(default=None)
     userAgent: Optional[str] = Field(default=None)
     cookies: Optional[str] = Field(default=None)
+    isInvisible: Optional[bool] = Field(default=None)
 
-    def getTaskDict(self) -> Dict[str, Union[str, int]]:
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
         task = {}
         task['type'] = self.type
         task['websiteURL'] = self.websiteUrl
@@ -26,12 +27,15 @@ class RecaptchaV2Request(BaseRequestWithProxy):
 
         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
 
+        if self.isInvisible is not None:
+            task['isInvisible'] = self.isInvisible
+
         return task
     

capmonstercloudclient-4.0.0/capmonstercloud_client/requests/RecaptchaV3EnterpriseRequest.py

@@ -0,0 +1,22 @@
+from typing import Dict, Union, Optional
+from pydantic import Field
+
+from .baseRequest import BaseRequest
+
+class RecaptchaV3EnterpriseRequest(BaseRequest):
+    type: str = Field(default='RecaptchaV3EnterpriseTask')
+    websiteUrl: str
+    websiteKey: str
+    minScore: Optional[float] = Field(default=None)
+    pageAction: Optional[str] = Field(default=None)
+    
+    def getTaskDict(self) -> Dict[str, Union[str, int, float]]:
+        task = {}
+        task['type'] = self.type
+        task['websiteURL'] = self.websiteUrl
+        task['websiteKey'] = self.websiteKey
+        if self.minScore is not None:
+            task['minScore'] = self.minScore
+        if self.pageAction is not None:
+            task['pageAction'] = self.pageAction
+        return task

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/requests/RecaptchaV3ProxylessRequest.py

@@ -7,10 +7,10 @@ class RecaptchaV3ProxylessRequest(BaseRequest):
     websiteUrl: str 
     websiteKey: str
     type: str = Field(default='RecaptchaV3TaskProxyless')
-    min_score: Optional[float] = Field(default=None)
+    minScore: Optional[float] = Field(default=None)
     pageAction: Optional[str] = Field(default=None)
 
-    @validator('min_score')
+    @validator('minScore')
     def validate_min_score(cls, value):
         if value is not None:
             if not 0.1 <= value <= 0.9:
@@ -23,8 +23,8 @@ class RecaptchaV3ProxylessRequest(BaseRequest):
         task['type'] = self.type
         task['websiteURL'] = self.websiteUrl
         task['websiteKey'] = self.websiteKey
-        if self.min_score is not None:
-            task['minScore'] = self.min_score
+        if self.minScore is not None:
+            task['minScore'] = self.minScore
         if self.pageAction is not None:
             task['pageAction'] = self.pageAction
         return task

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/requests/TenDiCustomTaskRequest.py

@@ -1,11 +1,21 @@
-from typing import Dict, Union
-from pydantic import Field
+from typing import Dict, Optional, Union
+from pydantic import Field, validator
 
 from .CustomTaskRequestBase import CustomTaskRequestBase
 
 class TenDiCustomTaskRequest(CustomTaskRequestBase):
     captchaClass: str = Field(default='TenDI')
     websiteKey: str = Field()
+    metadata: Optional[Dict[str, str]] = Field(default=None)
+
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        if value is not None:
+            if not set(value.keys()).issubset(set(["captchaUrl"])):
+                raise TypeError(f'Allowed keys for metadata are "captchaUrl"')
+            if value.get('captchaUrl') is not None and not isinstance(value.get('captchaUrl'), str):
+                raise TypeError(f'Expect that captchaUrl will be str.')
+        return value
 
     def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
         task = {}
@@ -21,4 +31,6 @@ class TenDiCustomTaskRequest(CustomTaskRequestBase):
             task['proxyPassword'] = self.proxy.proxyPassword
         if self.userAgent is not None:
             task['userAgent'] = self.userAgent
+        if self.metadata is not None:
+            task['metadata'] = self.metadata
         return task

capmonstercloudclient-4.0.0/capmonstercloud_client/requests/TspdCustomTaskRequest.py

@@ -0,0 +1,44 @@
+from typing import Dict, Union
+from pydantic import Field, validator, model_validator
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+class TspdCustomTaskRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='tspd')
+    userAgent: str = Field()
+    metadata: Dict[str, str]
+
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        if value.get('tspdCookie') is None:
+            raise TypeError(f'Expect that tspdCookie will be defined.')
+        else:
+            if not isinstance(value.get('tspdCookie'), str):
+                raise TypeError(f'Expect that tspdCookie will be str.')
+        if value.get('htmlPageBase64') is None:
+            raise TypeError(f'Expect that htmlPageBase64 will be defined.')
+        else:
+            if not isinstance(value.get('htmlPageBase64'), str):
+                raise TypeError(f'Expect that htmlPageBase64 will be str.')
+        return value
+
+    @model_validator(mode='before')
+    def validate_tspd_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['userAgent'] = self.userAgent
+        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.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/requests/TurnstileRequest.py

@@ -19,7 +19,7 @@ class TurnstileRequest(BaseRequestWithProxy):
     @validator('cloudflareTaskType')
     def validate_cloudflare_task(cls, value):
         if value is not None:
-            if value not in ['cf_clearance', 'token']:
+            if value not in ['cf_clearance', 'token', 'wait_room']:
                 raise ValueError(f'cloudflareTaskType could be "cf_clearance" if you need cookie or ' \
                                  f'"token" if required token from Turnstile.')
         return value
@@ -28,13 +28,13 @@ class TurnstileRequest(BaseRequestWithProxy):
     def validate_cloudflare_type_token(self):
         
         if self.get('htmlPageBase64') is None:
-            if self.get('cloudflareTaskType') == 'cf_clearance':
+            if self.get('cloudflareTaskType') in ['cf_clearance', 'wait_room']:
                 raise RuntimeError(f'Expect that "htmlPageBase64" will be filled ' \
-                    f'when cloudflareTaskType is "cf_clearance"')
+                    f'when cloudflareTaskType is "cf_clearance" or "wait_room')
         
         if self.get('proxy') is None:
-            if self.get('cloudflareTaskType') == 'cf_clearance':
-                raise RuntimeError(f'You are working using queries, and you need cf_clearance cookies ' \
+            if self.get('cloudflareTaskType') in ['cf_clearance', 'wait_room']:
+                raise RuntimeError(f'You are working using queries, and you need cf_clearance cookies or wait_room ' \
                         f'it is required that you need your proxies.')
 
         if self.get('cloudflareTaskType') == 'token':
@@ -44,7 +44,7 @@ class TurnstileRequest(BaseRequestWithProxy):
                     f'when "cloudflareTaskType" = "token".')
         
         if self.get('cloudflareTaskType') is not None:
-            if self.get('cloudflareTaskType') in ['cf_clearance', 'token']:
+            if self.get('cloudflareTaskType') in ['cf_clearance', 'token', 'wait_room']:
                 if self.get('userAgent') is None:
                     raise RuntimeError(f'Expect that userAgent will be filled ' \
                         f'when cloudflareTaskType specified.')

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/requests/YidunRequest.py

@@ -8,6 +8,11 @@ class YidunRequest(BaseRequestWithProxy):
     websiteUrl: str
     websiteKey: str
     userAgent: Optional[str] = Field(default=None)
+    yidunGetLib: Optional[str] = Field(default=None)
+    yidunApiServerSubdomain: Optional[str] = Field(default=None)
+    challenge: Optional[str] = Field(default=None)
+    hcg: Optional[str] = Field(default=None)
+    hct: Optional[int] = Field(default=None)
 
     def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
         task = {}
@@ -16,6 +21,16 @@ class YidunRequest(BaseRequestWithProxy):
         task["websiteKey"] = self.websiteKey
         if self.userAgent is not None:
             task["userAgent"] = self.userAgent
+        if self.yidunGetLib is not None:
+            task["yidunGetLib"] = self.yidunGetLib
+        if self.yidunApiServerSubdomain is not None:
+            task["yidunApiServerSubdomain"] = self.yidunApiServerSubdomain
+        if self.challenge is not None:
+            task["challenge"] = self.challenge
+        if self.hcg is not None:
+            task["hcg"] = self.hcg
+        if self.hct is not None:
+            task["hct"] = self.hct
         if self.proxy:
             task["proxyType"] = self.proxy.proxyType
             task["proxyAddress"] = self.proxy.proxyAddress

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/requests/__init__.py

@@ -2,6 +2,7 @@ from .ImageToTextRequest import ImageToTextRequest
 from .RecaptchaV2Request import RecaptchaV2Request
 from .RecaptchaV2EnterpiseRequest import RecaptchaV2EnterpriseRequest
 from .RecaptchaV3ProxylessRequest import RecaptchaV3ProxylessRequest
+from .RecaptchaV3EnterpriseRequest import RecaptchaV3EnterpriseRequest
 from .RecaptchaComplexImageTask import RecaptchaComplexImageTaskRequest
 from .HcaptchaRequest import HcaptchaRequest
 from .FuncaptchaRequest import FuncaptchaRequest
@@ -22,13 +23,17 @@ from .MTCaptchaRequest import MTCaptchaRequest
 from .YidunRequest import YidunRequest
 from .ProsopoTaskRequest import ProsopoTaskRequest
 from .TemuCustomTaskRequest import TemuCustomTaskRequest
-from .proxy_info import ProxyInfo
+from .AltchaCustomTaskRequest import AltchaCustomTaskRequest
+from .CastleCustomTaskRequest import CastleCustomTaskRequest
+from .TspdCustomTaskRequest import TspdCustomTaskRequest
+from .HuntCustomTaskRequest import HuntCustomTaskRequest
+from .proxy_info import ProxyInfo, ClientProxyInfo
 
 
-REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2Request', 'RecaptchaV3ProxylessRequest', 'RecaptchaComplexImageTaskRequest'
+REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2Request', 'RecaptchaV3ProxylessRequest', 'RecaptchaComplexImageTaskRequest', 'RecaptchaV3EnterpriseRequest',
             'ImageToTextRequest', 
             'FuncaptchaRequest', 'FunCaptchaComplexImageTaskRequest',
-            'HcaptchaRequest', 'HcaptchaComplexImageTaskRequest'
+            'HcaptchaRequest', 'HcaptchaComplexImageTaskRequest',
             'GeetestRequest',
             'DataDomeCustomTaskRequest',
             'TenDiCustomTaskRequest',
@@ -41,5 +46,9 @@ REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2Request', 'RecaptchaV3Pro
             'MTCaptchaRequest',
             'YidunRequest',
             'ProsopoTaskRequest',
-            'TemuCustomTaskRequest'
+            'TemuCustomTaskRequest',
+            'AltchaCustomTaskRequest',
+            'CastleCustomTaskRequest',
+            'TspdCustomTaskRequest',
+            'HuntCustomTaskRequest'
             ]

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.0}/capmonstercloud_client/requests/proxy_info.py

@@ -1,5 +1,6 @@
 from pydantic import BaseModel, validator
 from .enums import ProxyTypes
+from typing import Optional
 
 class ProxyInfo(BaseModel):
     proxyType: str 
@@ -19,3 +20,22 @@ class ProxyInfo(BaseModel):
         if not isinstance(value, int):
             raise TypeError(f'Expect that port value will be <int> type, got {type(value)}')
         return value
+
+class ClientProxyInfo(BaseModel):
+    proxyType: str
+    proxyAddress: str
+    proxyPort: int
+    proxyLogin: Optional[str] = None
+    proxyPassword: Optional[str] = None
+    
+    @validator('proxyType')
+    def validate_proxy_type(cls, value):
+        if value not in ProxyTypes.list_values():
+            raise ValueError(f'Expected that proxy type will be in {ProxyTypes.list_values()}, got "{value}"')
+        return value
+    
+    @validator('proxyPort')
+    def validate_port(cls, value):
+        if not isinstance(value, int):
+            raise TypeError(f'Expect that port value will be <int> type, got {type(value)}')
+        return value

capmonstercloudclient-4.0.0/capmonstercloud_client/version.txt

@@ -0,0 +1 @@
+4.0.0

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.0/capmonstercloudclient.egg-info}/PKG-INFO

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

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.0}/capmonstercloudclient.egg-info/SOURCES.txt

@@ -13,9 +13,11 @@ capmonstercloud_client/exceptions.py
 capmonstercloud_client/requestController.py
 capmonstercloud_client/utils.py
 capmonstercloud_client/version.txt
+capmonstercloud_client/requests/AltchaCustomTaskRequest.py
 capmonstercloud_client/requests/AmazonWafRequest.py
 capmonstercloud_client/requests/BasiliskCustomTaskRequest.py
 capmonstercloud_client/requests/BinanceTaskRequest.py
+capmonstercloud_client/requests/CastleCustomTaskRequest.py
 capmonstercloud_client/requests/ComplexImageTaskBase.py
 capmonstercloud_client/requests/CustomTaskRequestBase.py
 capmonstercloud_client/requests/DataDomeCustomTaskRequest.py
@@ -24,6 +26,7 @@ capmonstercloud_client/requests/FuncaptchaRequest.py
 capmonstercloud_client/requests/GeetestRequest.py
 capmonstercloud_client/requests/HcaptchaComplexImageTask.py
 capmonstercloud_client/requests/HcaptchaRequest.py
+capmonstercloud_client/requests/HuntCustomTaskRequest.py
 capmonstercloud_client/requests/ImageToTextRequest.py
 capmonstercloud_client/requests/ImpervaCustomTaskRequest.py
 capmonstercloud_client/requests/MTCaptchaRequest.py
@@ -31,10 +34,12 @@ capmonstercloud_client/requests/ProsopoTaskRequest.py
 capmonstercloud_client/requests/RecaptchaComplexImageTask.py
 capmonstercloud_client/requests/RecaptchaV2EnterpiseRequest.py
 capmonstercloud_client/requests/RecaptchaV2Request.py
+capmonstercloud_client/requests/RecaptchaV3EnterpriseRequest.py
 capmonstercloud_client/requests/RecaptchaV3ProxylessRequest.py
 capmonstercloud_client/requests/RecognitionComplexImageTaskRequest.py
 capmonstercloud_client/requests/TemuCustomTaskRequest.py
 capmonstercloud_client/requests/TenDiCustomTaskRequest.py
+capmonstercloud_client/requests/TspdCustomTaskRequest.py
 capmonstercloud_client/requests/TurnstileRequest.py
 capmonstercloud_client/requests/YidunRequest.py
 capmonstercloud_client/requests/__init__.py

capmonstercloudclient-4.0.0/pyproject.toml

@@ -0,0 +1,3 @@
+[build-system]
+requires = ["setuptools>=61", "wheel"]
+build-backend = "setuptools.build_meta"

{capmonstercloudclient-3.3.0 → capmonstercloudclient-4.0.0}/setup.py

@@ -5,7 +5,7 @@ if sys.version_info < (3,):
     sys.exit(-1)
 
 from pathlib import Path
-from pkg_resources import parse_requirements
+#from pkg_resources import parse_requirements
 from setuptools import setup
 
 
@@ -15,8 +15,8 @@ EMAIL = 'andrey.ilyin@zennolab.com'
 AUTHOR = 'Andrey Ilyin'
 with open('capmonstercloud_client/version.txt', 'r') as f:
     VERSION = f.read()
-with open("requirements.txt", "rt") as requirements_txt:
-    REQUIRED = [str(requirement) for requirement in parse_requirements(requirements_txt)]
+with open("requirements.txt") as f:
+    REQUIRED = [line.strip() for line in f if line.strip() and not line.startswith("#")]
 URL='https://github.com/ZennoLab/capmonstercloud-client-python'
 
 this_directory = Path(__file__).parent

capmonstercloudclient-3.3.0/capmonstercloud_client/version.txt

@@ -1 +0,0 @@
-3.3.0

capmonstercloudclient-3.3.0/pyproject.toml

@@ -1,3 +0,0 @@
-[build-system]
-requires = ["setuptools"]
-build-backend = "setuptools.build_meta"