python3-capsolver 0.8__tar.gz → 0.9.2__tar.gz

{python3-capsolver-0.8 → python3-capsolver-0.9.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python3-capsolver
-Version: 0.8
+Version: 0.9.2
 Summary: Python 3.8+ Capsolver library with AIO module.
 Home-page: https://andreidrang.github.io/python3-capsolver/
 Author: AndreiDrang
@@ -26,6 +26,9 @@ Keywords: captcha
 				cloudflare
 				amazon
 				amazon_waf
+				akamai
+				imperva
+				binance
 Classifier: License :: OSI Approved :: MIT License
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Development Status :: 5 - Production/Stable
@@ -45,7 +48,8 @@ Description-Content-Type: text/markdown
 
 
 # python3-capsolver
-![Python3-Capsolver](https://github.com/AndreiDrang/python3-capsolver/blob/main/files/CapsolverSm.png)
+
+![Logo](https://red-panda-dev.xyz/media/images/Capsolver.max-800x600.png)
 
 <a href="https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1">
     <img src="https://cdn.discordapp.com/attachments/1105172394655625306/1105180101802471575/20221207-160749.gif" alt="Capsolver's Banner">
@@ -83,6 +87,10 @@ Or email python-captcha@pm.me
 
 ***
 
+You can check our other projects here - [RedPandaDev group](https://red-panda-dev.xyz/blog/). For example - [Torrents Tracker bot](https://t.me/torrents_tracker_bot) for Telegram.
+
+***
+
 ## How to install?
 
 We recommend using the latest version of Python. `python3-capsolver` supports Python 3.7+.

python3-capsolver-0.9.2/python3_capsolver/__version__.py

@@ -0,0 +1 @@
+__version__ = "0.9.2"

python3-capsolver-0.9.2/python3_capsolver/binance.py

@@ -0,0 +1,112 @@
+from typing import Union
+
+from python3_capsolver.core.base import BaseCaptcha
+from python3_capsolver.core.enum import BinanceCaptchaTaskEnm
+from python3_capsolver.core.serializer import CaptchaResponseSer, BinanceCaptchaTaskSer
+
+
+class Binance(BaseCaptcha):
+    """
+    The class is used to work with Capsolver Imperva method.
+
+    Args:
+        api_key: Capsolver API key
+        captcha_type: Captcha type name, like ``AntiImpervaTask`` and etc.
+        websiteUrl: The website url
+        userAgent: Browser userAgent
+
+    Examples:
+        >>> Binance(api_key="CAI-BA9XXXXXXXXXXXXX2702E010",
+        ...          captcha_type="BinanceCaptchaTask",
+        ...          websiteURL="https://www.milanuncios.com/",
+        ...          websiteKey="login",
+        ...          validateId="3621a4fef82f4ab4a00e8b07465761c5",
+        ...         ).captcha_handler()
+        CaptchaResponseSer(errorId=0,
+                           errorCode=None,
+                           errorDescription=None,
+                           taskId='73bdcd28-6c77-4414-8....',
+                           status=<ResponseStatusEnm.Ready: 'ready'>,
+                           solution={'token': '90F9EAF...'}
+                          )
+
+        >>> Binance(api_key="CAI-BA9XXXXXXXXXXXXX2702E010",
+        ...          captcha_type=BinanceCaptchaTaskEnm.BinanceCaptchaTask,
+        ...          websiteURL="https://www.milanuncios.com/",
+        ...          websiteKey="login",
+        ...          validateId="3621a4fef82f4ab4a00e8b07465761c5",
+        ...         ).captcha_handler()
+        CaptchaResponseSer(errorId=0,
+                           errorCode=None,
+                           errorDescription=None,
+                           taskId='73bdcd28-6c77-4414-8....',
+                           status=<ResponseStatusEnm.Ready: 'ready'>,
+                           solution={'token': '90F9EAF...'}
+                          )
+
+        >>> await Binance(api_key="CAI-BA9650D2B9C2786B21120D512702E010",
+        ...                 captcha_type=BinanceCaptchaTaskEnm.BinanceCaptchaTask,
+        ...                 websiteURL="https://www.milanuncios.com/",
+        ...                 websiteKey="login",
+        ...                 validateId="3621a4fef82f4ab4a00e8b07465761c5",
+        ...         ).aio_captcha_handler()
+        CaptchaResponseSer(errorId=0,
+                           errorCode=None,
+                           errorDescription=None,
+                           taskId='73bdcd28-6c77-4414-8....',
+                           status=<ResponseStatusEnm.Ready: 'ready'>,
+                           solution={'token': '90F9EAF...'}
+                          )
+
+    Returns:
+        CaptchaResponseSer model with full server response
+
+    Notes:
+        https://docs.capsolver.com/guide/captcha/BnCaptcha.html
+    """
+
+    def __init__(
+        self,
+        captcha_type: Union[BinanceCaptchaTaskEnm, str],
+        websiteURL: str,
+        validateId: str,
+        websiteKey: str = "login",
+        *args,
+        **kwargs,
+    ):
+        super().__init__(*args, **kwargs)
+
+        if captcha_type == BinanceCaptchaTaskEnm.BinanceCaptchaTask:
+            self.task_params = BinanceCaptchaTaskSer(**locals()).dict()
+        else:
+            raise ValueError(
+                f"""Invalid `captcha_type` parameter set for `{self.__class__.__name__}`,
+                available - {BinanceCaptchaTaskEnm.list_values()}"""
+            )
+
+        for key in kwargs:
+            self.task_params.update({key: kwargs[key]})
+
+    def captcha_handler(self) -> CaptchaResponseSer:
+        """
+        Sync solving method
+
+        Returns:
+            CaptchaResponseSer model with full service response
+
+        Notes:
+            Check class docstring for more info
+        """
+        return self._processing_captcha(create_params=self.task_params)
+
+    async def aio_captcha_handler(self) -> CaptchaResponseSer:
+        """
+        Async method for captcha solving
+
+        Returns:
+            CaptchaResponseSer model with full service response
+
+        Notes:
+            Check class docstring for more info
+        """
+        return await self._aio_processing_captcha(create_params=self.task_params)

{python3-capsolver-0.8 → python3-capsolver-0.9.2}/python3_capsolver/cloudflare.py

@@ -1,4 +1,4 @@
-from typing import Dict, Union, Optional
+from typing import Union, Optional
 
 from python3_capsolver.core.base import BaseCaptcha
 from python3_capsolver.core.enum import CloudflareTypeEnm
@@ -22,46 +22,42 @@ class Cloudflare(BaseCaptcha):
         >>> Cloudflare(api_key="CAI-1324...",
         ...             captcha_type=CloudflareTypeEnm.AntiCloudflareTask,
         ...             websiteURL="https://bck.websiteurl.com/registry",
-        ...             websiteKey='4ac25d',
-        ...             proxy="socks5:158.120.100.23:334:user:pass",
-        ...             metadata={'type': 'turnstile', 'acton':'login', 'cdata': '0000-1111-2222-3333-example-cdata'}
+        ...             websiteKey='0x4AAAAAAABS7vwvV6VFfMcD',
+        ...             proxy="socks5:158.120.100.23:334:user:pass"
         ...          ).captcha_handler()
         CaptchaResponseSer(errorId=0,
                            errorCode=None,
                            errorDescription=None,
                            taskId='73bdcd28-6c77-4414-8....',
                            status=<ResponseStatusEnm.Ready: 'ready'>,
-                           solution={'gRecaptchaResponse': '44795sds...'}
+                           solution={'token': '44795sds...'}
                           )
 
         >>> Cloudflare(api_key="CAI-1324...",
         ...             captcha_type=CloudflareTypeEnm.AntiCloudflareTask,
         ...             websiteURL="https://bck.websiteurl.com/registry",
-        ...             proxy="socks5:158.120.100.23:334:user:pass",
-        ...             metadata={'type': 'challenge'}
-        ...             html="<your challenge html source code>",
+        ...             proxy="socks5:158.120.100.23:334:user:pass"
         ...          ).captcha_handler()
         CaptchaResponseSer(errorId=0,
                            errorCode=None,
                            errorDescription=None,
                            taskId='73bdcd28-6c77-4414-8....',
                            status=<ResponseStatusEnm.Ready: 'ready'>,
-                           solution={'gRecaptchaResponse': '44795sds...'}
+                           solution={'token': '44795sds...'}
                           )
 
         >>> await Cloudflare(api_key="CAI-1324...",
         ...             captcha_type=CloudflareTypeEnm.AntiCloudflareTask,
         ...             websiteURL="https://bck.websiteurl.com/registry",
-        ...             websiteKey='4ac25d',
-        ...             proxy="socks5:158.120.100.23:334:user:pass",
-        ...             metadata={'type': 'challenge', 'acton':'login', 'cdata': '0000-1111-2222-3333-example-cdata'}
+        ...             websiteKey='0x4AAAAAAABS7vwvV6VFfMcD',
+        ...             proxy="socks5:158.120.100.23:334:user:pass"
         ...          ).aio_captcha_handler()
         CaptchaResponseSer(errorId=0,
                            errorCode=None,
                            errorDescription=None,
                            taskId='73bdcd28-6c77-4414-8....',
                            status=<ResponseStatusEnm.Ready: 'ready'>,
-                           solution={'gRecaptchaResponse': '44795sds...'}
+                           solution={'token': '44795sds...'}
                           )
 
     Returns:
@@ -76,9 +72,7 @@ class Cloudflare(BaseCaptcha):
         self,
         captcha_type: Union[CloudflareTypeEnm, str],
         websiteURL: str,
-        metadata: Dict[str, str],
         websiteKey: Optional[str] = None,
-        html: Optional[str] = None,
         *args,
         **kwargs,
     ):

{python3-capsolver-0.8 → python3-capsolver-0.9.2}/python3_capsolver/core/enum.py

@@ -39,8 +39,8 @@ class EndpointPostfixEnm(str, MyEnum):
     GET_BALANCE = "getBalance"
     CREATE_TASK = "createTask"
     GET_TASK_RESULT = "getTaskResult"
-    AKAMAI_BMP_INVOKE = "/akamaibmp/invoke"
-    AKAMAI_WEB_INVOKE = "/akamaiweb/invoke"
+    AKAMAI_BMP_INVOKE = "akamaibmp/invoke"
+    AKAMAI_WEB_INVOKE = "akamaiweb/invoke"
 
 
 class ImageToTextTaskTypeEnm(str, MyEnum):
@@ -117,6 +117,14 @@ class AntiAkamaiTaskEnm(str, MyEnum):
     AntiAkamaiWebTask = "AntiAkamaiWebTask"
 
 
+class AntiImpervaTaskEnm(str, MyEnum):
+    AntiImpervaTask = "AntiImpervaTask"
+
+
+class BinanceCaptchaTaskEnm(str, MyEnum):
+    BinanceCaptchaTask = "BinanceCaptchaTask"
+
+
 class ResponseStatusEnm(str, MyEnum):
     """
     Enum store results `status` field variants

{python3-capsolver-0.8 → python3-capsolver-0.9.2}/python3_capsolver/core/serializer.py

@@ -1,4 +1,4 @@
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Literal, Optional
 
 from pydantic import Field, BaseModel, conint
 
@@ -20,7 +20,7 @@ class TaskSer(BaseModel):
 
 
 class RequestCreateTaskSer(PostRequestSer):
-    appId: str = Field(APP_ID, description="AppID", const=True)
+    appId: Literal[APP_ID] = APP_ID
 
 
 class RequestGetTaskResultSer(PostRequestSer):
@@ -80,14 +80,14 @@ class ReCaptchaV3Ser(WebsiteDataOptionsSer):
     )
 
 
-class HCaptchaClassificationOptionsSer(BaseModel):
+class HCaptchaClassificationOptionsSer(TaskSer):
     queries: List[str] = Field(..., description="Base64-encoded images, do not include 'data:image/***;base64,'")
     question: str = Field(
         ..., description="Question ID. Support English and Chinese, other languages please convert yourself"
     )
 
 
-class FunCaptchaClassificationOptionsSer(BaseModel):
+class FunCaptchaClassificationOptionsSer(TaskSer):
     images: List[str] = Field(..., description="Base64-encoded images, do not include 'data:image/***;base64,'")
     question: str = Field(
         ...,
@@ -121,10 +121,7 @@ class DatadomeSliderSer(TaskSer):
 
 
 class CloudflareTurnstileSer(WebsiteDataOptionsSer):
-    metadata: dict = Field(..., description="Extra data")
-    html: Optional[str] = Field(
-        None, description="You can pass in the entire html source code for the challenge directly."
-    )
+    ...
 
 
 class CyberSiAraSer(WebsiteDataOptionsSer):
@@ -134,11 +131,26 @@ class CyberSiAraSer(WebsiteDataOptionsSer):
     UserAgent: str = Field(..., description="Browser userAgent, you need submit your userAgent")
 
 
-class AntiAkamaiBMPTaskSer(BaseModel):
+class AntiAkamaiBMPTaskSer(TaskSer):
     packageName: str = Field("de.zalando.iphone", description="Package name of AkamaiBMP mobile APP")
     version: str = Field("3.2.6", description="AKAMAI BMP Version number")
     country: str = Field("US", description="AKAMAI BMP country")
 
 
-class AntiAkamaiWebTaskSer(BaseModel):
+class AntiAkamaiWebTaskSer(TaskSer):
     url: str = Field(..., description="Browser url address")
+
+
+class AntiImpervaTaskSer(TaskSer):
+    websiteUrl: str = Field(..., description="The website url")
+    userAgent: str = Field(..., description="Browser userAgent")
+    utmvc: bool = Field(
+        True, description="If cookie contains `incap_see_xxx`, `nlbi_xxx`, `visid_inap_xxx`, mean is true"
+    )
+    reese84: bool = Field(True, description="if cookie conains `reese84`, set it true")
+
+
+class BinanceCaptchaTaskSer(TaskSer):
+    websiteURL: str = Field(..., description="Address of a webpage with Binance captcha")
+    websiteKey: str = Field("login", description="`bizId` always be `login`")
+    validateId: str = Field(..., description="`validateId` bncaptcha validateId field")

python3-capsolver-0.9.2/python3_capsolver/imperva.py

@@ -0,0 +1,120 @@
+from typing import Union
+
+from python3_capsolver.core.base import BaseCaptcha
+from python3_capsolver.core.enum import AntiImpervaTaskEnm
+from python3_capsolver.core.serializer import AntiImpervaTaskSer, CaptchaResponseSer
+
+
+class Imperva(BaseCaptcha):
+    """
+    The class is used to work with Capsolver Imperva method.
+
+    Args:
+        api_key: Capsolver API key
+        captcha_type: Captcha type name, like ``AntiImpervaTask`` and etc.
+        websiteUrl: The website url
+        userAgent: Browser userAgent
+
+    Examples:
+        >>> Imperva(api_key="CAI-BA9XXXXXXXXXXXXX2702E010",
+        ...          captcha_type="AntiImpervaTask",
+        ...          websiteUrl="https://www.milanuncios.com/",
+        ...          userAgent="Mozilla/5.0 (Windows ....",
+        ...          proxy="socks5:98.181.137.83:4145",
+        ...          utmvc=True,
+        ...          reese84=True,
+        ...          reeseScriptUrl="https://www.milanuncios.com/librarym.js",
+        ...         ).captcha_handler()
+        CaptchaResponseSer(errorId=0,
+                           errorCode=None,
+                           errorDescription=None,
+                           taskId='73bdcd28-6c77-4414-8....',
+                           status=<ResponseStatusEnm.Ready: 'ready'>,
+                           solution={'token': '90F9EAF...'}
+                          )
+
+        >>> Imperva(api_key="CAI-BA9XXXXXXXXXXXXX2702E010",
+        ...          captcha_type=AntiImpervaTaskEnm.AntiImpervaTask,
+        ...          websiteUrl="https://www.milanuncios.com/",
+        ...          userAgent="Mozilla/5.0 (Windows ....",
+        ...          proxy="socks5:98.181.137.83:4145",
+        ...          utmvc=True,
+        ...          reese84=True,
+        ...          reeseScriptUrl="https://www.milanuncios.com/librarym.js",
+        ...         ).captcha_handler()
+        CaptchaResponseSer(errorId=0,
+                           errorCode=None,
+                           errorDescription=None,
+                           taskId='73bdcd28-6c77-4414-8....',
+                           status=<ResponseStatusEnm.Ready: 'ready'>,
+                           solution={'token': '90F9EAF...'}
+                          )
+
+        >>> await Imperva(api_key="CAI-BA9650D2B9C2786B21120D512702E010",
+        ...                 captcha_type=AntiImpervaTaskEnm.AntiImpervaTask,
+        ...                 websiteUrl="https://www.milanuncios.com/",
+        ...                 userAgent="Mozilla/5.0 (Windows ....",
+        ...                 proxy="socks5:98.181.137.83:4145",
+        ...                 utmvc=True,
+        ...                 reese84=True,
+        ...                 reeseScriptUrl="https://www.milanuncios.com/librarym.js",
+        ...         ).aio_captcha_handler()
+        CaptchaResponseSer(errorId=0,
+                           errorCode=None,
+                           errorDescription=None,
+                           taskId='73bdcd28-6c77-4414-8....',
+                           status=<ResponseStatusEnm.Ready: 'ready'>,
+                           solution={'token': '90F9EAF...'}
+                          )
+
+    Returns:
+        CaptchaResponseSer model with full server response
+
+    Notes:
+        https://docs.capsolver.com/guide/antibots/imperva.html
+    """
+
+    def __init__(
+        self,
+        captcha_type: Union[AntiImpervaTaskEnm, str],
+        websiteUrl: str,
+        userAgent: str,
+        *args,
+        **kwargs,
+    ):
+        super().__init__(*args, **kwargs)
+
+        if captcha_type == AntiImpervaTaskEnm.AntiImpervaTask:
+            self.task_params = AntiImpervaTaskSer(**locals()).dict()
+        else:
+            raise ValueError(
+                f"""Invalid `captcha_type` parameter set for `{self.__class__.__name__}`,
+                available - {AntiImpervaTaskEnm.list_values()}"""
+            )
+
+        for key in kwargs:
+            self.task_params.update({key: kwargs[key]})
+
+    def captcha_handler(self) -> CaptchaResponseSer:
+        """
+        Sync solving method
+
+        Returns:
+            CaptchaResponseSer model with full service response
+
+        Notes:
+            Check class docstring for more info
+        """
+        return self._processing_captcha(create_params=self.task_params)
+
+    async def aio_captcha_handler(self) -> CaptchaResponseSer:
+        """
+        Async method for captcha solving
+
+        Returns:
+            CaptchaResponseSer model with full service response
+
+        Notes:
+            Check class docstring for more info
+        """
+        return await self._aio_processing_captcha(create_params=self.task_params)

{python3-capsolver-0.8 → python3-capsolver-0.9.2}/python3_capsolver.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python3-capsolver
-Version: 0.8
+Version: 0.9.2
 Summary: Python 3.8+ Capsolver library with AIO module.
 Home-page: https://andreidrang.github.io/python3-capsolver/
 Author: AndreiDrang
@@ -26,6 +26,9 @@ Keywords: captcha
 				cloudflare
 				amazon
 				amazon_waf
+				akamai
+				imperva
+				binance
 Classifier: License :: OSI Approved :: MIT License
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Development Status :: 5 - Production/Stable
@@ -45,7 +48,8 @@ Description-Content-Type: text/markdown
 
 
 # python3-capsolver
-![Python3-Capsolver](https://github.com/AndreiDrang/python3-capsolver/blob/main/files/CapsolverSm.png)
+
+![Logo](https://red-panda-dev.xyz/media/images/Capsolver.max-800x600.png)
 
 <a href="https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1">
     <img src="https://cdn.discordapp.com/attachments/1105172394655625306/1105180101802471575/20221207-160749.gif" alt="Capsolver's Banner">
@@ -83,6 +87,10 @@ Or email python-captcha@pm.me
 
 ***
 
+You can check our other projects here - [RedPandaDev group](https://red-panda-dev.xyz/blog/). For example - [Torrents Tracker bot](https://t.me/torrents_tracker_bot) for Telegram.
+
+***
+
 ## How to install?
 
 We recommend using the latest version of Python. `python3-capsolver` supports Python 3.7+.

{python3-capsolver-0.8 → python3-capsolver-0.9.2}/python3_capsolver.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ python3_capsolver/__init__.py
 python3_capsolver/__version__.py
 python3_capsolver/akamai.py
 python3_capsolver/aws_waf.py
+python3_capsolver/binance.py
 python3_capsolver/cloudflare.py
 python3_capsolver/control.py
 python3_capsolver/cyber_si_ara.py
@@ -11,6 +12,7 @@ python3_capsolver/fun_captcha.py
 python3_capsolver/gee_test.py
 python3_capsolver/hcaptcha.py
 python3_capsolver/image_to_text.py
+python3_capsolver/imperva.py
 python3_capsolver/mt_captcha.py
 python3_capsolver/recaptcha.py
 python3_capsolver.egg-info/PKG-INFO

{python3-capsolver-0.8 → python3-capsolver-0.9.2}/python3_capsolver.egg-info/requires.txt

@@ -1,4 +1,4 @@
 requests>=2.21.0
 aiohttp>=3.7.4
-pydantic==1.10.*
+pydantic==2.4.2
 tenacity==8.*

{python3-capsolver-0.8 → python3-capsolver-0.9.2}/setup.py

@@ -110,6 +110,9 @@ setup(
 				cloudflare
 				amazon
 				amazon_waf
+				akamai
+				imperva
+				binance
                """,
     python_requires=REQUIRES_PYTHON,
     zip_safe=False,

python3-capsolver-0.8/python3_capsolver/__version__.py

@@ -1 +0,0 @@
-__version__ = "0.8"