Merge pull request #136 from AndreiDrang/main

1.0.0a
AndreiDrang · Jan 18, 2025 · 3a9694f · 3a9694f
2 parents c7fba25 + 713ae59
commit 3a9694f
Show file tree

Hide file tree

Showing 62 changed files with 1,164 additions and 3,935 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.11", ]
+        python-version: ["3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -38,9 +38,8 @@ jobs:
 
       - name: Install dependencies
         run: |
-          pip install --upgrade pip build setuptools
-          pip install -r requirements.test.txt
-          pip install .
+          pip install --upgrade pip
+          pip install -U -r requirements.test.txt
 
       - name: Test
         run: make tests
@@ -49,6 +48,6 @@ jobs:
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          files: ${{github.workspace}}/src/coverage/coverage.xml
+          files: ${{github.workspace}}/coverage/coverage.xml
           fail_ci_if_error: true
           verbose: true
diff --git a/.gitignore b/.gitignore
@@ -426,10 +426,7 @@ __pycache__/
 dist/
 
 env/
+/coverage/
 /.coverage
 /src/python3_capsolver.egg-info/
-/src/.coverage
-/src/coverage/lcov.info
-/src/htmlcov/
-/src/coverage/
 /docs/_build/
diff --git a/Makefile b/Makefile
@@ -31,11 +31,11 @@ upload:
 	twine upload dist/*
 
 tests: install
-	coverage run --rcfile=.coveragerc -m pytest -vv --showlocals --pastebin=all \
+	coverage run --rcfile=.coveragerc -m pytest --verbose --showlocals --disable-warnings \
 	tests/ && \
 	coverage report --precision=3 --sort=cover --skip-empty --show-missing && \
-	coverage html --precision=3 --skip-empty -d src/coverage/html/ && \
-	coverage xml -o src/coverage/coverage.xml
+	coverage html --precision=3 --skip-empty -d coverage/html/ && \
+	coverage xml -o coverage/coverage.xml
 
 doc: install
 	cd docs/ && \

diff --git a/README.md b/README.md
@@ -20,7 +20,6 @@
 
 
 Python 3 library for [Capsolver](https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1) service API.
-
 Tested on UNIX based OS.
 
 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.

diff --git a/docs/conf.py b/docs/conf.py
@@ -5,16 +5,16 @@
 
 from python3_capsolver import (
     core,
-    akamai,
-    binance,
-    imperva,
+    yandex,
+    aws_waf,
+    control,
     gee_test,
-    hcaptcha,
     recaptcha,
+    cloudflare,
     mt_captcha,
-    fun_captcha,
     image_to_text,
     datadome_slider,
+    friendly_captcha,
 )
 from python3_capsolver.__version__ import __version__
 

diff --git a/docs/index.rst b/docs/index.rst
@@ -25,18 +25,14 @@ Check our other projects here - `RedPandaDev group <https://red-panda-dev.xyz/bl
    :caption: Captcha examples:
 
    modules/image-to-text/example.rst
-   modules/re-captcha/example.rst
-   modules/h-captcha/example.rst
    modules/gee-test/example.rst
-   modules/fun-captcha/example.rst
-   modules/datadome/example.rst
+   modules/aws-waf/example.rst
+   modules/re-captcha/example.rst
    modules/mt-captcha/example.rst
+   modules/datadome/example.rst
    modules/cloudflare/example.rst
-   modules/aws-waf/example.rst
-   modules/cyber-si-ara/example.rst
-   modules/akamai/example.rst
-   modules/imperva/example.rst
-   modules/binance/example.rst
+   modules/friendly/example.rst
+   modules/yandex/example.rst
 
 .. toctree::
    :maxdepth: 2

diff --git a/docs/modules/akamai/example.rst b/docs/modules/akamai/example.rst
diff --git a/docs/modules/binance/example.rst b/docs/modules/binance/example.rst
diff --git a/docs/modules/cyber-si-ara/example.rst b/docs/modules/cyber-si-ara/example.rst
diff --git a/docs/modules/enum/info.rst b/docs/modules/enum/info.rst
@@ -20,66 +20,6 @@ To import this module:
     :members:
     :undoc-members:
 
-.. autoclass:: python3_capsolver.core.enum.FunCaptchaTypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.FunCaptchaClassificationTypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.CloudflareTypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.AntiCyberSiAraTaskTypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.AntiAwsWafTaskTypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.DatadomeSliderTypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.MtCaptchaTypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.ReCaptchaV3TypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.ReCaptchaV2TypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.GeeTestCaptchaTypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.HCaptchaClassificationTypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.HCaptchaTypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.ImageToTextTaskTypeEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.AntiAkamaiTaskEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.AntiImpervaTaskEnm
-    :members:
-    :undoc-members:
-
-.. autoclass:: python3_capsolver.core.enum.BinanceCaptchaTaskEnm
+.. autoclass:: python3_capsolver.core.enum.CaptchaTypeEnm
     :members:
     :undoc-members:
diff --git a/docs/modules/friendly/example.rst b/docs/modules/friendly/example.rst
@@ -0,0 +1,12 @@
+FriendlyCaptcha
+===============
+
+To import this module:
+
+.. code-block:: python
+
+    from python3_capsolver.friendly_captcha import FriendlyCaptcha
+
+
+.. autoclass:: python3_capsolver.friendly_captcha.FriendlyCaptcha
+    :members:
diff --git a/docs/modules/fun-captcha/example.rst b/docs/modules/fun-captcha/example.rst
diff --git a/docs/modules/h-captcha/example.rst b/docs/modules/h-captcha/example.rst
diff --git a/docs/modules/imperva/example.rst b/docs/modules/imperva/example.rst
diff --git a/docs/modules/main/info.md b/docs/modules/main/info.md
@@ -2,9 +2,9 @@
 
 ## Welcome to python3-capsolver
 
-![](../../_static/Capsolver.png)
+[![Capsolver.png](https://s.vyjava.xyz/files/2024/12-December/17/109278aa/Capsolver.png)](https://vyjava.xyz/dashboard/image/109278aa-961a-4503-bed0-0a9c838dcef2)
 
-[![Capsolver](https://user-images.githubusercontent.com/16991365/234852229-6e4b3f3c-f498-4fd5-9a6b-f7f269dd4bfc.gif)](https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1)
+<hr>
 
 [![PyPI version](https://badge.fury.io/py/python3-capsolver.svg)](https://badge.fury.io/py/python3-capsolver)
 [![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 @@
 
 
 Python 3 library for [Capsolver](https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1) service API.
-
 Tested on UNIX based OS.
 
 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
 pip install python3-capsolver
 ```
 
-### Source
-```bash
-git clone https://github.com/AndreiDrang/python3-capsolver.git
-cd python3-capsolver
-python setup.py install
-```
-
 ## How to test?
 
 1. You need set ``API_KEY`` in your environment(get this value from you account).

diff --git a/docs/modules/serializer/info.rst b/docs/modules/serializer/info.rst
@@ -8,33 +8,16 @@ To import this module:
     from python3_capsolver.core import serializer
 
 
-.. autopydantic_model:: python3_capsolver.core.serializer.CaptchaOptionsSer
+.. autoclass:: python3_capsolver.core.serializer.PostRequestSer
     :members:
     :undoc-members:
 
 
-.. autopydantic_model:: python3_capsolver.core.serializer.WebsiteDataOptionsSer
+.. autoclass:: python3_capsolver.core.serializer.ResponseSer
     :members:
     :undoc-members:
 
 
-.. autopydantic_model:: python3_capsolver.core.serializer.CyberSiAraSer
+.. autoclass:: python3_capsolver.core.serializer.CaptchaResponseSer
     :members:
     :undoc-members:
-
-
-.. autopydantic_model:: python3_capsolver.core.serializer.AntiAkamaiBMPTaskSer
-    :members:
-    :undoc-members:
-
-.. autopydantic_model:: python3_capsolver.core.serializer.AntiAkamaiWebTaskSer
-    :members:
-    :undoc-members:
-
-.. autopydantic_model:: python3_capsolver.core.serializer.AntiImpervaTaskSer
-    :members:
-    :undoc-members:
-
-.. autopydantic_model:: python3_capsolver.core.serializer.BinanceCaptchaTaskSer
-    :members:
-    :undoc-members:
diff --git a/docs/modules/yandex/example.rst b/docs/modules/yandex/example.rst
@@ -0,0 +1,12 @@
+YandexCaptcha
+=============
+
+To import this module:
+
+.. code-block:: python
+
+    from python3_capsolver.yandex import YandexCaptcha
+
+
+.. autoclass:: python3_capsolver.yandex.YandexCaptcha
+    :members:
diff --git a/docs/requirements.txt b/docs/requirements.txt
@@ -1,6 +1,3 @@
 sphinx==8.1.3
 pallets_sphinx_themes==2.3.0
 myst-parser==4.0.0
-autodoc_pydantic==2.2.0
-pydantic==2.10.4
-pydantic-settings==2.7.0
diff --git a/pyproject.toml b/pyproject.toml
@@ -24,6 +24,7 @@ length_sort = true
 [tool.pytest.ini_options]
 minversion = "7.0"
 asyncio_mode = "auto"
+asyncio_default_fixture_loop_scope = "function"
 testpaths = [
     "tests",
 ]

diff --git a/src/python3_capsolver/__version__.py b/src/python3_capsolver/__version__.py
@@ -1 +1 @@
-__version__ = "0.9.5"
+__version__ = "1.0.0a"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,7 +20,6 @@


		Python 3 library for [Capsolver](https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1) service API.

		Tested on UNIX based OS.

		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.
Expand Down