python-rucaptcha 4.3.1__py3-none-any.whl → 5.0.0a0__py3-none-any.whl

python_rucaptcha/CapyPuzzle.py

@@ -1,5 +1,5 @@
-from .base import BaseCaptcha
-from .enums import CapyPuzzleEnm
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import CapyPuzzleEnm
 
 
 class BaseCapyPuzzle(BaseCaptcha):

python_rucaptcha/FunCaptcha.py

@@ -1,5 +1,5 @@
-from .base import BaseCaptcha
-from .enums import FunCaptchaEnm
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import FunCaptchaEnm
 
 
 class BaseFunCaptcha(BaseCaptcha):

python_rucaptcha/GeeTest.py

@@ -1,5 +1,5 @@
-from .base import BaseCaptcha
-from .enums import GeetestEnm
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import GeetestEnm
 
 
 class BaseGeeTest(BaseCaptcha):

python_rucaptcha/HCaptcha.py

@@ -1,5 +1,5 @@
-from .base import BaseCaptcha
-from .enums import HCaptchaEnm
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import HCaptchaEnm
 
 
 class BaseHCaptcha(BaseCaptcha):

python_rucaptcha/ImageCaptcha.py

@@ -3,8 +3,8 @@ import uuid
 import base64
 import shutil
 
-from .base import BaseCaptcha
-from .enums import SaveFormatsEnm, ImageCaptchaEnm
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import SaveFormatsEnm, ImageCaptchaEnm
 
 
 class BaseImageCaptcha(BaseCaptcha):

python_rucaptcha/KeyCaptcha.py

@@ -1,5 +1,5 @@
-from .base import BaseCaptcha
-from .enums import KeyCaptchaEnm
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import KeyCaptchaEnm
 
 
 class BaseKeyCaptcha(BaseCaptcha):

python_rucaptcha/LeminCroppedCaptcha.py

@@ -1,5 +1,5 @@
-from .base import BaseCaptcha
-from .enums import LeminCroppedCaptchaEnm
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import LeminCroppedCaptchaEnm
 
 
 class BaseLeminCroppedCaptcha(BaseCaptcha):

python_rucaptcha/ReCaptcha.py

@@ -1,5 +1,5 @@
-from .base import BaseCaptcha
-from .enums import ReCaptchaEnm
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import ReCaptchaEnm
 
 
 class BaseReCaptcha(BaseCaptcha):

python_rucaptcha/RotateCaptcha.py

@@ -2,8 +2,8 @@ import base64
 
 import aiohttp
 
-from .base import BaseCaptcha
-from .enums import RotateCaptchaEnm
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import RotateCaptchaEnm
 
 
 class BaseRotateCaptcha(BaseCaptcha):

python_rucaptcha/TikTokCaptcha.py

@@ -1,5 +1,5 @@
-from .base import BaseCaptcha
-from .enums import TikTokCaptchaEnm
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import TikTokCaptchaEnm
 
 
 class BaseTikTokCaptcha(BaseCaptcha):

python_rucaptcha/YandexSmartCaptcha.py

@@ -1,5 +1,5 @@
-from .base import BaseCaptcha
-from .enums import YandexSmartCaptchaEnm
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import YandexSmartCaptchaEnm
 
 
 class BaseYandexSmartCaptcha(BaseCaptcha):

python_rucaptcha/__version__.py

@@ -1 +1 @@
-__version__ = "4.3.1"
+__version__ = "5.0.0a"

python_rucaptcha/amazon_waf.py

