capmonstercloudclient 3.1.0__py3-none-any.whl → 3.2.0__py3-none-any.whl

capmonstercloudclient/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/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/requests/HcaptchaComplexImageTask.py

@@ -10,74 +10,55 @@ class HcaptchaComplexImageTaskRequest(ComplexImageTaskRequestBase):
     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(f'Expect that task will be defined.')
+            raise TaskNotDefinedError('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
+    def validate_example_image_urls(cls, value):
+        return cls._validate_image_array(value, 'exampleImageUrls', 1)
     
     @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
+    def validate_example_images_base64(cls, value):
+        return cls._validate_image_array(value, 'exampleImagesBase64', 1)
     
     @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
+    def validate_images_urls(cls, value):
+        return cls._validate_image_array(value, 'imagesUrls', 18)
     
     @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 validate_images_base64(cls, value):
+        return cls._validate_image_array(value, 'imagesBase64', 18)
+
     def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
         
         task = {}
@@ -86,7 +67,7 @@ class HcaptchaComplexImageTaskRequest(ComplexImageTaskRequestBase):
         
         # 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.')
+            raise ZeroImagesErrors('Expect at least one of array(imageBase64 or imageUrls) to contain images.')
         
         if self.imagesUrls is not None:
             task['imageUrls'] = self.imagesUrls
@@ -113,4 +94,3 @@ class HcaptchaComplexImageTaskRequest(ComplexImageTaskRequestBase):
         
         return task
     
-    

capmonstercloudclient/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/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/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/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/version.txt

@@ -1 +1 @@
-3.1.0
+3.2.0

{capmonstercloudclient-3.1.0.dist-info → capmonstercloudclient-3.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capmonstercloudclient
-Version: 3.1.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.1.0.dist-info → capmonstercloudclient-3.2.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-capmonstercloudclient/CapMonsterCloudClient.py,sha256=0IWzHunUgTsD2QqR1gbOuil4vMEDC5D4g5561W8Zl5o,9101
+capmonstercloudclient/CapMonsterCloudClient.py,sha256=0YRJepYoyD2P_nwltTlrkD_1l69tc84iScycw-bFY_M,9326
 capmonstercloudclient/GetResultTimeouts.py,sha256=wgCXitjTsC6BYP3xjLqpW58xS55hsbqcf28IylxRS1E,1661
 capmonstercloudclient/__init__.py,sha256=XkfS_v1jZUx7HTUhdi-5uiZhvjvd9aLvt31jXXpVxeA,92
 capmonstercloudclient/captchaResult.py,sha256=qBRmadO9n6DMnG-IwJSzZEt54Z5OAXvWIC5Jvzd7OfI,314
@@ -6,34 +6,36 @@ capmonstercloudclient/clientOptions.py,sha256=kd2CXnmz2_crZd85SoOHOjp1zBklEbu9OW
 capmonstercloudclient/exceptions.py,sha256=9iTzO0ymBo7eAJwv7qtoPZTmb4yaQ6Fvi69VqBXTcwk,925
 capmonstercloudclient/requestController.py,sha256=9t31zNN4z1UBw4Q0N9ZIy47CwSQl2VaxD1eqDTDIr9w,497
 capmonstercloudclient/utils.py,sha256=hP090ddzDCLknr5wGCR7sIALDbOtWbiSzgZPvPnDC3c,609
-capmonstercloudclient/version.txt,sha256=hORQlST9mZYLrbrFUlSvzqMw16EOq9al8dy0X8OMP0A,5
+capmonstercloudclient/version.txt,sha256=ojyOaxZvgxpbs8G94LZrGFxuPlkFKS6Kgq_q-EF6VHY,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/DataDomeCustomTaskRequest.py,sha256=Cyh9SPR4ilwNbfXY6UmHYV0fnPYFGBNzo630L8Oewfc,1696
 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/HcaptchaComplexImageTask.py,sha256=1Oee7p2hWVnF7wVonWJ8Y3q-UhrSNX2gNiLjd1O0v2Y,3758
 capmonstercloudclient/requests/HcaptchaRequest.py,sha256=sa0FRLf-H-9MWlFrowMNED19EfkI_xbkNC6CMsR_pwg,1502
 capmonstercloudclient/requests/ImageToTextRequest.py,sha256=1F7Gzq0qTuxjbl9XfFbszQUHNG7W5PthuiJBAO_VEug,2481
 capmonstercloudclient/requests/ImpervaCustomTaskRequest.py,sha256=YUY_wC8yv16rZGK_VTCbqzj1rMxbUeJrxAE-7IT2AYY,1777
+capmonstercloudclient/requests/MTCaptchaRequest.py,sha256=dn2OxdB5Ro8c01Z4NplHKOVbYsA_o2hH8QCNFVLIzfY,1212
 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/TurnstileRequest.py,sha256=Z15aoC6IhUCBc1CUAlEd6tpfwk4UK4b-EzL1HbHQqw4,3510
+capmonstercloudclient/requests/YidunRequest.py,sha256=QwHal52oTAzLJOvDVfSqyb1hKvhbcgABdFlw9Il_Y1w,917
+capmonstercloudclient/requests/__init__.py,sha256=M80ammbzgrQMl44UUXDa0YlUcsnnN2ncUYM3SeEitHI,1944
 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.1.0.dist-info/licenses/LICENSE,sha256=VIIsA4331arqJBp_QqiY2cjVszTfuSt3I7uEUr4ouYw,1065
-capmonstercloudclient-3.1.0.dist-info/METADATA,sha256=-YLk6fDhT21bMEWTPU6KzVl6phno9JZ1Ap3dUUXYBk4,5462
-capmonstercloudclient-3.1.0.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-capmonstercloudclient-3.1.0.dist-info/top_level.txt,sha256=_rR6-Wb02PxobU8D33r_0OONJgybsros2e9H8opYGnA,22
-capmonstercloudclient-3.1.0.dist-info/RECORD,,
+capmonstercloudclient-3.2.0.dist-info/licenses/LICENSE,sha256=VIIsA4331arqJBp_QqiY2cjVszTfuSt3I7uEUr4ouYw,1065
+capmonstercloudclient-3.2.0.dist-info/METADATA,sha256=MXa6d5fCzH3-Q09lnN4nr1WBav0wzkaa8WGS-qpcu5I,5462
+capmonstercloudclient-3.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+capmonstercloudclient-3.2.0.dist-info/top_level.txt,sha256=_rR6-Wb02PxobU8D33r_0OONJgybsros2e9H8opYGnA,22
+capmonstercloudclient-3.2.0.dist-info/RECORD,,

{capmonstercloudclient-3.1.0.dist-info → capmonstercloudclient-3.2.0.dist-info}/WHEEL

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