capmonstercloudclient 3.2.0__tar.gz → 3.3.0__tar.gz

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

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

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

@@ -32,7 +32,9 @@ _instance_config = (
     ((ImpervaCustomTaskRequest,), getImpervaTimeouts),
     ((RecognitionComplexImageTaskRequest), getCITTimeouts),
     ((MTCaptchaRequest), getImage2TextTimeouts),
-    ((YidunRequest), getImage2TextTimeouts),
+    ((YidunRequest), getYidunTimeouts),
+    ((TemuCustomTaskRequest), getTemuTimeouts),
+    ((ProsopoTaskRequest), getProsopoTimeouts),
 )
 
 
@@ -83,7 +85,9 @@ class CapMonsterClient:
                                                  TurnstileRequest,
                                                  RecognitionComplexImageTaskRequest,
                                                  MTCaptchaRequest,
-                                                 YidunRequest],
+                                                 YidunRequest,
+                                                 TemuCustomTaskRequest,
+                                                 ProsopoTaskRequest],
                             ) -> Dict[str, str]:
         '''
         Non-blocking method for captcha solving. 
@@ -116,7 +120,11 @@ class CapMonsterClient:
                                           BinanceTaskRequest,
                                           ImpervaCustomTaskRequest,
                                           TurnstileRequest,
-                                          RecognitionComplexImageTaskRequest],
+                                          RecognitionComplexImageTaskRequest,
+                                          MTCaptchaRequest,
+                                          YidunRequest,
+                                          TemuCustomTaskRequest,
+                                          ProsopoTaskRequest],
                            timeouts: GetResultTimeouts,
                            ) -> Dict[str, str]:
 

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

@@ -52,3 +52,12 @@ def getImpervaTimeouts() -> GetResultTimeouts:
 
 def getCITTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(0.35, 0, 0.2, 10)
+
+def getYidunTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 10, 3, 180)
+
+def getProsopoTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 10, 3, 180)
+
+def getTemuTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 10, 3, 180)

capmonstercloudclient-3.3.0/capmonstercloud_client/requests/ProsopoTaskRequest.py

@@ -0,0 +1,23 @@
+from typing import Dict, Union
+from pydantic import Field
+from .baseRequestWithProxy import BaseRequestWithProxy
+
+
+class ProsopoTaskRequest(BaseRequestWithProxy):
+    type: str = Field(default="ProsopoTask")
+    websiteUrl: str
+    websiteKey: str
+
+    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
+        task = {}
+        task["type"] = self.type
+        task["websiteURL"] = self.websiteUrl
+        task["websiteKey"] = self.websiteKey
+        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.3.0/capmonstercloud_client/requests/TemuCustomTaskRequest.py

@@ -0,0 +1,35 @@
+from typing import Dict, Union
+from pydantic import Field, validator
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+class TemuCustomTaskRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='Temu')
+    metadata: Dict[str, str]
+
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        if value.get('cookie') is None:
+            raise TypeError(f'Expect that cookie will be defined.')
+        else:
+            if not isinstance(value.get('cookie'), str):
+                raise TypeError(f'Expect that cookie will be str.')
+        if not set(value.keys()).issubset(set(["cookie"])):
+            raise TypeError(f'Allowed keys for metadata are "cookie"')
+        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['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.2.0 → capmonstercloudclient-3.3.0}/capmonstercloud_client/requests/__init__.py

@@ -20,6 +20,8 @@ from .ImpervaCustomTaskRequest import ImpervaCustomTaskRequest
 from .RecognitionComplexImageTaskRequest import RecognitionComplexImageTaskRequest
 from .MTCaptchaRequest import MTCaptchaRequest
 from .YidunRequest import YidunRequest
+from .ProsopoTaskRequest import ProsopoTaskRequest
+from .TemuCustomTaskRequest import TemuCustomTaskRequest
 from .proxy_info import ProxyInfo
 
 
@@ -35,4 +37,9 @@ REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2Request', 'RecaptchaV3Pro
             'BinanceTaskRequest',
             'ImpervaCustomTaskRequest',
             'TurnstileRequest',
-            'RecognitionComplexImageTaskRequest']
+            'RecognitionComplexImageTaskRequest',
+            'MTCaptchaRequest',
+            'YidunRequest',
+            'ProsopoTaskRequest',
+            'TemuCustomTaskRequest'
+            ]

capmonstercloudclient-3.3.0/capmonstercloud_client/version.txt

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

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

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

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

@@ -27,11 +27,13 @@ capmonstercloud_client/requests/HcaptchaRequest.py
 capmonstercloud_client/requests/ImageToTextRequest.py
 capmonstercloud_client/requests/ImpervaCustomTaskRequest.py
 capmonstercloud_client/requests/MTCaptchaRequest.py
+capmonstercloud_client/requests/ProsopoTaskRequest.py
 capmonstercloud_client/requests/RecaptchaComplexImageTask.py
 capmonstercloud_client/requests/RecaptchaV2EnterpiseRequest.py
 capmonstercloud_client/requests/RecaptchaV2Request.py
 capmonstercloud_client/requests/RecaptchaV3ProxylessRequest.py
 capmonstercloud_client/requests/RecognitionComplexImageTaskRequest.py
+capmonstercloud_client/requests/TemuCustomTaskRequest.py
 capmonstercloud_client/requests/TenDiCustomTaskRequest.py
 capmonstercloud_client/requests/TurnstileRequest.py
 capmonstercloud_client/requests/YidunRequest.py

capmonstercloudclient-3.2.0/capmonstercloud_client/version.txt

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