@@ -0,0 +1,128 @@
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import AmazonWAFCaptchaEnm
+
+
+class AmazonWAF(BaseCaptcha):
+    def __init__(
+        self,
+        rucaptcha_key: str,
+        pageurl: str,
+        sitekey: str,
+        iv: str,
+        context: str,
+        method: str = AmazonWAFCaptchaEnm.AMAZON_WAF.value,
+        *args,
+        **kwargs,
+    ):
+        """
+        The class is used to work with Amazon WAF
+
+        Args:
+            rucaptcha_key: User API key
+            pageurl: Full URL of the captcha page
+            sitekey: Key value from the page
+            iv: Value iv from the page
+            context: Value of context from page
+            method: Captcha type
+
+        Examples:
+            >>> AmazonWAF(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...           pageurl="https://page-with-waf.com/",
+            ...           sitekey="some-site-key",
+            ...           iv="some-iv-value",
+            ...           context="some-context-value").captcha_handler()
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'eyJ0e......jNuSFqtyP4Ho',
+                'taskId': '7111111984',
+                'error': False,
+                'errorBody': None
+            }
+
+            >>> AmazonWAF(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...           pageurl="https://page-with-waf.com/",
+            ...           sitekey="some-site-key",
+            ...           iv="some-iv-value",
+            ...           context="some-context-value").aio_captcha_handler()
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'eyJ0e......jNuSFqtyP4Ho',
+                'taskId': '7111111984',
+                'error': False,
+                'errorBody': None
+            }
+
+        Returns:
+            Dict with full server response
+
+        Notes:
+            https://rucaptcha.com/api-rucaptcha#amazon-waf
+        """
+        super().__init__(rucaptcha_key=rucaptcha_key, method=method, *args, **kwargs)
+
+        self.post_payload.update({"sitekey": sitekey, "pageurl": pageurl, "iv": iv, "context": context})
+
+        # check user params
+        if method not in AmazonWAFCaptchaEnm.list_values():
+            raise ValueError(f"Invalid method parameter set, available - {AmazonWAFCaptchaEnm.list_values()}")
+
+    def captcha_handler(self, **kwargs) -> dict:
+        """
+        Synchronous method for captcha solving
+
+        Examples:
+            >>> AmazonWAF(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...           pageurl="https://page-with-waf.com/",
+            ...           sitekey="some-site-key",
+            ...           iv="some-iv-value",
+            ...           context="some-context-value").captcha_handler()
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'eyJ0e......jNuSFqtyP4Ho',
+                'taskId': '7111111984',
+                'error': False,
+                'errorBody': None
+            }
+
+        Returns:
+            Response to captcha as JSON string with fields:
+                 captchaSolve - captcha solution,
+                 taskId - finds the ID of the task to solve the captcha,
+                 error - False - if everything is fine, True - if there is an error,
+                 errorBody - error name
+
+        Notes:
+            Check class docstirng for more info
+        """
+
+        return self._processing_response(**kwargs)
+
+    async def aio_captcha_handler(self) -> dict:
+        """
+        Asynchronous method for captcha solving
+
+        Examples:
+            >>> await AmazonWAF(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...           pageurl="https://page-with-waf.com/",
+            ...           sitekey="some-site-key",
+            ...           iv="some-iv-value",
+            ...           context="some-context-value").aio_captcha_handler()
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'eyJ0e......jNuSFqtyP4Ho',
+                'taskId': '7111111984',
+                'error': False,
+                'errorBody': None
+            }
+
+        Returns:
+            Response to captcha as JSON string with fields:
+                 captchaSolve - captcha solution,
+                 taskId - finds the ID of the task to solve the captcha,
+                 error - False - if everything is fine, True - if there is an error,
+                 errorBody - error name
+
+        Notes:
+            Check class docstirng for more info
+        """
+        return await self._aio_processing_response()

python_rucaptcha/base.py

@@ -42,10 +42,8 @@ class BaseCaptcha:
         # prepare result payload
         self.result = ResponseSer()
 
-        # If more parameters are passed, add them to post_payload
-        if kwargs:
-            for key in kwargs:
-                self.post_payload.update({key: kwargs[key]})
+        for key in kwargs:
+            self.post_payload.update({key: kwargs[key]})
 
         # prepare session
         self.session = requests.Session()

python_rucaptcha/control.py

