Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v6.3 #312

Merged
merged 32 commits into from
Nov 29, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
1c98c6e
Update pallets_sphinx_themes from 2.1.3 to 2.2.0
pyup-bot Oct 17, 2024
afd0a65
Update pydantic-settings from 2.5.2 to 2.6.0
pyup-bot Oct 17, 2024
de503de
Merge pull request #302 from AndreiDrang/pyup-update-pydantic-setting…
AndreiDrang Oct 17, 2024
ee840db
Merge pull request #301 from AndreiDrang/pyup-update-pallets_sphinx_t…
AndreiDrang Oct 17, 2024
76ad078
Bump pallets-sphinx-themes from 2.2.0 to 2.3.0
dependabot[bot] Oct 28, 2024
229224b
Update pallets_sphinx_themes from 2.2.0 to 2.3.0
pyup-bot Oct 28, 2024
9e22f16
Merge pull request #304 from AndreiDrang/pyup-update-pallets_sphinx_t…
AndreiDrang Oct 28, 2024
0c5fb4b
Merge pull request #303 from AndreiDrang/dependabot/pip/pallets-sphin…
AndreiDrang Oct 28, 2024
072d8bb
Update pydantic-settings from 2.6.0 to 2.6.1
pyup-bot Nov 1, 2024
40005d2
Merge pull request #305 from AndreiDrang/pyup-update-pydantic-setting…
AndreiDrang Nov 1, 2024
12c639d
src\python_rucaptcha\re_captcha.py line-too-long
evidencebp Nov 10, 2024
e49ff82
src\python_rucaptcha\lemin_captcha.py line-too-long
evidencebp Nov 10, 2024
62c0dde
src\python_rucaptcha\tencent.py line-too-long
evidencebp Nov 10, 2024
08e31cf
src\python_rucaptcha\rotate_captcha.py line-too-long
evidencebp Nov 10, 2024
3a4d248
src\python_rucaptcha\mt_captcha.py line-too-long
evidencebp Nov 10, 2024
a177360
src\python_rucaptcha\key_captcha.py line-too-long
evidencebp Nov 10, 2024
ae61960
src\python_rucaptcha\capy_puzzle.py line-too-long
evidencebp Nov 10, 2024
0b479af
src\python_rucaptcha\datadome_captcha.py line-too-long
evidencebp Nov 10, 2024
62aadc4
src\python_rucaptcha\amazon_waf.py line-too-long
evidencebp Nov 10, 2024
778ba77
src\python_rucaptcha\cutcaptcha.py line-too-long
evidencebp Nov 10, 2024
9faab75
src\python_rucaptcha\hcaptcha.py line-too-long
evidencebp Nov 10, 2024
5c927b9
src\python_rucaptcha\turnstile.py line-too-long
evidencebp Nov 10, 2024
d3ed3f3
docs\conf.py line-too-long
evidencebp Nov 10, 2024
0eaea60
[github-actions] Bump codecov/codecov-action from 4 to 5
dependabot[bot] Nov 14, 2024
556ca60
Merge pull request #308 from AndreiDrang/dependabot/github_actions/co…
AndreiDrang Nov 15, 2024
54b3ff1
Update pydantic from 2.9.2 to 2.10.1
pyup-bot Nov 22, 2024
ce8093d
upd capsolver image
AndreiDrang Nov 24, 2024
5587c10
Merge pull request #310 from AndreiDrang/pyup-update-pydantic-2.9.2-t…
AndreiDrang Nov 24, 2024
99d3b8b
Update pydantic from 2.10.1 to 2.10.2
pyup-bot Nov 26, 2024
6c6d4d2
Merge pull request #311 from AndreiDrang/pyup-update-pydantic-2.10.1-…
AndreiDrang Nov 29, 2024
171f8d4
Merge pull request #307 from evidencebp/master
AndreiDrang Nov 29, 2024
1d65cb1
Release 6.3
AndreiDrang Nov 29, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
Binary file added docs/_static/capsolver.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed docs/_static/capsolver.png
Binary file not shown.
4 changes: 3 additions & 1 deletion docs/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ---------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion docs/modules/main/info.md
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
6 changes: 3 additions & 3 deletions docs/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Binary file added files/capsolver.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed files/capsolver.png
Binary file not shown.
2 changes: 1 addition & 1 deletion src/python_rucaptcha/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "6.2"
__version__ = "6.3"
3 changes: 2 additions & 1 deletion src/python_rucaptcha/amazon_waf.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
{
Expand Down
6 changes: 4 additions & 2 deletions src/python_rucaptcha/capy_puzzle.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
"""
Expand Down
7 changes: 5 additions & 2 deletions src/python_rucaptcha/cutcaptcha.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
"""
Expand Down
6 changes: 4 additions & 2 deletions src/python_rucaptcha/datadome_captcha.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 4 additions & 2 deletions src/python_rucaptcha/hcaptcha.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
"""
Expand Down
3 changes: 2 additions & 1 deletion src/python_rucaptcha/key_captcha.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
"""
Expand Down
7 changes: 5 additions & 2 deletions src/python_rucaptcha/lemin_captcha.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
"""
Expand Down
6 changes: 4 additions & 2 deletions src/python_rucaptcha/mt_captcha.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
"""
Expand Down
3 changes: 2 additions & 1 deletion src/python_rucaptcha/re_captcha.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
"""
Expand Down
3 changes: 2 additions & 1 deletion src/python_rucaptcha/rotate_captcha.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
6 changes: 4 additions & 2 deletions src/python_rucaptcha/tencent.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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:
"""
Expand Down
3 changes: 2 additions & 1 deletion src/python_rucaptcha/turnstile.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
"""
Expand Down
Loading