Merge pull request #312 from AndreiDrang/master

Release v6.3

.github/workflows/test.yml

@@ -48,7 +48,7 @@ jobs:
         run: make tests
 
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           files: ${{github.workspace}}/coverage/coverage.xml

README.md

@@ -4,7 +4,7 @@
 
 ### [Capsolver](https://www.capsolver.com/?utm_source=github&utm_medium=repo&utm_campaign=scraping&utm_term=python-rucaptcha)
 
-[![Capsolver](files/capsolver.png)](https://www.capsolver.com/?utm_source=github&utm_medium=repo&utm_campaign=scraping&utm_term=python-rucaptcha)
+[![Capsolver](files/capsolver.jpg)](https://www.capsolver.com/?utm_source=github&utm_medium=repo&utm_campaign=scraping&utm_term=python-rucaptcha)
 
 <hr>
 

docs/conf.py

@@ -32,7 +32,9 @@
 
 # -- Project information -----------------------------------------------------
 project = "python-rucaptcha"
-copyright = f"{date.today().year}, AndreiDrang; Release - {__version__}; Last update - {date.today()}"
+copyright = (f"{date.today().year}, " +
+             f"AndreiDrang; Release - {__version__};" +
+             f"Last update - {date.today()}")
 author = "AndreiDrang"
 
 # -- General configuration ---------------------------------------------------

docs/modules/main/info.md

@@ -5,7 +5,7 @@
 
 ### [Capsolver](https://www.capsolver.com/?utm_source=github&utm_medium=repo&utm_campaign=scraping&utm_term=python-rucaptcha)
 
-[![Capsolver](../../_static/capsolver.png)](https://www.capsolver.com/?utm_source=github&utm_medium=repo&utm_campaign=scraping&utm_term=python-rucaptcha)
+[![Capsolver](../../_static/capsolver.jpg)](https://www.capsolver.com/?utm_source=github&utm_medium=repo&utm_campaign=scraping&utm_term=python-rucaptcha)
 
 <hr>
 

docs/requirements.txt

@@ -1,9 +1,9 @@
 sphinx==8.1.3
-pallets_sphinx_themes==2.1.3
+pallets_sphinx_themes==2.3.0
 myst-parser==4.0.0
 autodoc_pydantic==2.2.0
-pydantic==2.9.2
-pydantic-settings==2.5.2
+pydantic==2.10.2
+pydantic-settings==2.6.1
 enum-tools[sphinx]==0.12.0
 requests>=2.32.0 # not directly required, pinned by Snyk to avoid a vulnerability
 urllib3>=2.2.2 # not directly required, pinned by Snyk to avoid a vulnerability

src/python_rucaptcha/__version__.py

@@ -1 +1 @@
-__version__ = "6.2"
+__version__ = "6.3"

src/python_rucaptcha/amazon_waf.py

@@ -77,7 +77,8 @@ def __init__(
 
         # check user params
         if method not in AmazonWAFCaptchaEnm.list_values():
-            raise ValueError(f"Invalid method parameter set, available - {AmazonWAFCaptchaEnm.list_values()}")
+            raise ValueError(
+                f"Invalid method parameter set, available - {AmazonWAFCaptchaEnm.list_values()}")
         # insert `gt` param to payload
         self.create_task_payload["task"].update(
             {

src/python_rucaptcha/capy_puzzle.py

@@ -103,11 +103,13 @@ def __init__(
         """
         super().__init__(method=method, *args, **kwargs)
 
-        self.create_task_payload["task"].update({"websiteURL": websiteURL, "websiteKey": websiteKey})
+        self.create_task_payload["task"].update({"websiteURL": websiteURL,
+                                                 "websiteKey": websiteKey})
 
         # check user params
         if method not in CapyPuzzleEnm.list_values():
-            raise ValueError(f"Invalid method parameter set, available - {CapyPuzzleEnm.list_values()}")
+            raise ValueError(
+                f"Invalid method parameter set, available - {CapyPuzzleEnm.list_values()}")
 
     def captcha_handler(self, **kwargs) -> dict:
         """

src/python_rucaptcha/cutcaptcha.py

@@ -81,11 +81,14 @@ def __init__(
         """
         super().__init__(method=method, *args, **kwargs)
 
-        self.create_task_payload["task"].update({"websiteURL": websiteURL, "miseryKey": miseryKey, "apiKey": apiKey})
+        self.create_task_payload["task"].update({"websiteURL": websiteURL,
+                                                 "miseryKey": miseryKey,
+                                                 "apiKey": apiKey})
 
         # check user params
         if method not in CutCaptchaEnm.list_values():
-            raise ValueError(f"Invalid method parameter set, available - {CutCaptchaEnm.list_values()}")
+            raise ValueError(
+                f"Invalid method parameter set, available - {CutCaptchaEnm.list_values()}")
 
     def captcha_handler(self, **kwargs) -> dict:
         """

src/python_rucaptcha/datadome_captcha.py

@@ -20,8 +20,10 @@ def __init__(
         Args:
             rucaptcha_key: User API key
             websiteURL: Full URL of the captcha page
-            captchaUrl: The value of the `src` parameter for the `iframe` element containing the captcha on the page.
-            userAgent: User-Agent of your browser will be used to load the captcha. Use only modern browser's User-Agents
+            captchaUrl: The value of the `src` parameter for the `iframe` element
+                            containing the captcha on the page.
+            userAgent: User-Agent of your browser will be used to load the captcha.
+                            Use only modern browser's User-Agents
             proxyType: Proxy type - `http`, `socks4`, `socks5`
             proxyAddress: Proxy IP address or hostname
             proxyPort: Proxy port

src/python_rucaptcha/hcaptcha.py

@@ -76,11 +76,13 @@ def __init__(
         """
         super().__init__(method=method, *args, **kwargs)
 
-        self.create_task_payload["task"].update({"websiteURL": websiteURL, "websiteKey": websiteKey})
+        self.create_task_payload["task"].update({"websiteURL": websiteURL,
+                                                 "websiteKey": websiteKey})
 
         # check user params
         if method not in HCaptchaEnm.list_values():
-            raise ValueError(f"Invalid method parameter set, available - {HCaptchaEnm.list_values()}")
+            raise ValueError(
+                f"Invalid method parameter set, available - {HCaptchaEnm.list_values()}")
 
     def captcha_handler(self, **kwargs) -> dict:
         """

src/python_rucaptcha/key_captcha.py

@@ -80,7 +80,8 @@ def __init__(
 
         # check user params
         if method not in KeyCaptchaEnm.list_values():
-            raise ValueError(f"Invalid method parameter set, available - {KeyCaptchaEnm.list_values()}")
+            raise ValueError(
+                f"Invalid method parameter set, available - {KeyCaptchaEnm.list_values()}")
 
     def captcha_handler(self, **kwargs) -> dict:
         """

src/python_rucaptcha/lemin_captcha.py

@@ -78,11 +78,14 @@ def __init__(
         """
         super().__init__(method=method, *args, **kwargs)
 
-        self.create_task_payload["task"].update({"websiteURL": websiteURL, "captchaId": captchaId, "div_id": div_id})
+        self.create_task_payload["task"].update({"websiteURL": websiteURL,
+                                                 "captchaId": captchaId,
+                                                 "div_id": div_id})
 
         # check user params
         if method not in LeminCaptchaEnm.list_values():
-            raise ValueError(f"Invalid method parameter set, available - {LeminCaptchaEnm.list_values()}")
+            raise ValueError(
+                f"Invalid method parameter set, available - {LeminCaptchaEnm.list_values()}")
 
     def captcha_handler(self, **kwargs) -> dict:
         """

src/python_rucaptcha/mt_captcha.py

@@ -70,10 +70,12 @@ def __init__(
         """
         super().__init__(method=method, *args, **kwargs)
 
-        self.create_task_payload["task"].update({"websiteURL": websiteURL, "websiteKey": websiteKey})
+        self.create_task_payload["task"].update({"websiteURL": websiteURL,
+                                                 "websiteKey": websiteKey})
         # check user params
         if method not in MTCaptchaEnm.list_values():
-            raise ValueError(f"Invalid method parameter set, available - {MTCaptchaEnm.list_values()}")
+            raise ValueError(
+                f"Invalid method parameter set, available - {MTCaptchaEnm.list_values()}")
 
     def captcha_handler(self, **kwargs) -> dict:
         """

src/python_rucaptcha/re_captcha.py

@@ -142,7 +142,8 @@ def __init__(
 
         # check user params
         if method not in ReCaptchaEnm.list_values():
-            raise ValueError(f"Invalid method parameter set, available - {ReCaptchaEnm.list_values()}")
+            raise ValueError(
+                f"Invalid method parameter set, available - {ReCaptchaEnm.list_values()}")
 
     def captcha_handler(self, **kwargs) -> dict:
         """

src/python_rucaptcha/rotate_captcha.py

@@ -74,7 +74,8 @@ def __init__(
             }
 
             >>> await RotateCaptcha(rucaptcha_key="aa9011f31111181111168611f1151122",
-            ...                     angle=45).aio_captcha_handler(captcha_file="examples/rotate/rotate_ex.png")
+            ...                     angle=45).aio_captcha_handler(
+            ...                                     captcha_file="examples/rotate/rotate_ex.png")
             {
                "errorId":0,
                "status":"ready",

src/python_rucaptcha/tencent.py

@@ -19,7 +19,8 @@ def __init__(
         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
+                            We do not open the page, not a problem if it is available
+                            only for authenticated users
             appId: The value of `appId` parameter in the website source code.
             method: Captcha type
 
@@ -81,7 +82,8 @@ def __init__(
 
         # check user params
         if method not in TencentEnm.list_values():
-            raise ValueError(f"Invalid method parameter set, available - {TencentEnm.list_values()}")
+            raise ValueError(
+                f"Invalid method parameter set, available - {TencentEnm.list_values()}")
 
     def captcha_handler(self, **kwargs) -> dict:
         """

src/python_rucaptcha/turnstile.py

@@ -81,7 +81,8 @@ def __init__(
 
         # check user params
         if method not in TurnstileCaptchaEnm.list_values():
-            raise ValueError(f"Invalid method parameter set, available - {TurnstileCaptchaEnm.list_values()}")
+            raise ValueError(
+                f"Invalid method parameter set, available - {TurnstileCaptchaEnm.list_values()}")
 
     def captcha_handler(self, **kwargs) -> dict:
         """