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

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

@@ -1 +1 @@
-3.2.0
+3.3.0

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

@@ -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.dist-info → capmonstercloudclient-3.3.0.dist-info}/RECORD

@@ -1,12 +1,12 @@
-capmonstercloudclient/CapMonsterCloudClient.py,sha256=0YRJepYoyD2P_nwltTlrkD_1l69tc84iScycw-bFY_M,9326
-capmonstercloudclient/GetResultTimeouts.py,sha256=wgCXitjTsC6BYP3xjLqpW58xS55hsbqcf28IylxRS1E,1661
+capmonstercloudclient/CapMonsterCloudClient.py,sha256=1OzypqFZMw9cuzDJYXEo8W6QaxW8KDRzJjsKkQI9WiU,9801
+capmonstercloudclient/GetResultTimeouts.py,sha256=d_uecjbwGoaTutuK9eEQ2gy53bKkCtcpNFBs3lV3iyI,1932
 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=ojyOaxZvgxpbs8G94LZrGFxuPlkFKS6Kgq_q-EF6VHY,5
+capmonstercloudclient/version.txt,sha256=bSYhZybiZv8dr1sYDsdjRHE6FmMyKeNmBtwSrNRlAyw,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
@@ -21,21 +21,23 @@ capmonstercloudclient/requests/HcaptchaRequest.py,sha256=sa0FRLf-H-9MWlFrowMNED1
 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/ProsopoTaskRequest.py,sha256=8FjE2tQmxFS6mEpeK4wiws1-E60fG-XMos_kxc6rNOU,778
 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/TemuCustomTaskRequest.py,sha256=ltYn_TdNTwo5FQbFqmUVycnZuJmU6tMFpBZ-4CBRL-c,1373
 capmonstercloudclient/requests/TenDiCustomTaskRequest.py,sha256=OIhLd_ODD6MsvBl6wSVcOHuBn0rv-Cg4sEFd6Y0zrY4,903
 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/__init__.py,sha256=TC816eAQM3HbNlktThQkMXNQzzK-NUc5WuXm2tMEOi8,2196
 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.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.3.0.dist-info/licenses/LICENSE,sha256=VIIsA4331arqJBp_QqiY2cjVszTfuSt3I7uEUr4ouYw,1065
+capmonstercloudclient-3.3.0.dist-info/METADATA,sha256=RMQdKYXzG88Ks_YBnSoCmqjsA4V5LPEA-dsfOJROAkE,5462
+capmonstercloudclient-3.3.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+capmonstercloudclient-3.3.0.dist-info/top_level.txt,sha256=_rR6-Wb02PxobU8D33r_0OONJgybsros2e9H8opYGnA,22
+capmonstercloudclient-3.3.0.dist-info/RECORD,,