capmonstercloudclient 1.6.0__tar.gz → 2.0.0__tar.gz

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

@@ -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 → capmonstercloudclient-2.0.0}/capmonstercloud_client/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-1.6.0 → capmonstercloudclient-2.0.0}/capmonstercloud_client/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-1.6.0 → capmonstercloudclient-2.0.0}/capmonstercloud_client/requests/RecaptchaComplexImageTask.py

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

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

@@ -0,0 +1 @@
+2.0.0

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

@@ -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 → capmonstercloudclient-2.0.0}/capmonstercloudclient.egg-info/SOURCES.txt

@@ -50,6 +50,7 @@ capmonstercloud_client/requests/RecaptchaV2ProxylessRequest.py
 capmonstercloud_client/requests/RecaptchaV2Request.py
 capmonstercloud_client/requests/RecaptchaV2RequestBase.py
 capmonstercloud_client/requests/RecaptchaV3ProxylessRequest.py
+capmonstercloud_client/requests/RecognitionComplexImageTaskRequest.py
 capmonstercloud_client/requests/TenDiCustomTaskProxylessRequest.py
 capmonstercloud_client/requests/TenDiCustomTaskRequest.py
 capmonstercloud_client/requests/TenDiCustomTaskRequestBase.py

capmonstercloudclient-2.0.0/capmonstercloudclient.egg-info/requires.txt

@@ -0,0 +1,30 @@
+
+[:python_version < "3.7"]
+pydantic==2.1.*
+
+[:python_version >= "3.6" and python_version <= "3.8"]
+aiohttp==3.7.4
+
+[:python_version >= "3.7" and python_version < "3.8"]
+pydantic==2.5.3
+
+[:python_version >= "3.8" and python_version < "3.9"]
+pydantic==2.10.3
+
+[:python_version >= "3.9" and python_version <= "3.11"]
+async-timeout==5.0.1
+
+[:python_version >= "3.9" and python_version <= "3.13"]
+aiohappyeyeballs==2.4.4
+aiohttp==3.11.10
+aiosignal==1.3.1
+annotated-types==0.7.0
+attrs==24.2.0
+frozenlist==1.5.0
+idna==3.10
+multidict==6.1.0
+propcache==0.2.1
+pydantic-core==2.27.1
+pydantic==2.10.3
+typing-extensions==4.12.2
+yarl==1.18.3

capmonstercloudclient-2.0.0/requirements.txt

@@ -0,0 +1,18 @@
+aiohappyeyeballs==2.4.4 ; python_version >= "3.9" and python_version <= "3.13"
+aiohttp==3.11.10 ; python_version >= "3.9" and python_version <= "3.13"
+aiosignal==1.3.1 ; python_version >= "3.9" and python_version <= "3.13"
+annotated-types==0.7.0 ; python_version >= "3.9" and python_version <= "3.13"
+async-timeout==5.0.1 ; python_version >= "3.9" and python_version <= "3.11"
+attrs==24.2.0 ; python_version >= "3.9" and python_version <= "3.13"
+frozenlist==1.5.0 ; python_version >= "3.9" and python_version <= "3.13"
+idna==3.10 ; python_version >= "3.9" and python_version <= "3.13"
+multidict==6.1.0 ; python_version >= "3.9" and python_version <= "3.13"
+propcache==0.2.1 ; python_version >= "3.9" and python_version <= "3.13"
+pydantic-core==2.27.1 ; python_version >= "3.9" and python_version <= "3.13"
+pydantic==2.10.3 ; python_version >= "3.9" and python_version <= "3.13"
+typing-extensions==4.12.2 ; python_version >= "3.9" and python_version <= "3.13"
+yarl==1.18.3 ; python_version >= "3.9" and python_version <= "3.13"
+aiohttp==3.7.4 ; python_version >= "3.6" and python_version <= "3.8"
+pydantic==2.10.3 ; python_version >= "3.8" and python_version < "3.9"
+pydantic==2.5.3 ; python_version >= "3.7" and python_version < "3.8"
+pydantic==2.1.* ; python_version < "3.7"

capmonstercloudclient-1.6.0/capmonstercloud_client/version.txt

@@ -1 +0,0 @@
-1.6.0

capmonstercloudclient-1.6.0/capmonstercloudclient.egg-info/requires.txt

@@ -1,2 +0,0 @@
-aiohttp>=3.7.4
-pydantic==2.1.*

capmonstercloudclient-1.6.0/requirements.txt

@@ -1,2 +0,0 @@
-aiohttp>=3.7.4
-pydantic==2.1.*