capmonstercloudclient 3.0.0__tar.gz → 3.2.0__tar.gz

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

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

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

@@ -30,7 +30,9 @@ _instance_config = (
     ((AmazonWafRequest,), getAmazonWafTimeouts),
     ((BinanceTaskRequest,), getBinanceTimeouts),
     ((ImpervaCustomTaskRequest,), getImpervaTimeouts),
-    ((RecognitionComplexImageTaskRequest), getCITTimeouts)
+    ((RecognitionComplexImageTaskRequest), getCITTimeouts),
+    ((MTCaptchaRequest), getImage2TextTimeouts),
+    ((YidunRequest), getImage2TextTimeouts),
 )
 
 
@@ -79,7 +81,9 @@ class CapMonsterClient:
                                                  BinanceTaskRequest,
                                                  ImpervaCustomTaskRequest,
                                                  TurnstileRequest,
-                                                 RecognitionComplexImageTaskRequest],
+                                                 RecognitionComplexImageTaskRequest,
+                                                 MTCaptchaRequest,
+                                                 YidunRequest],
                             ) -> Dict[str, str]:
         '''
         Non-blocking method for captcha solving. 

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

@@ -13,12 +13,8 @@ class DataDomeCustomTaskRequest(CustomTaskRequestBase):
         if value.get('captchaUrl') and value.get('htmlPageBase64'):
             raise TypeError(f'Expected only one of [captchaUrl, htmlPageBase64]')
         elif value.get('captchaUrl'):
-            if not isinstance(value.get('captchaUrl'), str):
-                raise TypeError(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 TypeError(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 TypeError(f'Expected one of [captchaUrl, htmlPageBase64]')

capmonstercloudclient-3.2.0/capmonstercloud_client/requests/HcaptchaComplexImageTask.py

@@ -0,0 +1,96 @@
+from typing import Dict, Union, List, Optional
+from pydantic import Field, validator
+
+from .ComplexImageTaskBase import ComplexImageTaskRequestBase
+from ..exceptions import NumbersImagesErrors, ZeroImagesErrors, TaskNotDefinedError, ExtraParamsError
+
+class HcaptchaComplexImageTaskRequest(ComplexImageTaskRequestBase):
+    
+    captchaClass: str = Field(default='hcaptcha')
+    metadata : Dict[str, str]
+    exampleImageUrls: Optional[List[str]] = None
+    exampleImagesBase64: Optional[List[str]] = None
+
+    @staticmethod
+    def _validate_image_array(value, field_name, max_images):
+        """Helper method to validate image array"""
+        if value is None:
+            return value
+        if not isinstance(value, (list, tuple)):
+            raise TypeError(f'Expect that type {field_name} array will be <list> or <tuple>, got {type(value)}')
+
+        if not len(value):
+            if 'base64' in field_name.lower():
+                raise ZeroImagesErrors(f'At least one image base64 expected, got {len(value)}')
+            else:
+                raise ZeroImagesErrors(f'At least one image url expected, got {len(value)}')
+
+        if len(value) > max_images:
+            raise NumbersImagesErrors(f'Maximum number of images in list {max_images}, got {len(value)}')
+
+        contain_types = [isinstance(x, str) for x in value]
+        if not all(contain_types):
+            if 'base64' in field_name.lower():
+                raise TypeError(f'Next images from imagesBase64 array are not string: {contain_types}')
+            else:
+                raise TypeError(f'Next images from imagesUrls array are not string: {contain_types}')
+        return value
+
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        if value.get('Task') is None:
+            raise TaskNotDefinedError('Expect that task will be defined.')
+        else:
+            return value
+    
+    @validator('exampleImageUrls')
+    def validate_example_image_urls(cls, value):
+        return cls._validate_image_array(value, 'exampleImageUrls', 1)
+    
+    @validator('exampleImagesBase64')
+    def validate_example_images_base64(cls, value):
+        return cls._validate_image_array(value, 'exampleImagesBase64', 1)
+    
+    @validator('imagesUrls')
+    def validate_images_urls(cls, value):
+        return cls._validate_image_array(value, 'imagesUrls', 18)
+    
+    @validator('imagesBase64')
+    def validate_images_base64(cls, value):
+        return cls._validate_image_array(value, 'imagesBase64', 18)
+
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
+        
+        task = {}
+        task['type'] = self.taskType
+        task['class'] = self.captchaClass
+        
+        # fill with images
+        if self.imagesBase64 is None and self.imagesUrls is None:
+            raise ZeroImagesErrors('Expect at least one of array(imageBase64 or imageUrls) to contain images.')
+        
+        if self.imagesUrls is not None:
+            task['imageUrls'] = self.imagesUrls
+        
+        if self.imagesBase64 is not None:
+            task['imagesBase64'] = self.imagesBase64
+        
+        task['metadata'] = self.metadata
+        
+        if self.exampleImageUrls and self.exampleImagesBase64:
+            raise ExtraParamsError('Expect only one of [exampleImageUrls, exampleImagesBase64]')
+        
+        if self.exampleImageUrls is not None:
+            task['exampleImageUrls'] = self.exampleImageUrls
+
+        if self.exampleImagesBase64 is not None:
+            task['exampleImagesBase64'] = self.exampleImagesBase64
+
+        if self.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        
+        if self.websiteUrl is not None:
+            task['websiteUrl'] = self.websiteUrl
+        
+        return task
+    

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

@@ -9,17 +9,17 @@ class ImpervaCustomTaskRequest(CustomTaskRequestBase):
     
     @validator('metadata')
     def validate_metadata(cls, value):
-        if value.get('incapsulaScriptBase64') is None:
-            raise TypeError(f'Expect that incapsulaScriptBase64 will be defined.')
+        if value.get('incapsulaScriptUrl') is None:
+            raise TypeError(f'Expect that incapsulaScriptUrl 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.')
+            if not isinstance(value.get('incapsulaScriptUrl'), str):
+                raise TypeError(f'Expect that incapsulaScriptUrl will be str.')
+        if value.get('incapsulaCookie') is None:
+            raise TypeError(f'Expect that incapsulaCookie 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):
+            if not isinstance(value.get('incapsulaCookie'), str):
+                raise TypeError(f'Expect that incapsulaCookie will be str.')
+        if value.get('reese84UrlEndpoint') is not None and not isinstance(value.get('reese84UrlEndpoint'), str):
             raise TypeError(f'Expect that reese84UrlEndpoint will be str.')
         return value
     

capmonstercloudclient-3.2.0/capmonstercloud_client/requests/MTCaptchaRequest.py

@@ -0,0 +1,32 @@
+from typing import Dict, Optional, Union
+from pydantic import Field
+from .baseRequestWithProxy import BaseRequestWithProxy
+
+
+class MTCaptchaRequest(BaseRequestWithProxy):
+    type: str = Field(default="MTCaptchaTask")
+    websiteUrl: str
+    websiteKey: str
+    pageAction: Optional[str] = Field(default=None)
+    isInvisible: Optional[bool] = Field(default=None)
+    userAgent: Optional[str] = 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.pageAction is not None:
+            task["pageAction"] = self.pageAction
+        if self.isInvisible is not None:
+            task["isInvisible"] = self.isInvisible
+        if self.userAgent is not None:
+            task["userAgent"] = self.userAgent
+        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 → capmonstercloudclient-3.2.0}/capmonstercloud_client/requests/TurnstileRequest.py

@@ -1,4 +1,4 @@
-from typing import Dict, Optional
+from typing import Dict, Optional, Union
 from pydantic import Field, validator, model_validator
 from .baseRequestWithProxy import BaseRequestWithProxy
 
@@ -32,6 +32,11 @@ class TurnstileRequest(BaseRequestWithProxy):
                 raise RuntimeError(f'Expect that "htmlPageBase64" will be filled ' \
                     f'when cloudflareTaskType is "cf_clearance"')
         
+        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 ' \
+                        f'it is required that you need your proxies.')
+
         if self.get('cloudflareTaskType') == 'token':
             for field in ['pageAction', 'pageData', 'data']:
                 if self.get(field) is None:
@@ -43,9 +48,34 @@ class TurnstileRequest(BaseRequestWithProxy):
                 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}
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
+        task = {}
+        task['type'] = self.type
+        task['websiteURL'] = self.websiteURL
+        task['websiteKey'] = self.websiteKey
+        if self.pageAction is not None:
+            task['pageAction'] = self.pageAction
+        if self.data is not None:
+            task['data'] = self.data
+        if self.pageData is not None:
+            task['pageData'] = self.pageData
+        if self.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        if self.cloudflareTaskType is not None:
+            task['cloudflareTaskType'] = self.cloudflareTaskType
+        if self.htmlPageBase64 is not None:
+            task['htmlPageBase64'] = self.htmlPageBase64
+        if self.apiJsUrl is not None:
+            task['apiJsUrl'] = self.apiJsUrl
+        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.2.0/capmonstercloud_client/requests/YidunRequest.py

@@ -0,0 +1,26 @@
+from typing import Dict, Optional, Union
+from pydantic import Field
+from .baseRequestWithProxy import BaseRequestWithProxy
+
+
+class YidunRequest(BaseRequestWithProxy):
+    type: str = Field(default="YidunTask")
+    websiteUrl: str
+    websiteKey: str
+    userAgent: Optional[str] = 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.userAgent is not None:
+            task["userAgent"] = self.userAgent
+        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 → capmonstercloudclient-3.2.0}/capmonstercloud_client/requests/__init__.py

@@ -18,6 +18,9 @@ from .AmazonWafRequest import AmazonWafRequest
 from .BinanceTaskRequest import BinanceTaskRequest
 from .ImpervaCustomTaskRequest import ImpervaCustomTaskRequest
 from .RecognitionComplexImageTaskRequest import RecognitionComplexImageTaskRequest
+from .MTCaptchaRequest import MTCaptchaRequest
+from .YidunRequest import YidunRequest
+from .proxy_info import ProxyInfo
 
 
 REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2Request', 'RecaptchaV3ProxylessRequest', 'RecaptchaComplexImageTaskRequest'

capmonstercloudclient-3.2.0/capmonstercloud_client/version.txt

@@ -0,0 +1 @@
+3.2.0

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

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

{capmonstercloudclient-3.0.0 → capmonstercloudclient-3.2.0}/capmonstercloudclient.egg-info/SOURCES.txt

@@ -26,6 +26,7 @@ capmonstercloud_client/requests/HcaptchaComplexImageTask.py
 capmonstercloud_client/requests/HcaptchaRequest.py
 capmonstercloud_client/requests/ImageToTextRequest.py
 capmonstercloud_client/requests/ImpervaCustomTaskRequest.py
+capmonstercloud_client/requests/MTCaptchaRequest.py
 capmonstercloud_client/requests/RecaptchaComplexImageTask.py
 capmonstercloud_client/requests/RecaptchaV2EnterpiseRequest.py
 capmonstercloud_client/requests/RecaptchaV2Request.py
@@ -33,6 +34,7 @@ capmonstercloud_client/requests/RecaptchaV3ProxylessRequest.py
 capmonstercloud_client/requests/RecognitionComplexImageTaskRequest.py
 capmonstercloud_client/requests/TenDiCustomTaskRequest.py
 capmonstercloud_client/requests/TurnstileRequest.py
+capmonstercloud_client/requests/YidunRequest.py
 capmonstercloud_client/requests/__init__.py
 capmonstercloud_client/requests/baseRequest.py
 capmonstercloud_client/requests/baseRequestWithProxy.py

capmonstercloudclient-3.0.0/capmonstercloud_client/requests/HcaptchaComplexImageTask.py

@@ -1,116 +0,0 @@
-from typing import Dict, Union, List, Optional
-from pydantic import Field, validator
-
-from .ComplexImageTaskBase import ComplexImageTaskRequestBase
-from ..exceptions import NumbersImagesErrors, ZeroImagesErrors, TaskNotDefinedError, ExtraParamsError
-
-class HcaptchaComplexImageTaskRequest(ComplexImageTaskRequestBase):
-    
-    captchaClass: str = Field(default='hcaptcha')
-    metadata : Dict[str, str]
-    exampleImageUrls: Optional[List[str]] = None
-    exampleImagesBase64: Optional[List[str]] = None
-    
-    @validator('metadata')
-    def validate_metadata(cls, value):
-        if value.get('Task') is None:
-            raise TaskNotDefinedError(f'Expect that task will be defined.')
-        else:
-            return value
-    
-    @validator('exampleImageUrls')
-    def validate_urls_array(cls, value):
-        if value is not None:
-            if not isinstance(value, (list, tuple)):
-                raise TypeError(f'Expect that type exampleImageUrls array will be <list> or <tuple>, got {type(value)}')
-            elif len(value) > 1:
-                raise NumbersImagesErrors(f'Maximum number of images in list 1, got {len(value)}')
-            elif not len(value):
-                raise ZeroImagesErrors(f'At least one image url expected, got {len(value)}')
-            # Check for each element type
-            contain_types = [isinstance(x, str) for x in value]
-            if not all(contain_types):
-                raise TypeError(f'Next images from imagesUrls array are not string: {contain_types}')
-        return value
-    
-    @validator('exampleImagesBase64')
-    def validate_urls_array(cls, value):
-        if value is not None:
-            if not isinstance(value, (list, tuple)):
-                raise TypeError(f'Expect that type exampleImagesBase64 array will be <list> or <tuple>, got {type(value)}')
-            elif len(value) > 1:
-                raise NumbersImagesErrors(f'Maximum number of images in list 1, got {len(value)}')
-            elif not len(value):
-                raise ZeroImagesErrors(f'At least one image base64 expected, got {len(value)}')
-            # Check for each element type
-            contain_types = [isinstance(x, str) for x in value]
-            if not all(contain_types):
-                raise TypeError(f'Next images from imagesBase64 array are not string: {contain_types}')
-        return value
-    
-    @validator('imagesUrls')
-    def validate_urls_array(cls, value):
-        if value is not None:
-            if not isinstance(value, (list, tuple)):
-                raise TypeError(f'Expect that type imagesUrls array will be <list> or <tuple>, got {type(value)}')
-            elif len(value) > 18:
-                raise NumbersImagesErrors(f'Maximum number of images in list 18, got {len(value)}')
-            elif not len(value):
-                raise ZeroImagesErrors(f'At least one image url expected, got {len(value)}')
-            # Check for each element type
-            contain_types = [isinstance(x, str) for x in value]
-            if not all(contain_types):
-                raise TypeError(f'Next images from imagesUrls array are not string: {contain_types}')
-        return value
-    
-    @validator('imagesBase64')
-    def validate_images_array(cls, value):
-        if value is not None:
-            if not isinstance(value, (list, tuple)):
-                raise TypeError(f'Expect that type imagesBase64 array will be <list> or <tuple>, got {type(value)}')
-            elif len(value) > 18:
-                raise NumbersImagesErrors(f'Maximum number of images in list 18, got {len(value)}')
-            elif not len(value):
-                raise ZeroImagesErrors(f'At least one image base64 expected, got {len(value)}')
-            # Check for each element type
-            contain_types = [isinstance(x, str) for x in value]
-            if not all(contain_types):
-                raise TypeError(f'Next images from imagesBase64 array are not string: {contain_types}')
-        return value
-    
-    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
-        
-        task = {}
-        task['type'] = self.taskType
-        task['class'] = self.captchaClass
-        
-        # fill with images
-        if self.imagesBase64 is None and self.imagesUrls is None:
-            raise ZeroImagesErrors(f'Expect at least one of array(imageBase64 or imageUrls) to contain images.')
-        
-        if self.imagesUrls is not None:
-            task['imageUrls'] = self.imagesUrls
-        
-        if self.imagesBase64 is not None:
-            task['imagesBase64'] = self.imagesBase64
-        
-        task['metadata'] = self.metadata
-        
-        if self.exampleImageUrls and self.exampleImagesBase64:
-            raise ExtraParamsError('Expect only one of [exampleImageUrls, exampleImagesBase64]')
-        
-        if self.exampleImageUrls is not None:
-            task['exampleImageUrls'] = self.exampleImageUrls
-
-        if self.exampleImagesBase64 is not None:
-            task['exampleImagesBase64'] = self.exampleImagesBase64
-
-        if self.userAgent is not None:
-            task['userAgent'] = self.userAgent
-        
-        if self.websiteUrl is not None:
-            task['websiteUrl'] = self.websiteUrl
-        
-        return task
-    
-    

capmonstercloudclient-3.0.0/capmonstercloud_client/version.txt

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