Skip to content

Commit 3a9694f

Browse files
AndreiDrangAndreiDrang
authored
Merge pull request #136 from AndreiDrang/main
1.0.0a
2 parents c7fba25 + 713ae59 commit 3a9694f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

62 files changed

+1164
-3935
lines changed

‎.github/workflows/test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ jobs:
2727
strategy:
2828
fail-fast: false
2929
matrix:
30-
python-version: ["3.11", ]
30+
python-version: ["3.12"]
3131

3232
steps:
3333
- uses: actions/checkout@v4
@@ -38,9 +38,8 @@ jobs:
3838

3939
- name: Install dependencies
4040
run: |
41-
pip install --upgrade pip build setuptools
42-
pip install -r requirements.test.txt
43-
pip install .
41+
pip install --upgrade pip
42+
pip install -U -r requirements.test.txt
4443
4544
- name: Test
4645
run: make tests
@@ -49,6 +48,6 @@ jobs:
4948
uses: codecov/codecov-action@v5
5049
with:
5150
token: ${{ secrets.CODECOV_TOKEN }}
52-
files: ${{github.workspace}}/src/coverage/coverage.xml
51+
files: ${{github.workspace}}/coverage/coverage.xml
5352
fail_ci_if_error: true
5453
verbose: true

‎.gitignore

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -426,10 +426,7 @@ __pycache__/
426426
dist/
427427

428428
env/
429+
/coverage/
429430
/.coverage
430431
/src/python3_capsolver.egg-info/
431-
/src/.coverage
432-
/src/coverage/lcov.info
433-
/src/htmlcov/
434-
/src/coverage/
435432
/docs/_build/

