python-rucaptcha 6.1__tar.gz → 6.1.2__tar.gz

{python-rucaptcha-6.1 → python-rucaptcha-6.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-rucaptcha
-Version: 6.1
+Version: 6.1.2
 Summary: Python 3.9+ RuCaptcha library with AIO module.
 Home-page: https://andreidrang.github.io/python-rucaptcha/
 Author: AndreiDrang, redV0ID
@@ -34,6 +34,7 @@ Keywords: captcha
 				turnstile
 				amazon
 				amazon_waf
+				friendly-captcha
 Classifier: License :: OSI Approved :: MIT License
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Programming Language :: Python
@@ -58,7 +59,7 @@ Requires-Dist: tenacity==8.2.*
 
 # python-rucaptcha
 
-![Logo](https://red-panda-dev.xyz/media/images/RuCaptchaHigh.max-800x600.png)
+![Logo](https://red-panda-dev.xyz/media/images/RuCaptchaHigh_zkkPoYF.original.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">

python-rucaptcha-6.1.2/python_rucaptcha/__version__.py

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

{python-rucaptcha-6.1 → python-rucaptcha-6.1.2}/python_rucaptcha/core/enums.py

@@ -144,3 +144,8 @@ class CoordinatesCaptchaEnm(str, MyEnum):
 
 class GridCaptchaEnm(str, MyEnum):
     GridTask = "GridTask"
+
+
+class FriendlyCaptchaEnm(str, MyEnum):
+    FriendlyCaptchaTaskProxyless = "FriendlyCaptchaTaskProxyless"
+    FriendlyCaptchaTask = "FriendlyCaptchaTask"

{python-rucaptcha-6.1 → python-rucaptcha-6.1.2}/python_rucaptcha/core/serializer.py

@@ -20,11 +20,6 @@ class TaskSer(MyBaseModel):
     type: str
 
 
-class ErrorFieldsSer(Struct):
-    errorCode: str = None
-    errorDescription: str = None
-
-
 class CreateTaskBaseSer(MyBaseModel):
     clientKey: str
     task: TaskSer = {}
@@ -62,8 +57,7 @@ HTTP API Response
 """
 
 
-class GetTaskResultResponseSer(MyBaseModel, ErrorFieldsSer):
-    errorId: int = 0
+class GetTaskResultResponseSer(MyBaseModel):
     status: str = "ready"
     solution: dict = None
     cost: float = None
@@ -74,3 +68,7 @@ class GetTaskResultResponseSer(MyBaseModel, ErrorFieldsSer):
     taskId: int = None
     # control method params
     balance: float = None
+    # error info
+    errorId: int = 0
+    errorCode: str = None
+    errorDescription: str = None

python-rucaptcha-6.1.2/python_rucaptcha/friendly_captcha.py

@@ -0,0 +1,124 @@
+from typing import Union
+
+from .core.base import BaseCaptcha
+from .core.enums import FriendlyCaptchaEnm
+
+
+class FriendlyCaptcha(BaseCaptcha):
+    def __init__(
+        self,
+        websiteURL: str,
+        websiteKey: str,
+        method: Union[str, FriendlyCaptchaEnm] = FriendlyCaptchaEnm.FriendlyCaptchaTaskProxyless,
+        *args,
+        **kwargs,
+    ):
+        """
+        The class is used to work with Friendly Captcha.
+
+        Args:
+            rucaptcha_key: User API key
+            websiteURL: The full URL of target web page where the captcha is loaded. We do not open the page,
+                            not a problem if it is available only for authenticated users
+            websiteKey: The value of `data-sitekey` attribute of captcha's `div` element on page.
+            method: Captcha type
+
+        Examples:
+            >>> FriendlyCaptcha(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...             websiteKey="2FZFEVS1FZCGQ9",
+            ...             websiteURL="https://example.com",
+            ...             method=FriendlyCaptchaEnm.FriendlyCaptchaTaskProxyless.value
+            ...             ).captcha_handler()
+            {
+               "errorId":0,
+               "status":"ready",
+               "solution":{
+                  "token":"PUZZLE_Abc1dEFghIJKLM2no34P56q7rStu8v"
+               },
+               "cost":"0.00299",
+               "ip":"1.2.3.4",
+               "createTime":1692863536,
+               "endTime":1692863556,
+               "solveCount":1,
+               "taskId":75190409731
+            }
+
+            >>> FriendlyCaptcha(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...             websiteKey="2FZFEVS1FZCGQ9",
+            ...             websiteURL="https://example.com",
+            ...             method=FriendlyCaptchaEnm.FriendlyCaptchaTaskProxyless.value
+            ...             ).captcha_handler()
+            {
+               "errorId":0,
+               "status":"ready",
+               "solution":{
+                  "token":"PUZZLE_Abc1dEFghIJKLM2no34P56q7rStu8v"
+               },
+               "cost":"0.00299",
+               "ip":"1.2.3.4",
+               "createTime":1692863536,
+               "endTime":1692863556,
+               "solveCount":1,
+               "taskId":75190409731
+            }
+
+            >>> await FriendlyCaptcha(rucaptcha_key="aa9011f31111181111168611f1151122",
+            ...             websiteKey="2FZFEVS1FZCGQ9",
+            ...             websiteURL="https://example.com",
+            ...             method=FriendlyCaptchaEnm.FriendlyCaptchaTaskProxyless.value
+            ...             ).aio_captcha_handler()
+            {
+               "errorId":0,
+               "status":"ready",
+               "solution":{
+                  "token":"PUZZLE_Abc1dEFghIJKLM2no34P56q7rStu8v"
+               },
+               "cost":"0.00299",
+               "ip":"1.2.3.4",
+               "createTime":1692863536,
+               "endTime":1692863556,
+               "solveCount":1,
+               "taskId":75190409731
+            }
+
+        Returns:
+            Dict with full server response
+
+        Notes:
+            https://rucaptcha.com/api-docs/friendly-captcha
+        """
+        super().__init__(method=method, *args, **kwargs)
+
+        self.create_task_payload["task"].update({"websiteURL": websiteURL, "websiteKey": websiteKey})
+
+        # check user params
+        if method not in FriendlyCaptchaEnm.list_values():
+            raise ValueError(f"Invalid method parameter set, available - {FriendlyCaptchaEnm.list_values()}")
+
+    def captcha_handler(self, **kwargs) -> dict:
+        """
+        Sync solving method
+
+        Args:
+            kwargs: additional params for `requests` library
+
+        Returns:
+            Dict with full server response
+
+        Notes:
+            Check class docstirng for more info
+        """
+
+        return self._processing_response(**kwargs)
+
+    async def aio_captcha_handler(self) -> dict:
+        """
+        Async solving method
+
+        Returns:
+            Dict with full server response
+
+        Notes:
+            Check class docstirng for more info
+        """
+        return await self._aio_processing_response()

{python-rucaptcha-6.1 → python-rucaptcha-6.1.2}/python_rucaptcha/gee_test.py

@@ -194,11 +194,7 @@ class GeeTest(BaseCaptcha):
         Notes:
             Check class docstirng for more info
         """
-        if self.method == GeetestEnm.GeeTestTaskProxyless.value:
-            if challenge is not None:
-                self.create_task_payload["task"].update({"challenge": challenge})
-            else:
-                raise ValueError(f"For {self.method} challenge is required")
+        self.create_task_payload["task"].update({"challenge": challenge})
 
         return self._processing_response(**kwargs)
 
@@ -215,10 +211,6 @@ class GeeTest(BaseCaptcha):
         Notes:
             Check class docstirng for more info
         """
-        if self.method == GeetestEnm.GeeTestTaskProxyless.value:
-            if challenge is not None:
-                self.create_task_payload["task"].update({"challenge": challenge})
-            else:
-                raise ValueError(f"For {self.method} challenge is required")
+        self.create_task_payload["task"].update({"challenge": challenge})
 
         return await self._aio_processing_response()

{python-rucaptcha-6.1 → python-rucaptcha-6.1.2}/python_rucaptcha.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-rucaptcha
-Version: 6.1
+Version: 6.1.2
 Summary: Python 3.9+ RuCaptcha library with AIO module.
 Home-page: https://andreidrang.github.io/python-rucaptcha/
 Author: AndreiDrang, redV0ID
@@ -34,6 +34,7 @@ Keywords: captcha
 				turnstile
 				amazon
 				amazon_waf
+				friendly-captcha
 Classifier: License :: OSI Approved :: MIT License
 Classifier: License :: OSI Approved :: Mozilla Public License 2.0 (MPL 2.0)
 Classifier: Programming Language :: Python
@@ -58,7 +59,7 @@ Requires-Dist: tenacity==8.2.*
 
 # python-rucaptcha
 
-![Logo](https://red-panda-dev.xyz/media/images/RuCaptchaHigh.max-800x600.png)
+![Logo](https://red-panda-dev.xyz/media/images/RuCaptchaHigh_zkkPoYF.original.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">

{python-rucaptcha-6.1 → python-rucaptcha-6.1.2}/python_rucaptcha.egg-info/SOURCES.txt

@@ -11,6 +11,7 @@ python_rucaptcha/cutcaptcha.py
 python_rucaptcha/cyber_siara_captcha.py
 python_rucaptcha/datadome_captcha.py
 python_rucaptcha/draw_around_captcha.py
+python_rucaptcha/friendly_captcha.py
 python_rucaptcha/fun_captcha.py
 python_rucaptcha/gee_test.py
 python_rucaptcha/grid_captcha.py

{python-rucaptcha-6.1 → python-rucaptcha-6.1.2}/setup.py

@@ -115,6 +115,7 @@ setup(
 				turnstile
 				amazon
 				amazon_waf
+				friendly-captcha
                """,
     python_requires=REQUIRES_PYTHON,
     zip_safe=False,

python-rucaptcha-6.1/python_rucaptcha/__version__.py

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