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

capmonstercloudclient/CapMonsterCloudClient.py

@@ -29,7 +29,8 @@ _instance_config = (
     ((BasiliskCustomTaskRequest, BasiliskCustomTaskProxylessRequest), getBasiliskTimeouts),
     ((AmazonWafRequest, AmazonWafProxylessRequest), getAmazonWafTimeouts),
     ((BinanceTaskRequest, BinanceTaskProxylessRequest), getBinanceTimeouts),
-    ((ImpervaCustomTaskRequest, ImpervaCustomTaskProxylessRequest), getImpervaTimeouts)
+    ((ImpervaCustomTaskRequest, ImpervaCustomTaskProxylessRequest), getImpervaTimeouts),
+    ((RecognitionComplexImageTaskRequest), getCITTimeouts)
 )
 
 
@@ -82,7 +83,8 @@ class CapMonsterClient:
                                                  BinanceTaskRequest,
                                                  BinanceTaskProxylessRequest,
                                                  ImpervaCustomTaskRequest,
-                                                 ImpervaCustomTaskProxylessRequest],
+                                                 ImpervaCustomTaskProxylessRequest,
+                                                 RecognitionComplexImageTaskRequest],
                             ) -> Dict[str, str]:
         '''
         Non-blocking method for captcha solving. 

capmonstercloudclient/GetResultTimeouts.py

@@ -49,3 +49,6 @@ def getBinanceTimeouts() -> GetResultTimeouts:
 
 def getImpervaTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 20)
+
+def getCITTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(0.35, 0, 0.2, 10)

capmonstercloudclient/requests/RecaptchaComplexImageTask.py

@@ -71,7 +71,7 @@ class RecaptchaComplexImageTaskRequest(ComplexImageTaskRequestBase):
             
         if self.websiteUrl is not None:
             task["websiteUrl"] = self.websiteUrl
-        
+
         return task
     
     

capmonstercloudclient/requests/RecognitionComplexImageTaskRequest.py

@@ -0,0 +1,45 @@
+from typing import Optional, List, Dict, Union
+from pydantic import validator
+from .ComplexImageTaskBase import ComplexImageTaskRequestBase
+from ..exceptions import NumbersImagesErrors, ZeroImagesErrors, TaskNotDefinedError
+
+
+class RecognitionComplexImageTaskRequest(ComplexImageTaskRequestBase):
+    captchaClass: str = 'recognition'
+    metadata: Dict[str, str]
+
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        if value.get('Task') is None:
+            raise TaskNotDefinedError(f'Expect that Task will be defined.')
+        else:
+            if not isinstance(value.get('Task'), str):
+                raise TypeError(f'Expect that Task will be str.')
+        if not set(value.keys()).issubset(set(["Task", "TaskArgument"])):
+            raise TypeError(f'Allowed keys for metadata are "Task" and "TaskArgument"')
+        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 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}')
+        else:
+            raise ZeroImagesErrors(f'At least one image base64 expected, got {len(value)}')
+        return value
+    
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
+        task = {}
+        task['type'] = self.taskType
+        task['class'] = self.captchaClass
+        task['imagesBase64'] = self.imagesBase64
+        task['metadata'] = self.metadata
+        if self.userAgent is not None:
+            task['userAgent'] = self.userAgent
+        return task

capmonstercloudclient/requests/__init__.py

@@ -28,6 +28,7 @@ from .BinanceTaskRequest import BinanceTaskRequest
 from .BinanceTaskProxylessRequest import BinanceTaskProxylessRequest
 from .ImpervaCustomTaskRequest import ImpervaCustomTaskRequest
 from .ImpervaCustomTaskProxylessRequest import ImpervaCustomTaskProxylessRequest
+from .RecognitionComplexImageTaskRequest import RecognitionComplexImageTaskRequest
 
 
 REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2EnterpriseProxylessRequest', 
@@ -38,4 +39,4 @@ REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2EnterpriseProxylessReques
             'TenDiCustomTaskRequest', 'TenDiCustomTaskProxylessRequest', 'BasiliskCustomTaskRequest',
             'BasiliskCustomTaskProxylessRequest', 'AmazonWafRequest', 'AmazonWafProxylessRequest',
             'BinanceTaskRequest', 'BinanceTaskProxylessRequest', 'ImpervaCustomTaskProxylessRequest',
-            'ImpervaCustomTaskRequest']
+            'ImpervaCustomTaskRequest', 'RecognitionComplexImageTaskRequest']

capmonstercloudclient/version.txt

@@ -1 +1 @@
-1.6.0
+2.0.0

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: capmonstercloudclient
-Version: 1.6.0
+Version: 2.0.0
 Summary: Official CapMonsterCloud Client: https://capmonster.cloud/
 Home-page: https://github.com/ZennoLab/capmonstercloud-client-python
 Author: Andrey Ilyin
@@ -33,8 +33,24 @@ Classifier: Operating System :: MacOS
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: aiohttp>=3.7.4
-Requires-Dist: pydantic==2.1.*
+Requires-Dist: aiohappyeyeballs==2.4.4; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: aiohttp==3.11.10; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: aiosignal==1.3.1; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: annotated-types==0.7.0; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: async-timeout==5.0.1; python_version >= "3.9" and python_version <= "3.11"
+Requires-Dist: attrs==24.2.0; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: frozenlist==1.5.0; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: idna==3.10; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: multidict==6.1.0; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: propcache==0.2.1; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: pydantic-core==2.27.1; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: pydantic==2.10.3; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: typing-extensions==4.12.2; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: yarl==1.18.3; python_version >= "3.9" and python_version <= "3.13"
+Requires-Dist: aiohttp==3.7.4; python_version >= "3.6" and python_version <= "3.8"
+Requires-Dist: pydantic==2.10.3; python_version >= "3.8" and python_version < "3.9"
+Requires-Dist: pydantic==2.5.3; python_version >= "3.7" and python_version < "3.8"
+Requires-Dist: pydantic==2.1.*; python_version < "3.7"
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -43,6 +59,7 @@ Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
 Dynamic: license
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary

{capmonstercloudclient-1.6.0.dist-info → capmonstercloudclient-2.0.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-capmonstercloudclient/CapMonsterCloudClient.py,sha256=M_o11eAs_Hcdg36QA77V-AE6V-IrKXn12gpfpXkBUXY,9964
-capmonstercloudclient/GetResultTimeouts.py,sha256=SqQlQwl0id5y8SwN9F4ug8CgvQaLV9hWxWjFiksr32A,1570
+capmonstercloudclient/CapMonsterCloudClient.py,sha256=447XcFb5JXdPGBFb7nc_pP_yrHgV0y0Ac6mApyMRBxM,10109
+capmonstercloudclient/GetResultTimeouts.py,sha256=wgCXitjTsC6BYP3xjLqpW58xS55hsbqcf28IylxRS1E,1661
 capmonstercloudclient/__init__.py,sha256=XkfS_v1jZUx7HTUhdi-5uiZhvjvd9aLvt31jXXpVxeA,92
 capmonstercloudclient/captchaResult.py,sha256=qBRmadO9n6DMnG-IwJSzZEt54Z5OAXvWIC5Jvzd7OfI,314
 capmonstercloudclient/clientOptions.py,sha256=kd2CXnmz2_crZd85SoOHOjp1zBklEbu9OWDpk-JfBf4,895
 capmonstercloudclient/exceptions.py,sha256=9iTzO0ymBo7eAJwv7qtoPZTmb4yaQ6Fvi69VqBXTcwk,925
 capmonstercloudclient/requestController.py,sha256=9t31zNN4z1UBw4Q0N9ZIy47CwSQl2VaxD1eqDTDIr9w,497
 capmonstercloudclient/utils.py,sha256=hP090ddzDCLknr5wGCR7sIALDbOtWbiSzgZPvPnDC3c,609
-capmonstercloudclient/version.txt,sha256=ViNosgpkvpVlG7gka3Qg9_zlVTjf-Zmu-qeGYqFNDTk,5
+capmonstercloudclient/version.txt,sha256=8iq9Z3OrIyhpMhrUseR6wMkI_r9POivRDIBmFA90EmE,5
 capmonstercloudclient/requests/AmazonWafProxylessRequest.py,sha256=lgNC-03ccOsWZJM9xuLChaWAgNkOpMz4jRmhsK6yi58,753
 capmonstercloudclient/requests/AmazonWafRequest.py,sha256=vXw1AcTStr3NPFMSTUxi0ZuQ9ICEhwfhZ3m5BhSc6Jw,986
 capmonstercloudclient/requests/AmazonWafRequestBase.py,sha256=Ie4Vv6OZpFPvy6gQyuwsNMGKHEI4qNFa6Z5RK3KUqEw,308
@@ -36,7 +36,7 @@ capmonstercloudclient/requests/ImageToTextRequest.py,sha256=iubmsWXBwpQKFSoqL2Yu
 capmonstercloudclient/requests/ImpervaCustomTaskProxylessRequest.py,sha256=YTCLEvDZkIko9inkc4JLZBNlxPnL3CToV7o5kwFB-Dk,1498
 capmonstercloudclient/requests/ImpervaCustomTaskRequest.py,sha256=zw_dpvp5Yy2D5LeFZYSpuxZgIaSnpSibfIgs-bQzR_8,1765
 capmonstercloudclient/requests/ImpervaCustomTaskRequestBase.py,sha256=se-LV7B-WSZSBlPXOFUfHWlpWwkjCPul9dCN6eVJ6oM,269
-capmonstercloudclient/requests/RecaptchaComplexImageTask.py,sha256=fhT5tJo8__Ffc0sr4v0SxG0_tvqQt4A301CdM0zA8PI,3299
+capmonstercloudclient/requests/RecaptchaComplexImageTask.py,sha256=DW7FO14Q8da1AdDEvzfFcBAILqzesbARzi7cgwI742Q,3291
 capmonstercloudclient/requests/RecaptchaV2EnterpiseRequest.py,sha256=4mD8Lv52K9rhEzwXEBefnN0sN8TGwOsGvoFVrU7T44A,965
 capmonstercloudclient/requests/RecaptchaV2EnterpriseProxylessRequest.py,sha256=2B8tJXDwb_L-UHCJ0jz_ut116HzWk1EuDQBMfPOxSoc,718
 capmonstercloudclient/requests/RecaptchaV2EnterpriseRequestBase.py,sha256=WVw4HZhsKlUwC-npXnZKUHNvcJWgWtK8ah0iqNg0oWw,297
@@ -44,18 +44,19 @@ capmonstercloudclient/requests/RecaptchaV2ProxylessRequest.py,sha256=rfrvXjOuy09
 capmonstercloudclient/requests/RecaptchaV2Request.py,sha256=n2xhE9CH255nGChg1bc2cnQqTodehkUO9NZTPrJXcO8,995
 capmonstercloudclient/requests/RecaptchaV2RequestBase.py,sha256=IMjBmB8y7KwZ-CPkbYC48w2ADoEDiEpoK4Kzd8_Wbo8,329
 capmonstercloudclient/requests/RecaptchaV3ProxylessRequest.py,sha256=0IYCgNruZrVr0L7E4dfHE_Pv8DimkrH4PBkEPEv7dxw,1078
+capmonstercloudclient/requests/RecognitionComplexImageTaskRequest.py,sha256=p78sKK8-_J80lw5jk5cfB8sv85Kv8muTr7GEayDZbq8,2007
 capmonstercloudclient/requests/TenDiCustomTaskProxylessRequest.py,sha256=_mxYiUwsjbSaQ-1J4DKjNbho8HIQCwwxW1LDQRU7y2I,561
 capmonstercloudclient/requests/TenDiCustomTaskRequest.py,sha256=jWgGQaidkQHuJ8DeMMokQwlCKpI-5fhjoRQKflb6I6E,828
 capmonstercloudclient/requests/TenDiCustomTaskRequestBase.py,sha256=3bnONuD0u9Qs2qZ6XCTV3G8tOqHQIgTm-sG4azHTikQ,361
 capmonstercloudclient/requests/TurnstileProxylessRequest.py,sha256=ZRiBYYudP5z8J79YjjMf5PSgR9q1eWTCb1TWWfnIn10,342
 capmonstercloudclient/requests/TurnstileRequest.py,sha256=xPH5EyXwvw3apI1YlUEcTktGP3wxkaRAWKpP6uqOguI,378
 capmonstercloudclient/requests/TurnstileRequestBase.py,sha256=TRXbxmbZKM9449ZUni0g3ZdLIX4bFmh2PWdaLvNWlhc,2008
-capmonstercloudclient/requests/__init__.py,sha256=4Fd7Q-bxniIXF5sc4RIIsGXOIEnrvdtC8hwaOzZjJz0,2694
+capmonstercloudclient/requests/__init__.py,sha256=TcN1RyvVIASZhCu_2YTD-RHFT2OiVQ6mPo8Yh_K0UUw,2815
 capmonstercloudclient/requests/baseRequest.py,sha256=oVOtKdCfVhxQ9x4qDkIc1D_-q3B08hNQeUKrBLwkjaM,279
 capmonstercloudclient/requests/enums.py,sha256=itJ95OEzwous9zOe4n411w5LeBw4yCpCCTMomlT3LU0,1000
 capmonstercloudclient/requests/proxy_info.py,sha256=ctmxvykMflsym-snO449t9mOZ1jxpUFTnxcI8koACUw,678
-capmonstercloudclient-1.6.0.dist-info/LICENSE,sha256=VIIsA4331arqJBp_QqiY2cjVszTfuSt3I7uEUr4ouYw,1065
-capmonstercloudclient-1.6.0.dist-info/METADATA,sha256=kpesZFnlX9xJ7G-EqxSwZ0iMufFIXUWScqnSzwGvWSo,3973
-capmonstercloudclient-1.6.0.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-capmonstercloudclient-1.6.0.dist-info/top_level.txt,sha256=_rR6-Wb02PxobU8D33r_0OONJgybsros2e9H8opYGnA,22
-capmonstercloudclient-1.6.0.dist-info/RECORD,,
+capmonstercloudclient-2.0.0.dist-info/licenses/LICENSE,sha256=VIIsA4331arqJBp_QqiY2cjVszTfuSt3I7uEUr4ouYw,1065
+capmonstercloudclient-2.0.0.dist-info/METADATA,sha256=TCLLQUI3hNZH-Ww8iOuqa89qhiuZQy6CrZLx_0Y2AoM,5462
+capmonstercloudclient-2.0.0.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+capmonstercloudclient-2.0.0.dist-info/top_level.txt,sha256=_rR6-Wb02PxobU8D33r_0OONJgybsros2e9H8opYGnA,22
+capmonstercloudclient-2.0.0.dist-info/RECORD,,

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

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