capmonstercloudclient 4.0.0__tar.gz → 4.1.0__tar.gz

{capmonstercloudclient-4.0.0 → capmonstercloudclient-4.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capmonstercloudclient
-Version: 4.0.0
+Version: 4.1.0
 Summary: Official CapMonsterCloud Client: https://capmonster.cloud/
 Home-page: https://github.com/ZennoLab/capmonstercloud-client-python
 Author: Andrey Ilyin
@@ -9,7 +9,6 @@ License: AGPL-3.0
 Keywords: captcha 
 				recaptcha
 				geetest
-				hcaptcha
 				funcaptcha
 				python3
 				python-library
@@ -64,53 +63,78 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# Zennolab.CapMonsterCloud.Client
+# CapMonster Cloud Python SDK
 
-Official python client library for [capmonster.cloud](https://capmonster.cloud/) captcha recognition service
+[![PyPI version](https://img.shields.io/pypi/v/capmonstercloudclient)](https://pypi.org/project/capmonstercloudclient/)
+
+Official Python SDK for the CapMonster Cloud API.
+Use this package when you want to create tasks and retrieve solutions from Python applications or scripts.
+
+## Links
+
+- Package: [capmonstercloudclient on PyPI](https://pypi.org/project/capmonstercloudclient/)
+- Documentation: [docs.capmonster.cloud](https://docs.capmonster.cloud/)
+- Dashboard / API key: [dash.capmonster.cloud](https://dash.capmonster.cloud/)
 
 ## Installation
 
-    python3 -m pip install capmonstercloudclient
+```bash
+python3 -m pip install capmonstercloudclient
+```
 
-## Usage
+Need to test before depositing? Contact support and we’ll add trial credits to your account.
 
-***
-    import asyncio
+## Minimal async example
 
-    from capmonstercloudclient import CapMonsterClient, ClientOptions
-    from capmonstercloudclient.requests import RecaptchaV2ProxylessRequest
+```python
+import asyncio
 
-    client_options = ClientOptions(api_key=<YOUR_API_KEY>)
-    cap_monster_client = CapMonsterClient(options=client_options)
+from capmonstercloudclient import CapMonsterClient, ClientOptions
+from capmonstercloudclient.requests import RecaptchaV2Request
 
-    async def solve_captcha():
-        return await cap_monster_client.solve_captcha(recaptcha2request)
+client_options = ClientOptions(api_key="<YOUR_API_KEY>")
+cap_monster_client = CapMonsterClient(options=client_options)
 
-    recaptcha2request = RecaptchaV2ProxylessRequest(websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
-                                                    websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd")
+recaptcha2request = RecaptchaV2Request(
+    websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
+    websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd",
+)
 
-    responses = asyncio.run(solve_captcha())
-    print(responses)
-***
+async def solve_captcha():
+    return await cap_monster_client.solve_captcha(recaptcha2request)
 
-Supported captcha recognition requests:
+response = asyncio.run(solve_captcha())
+print(response)
+```
 
-- [GeeTestProxylessRequest](https://zenno.link/doc-geetest-en)
-- [GeeTestRequest](https://zenno.link/doc-geetest-proxy-en)
-- [ImageToTextRequest](https://zenno.link/doc-ImageToTextTask-en)
-- [RecaptchaV2ProxylessRequest](https://zenno.link/doc-recaptcha2-en)
-- [RecaptchaV2Request](https://zenno.link/doc-recaptcha2-proxy-en)
-- [RecaptchaV3ProxylessRequest](https://zenno.link/doc-recaptcha3-en)
-- [RecaptchaV2EnterpriseProxylessRequest](https://zenno.link/doc-recaptcha2e-en)
-- [RecaptchaV2EnterpriseRequest](https://zenno.link/doc-recaptcha2e-proxy-en)
-- [TurnstileProxylessRequest](https://zenno.link/doc-turnstile-en)
-- [TurnstileRequest](https://zenno.link/doc-turnstile-proxy-en)
-- [RecaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-rc-en)
-- [DataDomeCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/datadome)
-- [TenDiCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tendi)
-- [BasiliskCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/Basilisk-task)
+Supported task families include reCAPTCHA, GeeTest, Turnstile, image-to-text, and additional task types documented in the public docs.
+
+Supported request classes:
+
+- [AltchaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/altcha-task)
+- [AlibabaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/alibaba-task)
 - [AmazonWafRequest](https://docs.capmonster.cloud/docs/captchas/amazon-task)
+- [BasiliskCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/Basilisk-task)
 - [BinanceTaskRequest](https://docs.capmonster.cloud/docs/captchas/binance)
-- [BinanceTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [CastleCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/castle-task)
+- [DataDomeCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/datadome)
+- [FriendlyCaptchaRequest](https://docs.capmonster.cloud/docs/captchas/friendly-task)
+- [FuncaptchaRequest](https://docs.capmonster.cloud/docs/captchas/funcaptcha-task)
+- [FunCaptchaComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/ComplexImageTask-Recognition)
+- [GeetestRequest](https://docs.capmonster.cloud/docs/captchas/geetest-task)
+- [HuntCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/hunt-task)
+- [ImageToTextRequest](https://docs.capmonster.cloud/docs/captchas/image-to-text)
 - [ImpervaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
-- [ImpervaCustomTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
+- [MTCaptchaRequest](https://docs.capmonster.cloud/docs/captchas/mtcaptcha-task)
+- [ProsopoTaskRequest](https://docs.capmonster.cloud/docs/captchas/prosopo-task)
+- [RecognitionComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/ComplexImageTask-Recognition)
+- [RecaptchaComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-click)
+- [RecaptchaV2EnterpriseRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v2-enterprise-task)
+- [RecaptchaV2Request](https://docs.capmonster.cloud/docs/captchas/no-captcha-task)
+- [RecaptchaV3EnterpriseRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v3-enterprise-task)
+- [RecaptchaV3ProxylessRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v3-task)
+- [TemuCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/temu-task)
+- [TenDiCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tendi)
+- [TspdCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tspd-task)
+- [TurnstileRequest](https://docs.capmonster.cloud/docs/captchas/turnstile-task)
+- [YidunRequest](https://docs.capmonster.cloud/docs/captchas/yidun-task)

capmonstercloudclient-4.1.0/README.md

@@ -0,0 +1,75 @@
+# CapMonster Cloud Python SDK
+
+[![PyPI version](https://img.shields.io/pypi/v/capmonstercloudclient)](https://pypi.org/project/capmonstercloudclient/)
+
+Official Python SDK for the CapMonster Cloud API.
+Use this package when you want to create tasks and retrieve solutions from Python applications or scripts.
+
+## Links
+
+- Package: [capmonstercloudclient on PyPI](https://pypi.org/project/capmonstercloudclient/)
+- Documentation: [docs.capmonster.cloud](https://docs.capmonster.cloud/)
+- Dashboard / API key: [dash.capmonster.cloud](https://dash.capmonster.cloud/)
+
+## Installation
+
+```bash
+python3 -m pip install capmonstercloudclient
+```
+
+Need to test before depositing? Contact support and we’ll add trial credits to your account.
+
+## Minimal async example
+
+```python
+import asyncio
+
+from capmonstercloudclient import CapMonsterClient, ClientOptions
+from capmonstercloudclient.requests import RecaptchaV2Request
+
+client_options = ClientOptions(api_key="<YOUR_API_KEY>")
+cap_monster_client = CapMonsterClient(options=client_options)
+
+recaptcha2request = RecaptchaV2Request(
+    websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
+    websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd",
+)
+
+async def solve_captcha():
+    return await cap_monster_client.solve_captcha(recaptcha2request)
+
+response = asyncio.run(solve_captcha())
+print(response)
+```
+
+Supported task families include reCAPTCHA, GeeTest, Turnstile, image-to-text, and additional task types documented in the public docs.
+
+Supported request classes:
+
+- [AltchaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/altcha-task)
+- [AlibabaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/alibaba-task)
+- [AmazonWafRequest](https://docs.capmonster.cloud/docs/captchas/amazon-task)
+- [BasiliskCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/Basilisk-task)
+- [BinanceTaskRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [CastleCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/castle-task)
+- [DataDomeCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/datadome)
+- [FriendlyCaptchaRequest](https://docs.capmonster.cloud/docs/captchas/friendly-task)
+- [FuncaptchaRequest](https://docs.capmonster.cloud/docs/captchas/funcaptcha-task)
+- [FunCaptchaComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/ComplexImageTask-Recognition)
+- [GeetestRequest](https://docs.capmonster.cloud/docs/captchas/geetest-task)
+- [HuntCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/hunt-task)
+- [ImageToTextRequest](https://docs.capmonster.cloud/docs/captchas/image-to-text)
+- [ImpervaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
+- [MTCaptchaRequest](https://docs.capmonster.cloud/docs/captchas/mtcaptcha-task)
+- [ProsopoTaskRequest](https://docs.capmonster.cloud/docs/captchas/prosopo-task)
+- [RecognitionComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/ComplexImageTask-Recognition)
+- [RecaptchaComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-click)
+- [RecaptchaV2EnterpriseRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v2-enterprise-task)
+- [RecaptchaV2Request](https://docs.capmonster.cloud/docs/captchas/no-captcha-task)
+- [RecaptchaV3EnterpriseRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v3-enterprise-task)
+- [RecaptchaV3ProxylessRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v3-task)
+- [TemuCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/temu-task)
+- [TenDiCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tendi)
+- [TspdCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tspd-task)
+- [TurnstileRequest](https://docs.capmonster.cloud/docs/captchas/turnstile-task)
+- [YidunRequest](https://docs.capmonster.cloud/docs/captchas/yidun-task)

{capmonstercloudclient-4.0.0 → capmonstercloudclient-4.1.0}/capmonstercloud_client/CapMonsterCloudClient.py

@@ -20,11 +20,9 @@ _instance_config = (
     ((RecaptchaV3EnterpriseRequest,), getRecaptchaV3Timeouts),
     ((ImageToTextRequest,), getImage2TextTimeouts),
     ((FuncaptchaRequest,), getFuncaptchaTimeouts),
-    ((HcaptchaRequest,), getHcaptchaTimeouts),
     ((GeetestRequest,), getGeetestTimeouts),
     ((TurnstileRequest,), getTurnstileTimeouts),
-    ((RecaptchaComplexImageTaskRequest, HcaptchaComplexImageTaskRequest, 
-      FunCaptchaComplexImageTaskRequest), getImage2TextTimeouts),
+    ((RecaptchaComplexImageTaskRequest, FunCaptchaComplexImageTaskRequest), getImage2TextTimeouts),
     ((DataDomeCustomTaskRequest,), getDatadomeTimeouts),
     ((TenDiCustomTaskRequest,), getTenDiTimeouts),
     ((BasiliskCustomTaskRequest,), getBasiliskTimeouts),
@@ -40,6 +38,8 @@ _instance_config = (
     ((CastleCustomTaskRequest,), getCastleTimeouts),
     ((TspdCustomTaskRequest,), getTspdTimeouts),
     ((HuntCustomTaskRequest,), getHuntTimeouts),
+    ((FriendlyCaptchaRequest,), getFriendlyCaptchaTimeouts),
+    ((AlibabaCustomTaskRequest,), getAlibabaTimeouts),
 )
 
 
@@ -88,8 +88,6 @@ class CapMonsterClient:
                                                  ImageToTextRequest, 
                                                  FuncaptchaRequest,
                                                  FunCaptchaComplexImageTaskRequest,
-                                                 HcaptchaRequest,
-                                                 HcaptchaComplexImageTaskRequest,
                                                  GeetestRequest,
                                                  DataDomeCustomTaskRequest,
                                                  TenDiCustomTaskRequest,
@@ -106,7 +104,9 @@ class CapMonsterClient:
                                                  AltchaCustomTaskRequest,
                                                  CastleCustomTaskRequest,
                                                  TspdCustomTaskRequest,
-                                                 HuntCustomTaskRequest],
+                                                 HuntCustomTaskRequest,
+                                                 FriendlyCaptchaRequest,
+                                                 AlibabaCustomTaskRequest],
                             ) -> Dict[str, str]:
         '''
         Non-blocking method for captcha solving. 
@@ -130,8 +130,6 @@ class CapMonsterClient:
                                           ImageToTextRequest, 
                                           FuncaptchaRequest,
                                           FunCaptchaComplexImageTaskRequest,
-                                          HcaptchaRequest,
-                                          HcaptchaComplexImageTaskRequest,
                                           GeetestRequest,
                                           DataDomeCustomTaskRequest,
                                           TenDiCustomTaskRequest,
@@ -145,7 +143,9 @@ class CapMonsterClient:
                                           YidunRequest,
                                           TemuCustomTaskRequest,
                                           ProsopoTaskRequest,
-                                          AltchaCustomTaskRequest],
+                                          AltchaCustomTaskRequest,
+                                          FriendlyCaptchaRequest,
+                                          AlibabaCustomTaskRequest],
                            timeouts: GetResultTimeouts,
                            ) -> Dict[str, str]:
 
@@ -215,4 +215,4 @@ class CapMonsterClient:
                     raise HTTPException(f'Cannot create task. Status code: {resp.status}.')
                 else:
                     return await resp.json(content_type=None)
-        
+        

{capmonstercloudclient-4.0.0 → capmonstercloudclient-4.1.0}/capmonstercloud_client/GetResultTimeouts.py

@@ -1,78 +1,106 @@
 from typing import Union
 from dataclasses import dataclass
 
+
 @dataclass
 class GetResultTimeouts:
     firstRequestDelay: Union[int, float]
     firstRequestNoCacheDelay: Union[int, float]
-    requestsInterval: Union[int, float] 
+    requestsInterval: Union[int, float]
     timeout: Union[int, float]
 
+
 def getRecaptchaV2Timeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getRecaptchaV2EnterpriseTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getRecaptchaV3Timeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getRecaptchaV3EnterpriseTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 150)
 
+
 def getImage2TextTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(0.35, 0, 0.2, 10)
 
+
 def getFuncaptchaTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 1, 80)
 
-def getHcaptchaTimeouts() -> GetResultTimeouts:
-    return GetResultTimeouts(1, 10, 3, 180)
 
 def getGeetestTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 80)
 
+
 def getTurnstileTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 80)
 
+
 def getDatadomeTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 80)
 
+
 def getTenDiTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getBasiliskTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 100)
 
+
 def getAmazonWafTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 10, 3, 180)
 
+
 def getBinanceTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 20)
 
+
 def getImpervaTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 20)
 
+
 def getAltchaTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 50)
 
+
 def getCastleTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 60)
 
+
 def getTspdTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 60)
 
+
 def getHuntTimeouts() -> GetResultTimeouts:
     return GetResultTimeouts(1, 0, 1, 60)
 
+
 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)
+
+
+def getFriendlyCaptchaTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 0, 1, 180)
+
+
+def getAlibabaTimeouts() -> GetResultTimeouts:
+    return GetResultTimeouts(1, 0, 1, 180)

capmonstercloudclient-4.1.0/capmonstercloud_client/requests/AlibabaCustomTaskRequest.py

@@ -0,0 +1,42 @@
+from typing import Dict, Union
+from pydantic import Field, validator
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+
+class AlibabaCustomTaskRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='alibaba')
+    metadata: Dict[str, str]
+
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        allowed_keys = {'sceneId', 'prefix', 'userId', 'userUserId', 'verifyType',
+                        'region', 'UserCertifyId', 'apiGetLib'}
+        unknown = set(value.keys()) - allowed_keys
+        if unknown:
+            raise TypeError(f'Unexpected metadata keys: {unknown}. Allowed: {allowed_keys}')
+        for key in ['sceneId', 'prefix']:
+            if value.get(key) is None:
+                raise TypeError(f'Expect that {key} will be defined.')
+            if not isinstance(value[key], str):
+                raise TypeError(f'Expect that {key} will be str.')
+        for key in ['userId', 'userUserId', 'verifyType', 'region', 'UserCertifyId', 'apiGetLib']:
+            if key in value and not isinstance(value[key], str):
+                raise TypeError(f'Expect that {key} will be str.')
+        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-4.1.0/capmonstercloud_client/requests/FriendlyCaptchaRequest.py

@@ -0,0 +1,35 @@
+from typing import Dict, Union
+from pydantic import Field, validator
+
+from .CustomTaskRequestBase import CustomTaskRequestBase
+
+
+class FriendlyCaptchaRequest(CustomTaskRequestBase):
+    captchaClass: str = Field(default='friendly')
+    websiteKey: str = Field()
+    metadata: Dict[str, str]
+
+    @validator('metadata')
+    def validate_metadata(cls, value):
+        if value.get('apiGetLib') is None:
+            raise TypeError('Expect that apiGetLib will be defined.')
+        if not isinstance(value['apiGetLib'], str):
+            raise TypeError('Expect that apiGetLib will be str.')
+        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['websiteKey'] = self.websiteKey
+        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-4.0.0 → capmonstercloudclient-4.1.0}/capmonstercloud_client/requests/RecognitionComplexImageTaskRequest.py

@@ -15,8 +15,8 @@ class RecognitionComplexImageTaskRequest(ComplexImageTaskRequestBase):
         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"')
+        if not set(value.keys()).issubset(set(["Task", "TaskArgument", "PayloadType"])):
+            raise TypeError(f'Allowed keys for metadata are "Task", "TaskArgument" and "PayloadType')
         return value
     
     @validator('imagesBase64')

{capmonstercloudclient-4.0.0 → capmonstercloudclient-4.1.0}/capmonstercloud_client/requests/__init__.py

@@ -4,12 +4,10 @@ from .RecaptchaV2EnterpiseRequest import RecaptchaV2EnterpriseRequest
 from .RecaptchaV3ProxylessRequest import RecaptchaV3ProxylessRequest
 from .RecaptchaV3EnterpriseRequest import RecaptchaV3EnterpriseRequest
 from .RecaptchaComplexImageTask import RecaptchaComplexImageTaskRequest
-from .HcaptchaRequest import HcaptchaRequest
 from .FuncaptchaRequest import FuncaptchaRequest
 from .FuncaptchaComplexImageTask import FunCaptchaComplexImageTaskRequest
 from .GeetestRequest import GeetestRequest
 from .TurnstileRequest import TurnstileRequest
-from .HcaptchaComplexImageTask import HcaptchaComplexImageTaskRequest
 from .RecaptchaComplexImageTask import RecaptchaComplexImageTaskRequest
 from .baseRequest import BaseRequest
 from .DataDomeCustomTaskRequest import DataDomeCustomTaskRequest
@@ -27,13 +25,14 @@ from .AltchaCustomTaskRequest import AltchaCustomTaskRequest
 from .CastleCustomTaskRequest import CastleCustomTaskRequest
 from .TspdCustomTaskRequest import TspdCustomTaskRequest
 from .HuntCustomTaskRequest import HuntCustomTaskRequest
+from .FriendlyCaptchaRequest import FriendlyCaptchaRequest
+from .AlibabaCustomTaskRequest import AlibabaCustomTaskRequest
 from .proxy_info import ProxyInfo, ClientProxyInfo
 
 
 REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2Request', 'RecaptchaV3ProxylessRequest', 'RecaptchaComplexImageTaskRequest', 'RecaptchaV3EnterpriseRequest',
             'ImageToTextRequest', 
             'FuncaptchaRequest', 'FunCaptchaComplexImageTaskRequest',
-            'HcaptchaRequest', 'HcaptchaComplexImageTaskRequest',
             'GeetestRequest',
             'DataDomeCustomTaskRequest',
             'TenDiCustomTaskRequest',
@@ -50,5 +49,7 @@ REQUESTS = ['RecaptchaV2EnterpiseRequest', 'RecaptchaV2Request', 'RecaptchaV3Pro
             'AltchaCustomTaskRequest',
             'CastleCustomTaskRequest',
             'TspdCustomTaskRequest',
-            'HuntCustomTaskRequest'
+            'HuntCustomTaskRequest',
+            'FriendlyCaptchaRequest',
+            'AlibabaCustomTaskRequest'
             ]

capmonstercloudclient-4.1.0/capmonstercloud_client/version.txt

@@ -0,0 +1 @@
+4.1.0

{capmonstercloudclient-4.0.0 → capmonstercloudclient-4.1.0}/capmonstercloudclient.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: capmonstercloudclient
-Version: 4.0.0
+Version: 4.1.0
 Summary: Official CapMonsterCloud Client: https://capmonster.cloud/
 Home-page: https://github.com/ZennoLab/capmonstercloud-client-python
 Author: Andrey Ilyin
@@ -9,7 +9,6 @@ License: AGPL-3.0
 Keywords: captcha 
 				recaptcha
 				geetest
-				hcaptcha
 				funcaptcha
 				python3
 				python-library
@@ -64,53 +63,78 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# Zennolab.CapMonsterCloud.Client
+# CapMonster Cloud Python SDK
 
-Official python client library for [capmonster.cloud](https://capmonster.cloud/) captcha recognition service
+[![PyPI version](https://img.shields.io/pypi/v/capmonstercloudclient)](https://pypi.org/project/capmonstercloudclient/)
+
+Official Python SDK for the CapMonster Cloud API.
+Use this package when you want to create tasks and retrieve solutions from Python applications or scripts.
+
+## Links
+
+- Package: [capmonstercloudclient on PyPI](https://pypi.org/project/capmonstercloudclient/)
+- Documentation: [docs.capmonster.cloud](https://docs.capmonster.cloud/)
+- Dashboard / API key: [dash.capmonster.cloud](https://dash.capmonster.cloud/)
 
 ## Installation
 
-    python3 -m pip install capmonstercloudclient
+```bash
+python3 -m pip install capmonstercloudclient
+```
 
-## Usage
+Need to test before depositing? Contact support and we’ll add trial credits to your account.
 
-***
-    import asyncio
+## Minimal async example
 
-    from capmonstercloudclient import CapMonsterClient, ClientOptions
-    from capmonstercloudclient.requests import RecaptchaV2ProxylessRequest
+```python
+import asyncio
 
-    client_options = ClientOptions(api_key=<YOUR_API_KEY>)
-    cap_monster_client = CapMonsterClient(options=client_options)
+from capmonstercloudclient import CapMonsterClient, ClientOptions
+from capmonstercloudclient.requests import RecaptchaV2Request
 
-    async def solve_captcha():
-        return await cap_monster_client.solve_captcha(recaptcha2request)
+client_options = ClientOptions(api_key="<YOUR_API_KEY>")
+cap_monster_client = CapMonsterClient(options=client_options)
 
-    recaptcha2request = RecaptchaV2ProxylessRequest(websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
-                                                    websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd")
+recaptcha2request = RecaptchaV2Request(
+    websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
+    websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd",
+)
 
-    responses = asyncio.run(solve_captcha())
-    print(responses)
-***
+async def solve_captcha():
+    return await cap_monster_client.solve_captcha(recaptcha2request)
 
-Supported captcha recognition requests:
+response = asyncio.run(solve_captcha())
+print(response)
+```
 
-- [GeeTestProxylessRequest](https://zenno.link/doc-geetest-en)
-- [GeeTestRequest](https://zenno.link/doc-geetest-proxy-en)
-- [ImageToTextRequest](https://zenno.link/doc-ImageToTextTask-en)
-- [RecaptchaV2ProxylessRequest](https://zenno.link/doc-recaptcha2-en)
-- [RecaptchaV2Request](https://zenno.link/doc-recaptcha2-proxy-en)
-- [RecaptchaV3ProxylessRequest](https://zenno.link/doc-recaptcha3-en)
-- [RecaptchaV2EnterpriseProxylessRequest](https://zenno.link/doc-recaptcha2e-en)
-- [RecaptchaV2EnterpriseRequest](https://zenno.link/doc-recaptcha2e-proxy-en)
-- [TurnstileProxylessRequest](https://zenno.link/doc-turnstile-en)
-- [TurnstileRequest](https://zenno.link/doc-turnstile-proxy-en)
-- [RecaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-rc-en)
-- [DataDomeCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/datadome)
-- [TenDiCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tendi)
-- [BasiliskCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/Basilisk-task)
+Supported task families include reCAPTCHA, GeeTest, Turnstile, image-to-text, and additional task types documented in the public docs.
+
+Supported request classes:
+
+- [AltchaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/altcha-task)
+- [AlibabaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/alibaba-task)
 - [AmazonWafRequest](https://docs.capmonster.cloud/docs/captchas/amazon-task)
+- [BasiliskCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/Basilisk-task)
 - [BinanceTaskRequest](https://docs.capmonster.cloud/docs/captchas/binance)
-- [BinanceTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/binance)
+- [CastleCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/castle-task)
+- [DataDomeCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/datadome)
+- [FriendlyCaptchaRequest](https://docs.capmonster.cloud/docs/captchas/friendly-task)
+- [FuncaptchaRequest](https://docs.capmonster.cloud/docs/captchas/funcaptcha-task)
+- [FunCaptchaComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/ComplexImageTask-Recognition)
+- [GeetestRequest](https://docs.capmonster.cloud/docs/captchas/geetest-task)
+- [HuntCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/hunt-task)
+- [ImageToTextRequest](https://docs.capmonster.cloud/docs/captchas/image-to-text)
 - [ImpervaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
-- [ImpervaCustomTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
+- [MTCaptchaRequest](https://docs.capmonster.cloud/docs/captchas/mtcaptcha-task)
+- [ProsopoTaskRequest](https://docs.capmonster.cloud/docs/captchas/prosopo-task)
+- [RecognitionComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/ComplexImageTask-Recognition)
+- [RecaptchaComplexImageTaskRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-click)
+- [RecaptchaV2EnterpriseRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v2-enterprise-task)
+- [RecaptchaV2Request](https://docs.capmonster.cloud/docs/captchas/no-captcha-task)
+- [RecaptchaV3EnterpriseRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v3-enterprise-task)
+- [RecaptchaV3ProxylessRequest](https://docs.capmonster.cloud/docs/captchas/recaptcha-v3-task)
+- [TemuCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/temu-task)
+- [TenDiCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tendi)
+- [TspdCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tspd-task)
+- [TurnstileRequest](https://docs.capmonster.cloud/docs/captchas/turnstile-task)
+- [YidunRequest](https://docs.capmonster.cloud/docs/captchas/yidun-task)

{capmonstercloudclient-4.0.0 → capmonstercloudclient-4.1.0}/capmonstercloudclient.egg-info/SOURCES.txt

@@ -13,6 +13,7 @@ capmonstercloud_client/exceptions.py
 capmonstercloud_client/requestController.py
 capmonstercloud_client/utils.py
 capmonstercloud_client/version.txt
+capmonstercloud_client/requests/AlibabaCustomTaskRequest.py
 capmonstercloud_client/requests/AltchaCustomTaskRequest.py
 capmonstercloud_client/requests/AmazonWafRequest.py
 capmonstercloud_client/requests/BasiliskCustomTaskRequest.py
@@ -21,11 +22,10 @@ capmonstercloud_client/requests/CastleCustomTaskRequest.py
 capmonstercloud_client/requests/ComplexImageTaskBase.py
 capmonstercloud_client/requests/CustomTaskRequestBase.py
 capmonstercloud_client/requests/DataDomeCustomTaskRequest.py
+capmonstercloud_client/requests/FriendlyCaptchaRequest.py
 capmonstercloud_client/requests/FuncaptchaComplexImageTask.py
 capmonstercloud_client/requests/FuncaptchaRequest.py
 capmonstercloud_client/requests/GeetestRequest.py
-capmonstercloud_client/requests/HcaptchaComplexImageTask.py
-capmonstercloud_client/requests/HcaptchaRequest.py
 capmonstercloud_client/requests/HuntCustomTaskRequest.py
 capmonstercloud_client/requests/ImageToTextRequest.py
 capmonstercloud_client/requests/ImpervaCustomTaskRequest.py

{capmonstercloudclient-4.0.0 → capmonstercloudclient-4.1.0}/setup.py

@@ -40,10 +40,9 @@ setup(
     python_requires='>=3.6',
     install_requires=REQUIRED,
     keywords="""
-                captcha 
+				captcha 
 				recaptcha
 				geetest
-				hcaptcha
 				funcaptcha
 				python3
 				python-library
@@ -68,4 +67,4 @@ setup(
         "Operating System :: Microsoft :: Windows",
         "Operating System :: MacOS",
     ]
-)
+)

capmonstercloudclient-4.0.0/README.md

@@ -1,50 +0,0 @@
-# Zennolab.CapMonsterCloud.Client
-
-Official python client library for [capmonster.cloud](https://capmonster.cloud/) captcha recognition service
-
-## Installation
-
-    python3 -m pip install capmonstercloudclient
-
-## Usage
-
-***
-    import asyncio
-
-    from capmonstercloudclient import CapMonsterClient, ClientOptions
-    from capmonstercloudclient.requests import RecaptchaV2ProxylessRequest
-
-    client_options = ClientOptions(api_key=<YOUR_API_KEY>)
-    cap_monster_client = CapMonsterClient(options=client_options)
-
-    async def solve_captcha():
-        return await cap_monster_client.solve_captcha(recaptcha2request)
-
-    recaptcha2request = RecaptchaV2ProxylessRequest(websiteUrl="https://lessons.zennolab.com/captchas/recaptcha/v2_simple.php?level=high",
-                                                    websiteKey="6Lcg7CMUAAAAANphynKgn9YAgA4tQ2KI_iqRyTwd")
-
-    responses = asyncio.run(solve_captcha())
-    print(responses)
-***
-
-Supported captcha recognition requests:
-
-- [GeeTestProxylessRequest](https://zenno.link/doc-geetest-en)
-- [GeeTestRequest](https://zenno.link/doc-geetest-proxy-en)
-- [ImageToTextRequest](https://zenno.link/doc-ImageToTextTask-en)
-- [RecaptchaV2ProxylessRequest](https://zenno.link/doc-recaptcha2-en)
-- [RecaptchaV2Request](https://zenno.link/doc-recaptcha2-proxy-en)
-- [RecaptchaV3ProxylessRequest](https://zenno.link/doc-recaptcha3-en)
-- [RecaptchaV2EnterpriseProxylessRequest](https://zenno.link/doc-recaptcha2e-en)
-- [RecaptchaV2EnterpriseRequest](https://zenno.link/doc-recaptcha2e-proxy-en)
-- [TurnstileProxylessRequest](https://zenno.link/doc-turnstile-en)
-- [TurnstileRequest](https://zenno.link/doc-turnstile-proxy-en)
-- [RecaptchaComplexImageTaskRequest](https://zenno.link/doc-complextask-rc-en)
-- [DataDomeCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/datadome)
-- [TenDiCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/tendi)
-- [BasiliskCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/Basilisk-task)
-- [AmazonWafRequest](https://docs.capmonster.cloud/docs/captchas/amazon-task)
-- [BinanceTaskRequest](https://docs.capmonster.cloud/docs/captchas/binance)
-- [BinanceTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/binance)
-- [ImpervaCustomTaskRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)
-- [ImpervaCustomTaskProxylessRequest](https://docs.capmonster.cloud/docs/captchas/incapsula)

capmonstercloudclient-4.0.0/capmonstercloud_client/requests/HcaptchaComplexImageTask.py

@@ -1,96 +0,0 @@
-from typing import Dict, Union, List, Optional
-from pydantic import Field, validator
-
-from .ComplexImageTaskBase import ComplexImageTaskRequestBase
-from ..exceptions import NumbersImagesErrors, ZeroImagesErrors, TaskNotDefinedError, ExtraParamsError
-
-class HcaptchaComplexImageTaskRequest(ComplexImageTaskRequestBase):
-    
-    captchaClass: str = Field(default='hcaptcha')
-    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('Expect that task will be defined.')
-        else:
-            return value
-    
-    @validator('exampleImageUrls')
-    def validate_example_image_urls(cls, value):
-        return cls._validate_image_array(value, 'exampleImageUrls', 1)
-    
-    @validator('exampleImagesBase64')
-    def validate_example_images_base64(cls, value):
-        return cls._validate_image_array(value, 'exampleImagesBase64', 1)
-    
-    @validator('imagesUrls')
-    def validate_images_urls(cls, value):
-        return cls._validate_image_array(value, 'imagesUrls', 18)
-    
-    @validator('imagesBase64')
-    def validate_images_base64(cls, value):
-        return cls._validate_image_array(value, 'imagesBase64', 18)
-
-    def getTaskDict(self) -> Dict[str, Union[str, int, bool]]:
-        
-        task = {}
-        task['type'] = self.taskType
-        task['class'] = self.captchaClass
-        
-        # fill with images
-        if self.imagesBase64 is None and self.imagesUrls is None:
-            raise ZeroImagesErrors('Expect at least one of array(imageBase64 or imageUrls) to contain images.')
-        
-        if self.imagesUrls is not None:
-            task['imageUrls'] = self.imagesUrls
-        
-        if self.imagesBase64 is not None:
-            task['imagesBase64'] = self.imagesBase64
-        
-        task['metadata'] = self.metadata
-        
-        if self.exampleImageUrls and self.exampleImagesBase64:
-            raise ExtraParamsError('Expect only one of [exampleImageUrls, exampleImagesBase64]')
-        
-        if self.exampleImageUrls is not None:
-            task['exampleImageUrls'] = self.exampleImageUrls
-
-        if self.exampleImagesBase64 is not None:
-            task['exampleImagesBase64'] = self.exampleImagesBase64
-
-        if self.userAgent is not None:
-            task['userAgent'] = self.userAgent
-        
-        if self.websiteUrl is not None:
-            task['websiteUrl'] = self.websiteUrl
-        
-        return task
-    

capmonstercloudclient-4.0.0/capmonstercloud_client/requests/HcaptchaRequest.py

@@ -1,39 +0,0 @@
-from pydantic import Field
-from typing import Dict, Union, Optional
-
-from .baseRequestWithProxy import BaseRequestWithProxy
-
-class HcaptchaRequest(BaseRequestWithProxy):
-    type: str = Field(default='HCaptchaTask')
-    websiteUrl: str
-    websiteKey: str
-    is_invisible: Optional[bool] = Field(default=None)
-    data: Optional[str] = Field(default=None)
-    user_agent: Optional[str] = Field(default=None)
-    cookies: Optional[str] = Field(default=None)
-    fallbackToActualUA: Optional[bool] = 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.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.is_invisible is not None:
-            task['isInvisible'] = self.is_invisible
-        if self.data is not None:
-            task['data'] = self.data
-        if self.user_agent is not None:
-            task['userAgent'] = self.user_agent
-        if self.cookies is not None:
-            task['cookies'] = self.cookies
-        if self.fallbackToActualUA is not None:
-            task['fallbackToActualUA'] = self.fallbackToActualUA
-
-        return task

capmonstercloudclient-4.0.0/capmonstercloud_client/version.txt

@@ -1 +0,0 @@
-4.0.0