@@ -0,0 +1,401 @@
+from typing import Optional
+
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import ControlEnm
+from python_rucaptcha.core.result_handler import get_sync_result, get_async_result
+
+
+class Control(BaseCaptcha):
+    """
+    The class is used to work with RuCaptcha control methods.
+
+    Args:
+        action: Control action type
+
+    Examples:
+        >>> Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+        ...         action=ControlEnm.DEL_PINGBACK.value).domain_control(addr="all")
+        {
+            'serverAnswer': {},
+            'captchaSolve': 'OK',
+            'taskId': None,
+            'error': False,
+            'errorBody': None
+        }
+
+        >>> Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+        ...            action=ControlEnm.GET.value).report(id="73043727671")
+        {
+            'serverAnswer': {},
+            'captchaSolve': '1',
+            'taskId': None,
+            'error': False,
+            'errorBody': None
+        }
+
+    Returns:
+        Dict with full server response
+
+    Notes:
+        https://rucaptcha.com/api-rucaptcha#manage_pingback
+        https://rucaptcha.com/api-rucaptcha#complain
+        https://rucaptcha.com/api-rucaptcha#additional
+    """
+
+    def __init__(
+        self,
+        action: str,
+        *args,
+        **kwargs,
+    ):
+        super().__init__(action=action, *args, **kwargs)
+
+        # check user params
+        if action not in ControlEnm.list_values():
+            raise ValueError(f"Invalid method parameter set, available - {ControlEnm.list_values()}")
+
+    def domain_control(self, addr: Optional[str] = None) -> dict:
+        """
+        Callback domains control
+
+        Args:
+            addr: URL for pingback or `all` with pingback delete param
+
+        Examples:
+            >>> Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...         action=ControlEnm.DEL_PINGBACK.value).domain_control(addr="all")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'OK',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+            >>> Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...         action=ControlEnm.DEL_PINGBACK.value)\
+            ...             .domain_control(addr="http://mysite.com/pingback/url/")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'OK',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+            >>> Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...         action=ControlEnm.ADD_PINGBACK.value)\
+            ...             .domain_control(addr="http://mysite.com/pingback/url/")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'OK',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+            >>> Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...         action=ControlEnm.GET_PINGBACK.value).domain_control()
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'http://mysite.com/pingback/url/',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+
+        Returns:
+            Dict with full server response
+
+        Notes:
+            https://rucaptcha.com/api-rucaptcha#manage_pingback
+        """
+        self.get_payload.update({"addr": addr})
+        return get_sync_result(
+            get_payload=self.get_payload,
+            sleep_time=self.params.sleep_time,
+            url_response=self.params.url_response,
+            result=self.result,
+        )
+
+    async def aio_domain_control(self, addr: Optional[str] = None) -> dict:
+        """
+        Callback domains control
+
+        Args:
+            addr: URL for pingback or `all` with pingback delete param
+
+        Examples:
+            >>> await Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...         action=ControlEnm.DEL_PINGBACK.value).aio_domain_control(addr="all")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'OK',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+            >>> await Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...         action=ControlEnm.DEL_PINGBACK.value)\
+            ...             .aio_domain_control(addr="http://mysite.com/pingback/url/")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'OK',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+            >>> await Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...         action=ControlEnm.ADD_PINGBACK.value)\
+            ...             .aio_domain_control(addr="http://mysite.com/pingback/url/")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'OK',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+            >>> await Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...         action=ControlEnm.GET_PINGBACK.value).aio_domain_control()
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'http://mysite.com/pingback/url/',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+
+        Returns:
+            Dict with full server response
+
+        Notes:
+            https://rucaptcha.com/api-rucaptcha#manage_pingback
+        """
+        self.get_payload.update({"addr": addr})
+        return await get_async_result(
+            get_payload=self.get_payload,
+            sleep_time=self.params.sleep_time,
+            url_response=self.params.url_response,
+            result=self.result,
+        )
+
+    def report(self, id: str) -> dict:
+        """
+        Captcha results report
+
+        Args:
+            id: Captcha task ID
+
+        Examples:
+            >>> Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...            action=ControlEnm.GET.value).report(id="73043727671")
+            {
+                'serverAnswer': {},
+                'captchaSolve': '1',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+            >>> Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...             action=ControlEnm.REPORTGOOD.value).report(id="73043727671")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'OK_REPORT_RECORDED',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+            >>> Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...             action=ControlEnm.REPORTBAD.value).report(id="73043727671")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'OK_REPORT_RECORDED',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+
+        Returns:
+            Dict with full server response
+
+        Notes:
+            https://rucaptcha.com/api-rucaptcha#complain
+        """
+        self.get_payload.update({"id": id})
+        return get_sync_result(
+            get_payload=self.get_payload,
+            sleep_time=self.params.sleep_time,
+            url_response=self.params.url_response,
+            result=self.result,
+        )
+
+    async def aio_report(self, id: str) -> dict:
+        """
+        Captcha results report
+
+        Args:
+            id: Captcha task ID
+
+        Examples:
+            >>> await Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...                 action=ControlEnm.GET.value).aio_report(id="73043727671")
+            {
+                'serverAnswer': {},
+                'captchaSolve': '1',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+            >>> await Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...                 action=ControlEnm.REPORTGOOD.value).aio_report(id="73043727671")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'OK_REPORT_RECORDED',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+            >>> await Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...                 action=ControlEnm.REPORTBAD.value).aio_report(id="73043727671")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'OK_REPORT_RECORDED',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+
+        Returns:
+            Dict with full server response
+
+        Notes:
+            https://rucaptcha.com/api-rucaptcha#complain
+        """
+        self.get_payload.update({"id": id})
+        return await get_async_result(
+            get_payload=self.get_payload,
+            sleep_time=self.params.sleep_time,
+            url_response=self.params.url_response,
+            result=self.result,
+        )
+
+    def additional_methods(self, **kwargs) -> dict:
+        """
+        Some additional methods for control API (like balance and etc.)
+
+        Args:
+            kwargs: Additional params for method, like `id`, `ids`, more info in service docs.
+
+        Examples:
+            >>> Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...         action=ControlEnm.GETBALANCE.value).additional_methods()
+            {
+                'serverAnswer': {},
+                'captchaSolve': '1044.23118',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+        Returns:
+            Dict with full server response
+
+        Notes:
+            https://rucaptcha.com/api-rucaptcha#additional
+        """
+        for key in kwargs:
+            self.get_payload.update({key: kwargs[key]})
+        return get_sync_result(
+            get_payload=self.get_payload,
+            sleep_time=self.params.sleep_time,
+            url_response=self.params.url_response,
+            result=self.result,
+        )
+
+    async def aio_additional_methods(self, **kwargs) -> dict:
+        """
+        Some additional methods for control API (like balance and etc.)
+
+        Args:
+            kwargs: Additional params for method, like `id`, `ids`, more info in service docs.
+
+        Examples:
+            >>> await Control(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...         action=ControlEnm.GETBALANCE.value).aio_additional_methods()
+            {
+                'serverAnswer': {},
+                'captchaSolve': '1044.23118',
+                'taskId': None,
+                'error': False,
+                'errorBody': None
+            }
+
+        Returns:
+            Dict with full server response
+
+        Notes:
+            https://rucaptcha.com/api-rucaptcha#additional
+        """
+        for key in kwargs:
+            self.get_payload.update({key: kwargs[key]})
+        return await get_async_result(
+            get_payload=self.get_payload,
+            sleep_time=self.params.sleep_time,
+            url_response=self.params.url_response,
+            result=self.result,
+        )
+
+
+'''
+# Async WebSocket method
+class sockCaptchaControl(WebSocketRuCaptcha):
+    def __init__(self, rucaptcha_key: str, allSessions: bool = None, suppressSuccess: bool = None):
+        """
+        Method setup WebSocket connection data
+        Params description check in parent class
+        """
+        super().__init__(allSessions, suppressSuccess)
+        self.rucaptcha_key = rucaptcha_key
+
+    async def get_balance(self) -> dict:
+        """
+        The asynchronous WebSocket method return account balance.
+        More info - https://wsrucaptcha.docs.apiary.io/#reference/4
+        :return: Server response dict
+        """
+        balance_payload = ControlCaptchaSocketSer(
+            **{
+                "method": "balance",
+            }
+        )
+        return await self.send_request(balance_payload.json(exclude_none=True))
+
+    async def report(self, success: bool, captchaId: int) -> dict:
+        """
+        The asynchronous WebSocket method send captcha solving reports (success or fail).
+        More info - https://wsrucaptcha.docs.apiary.io/#reference/2
+        :param success: Is captcha solved success?
+        :param captchaId: Captcha task unique id. For example - 5034284222
+        :return: Server response dict
+        """
+        report_payload = ControlCaptchaSocketSer(
+            **{
+                "method": "report",
+                "success": success,
+                "captchaId": captchaId,
+            }
+        )
+
+        return await self.send_request(report_payload.json(exclude_none=True))
+'''