‎Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@ upload:
3131
twine upload dist/*
3232

3333
tests: install
34-
coverage run --rcfile=.coveragerc -m pytest -vv --showlocals --pastebin=all \
34+
coverage run --rcfile=.coveragerc -m pytest --verbose --showlocals --disable-warnings \
3535
tests/ && \
3636
coverage report --precision=3 --sort=cover --skip-empty --show-missing && \
37-
coverage html --precision=3 --skip-empty -d src/coverage/html/ && \
38-
coverage xml -o src/coverage/coverage.xml
37+
coverage html --precision=3 --skip-empty -d coverage/html/ && \
38+
coverage xml -o coverage/coverage.xml
3939

4040
doc: install
4141
cd docs/ && \

‎README.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121

2222
Python 3 library for [Capsolver](https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1) service API.
23-
2423
Tested on UNIX based OS.
2524

2625
The library is intended for software developers and is used to work with the [Capsolver](https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1) service API.

‎docs/conf.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@
55

66
from python3_capsolver import (
77
core,
8-
akamai,
9-
binance,
10-
imperva,
8+
yandex,
9+
aws_waf,
10+
control,
1111
gee_test,
12-
hcaptcha,
1312
recaptcha,
13+
cloudflare,
1414
mt_captcha,
15-
fun_captcha,
1615
image_to_text,
1716
datadome_slider,
17+
friendly_captcha,
1818
)
1919
from python3_capsolver.__version__ import __version__
2020

‎docs/index.rst

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,18 +25,14 @@ Check our other projects here - `RedPandaDev group <https://red-panda-dev.xyz/bl
2525
:caption: Captcha examples:
2626

2727
modules/image-to-text/example.rst
28-
modules/re-captcha/example.rst
29-
modules/h-captcha/example.rst
3028
modules/gee-test/example.rst
31-
modules/fun-captcha/example.rst
32-
modules/datadome/example.rst
29+
modules/aws-waf/example.rst
30+
modules/re-captcha/example.rst
3331
modules/mt-captcha/example.rst
32+
modules/datadome/example.rst
3433
modules/cloudflare/example.rst
35-
modules/aws-waf/example.rst
36-
modules/cyber-si-ara/example.rst
37-
modules/akamai/example.rst
38-
modules/imperva/example.rst
39-
modules/binance/example.rst
34+
modules/friendly/example.rst
35+
modules/yandex/example.rst
4036

4137
.. toctree::
4238
:maxdepth: 2

‎docs/modules/akamai/example.rst

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎docs/modules/binance/example.rst

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎docs/modules/cyber-si-ara/example.rst

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎docs/modules/enum/info.rst

Lines changed: 1 addition & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -20,66 +20,6 @@ To import this module:
2020
:members:
2121
:undoc-members:
2222

23-
.. autoclass:: python3_capsolver.core.enum.FunCaptchaTypeEnm
24-
:members:
25-
:undoc-members:
26-
27-
.. autoclass:: python3_capsolver.core.enum.FunCaptchaClassificationTypeEnm
28-
:members:
29-
:undoc-members:
30-
31-
.. autoclass:: python3_capsolver.core.enum.CloudflareTypeEnm
32-
:members:
33-
:undoc-members:
34-
35-
.. autoclass:: python3_capsolver.core.enum.AntiCyberSiAraTaskTypeEnm
36-
:members:
37-
:undoc-members:
38-
39-
.. autoclass:: python3_capsolver.core.enum.AntiAwsWafTaskTypeEnm
40-
:members:
41-
:undoc-members:
42-
43-
.. autoclass:: python3_capsolver.core.enum.DatadomeSliderTypeEnm
44-
:members:
45-
:undoc-members:
46-
47-
.. autoclass:: python3_capsolver.core.enum.MtCaptchaTypeEnm
48-
:members:
49-
:undoc-members:
50-
51-
.. autoclass:: python3_capsolver.core.enum.ReCaptchaV3TypeEnm
52-
:members:
53-
:undoc-members:
54-
55-
.. autoclass:: python3_capsolver.core.enum.ReCaptchaV2TypeEnm
56-
:members:
57-
:undoc-members:
58-
59-
.. autoclass:: python3_capsolver.core.enum.GeeTestCaptchaTypeEnm
60-
:members:
61-
:undoc-members:
62-
63-
.. autoclass:: python3_capsolver.core.enum.HCaptchaClassificationTypeEnm
64-
:members:
65-
:undoc-members:
66-
67-
.. autoclass:: python3_capsolver.core.enum.HCaptchaTypeEnm
68-
:members:
69-
:undoc-members:
70-
71-
.. autoclass:: python3_capsolver.core.enum.ImageToTextTaskTypeEnm
72-
:members:
73-
:undoc-members:
74-
75-
.. autoclass:: python3_capsolver.core.enum.AntiAkamaiTaskEnm
76-
:members:
77-
:undoc-members:
78-
79-
.. autoclass:: python3_capsolver.core.enum.AntiImpervaTaskEnm
80-
:members:
81-
:undoc-members:
82-
83-
.. autoclass:: python3_capsolver.core.enum.BinanceCaptchaTaskEnm
23+
.. autoclass:: python3_capsolver.core.enum.CaptchaTypeEnm
8424
:members:
8525
:undoc-members:

‎docs/modules/friendly/example.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
FriendlyCaptcha
2+
===============
3+
4+
To import this module:
5+
6+
.. code-block:: python
7+
8+
from python3_capsolver.friendly_captcha import FriendlyCaptcha
9+
10+
11+
.. autoclass:: python3_capsolver.friendly_captcha.FriendlyCaptcha
12+
:members:

‎docs/modules/fun-captcha/example.rst

Lines changed: 0 additions & 17 deletions
This file was deleted.

‎docs/modules/h-captcha/example.rst

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎docs/modules/imperva/example.rst

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎docs/modules/main/info.md

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
## Welcome to python3-capsolver
44

5-
![](../../_static/Capsolver.png)
5+
[![Capsolver.png](https://s.vyjava.xyz/files/2024/12-December/17/109278aa/Capsolver.png)](https://vyjava.xyz/dashboard/image/109278aa-961a-4503-bed0-0a9c838dcef2)
66

7-
[![Capsolver](https://user-images.githubusercontent.com/16991365/234852229-6e4b3f3c-f498-4fd5-9a6b-f7f269dd4bfc.gif)](https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1)
7+
<hr>
88

99
[![PyPI version](https://badge.fury.io/py/python3-capsolver.svg)](https://badge.fury.io/py/python3-capsolver)
1010
[![Python versions](https://img.shields.io/pypi/pyversions/python3-capsolver.svg?logo=python&logoColor=FBE072)](https://badge.fury.io/py/python3-capsolver)
@@ -22,7 +22,6 @@
2222

2323

2424
Python 3 library for [Capsolver](https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1) service API.
25-
2625
Tested on UNIX based OS.
2726

2827
The library is intended for software developers and is used to work with the [Capsolver](https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1) service API.
@@ -41,13 +40,6 @@ We recommend using the latest version of Python. `python3-capsolver` supports Py
4140
pip install python3-capsolver
4241
```
4342

44-
### Source
45-
```bash
46-
git clone https://github.com/AndreiDrang/python3-capsolver.git
47-
cd python3-capsolver
48-
python setup.py install
49-
```
50-
5143
## How to test?
5244

5345
1. You need set ``API_KEY`` in your environment(get this value from you account).

‎docs/modules/serializer/info.rst

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,33 +8,16 @@ To import this module:
88
from python3_capsolver.core import serializer
99
1010
11-
.. autopydantic_model:: python3_capsolver.core.serializer.CaptchaOptionsSer
11+
.. autoclass:: python3_capsolver.core.serializer.PostRequestSer
1212
:members:
1313
:undoc-members:
1414

1515

16-
.. autopydantic_model:: python3_capsolver.core.serializer.WebsiteDataOptionsSer
16+
.. autoclass:: python3_capsolver.core.serializer.ResponseSer
1717
:members:
1818
:undoc-members:
1919

2020

21-
.. autopydantic_model:: python3_capsolver.core.serializer.CyberSiAraSer
21+
.. autoclass:: python3_capsolver.core.serializer.CaptchaResponseSer
2222
:members:
2323
:undoc-members:
24-
25-
26-
.. autopydantic_model:: python3_capsolver.core.serializer.AntiAkamaiBMPTaskSer
27-
:members:
28-
:undoc-members:
29-
30-
.. autopydantic_model:: python3_capsolver.core.serializer.AntiAkamaiWebTaskSer
31-
:members:
32-
:undoc-members:
33-
34-
.. autopydantic_model:: python3_capsolver.core.serializer.AntiImpervaTaskSer
35-
:members:
36-
:undoc-members:
37-
38-
.. autopydantic_model:: python3_capsolver.core.serializer.BinanceCaptchaTaskSer
39-
:members:
40-
:undoc-members:

‎docs/modules/yandex/example.rst

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
YandexCaptcha
2+
=============
3+
4+
To import this module:
5+
6+
.. code-block:: python
7+
8+
from python3_capsolver.yandex import YandexCaptcha
9+
10+
11+
.. autoclass:: python3_capsolver.yandex.YandexCaptcha
12+
:members:

‎docs/requirements.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
11
sphinx==8.1.3
22
pallets_sphinx_themes==2.3.0
33
myst-parser==4.0.0
4-
autodoc_pydantic==2.2.0
5-
pydantic==2.10.4
6-
pydantic-settings==2.7.0

‎pyproject.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ length_sort = true
2424
[tool.pytest.ini_options]
2525
minversion = "7.0"
2626
asyncio_mode = "auto"
27+
asyncio_default_fixture_loop_scope = "function"
2728
testpaths = [
2829
"tests",
2930
]

‎src/python3_capsolver/__version__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "0.9.5"
1+
__version__ = "1.0.0a"

0 commit comments

Comments
 (0)