python3-capsolver 1.0.0a0__tar.gz → 1.0.1__tar.gz

{python3_capsolver-1.0.0a0/src/python3_capsolver.egg-info → python3_capsolver-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: python3-capsolver
-Version: 1.0.0a0
+Version: 1.0.1
 Summary: Python 3.8+ Capsolver library with AIO module.
 Author-email: AndreiDrang <python-captcha@pm.me>
 License: MIT License
@@ -44,6 +44,7 @@ Requires-Dist: tenacity<10,>=8
 [![Downloads](https://static.pepy.tech/badge/python3-capsolver/month)](https://pepy.tech/project/python3-capsolver)
 [![Static Badge](https://img.shields.io/badge/docs-Sphinx-green?label=Documentation&labelColor=gray)](https://andreidrang.github.io/python3-capsolver/)
 
+[![Maintainability](https://api.codeclimate.com/v1/badges/3c30167b5fb37a0775ea/maintainability)](https://codeclimate.com/github/AndreiDrang/python3-capsolver/maintainability)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/323d4eda0fe1477bbea8fe8902b9e97e)](https://www.codacy.com/gh/AndreiDrang/python3-capsolver/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=AndreiDrang/python3-capsolver&amp;utm_campaign=Badge_Grade)
 [![codecov](https://codecov.io/gh/AndreiDrang/python3-capsolver/branch/main/graph/badge.svg?token=2L4VVIF4G8)](https://codecov.io/gh/AndreiDrang/python3-capsolver)
 

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/README.md

@@ -9,6 +9,7 @@
 [![Downloads](https://static.pepy.tech/badge/python3-capsolver/month)](https://pepy.tech/project/python3-capsolver)
 [![Static Badge](https://img.shields.io/badge/docs-Sphinx-green?label=Documentation&labelColor=gray)](https://andreidrang.github.io/python3-capsolver/)
 
+[![Maintainability](https://api.codeclimate.com/v1/badges/3c30167b5fb37a0775ea/maintainability)](https://codeclimate.com/github/AndreiDrang/python3-capsolver/maintainability)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/323d4eda0fe1477bbea8fe8902b9e97e)](https://www.codacy.com/gh/AndreiDrang/python3-capsolver/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AndreiDrang/python3-capsolver&utm_campaign=Badge_Grade)
 [![codecov](https://codecov.io/gh/AndreiDrang/python3-capsolver/branch/main/graph/badge.svg?token=2L4VVIF4G8)](https://codecov.io/gh/AndreiDrang/python3-capsolver)
 

python3_capsolver-1.0.1/src/python3_capsolver/__version__.py

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

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/src/python3_capsolver/cloudflare.py

@@ -79,6 +79,42 @@ class Cloudflare(CaptchaParams):
             }
         }
 
+        >>> import asyncio
+        >>> from python3_capsolver.cloudflare import Cloudflare
+        >>> from python3_capsolver.core.enum import CaptchaTypeEnm
+        >>> asyncio.run(Cloudflare(api_key="CAI-12345....",
+        ...             captcha_type=CaptchaTypeEnm.AntiCloudflareTask)
+        ...         .aio_captcha_handler(task_payload={
+        ...                     "websiteURL": "https://www.yourwebsite.com",
+        ...                     "proxy": "ip:port:user:pass",
+        ...         }))
+        {
+            "errorId":0,
+            "errorCode":"None",
+            "errorDescription":"None",
+            "taskId":"db0a3153-621d-4f5e-8554-a1c032597ee7",
+            "status":"ready",
+            "solution":{
+                "cookies": "cf_clearance=_VPxxxx",
+                "headers": {
+                    "sec-ch-ua": "\"Chromium\";v=\"130\", \"Google Chrome\";v=\"130\", \"Not?A_Brand\";v=\"99\"",
+                    "sec-ch-ua-platform": "\"Windows\"",
+                    "accept": "text/html,axxxx",
+                    "User-Agent": "Mozilla/5.0xxxx",
+                    "sec-ch-ua-mobile": "?0",
+                    "sec-fetch-user": "?1",
+                    "referer": "https://www.yourwebsite.com",
+                    "Sec-Fetch-Dest": "document",
+                    "Sec-Fetch-Mode": "navigate",
+                    "Sec-Fetch-Site": "same-origin",
+                    "accept-language": "en",
+                },
+                "page_url": "https://www.yourwebsite.com",
+                "proxy": "your proxyxxxx",
+                "token": "_VPCTZXP5bhinxxxx"
+            }
+        }
+
     Notes:
         https://docs.capsolver.com/en/guide/captcha/cloudflare_turnstile/
 

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/src/python3_capsolver/core/base.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Any, Dict
 
 from python3_capsolver.core.enum import CaptchaTypeEnm
 from python3_capsolver.core.serializer import TaskSer
@@ -41,15 +41,15 @@ class CaptchaParams(SIOContextManager, AIOContextManager):
         self._captcha_handling_instrument = CaptchaInstrument()
         self.sleep_time = sleep_time
 
-    def captcha_handler(self, task_payload: Dict) -> Dict[str, str]:
+    def captcha_handler(self, task_payload: Dict) -> Dict[str, Any]:
         """
         Synchronous method for captcha solving
 
         Args:
             task_payload: Some additional parameters that will be used in creating the task
-                                and will be passed to the payload under ``task`` key.
-                                Like ``proxyLogin``, ``proxyPassword`` and etc. - more info in service docs
-
+                            and will be passed to the payload under ``task`` key.
+                            Like ``websiteURL``, ``image``, ``proxyPassword``, ``websiteKey`` and etc.
+                            more info in service docs
 
         Returns:
             Dict with full server response
@@ -61,14 +61,15 @@ class CaptchaParams(SIOContextManager, AIOContextManager):
         self._captcha_handling_instrument = SIOCaptchaInstrument(captcha_params=self)
         return self._captcha_handling_instrument.processing_captcha()
 
-    async def aio_captcha_handler(self, task_payload: Dict) -> Dict[str, str]:
+    async def aio_captcha_handler(self, task_payload: Dict) -> Dict[str, Any]:
         """
         Asynchronous method for captcha solving
 
         Args:
             task_payload: Some additional parameters that will be used in creating the task
-                                and will be passed to the payload under ``task`` key.
-                                Like ``proxyLogin``, ``proxyPassword`` and etc. - more info in service docs
+                            and will be passed to the payload under ``task`` key.
+                            Like ``websiteURL``, ``image``, ``proxyPassword``, ``websiteKey`` and etc.
+                            more info in service docs
 
         Returns:
             Dict with full server response

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/src/python3_capsolver/core/serializer.py

@@ -10,7 +10,7 @@ __all__ = ("PostRequestSer", "TaskSer", "RequestCreateTaskSer", "CaptchaResponse
 
 
 class MyBaseModel(Struct):
-    def to_dict(self) -> Dict[str, str]:
+    def to_dict(self) -> Dict[str, Any]:
         result = {}
         for f in self.__struct_fields__:
             if isinstance(getattr(self, f), Enum):

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/src/python3_capsolver/datadome_slider.py

@@ -39,6 +39,28 @@ class DatadomeSlider(CaptchaParams):
            }
         }
 
+        >>> import asyncio
+        >>> from python3_capsolver.datadome_slider import DatadomeSlider
+        >>> from python3_capsolver.core.enum import CaptchaTypeEnm
+        >>> asyncio.run(DatadomeSlider(api_key="CAI-12345....",
+        ...             captcha_type=CaptchaTypeEnm.DatadomeSliderTask)
+        ...         .aio_captcha_handler(task_payload={
+        ...                 "captchaUrl": "https://geo.captchaxxxxxx",
+        ...                 "userAgent": "Mozilla/5.0 xxxx",
+        ...                 "proxy": "0.0.0.0:334:user:pass"
+        ...         }))
+        {
+           "errorId":0,
+           "errorCode":"None",
+           "errorDescription":"None",
+           "taskId":"db0a3153-621d-4f5e-8554-a1c032597ee7",
+           "status":"ready",
+           "solution":{
+                "userAgent": "Mozilla/5.0 xxxx",
+                "cookie": "datadome=yzj_BK..xxxx"
+           }
+        }
+
     Notes:
         https://docs.capsolver.com/en/guide/captcha/datadome/
     """

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/src/python3_capsolver/friendly_captcha.py

@@ -55,6 +55,42 @@ class FriendlyCaptcha(CaptchaParams):
             }
         }
 
+        >>> import asyncio
+        >>> from python3_capsolver.core.enum import CaptchaTypeEnm
+        >>> from python3_capsolver.friendly_captcha import FriendlyCaptcha
+        >>> asyncio.run(FriendlyCaptcha(api_key="CAP-XXXXX",
+        ...         captcha_type=CaptchaTypeEnm.FriendlyCaptchaTaskProxyless,
+        ...         ).aio_captcha_handler(task_payload={
+        ...                                 "websiteURL": "https://www.yourwebsite.com",
+        ...                                 "proxy": "ip:port:user:pass"
+        ...                         }))
+        {
+            "errorId":0,
+            "errorCode":"None",
+            "errorDescription":"None",
+            "taskId":"db0a3153-621d-4f5e-8554-a1c032597ee7",
+            "status":"ready",
+            "solution":{
+                "cookies": "cf_clearance=_VPxxxx",
+                "headers": {
+                    "sec-ch-ua": "\"Chromium\";v=\"130\", \"Google Chrome\";v=\"130\", \"Not?A_Brand\";v=\"99\"",
+                    "sec-ch-ua-platform": "\"Windows\"",
+                    "accept": "text/html,axxxx",
+                    "User-Agent": "Mozilla/5.0xxxx",
+                    "sec-ch-ua-mobile": "?0",
+                    "sec-fetch-user": "?1",
+                    "referer": "https://www.yourwebsite.com",
+                    "Sec-Fetch-Dest": "document",
+                    "Sec-Fetch-Mode": "navigate",
+                    "Sec-Fetch-Site": "same-origin",
+                    "accept-language": "en",
+                },
+                "page_url": "https://www.yourwebsite.com",
+                "proxy": "your proxyxxxx",
+                "token": "_VPCTZXP5bhinxxxx"
+            }
+        }
+
     Notes:
         https://docs.capsolver.com/en/guide/captcha/FriendlyCaptcha/
     """

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/src/python3_capsolver/image_to_text.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Any, Dict
 
 from .core.base import CaptchaParams
 from .core.enum import CaptchaTypeEnm
@@ -88,7 +88,7 @@ class ImageToText(CaptchaParams):
 
         super().__init__(api_key=api_key, captcha_type=CaptchaTypeEnm.ImageToTextTask, **kwargs)
 
-    def captcha_handler(self, task_payload: Dict) -> Dict[str, str]:
+    def captcha_handler(self, task_payload: Dict) -> Dict[str, Any]:
         """
         Synchronous method for captcha solving
 
@@ -104,7 +104,7 @@ class ImageToText(CaptchaParams):
         task_payload.pop("type", None)
         return super().captcha_handler(task_payload=task_payload)
 
-    async def aio_captcha_handler(self, task_payload: Dict) -> Dict[str, str]:
+    async def aio_captcha_handler(self, task_payload: Dict) -> Dict[str, Any]:
         """
         Asynchronous method for captcha solving
 

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/src/python3_capsolver/mt_captcha.py

@@ -38,6 +38,23 @@ class MtCaptcha(CaptchaParams):
            }
         }
 
+        >>> import asyncio
+        >>> from python3_capsolver.mt_captcha import MtCaptcha
+        >>> from python3_capsolver.core.enum import CaptchaTypeEnm
+        >>> asyncio.run(MtCaptcha(api_key="CAI-12345....",
+        ...             captcha_type=CaptchaTypeEnm.MtCaptchaTaskProxyLess)
+        ...         .aio_captcha_handler(task_payload={"websiteURL": "some-url"}))
+        {
+           "errorId":0,
+           "errorCode":"None",
+           "errorDescription":"None",
+           "taskId":"db0a3153-621d-4f5e-8554-a1c032597ee7",
+           "status":"ready",
+           "solution":{
+              "token": ""
+           }
+        }
+
     Notes:
         https://docs.capsolver.com/en/guide/captcha/MtCaptcha/
     """

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/src/python3_capsolver/vision_engine.py

@@ -1,4 +1,4 @@
-from typing import Dict
+from typing import Any, Dict
 
 from .core.base import CaptchaParams
 from .core.enum import CaptchaTypeEnm
@@ -69,7 +69,7 @@ class VisionEngine(CaptchaParams):
     def __init__(self, api_key: str, **kwargs):
         super().__init__(api_key=api_key, captcha_type=CaptchaTypeEnm.VisionEngine, **kwargs)
 
-    def captcha_handler(self, task_payload: Dict) -> Dict[str, str]:
+    def captcha_handler(self, task_payload: Dict) -> Dict[str, Any]:
         """
         Synchronous method for captcha solving
 
@@ -85,7 +85,7 @@ class VisionEngine(CaptchaParams):
         task_payload.pop("type", None)
         return super().captcha_handler(task_payload=task_payload)
 
-    async def aio_captcha_handler(self, task_payload: Dict) -> Dict[str, str]:
+    async def aio_captcha_handler(self, task_payload: Dict) -> Dict[str, Any]:
         """
         Asynchronous method for captcha solving
 

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/src/python3_capsolver/yandex.py

@@ -12,7 +12,7 @@ class YandexCaptcha(CaptchaParams):
 
     Args:
         api_key: Capsolver API key
-        captcha_type: Captcha type name, like ``FriendlyCaptchaTaskProxyless`` and etc.
+        captcha_type: Captcha type name, like ``YandexCaptchaTaskProxyLess`` and etc.
         kwargs: additional params for client, like captcha waiting time
                     available keys:
                      - sleep_time: int - captcha solution waintig time in sec
@@ -39,14 +39,34 @@ class YandexCaptcha(CaptchaParams):
             }
         }
 
+        >>> import asyncio
+        >>> from python3_capsolver.core.enum import CaptchaTypeEnm
+        >>> from python3_capsolver.yandex import YandexCaptcha
+        >>> asyncio.run(YandexCaptcha(api_key="CAP-XXXXX",
+        ...         captcha_type=CaptchaTypeEnm.YandexCaptchaTaskProxyLess,
+        ...         ).aio_captcha_handler(task_payload={
+        ...                                 "websiteURL": "https://www.yourwebsite.com",
+        ...                                 "websiteKey": "ysc1_bFdbbET5WBnPTvoE5jTXxxxx"
+        ...                         }))
+        {
+            "errorId":0,
+            "errorCode":"None",
+            "errorDescription":"None",
+            "taskId":"db0a3153-621d-4f5e-8554-a1c032597ee7",
+            "status":"ready",
+            "solution":{
+                "token": "dD0xNzMzMjc0MjkzO2k9Nxxxx"
+            }
+        }
+
     Notes:
-        https://docs.capsolver.com/en/guide/captcha/FriendlyCaptcha/
+        https://docs.capsolver.com/en/guide/captcha/YandexCaptcha/
     """
 
     def __init__(
         self,
         api_key: str,
-        captcha_type: Union[CaptchaTypeEnm, str] = CaptchaTypeEnm.FriendlyCaptchaTaskProxyless,
+        captcha_type: Union[CaptchaTypeEnm, str] = CaptchaTypeEnm.YandexCaptchaTaskProxyLess,
         **kwargs,
     ):
 

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1/src/python3_capsolver.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: python3-capsolver
-Version: 1.0.0a0
+Version: 1.0.1
 Summary: Python 3.8+ Capsolver library with AIO module.
 Author-email: AndreiDrang <python-captcha@pm.me>
 License: MIT License
@@ -44,6 +44,7 @@ Requires-Dist: tenacity<10,>=8
 [![Downloads](https://static.pepy.tech/badge/python3-capsolver/month)](https://pepy.tech/project/python3-capsolver)
 [![Static Badge](https://img.shields.io/badge/docs-Sphinx-green?label=Documentation&labelColor=gray)](https://andreidrang.github.io/python3-capsolver/)
 
+[![Maintainability](https://api.codeclimate.com/v1/badges/3c30167b5fb37a0775ea/maintainability)](https://codeclimate.com/github/AndreiDrang/python3-capsolver/maintainability)
 [![Codacy Badge](https://app.codacy.com/project/badge/Grade/323d4eda0fe1477bbea8fe8902b9e97e)](https://www.codacy.com/gh/AndreiDrang/python3-capsolver/dashboard?utm_source=github.com&amp;utm_medium=referral&amp;utm_content=AndreiDrang/python3-capsolver&amp;utm_campaign=Badge_Grade)
 [![codecov](https://codecov.io/gh/AndreiDrang/python3-capsolver/branch/main/graph/badge.svg?token=2L4VVIF4G8)](https://codecov.io/gh/AndreiDrang/python3-capsolver)
 

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/src/python3_capsolver.egg-info/SOURCES.txt

@@ -31,10 +31,15 @@ src/python3_capsolver/core/serializer.py
 src/python3_capsolver/core/sio_captcha_instrument.py
 src/python3_capsolver/core/utils.py
 tests/test_aws_waf.py
+tests/test_cloudflare.py
 tests/test_control.py
 tests/test_core.py
+tests/test_datadome.py
+tests/test_friendly.py
 tests/test_gee_test.py
 tests/test_image_to_text.py
 tests/test_instrument.py
 tests/test_mt_captcha.py
-tests/test_recaptcha.py
+tests/test_recaptcha.py
+tests/test_vision_engine.py
+tests/test_yandex.py

python3_capsolver-1.0.1/tests/test_aws_waf.py

@@ -0,0 +1,115 @@
+import pytest
+
+from tests.conftest import BaseTest
+from python3_capsolver.aws_waf import AwsWaf
+from python3_capsolver.core.enum import CaptchaTypeEnm, ResponseStatusEnm
+
+
+class TestAwsWafBase(BaseTest):
+    captcha_types = (
+        CaptchaTypeEnm.AwsWafClassification,
+        CaptchaTypeEnm.AntiAwsWafTask,
+        CaptchaTypeEnm.AntiAwsWafTaskProxyLess,
+    )
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    def test_captcha_handler_exist(self, captcha_type):
+        instance = AwsWaf(api_key=self.get_random_string(36), captcha_type=captcha_type)
+        assert "captcha_handler" in instance.__dir__()
+        assert "aio_captcha_handler" in instance.__dir__()
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    def test_api_key_err(self, captcha_type):
+        result = AwsWaf(api_key=self.get_random_string(36), captcha_type=captcha_type).captcha_handler(
+            task_payload={"some": "data"}
+        )
+        assert result["errorId"] == 1
+        assert result["errorCode"] in ("ERROR_INVALID_TASK_DATA", "ERROR_KEY_DENIED_ACCESS")
+        assert result["solution"] is None
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    async def test_aio_api_key_err(self, captcha_type):
+        result = await AwsWaf(api_key=self.get_random_string(36), captcha_type=captcha_type).aio_captcha_handler(
+            task_payload={"some": "data"}
+        )
+        assert result["errorId"] == 1
+        assert result["errorCode"] in ("ERROR_INVALID_TASK_DATA", "ERROR_KEY_DENIED_ACCESS")
+        assert result["solution"] is None
+
+
+class TestAwsWafClassification(BaseTest):
+    toycarcity_image = "tests/files/aws_waf_class_toycarcity.png"
+
+    def test_success(self):
+        result = AwsWaf(api_key=self.API_KEY, captcha_type=CaptchaTypeEnm.AwsWafClassification).captcha_handler(
+            task_payload={
+                "images": [self.read_image_as_str(file_path=self.toycarcity_image)],
+                "question": "aws:toycarcity:carcity",
+            }
+        )
+        assert result["errorId"] == 0
+        assert result["errorCode"] is None
+        assert isinstance(result["solution"], dict)
+        assert result["status"] == ResponseStatusEnm.Ready.value
+        assert result["taskId"] is not ""
+
+    def test_api_key_err(self):
+        result = AwsWaf(
+            api_key=self.get_random_string(36), captcha_type=CaptchaTypeEnm.AwsWafClassification
+        ).captcha_handler(
+            task_payload={
+                "images": [self.read_image_as_str()],
+                "question": "aws:toycarcity:carcity",
+            }
+        )
+        assert result["errorId"] == 1
+        assert result["errorCode"] == "ERROR_KEY_DENIED_ACCESS"
+        assert result["solution"] is None
+
+    async def test_aio_api_key_err(self):
+        result = await AwsWaf(
+            api_key=self.get_random_string(36), captcha_type=CaptchaTypeEnm.AwsWafClassification
+        ).aio_captcha_handler(
+            task_payload={
+                "images": [self.read_image_as_str()],
+                "question": "aws:toycarcity:carcity",
+            }
+        )
+        assert result["errorId"] == 1
+        assert result["errorCode"] == "ERROR_KEY_DENIED_ACCESS"
+        assert result["solution"] is None
+
+
+class TestAntiAwsWafTaskProxyLess(BaseTest):
+
+    def test_api_key_err(self):
+        result = AwsWaf(
+            api_key=self.get_random_string(36), captcha_type=CaptchaTypeEnm.AntiAwsWafTaskProxyLess
+        ).captcha_handler(
+            task_payload={
+                "websiteURL": "https://efw47fpad9.execute-api.us-east-1.amazonaws.com/latest",
+                "awsKey": "AQIDAHjcYu/GjX+QlghicBg......shMIKvZswZemrVVqA==",
+                "awsIv": "CgAAFDIlckAAAAid",
+                "awsContext": "7DhQfG5CmoY90ZdxdHCi8WtJ3z......njNKULdcUUVEtxTk=",
+                "awsChallengeJS": "https://41bcdd4fb3cb.610cd090.us-east-1.token.awswaf.com/41bcdd4fb3cb/0d21de737ccb/cd77baa6c832/challenge.js",
+            }
+        )
+        assert result["errorId"] == 1
+        assert result["errorCode"] == "ERROR_KEY_DENIED_ACCESS"
+        assert result["solution"] is None
+
+    async def test_aio_api_key_err(self):
+        result = await AwsWaf(
+            api_key=self.get_random_string(36), captcha_type=CaptchaTypeEnm.AntiAwsWafTaskProxyLess
+        ).aio_captcha_handler(
+            task_payload={
+                "websiteURL": "https://efw47fpad9.execute-api.us-east-1.amazonaws.com/latest",
+                "awsKey": "AQIDAHjcYu/GjX+QlghicBg......shMIKvZswZemrVVqA==",
+                "awsIv": "CgAAFDIlckAAAAid",
+                "awsContext": "7DhQfG5CmoY90ZdxdHCi8WtJ3z......njNKULdcUUVEtxTk=",
+                "awsChallengeJS": "https://41bcdd4fb3cb.610cd090.us-east-1.token.awswaf.com/41bcdd4fb3cb/0d21de737ccb/cd77baa6c832/challenge.js",
+            }
+        )
+        assert result["errorId"] == 1
+        assert result["errorCode"] == "ERROR_KEY_DENIED_ACCESS"
+        assert result["solution"] is None

python3_capsolver-1.0.0a0/tests/test_aws_waf.py → python3_capsolver-1.0.1/tests/test_cloudflare.py

@@ -1,26 +1,25 @@
 import pytest
 
 from tests.conftest import BaseTest
-from python3_capsolver.aws_waf import AwsWaf
 from python3_capsolver.core.enum import CaptchaTypeEnm
+from python3_capsolver.cloudflare import Cloudflare
 
 
-class TestAwsWafBase(BaseTest):
+class TestCloudflare(BaseTest):
     captcha_types = (
-        CaptchaTypeEnm.AwsWafClassification,
-        CaptchaTypeEnm.AntiAwsWafTask,
-        CaptchaTypeEnm.AntiAwsWafTaskProxyLess,
+        CaptchaTypeEnm.AntiCloudflareTask,
+        CaptchaTypeEnm.AntiTurnstileTaskProxyLess,
     )
 
     @pytest.mark.parametrize("captcha_type", captcha_types)
     def test_captcha_handler_exist(self, captcha_type):
-        instance = AwsWaf(api_key=self.get_random_string(36), captcha_type=captcha_type)
+        instance = Cloudflare(api_key=self.get_random_string(36), captcha_type=captcha_type)
         assert "captcha_handler" in instance.__dir__()
         assert "aio_captcha_handler" in instance.__dir__()
 
     @pytest.mark.parametrize("captcha_type", captcha_types)
     def test_api_key_err(self, captcha_type):
-        result = AwsWaf(api_key=self.get_random_string(36), captcha_type=captcha_type).captcha_handler(
+        result = Cloudflare(api_key=self.get_random_string(36), captcha_type=captcha_type).captcha_handler(
             task_payload={"some": "data"}
         )
         assert result["errorId"] == 1
@@ -29,7 +28,7 @@ class TestAwsWafBase(BaseTest):
 
     @pytest.mark.parametrize("captcha_type", captcha_types)
     async def test_aio_api_key_err(self, captcha_type):
-        result = await AwsWaf(api_key=self.get_random_string(36), captcha_type=captcha_type).aio_captcha_handler(
+        result = await Cloudflare(api_key=self.get_random_string(36), captcha_type=captcha_type).aio_captcha_handler(
             task_payload={"some": "data"}
         )
         assert result["errorId"] == 1

{python3_capsolver-1.0.0a0 → python3_capsolver-1.0.1}/tests/test_core.py

@@ -23,7 +23,7 @@ class TestCore(BaseTest):
     def test_create_base(self):
         CaptchaParams(
             api_key=self.get_random_string(36),
-            captcha_type=CaptchaTypeEnm.VisionEngine,
+            captcha_type=CaptchaTypeEnm.Control,
             request_url=REQUEST_URL,
             sleep_time=self.sleep_time,
         )
@@ -31,7 +31,7 @@ class TestCore(BaseTest):
     def test_aio_create_base(self):
         CaptchaParams(
             api_key=self.get_random_string(36),
-            captcha_type=CaptchaTypeEnm.VisionEngine,
+            captcha_type=CaptchaTypeEnm.Control,
             request_url=REQUEST_URL,
             sleep_time=self.sleep_time,
         )
@@ -39,7 +39,7 @@ class TestCore(BaseTest):
     def test_create_base_context(self):
         with CaptchaParams(
             api_key=self.get_random_string(36),
-            captcha_type=CaptchaTypeEnm.VisionEngine,
+            captcha_type=CaptchaTypeEnm.Control,
             request_url=REQUEST_URL,
             sleep_time=self.sleep_time,
         ) as instance:
@@ -48,7 +48,7 @@ class TestCore(BaseTest):
     async def test_aio_create_base_context(self):
         async with CaptchaParams(
             api_key=self.get_random_string(36),
-            captcha_type=CaptchaTypeEnm.VisionEngine,
+            captcha_type=CaptchaTypeEnm.Control,
             request_url=REQUEST_URL,
             sleep_time=self.sleep_time,
         ) as instance:
@@ -60,19 +60,19 @@ class TestCore(BaseTest):
 
     def test_no_key_err(self):
         with pytest.raises(TypeError):
-            CaptchaParams(captcha_type=CaptchaTypeEnm.VisionEngine, request_url=REQUEST_URL, sleep_time=self.sleep_time)
+            CaptchaParams(captcha_type=CaptchaTypeEnm.Control, request_url=REQUEST_URL, sleep_time=self.sleep_time)
 
     def test_no_key_err_context(self):
         with pytest.raises(TypeError):
             with CaptchaParams(
-                captcha_type=CaptchaTypeEnm.VisionEngine, request_url=REQUEST_URL, sleep_time=self.sleep_time
+                captcha_type=CaptchaTypeEnm.Control, request_url=REQUEST_URL, sleep_time=self.sleep_time
             ) as instance:
                 pass
 
     async def test_aio_no_key_err_context(self):
         with pytest.raises(TypeError):
             async with CaptchaParams(
-                captcha_type=CaptchaTypeEnm.VisionEngine, request_url=REQUEST_URL, sleep_time=self.sleep_time
+                captcha_type=CaptchaTypeEnm.Control, request_url=REQUEST_URL, sleep_time=self.sleep_time
             ) as instance:
                 pass
 
@@ -80,7 +80,7 @@ class TestCore(BaseTest):
         with pytest.raises(Exception):
             with CaptchaParams(
                 api_key=self.get_random_string(36),
-                captcha_type=CaptchaTypeEnm.VisionEngine,
+                captcha_type=CaptchaTypeEnm.Control,
                 request_url=REQUEST_URL,
                 sleep_time=self.sleep_time,
             ) as instance:
@@ -90,14 +90,14 @@ class TestCore(BaseTest):
         with pytest.raises(Exception):
             async with CaptchaParams(
                 api_key=self.get_random_string(36),
-                captcha_type=CaptchaTypeEnm.VisionEngine,
+                captcha_type=CaptchaTypeEnm.Control,
                 request_url=REQUEST_URL,
                 sleep_time=self.sleep_time,
             ) as instance:
                 raise Exception()
 
 
-class TestEnum(BaseTest):
+class TestMyEnum(BaseTest):
     def test_enum_list(self):
         assert isinstance(MyEnum.list(), list)
 

python3_capsolver-1.0.1/tests/test_datadome.py

@@ -0,0 +1,33 @@
+import pytest
+
+from tests.conftest import BaseTest
+from python3_capsolver.core.enum import CaptchaTypeEnm
+from python3_capsolver.datadome_slider import DatadomeSlider
+
+
+class TestDatadomeSliderBase(BaseTest):
+    captcha_types = (CaptchaTypeEnm.DatadomeSliderTask,)
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    def test_captcha_handler_exist(self, captcha_type):
+        instance = DatadomeSlider(api_key=self.get_random_string(36), captcha_type=captcha_type)
+        assert "captcha_handler" in instance.__dir__()
+        assert "aio_captcha_handler" in instance.__dir__()
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    def test_api_key_err(self, captcha_type):
+        result = DatadomeSlider(api_key=self.get_random_string(36), captcha_type=captcha_type).captcha_handler(
+            task_payload={"some": "data"}
+        )
+        assert result["errorId"] == 1
+        assert result["errorCode"] in ("ERROR_KEY_DENIED_ACCESS", "ERROR_INVALID_TASK_DATA")
+        assert result["solution"] is None
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    async def test_aio_api_key_err(self, captcha_type):
+        result = await DatadomeSlider(
+            api_key=self.get_random_string(36), captcha_type=captcha_type
+        ).aio_captcha_handler(task_payload={"some": "data"})
+        assert result["errorId"] == 1
+        assert result["errorCode"] in ("ERROR_KEY_DENIED_ACCESS", "ERROR_INVALID_TASK_DATA")
+        assert result["solution"] is None

python3_capsolver-1.0.1/tests/test_friendly.py

@@ -0,0 +1,33 @@
+import pytest
+
+from tests.conftest import BaseTest
+from python3_capsolver.core.enum import CaptchaTypeEnm
+from python3_capsolver.friendly_captcha import FriendlyCaptcha
+
+
+class TestFriendlyCaptchaBase(BaseTest):
+    captcha_types = (CaptchaTypeEnm.FriendlyCaptchaTaskProxyless,)
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    def test_captcha_handler_exist(self, captcha_type):
+        instance = FriendlyCaptcha(api_key=self.get_random_string(36), captcha_type=captcha_type)
+        assert "captcha_handler" in instance.__dir__()
+        assert "aio_captcha_handler" in instance.__dir__()
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    def test_api_key_err(self, captcha_type):
+        result = FriendlyCaptcha(api_key=self.get_random_string(36), captcha_type=captcha_type).captcha_handler(
+            task_payload={"some": "data"}
+        )
+        assert result["errorId"] == 1
+        assert result["errorCode"] in ("ERROR_KEY_DENIED_ACCESS", "ERROR_INVALID_TASK_DATA")
+        assert result["solution"] is None
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    async def test_aio_api_key_err(self, captcha_type):
+        result = await FriendlyCaptcha(
+            api_key=self.get_random_string(36), captcha_type=captcha_type
+        ).aio_captcha_handler(task_payload={"some": "data"})
+        assert result["errorId"] == 1
+        assert result["errorCode"] in ("ERROR_KEY_DENIED_ACCESS", "ERROR_INVALID_TASK_DATA")
+        assert result["solution"] is None

python3_capsolver-1.0.1/tests/test_vision_engine.py

@@ -0,0 +1,23 @@
+from tests.conftest import BaseTest
+from python3_capsolver.vision_engine import VisionEngine
+
+
+class TestVisionEngineBase(BaseTest):
+    def test_captcha_handler_exist(self):
+        instance = VisionEngine(api_key=self.get_random_string(36))
+        assert "captcha_handler" in instance.__dir__()
+        assert "aio_captcha_handler" in instance.__dir__()
+
+    def test_api_key_err(self):
+        result = VisionEngine(api_key=self.get_random_string(36)).captcha_handler(task_payload={"some": "data"})
+        assert result["errorId"] == 1
+        assert result["errorCode"] in ("ERROR_KEY_DENIED_ACCESS", "ERROR_INVALID_TASK_DATA")
+        assert result["solution"] is None
+
+    async def test_aio_api_key_err(self):
+        result = await VisionEngine(api_key=self.get_random_string(36)).aio_captcha_handler(
+            task_payload={"some": "data"}
+        )
+        assert result["errorId"] == 1
+        assert result["errorCode"] in ("ERROR_KEY_DENIED_ACCESS", "ERROR_INVALID_TASK_DATA")
+        assert result["solution"] is None

python3_capsolver-1.0.1/tests/test_yandex.py

@@ -0,0 +1,33 @@
+import pytest
+
+from tests.conftest import BaseTest
+from python3_capsolver.yandex import YandexCaptcha
+from python3_capsolver.core.enum import CaptchaTypeEnm
+
+
+class TestYandexCaptchaBase(BaseTest):
+    captcha_types = (CaptchaTypeEnm.YandexCaptchaTaskProxyLess,)
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    def test_captcha_handler_exist(self, captcha_type):
+        instance = YandexCaptcha(api_key=self.get_random_string(36), captcha_type=captcha_type)
+        assert "captcha_handler" in instance.__dir__()
+        assert "aio_captcha_handler" in instance.__dir__()
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    def test_api_key_err(self, captcha_type):
+        result = YandexCaptcha(api_key=self.get_random_string(36), captcha_type=captcha_type).captcha_handler(
+            task_payload={"some": "data"}
+        )
+        assert result["errorId"] == 1
+        assert result["errorCode"] in ("ERROR_KEY_DENIED_ACCESS", "ERROR_INVALID_TASK_DATA")
+        assert result["solution"] is None
+
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    async def test_aio_api_key_err(self, captcha_type):
+        result = await YandexCaptcha(api_key=self.get_random_string(36), captcha_type=captcha_type).aio_captcha_handler(
+            task_payload={"some": "data"}
+        )
+        assert result["errorId"] == 1
+        assert result["errorCode"] in ("ERROR_KEY_DENIED_ACCESS", "ERROR_INVALID_TASK_DATA")
+        assert result["solution"] is None

python3_capsolver-1.0.0a0/src/python3_capsolver/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.0.0a"