python_rucaptcha/text_captcha.py

@@ -0,0 +1,117 @@
+from python_rucaptcha.core.base import BaseCaptcha
+
+
+class TextCaptcha(BaseCaptcha):
+    """
+    The class is used to work with TextCaptcha.
+    Solve description:
+        https://rucaptcha.com/api-rucaptcha#solving_text_captcha
+
+    Args:
+        rucaptcha_key: User API key
+        language: Captcha text lang:
+                    0 - not defined
+                    1 - captcha contains only Cyrillic
+                    2 - captcha contains only latin characters
+
+    Examples:
+        >>> TextCaptcha(rucaptcha_key="aa9011f31111181111168611f1151122",
+        ...             language=2).captcha_handler(textcaptcha="Our planet name?")
+        {
+            'serverAnswer': {},
+            'captchaSolve': 'earth',
+            'taskId': '73043008354',
+            'error': False,
+            'errorBody': None
+        }
+
+        >>> TextCaptcha(rucaptcha_key="aa9011f31111181111168611f1151122")\
+        ...             .captcha_handler(textcaptcha="Our planet name?")
+        {
+            'serverAnswer': {},
+            'captchaSolve': 'earth',
+            'taskId': '73043008354',
+            'error': False,
+            'errorBody': None
+        }
+
+    Returns:
+        Dict with full server response
+
+    Notes:
+        https://rucaptcha.com/api-rucaptcha#solving_text_captcha
+    """
+
+    def __init__(
+        self,
+        rucaptcha_key: str,
+        language: int = 0,
+        *args,
+        **kwargs,
+    ):
+        super().__init__(rucaptcha_key=rucaptcha_key, *args, **kwargs)
+
+        self.post_payload.update({"language": language})
+
+    def captcha_handler(self, textcaptcha: str, **kwargs) -> dict:
+        """
+        Synchronous method for captcha solving
+
+        Args:
+            textcaptcha: Captcha text
+
+        Examples:
+            >>> TextCaptcha(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...             language=2).captcha_handler(textcaptcha="Our planet name?")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'earth',
+                'taskId': '73043008354',
+                'error': False,
+                'errorBody': None
+            }
+
+        Returns:
+            Response to captcha as JSON string with fields:
+                 captchaSolve - captcha solution,
+                 taskId - finds the ID of the task to solve the captcha,
+                 error - False - if everything is fine, True - if there is an error,
+                 errorBody - error name
+
+        Notes:
+            Check class docstirng for more info
+        """
+        self.post_payload.update({"textcaptcha": textcaptcha})
+
+        return self._processing_response(**kwargs)
+
+    async def aio_captcha_handler(self, textcaptcha: str) -> dict:
+        """
+        Asynchronous method for captcha solving
+
+        Args:
+            :param textcaptcha: Captcha text
+
+        Examples:
+            >>> await TextCaptcha(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...             language=2).aio_captcha_handler(textcaptcha="Our planet name?")
+            {
+                'serverAnswer': {},
+                'captchaSolve': 'earth',
+                'taskId': '73043008354',
+                'error': False,
+                'errorBody': None
+            }
+
+        Returns:
+            Response to captcha as JSON string with fields:
+                 captchaSolve - captcha solution,
+                 taskId - finds the ID of the task to solve the captcha,
+                 error - False - if everything is fine, True - if there is an error,
+                 errorBody - error name
+
+        Notes:
+            Check class docstirng for more info
+        """
+        self.post_payload.update({"textcaptcha": textcaptcha})
+        return await self._aio_processing_response()

python_rucaptcha/turnstile.py

@@ -0,0 +1,53 @@
+from python_rucaptcha.core.base import BaseCaptcha
+from python_rucaptcha.core.enums import TurnstileCaptchaEnm
+
+
+class BaseTurnstile(BaseCaptcha):
+    def __init__(self, pageurl: str, sitekey: str, method: str = TurnstileCaptchaEnm.TURNSTILE.value, *args, **kwargs):
+        super().__init__(method=method, *args, **kwargs)
+
+        self.post_payload.update({"sitekey": sitekey, "pageurl": pageurl})
+
+        # check user params
+        if method not in TurnstileCaptchaEnm.list_values():
+            raise ValueError(f"Invalid method parameter set, available - {TurnstileCaptchaEnm.list_values()}")
+
+
+class Turnstile(BaseTurnstile):
+    """
+    The class is used to work with Cloudflare Turnstile
+    Solve description:
+        https://rucaptcha.com/api-rucaptcha#turnstile
+    """
+
+    def captcha_handler(self, **kwargs):
+        """
+        The method is responsible for sending data to the server to solve the captcha
+        :param kwargs: Parameters for the `requests` library
+        :return: Response to captcha as JSON string with fields:
+                 captchaSolve - captcha solution,
+                 taskId - finds the ID of the task to solve the captcha,
+                 error - False - if everything is fine, True - if there is an error,
+                 errorBody - error name
+        """
+
+        return self._processing_response(**kwargs)
+
+
+class aioTurnstile(BaseTurnstile):
+    """
+    The class is used to work with Cloudflare Turnstile
+    Solve description:
+        https://rucaptcha.com/api-rucaptcha#turnstile
+    """
+
+    async def captcha_handler(self):
+        """
+        The method is responsible for sending data to the server to solve the captcha
+        :return: Response to captcha as JSON string with fields:
+                 captchaSolve - captcha solution,
+                 taskId - finds the ID of the task to solve the captcha,
+                 error - False - if everything is fine, True - if there is an error,
+                 errorBody - error name
+        """
+        return await self._aio_processing_response()

{python_rucaptcha-4.3.1.dist-info → python_rucaptcha-5.0.0a0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-rucaptcha
-Version: 4.3.1
+Version: 5.0.0a0
 Summary: Python 3.6+ RuCaptcha library with AIO module.
 Home-page: https://github.com/AndreiDrang/python-rucaptcha
 Author: AndreiDrang, redV0ID
@@ -27,6 +27,8 @@ Keywords: captcha
 				rucaptcha-client
 				yandex
 				turnstile
+				amazon
+				amazon_waf
 Platform: UNKNOWN
 Classifier: License :: OSI Approved :: MIT License
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
@@ -42,7 +44,7 @@ Classifier: Framework :: AsyncIO
 Classifier: Operating System :: Unix
 Classifier: Operating System :: Microsoft :: Windows
 Classifier: Operating System :: MacOS
-Requires-Python: >=3.6.0
+Requires-Python: >=3.7.0
 Description-Content-Type: text/markdown
 Requires-Dist: requests (>=2.21.0)
 Requires-Dist: aiohttp (>=3.7.4)
@@ -62,6 +64,9 @@ Requires-Dist: tenacity (==8.*)
 
 [![Maintainability](https://api.codeclimate.com/v1/badges/aec93bb04a277cf0dde9/maintainability)](https://codeclimate.com/github/AndreiDrang/python-rucaptcha/maintainability)
 
+[![Tests](https://github.com/AndreiDrang/python-rucaptcha/actions/workflows/test.yml/badge.svg?branch=master)](https://github.com/AndreiDrang/python-rucaptcha/actions/workflows/test.yml)
+[![Lint](https://github.com/AndreiDrang/python-rucaptcha/actions/workflows/lint.yml/badge.svg?branch=master)](https://github.com/AndreiDrang/python-rucaptcha/actions/workflows/lint.yml)
+
 Python3 library for [RuCaptcha](https://rucaptcha.com/) and [2Captcha](https://2captcha.com/) service API.
 
 Tested on UNIX based OS.

python_rucaptcha-5.0.0a0.dist-info/RECORD

@@ -0,0 +1,30 @@
+python_rucaptcha/CaptchaControl.py,sha256=-UcKan0m6tb-l9LJ-Nz8_GVW8j6B_Te9VJwdW1eQ_AQ,6031
+python_rucaptcha/CapyPuzzle.py,sha256=qxTJoZAr0PcklTCp1DVzJB7uxjBHhnuzWgk5iy2nqoc,2124
+python_rucaptcha/FunCaptcha.py,sha256=4O-CUU4RksXfUNwE40fMKr5YJEixCh9Xp2-xJupuAPQ,2148
+python_rucaptcha/GeeTest.py,sha256=0B83baV6O2IlLjRiwb72zzyDUFbufQIZmpXv79manBU,3303
+python_rucaptcha/HCaptcha.py,sha256=n_fj1zq1bhn1HPzKAogEHzmv080VJFusVR73sM0QNQg,2076
+python_rucaptcha/ImageCaptcha.py,sha256=yWr1f5CwjfITirOAbt4gLQzUaXiZsm1-iCeI8pROmpk,9021
+python_rucaptcha/KeyCaptcha.py,sha256=m47iFeK0OVSDb2nQ_t2gHBMN9nIn36dhRmEiVZcXhjc,2480
+python_rucaptcha/LeminCroppedCaptcha.py,sha256=TRMA554XDP2ysCft-VfE30bh3dy5NjrH6QpGCFh7iLw,2212
+python_rucaptcha/ReCaptcha.py,sha256=8JNiO_8krcTT1xN3yTNGPjlC1BtF-TRq9doEhGaDCZw,2438
+python_rucaptcha/RotateCaptcha.py,sha256=vz9GhKplK1PoexhCmgxhebEoySn4XWnFM17ga5tBz2Q,3295
+python_rucaptcha/SocketAPI.py,sha256=W_ZmEaNTMx--lvaYiLJyckWGt3P-gxoZf0qdxK-onb0,4291
+python_rucaptcha/TextCaptcha.py,sha256=vMNbQFWZa3FY5m01vw9DPAI389OImtuTuZRs06gNRio,2935
+python_rucaptcha/TikTokCaptcha.py,sha256=l9GMq1eiXqxPTuath9s0uc-XUusQXDc8sNcFhDieCJg,2289
+python_rucaptcha/Turnstile.py,sha256=C7MYHrsx-wVYCrHS0fwfIuLVWZqeks_W9x8C2TpbuUc,2019
+python_rucaptcha/YandexSmartCaptcha.py,sha256=N_XyGZ92bjyRV9yD6I3A64Qcxzsl-HKxw5KaZWkGByE,2087
+python_rucaptcha/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+python_rucaptcha/__version__.py,sha256=MlH-A-_oP01JeZLx9j1ZRRXkKE1SJSep_CffU4pyeJ8,23
+python_rucaptcha/amazon_waf.py,sha256=VIf0RMs8i99KEQ9W6hlN420IBdehEk9hPWdFIaC6Uvs,4618
+python_rucaptcha/base.py,sha256=UDAsyHUUKcsnvBJBnHqfUs2d1H-k6nVnDXL8dwR57Zs,5805
+python_rucaptcha/config.py,sha256=xGFAeYmgqGEuUlAOCyZthEiTYlChqQQ2KSwfPeBOdXM,567
+python_rucaptcha/control.py,sha256=ZFPdhNKiEOCTaMm2QpBPwKmEUGGY9ZcHdhz0tf9dTRA,13209
+python_rucaptcha/enums.py,sha256=O2rpMnbKPO-HVVJD8LnKVE1xtxmjYgrkLaR0f1WGkoU,1705
+python_rucaptcha/result_handler.py,sha256=W8meecABi2kADirNQ58gkmUI9CdVesI1x8zxHOIe1QA,3138
+python_rucaptcha/serializer.py,sha256=kDr2FfNYy0NLL73n_tsIvqyPPDlL8vV0qsybZGX7-hA,3973
+python_rucaptcha/text_captcha.py,sha256=5r0oK5Zd3HajwIgSw4XU582na3wwQm008K82erCl6UE,3759
+python_rucaptcha/turnstile.py,sha256=U3CjcbXZvFuu97rEnNLQOk8iLN8kg_9f-d1JlxZOdRc,2061
+python_rucaptcha-5.0.0a0.dist-info/METADATA,sha256=lpk8-A-KPzJvaiZ_n6zI9wo6lcnMJCL971awlLFW9u8,4056
+python_rucaptcha-5.0.0a0.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
+python_rucaptcha-5.0.0a0.dist-info/top_level.txt,sha256=Eu_atEB79Y7jCsfXPcXF5N8OLt6kKVbvhuRsI1BmSWM,17
+python_rucaptcha-5.0.0a0.dist-info/RECORD,,

python_rucaptcha-4.3.1.dist-info/RECORD

@@ -1,26 +0,0 @@
-python_rucaptcha/CaptchaControl.py,sha256=-UcKan0m6tb-l9LJ-Nz8_GVW8j6B_Te9VJwdW1eQ_AQ,6031
-python_rucaptcha/CapyPuzzle.py,sha256=MLetxVoeXXw7X98pe_-djUJp97WG0JfQxov9DDSu-4s,2082
-python_rucaptcha/FunCaptcha.py,sha256=Ij79BuaGUIdbsuIodC_XnK0POoiXNFRCfK4S0AghsOg,2106
-python_rucaptcha/GeeTest.py,sha256=GbEwJtl3l5CpR00KvzAmnT2b_saeIwz84DV1VPqVQTk,3261
-python_rucaptcha/HCaptcha.py,sha256=dmssVRVWjOykB-e_hK9uA_6zBH4kqFR0ezpxdLRFHAk,2034
-python_rucaptcha/ImageCaptcha.py,sha256=HinU3-hUmZVS_NUrCSY5cxlcXnGI9dyXdBf8Kbtu5CU,8979
-python_rucaptcha/KeyCaptcha.py,sha256=CDDM8bfxlvmL3wX5qFDAIJaQ7rKhVdkI181adeewPaY,2438
-python_rucaptcha/LeminCroppedCaptcha.py,sha256=DMVwvers7dVLwNBHksBmZj9pGl2jrHgT5a5gT61k5HY,2170
-python_rucaptcha/ReCaptcha.py,sha256=2UUKzDL9cg03G6d9n15TCJLPN_mPTezySrNSyB1lAYI,2396
-python_rucaptcha/RotateCaptcha.py,sha256=Ik-n6toGaKqBxO99quXmzsZD3FlJbDHXpb4j4Iu5KAM,3253
-python_rucaptcha/SocketAPI.py,sha256=W_ZmEaNTMx--lvaYiLJyckWGt3P-gxoZf0qdxK-onb0,4291
-python_rucaptcha/TextCaptcha.py,sha256=vMNbQFWZa3FY5m01vw9DPAI389OImtuTuZRs06gNRio,2935
-python_rucaptcha/TikTokCaptcha.py,sha256=TngS2ZE96Y1a32jl93CetTBMVTh04oe3c5bsPs0hm-c,2247
-python_rucaptcha/Turnstile.py,sha256=C7MYHrsx-wVYCrHS0fwfIuLVWZqeks_W9x8C2TpbuUc,2019
-python_rucaptcha/YandexSmartCaptcha.py,sha256=W4O0TkXcc3WiYWAt8qdIuPqlWItEXhJ0JgBhDEcHKQM,2045
-python_rucaptcha/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-python_rucaptcha/__version__.py,sha256=gKhp048MdP-3cJ_eV-P1YyHenF2KvM2r8m9M1vLMB1A,22
-python_rucaptcha/base.py,sha256=-Jo05hKrNBX-Qzjv2xOwIngWZZpQKUody9xptX9zjoM,5898
-python_rucaptcha/config.py,sha256=xGFAeYmgqGEuUlAOCyZthEiTYlChqQQ2KSwfPeBOdXM,567
-python_rucaptcha/enums.py,sha256=O2rpMnbKPO-HVVJD8LnKVE1xtxmjYgrkLaR0f1WGkoU,1705
-python_rucaptcha/result_handler.py,sha256=W8meecABi2kADirNQ58gkmUI9CdVesI1x8zxHOIe1QA,3138
-python_rucaptcha/serializer.py,sha256=kDr2FfNYy0NLL73n_tsIvqyPPDlL8vV0qsybZGX7-hA,3973
-python_rucaptcha-4.3.1.dist-info/METADATA,sha256=tbjU83L7cTyZa1YuYX1WFRT7laMQsF76-m3ouUPTjOY,3654
-python_rucaptcha-4.3.1.dist-info/WHEEL,sha256=G16H4A3IeoQmnOrYV4ueZGKSjhipXx8zc8nu9FGlvMA,92
-python_rucaptcha-4.3.1.dist-info/top_level.txt,sha256=Eu_atEB79Y7jCsfXPcXF5N8OLt6kKVbvhuRsI1BmSWM,17
-python_rucaptcha-4.3.1.dist-info/RECORD,,