0.6

src/.coveragerc → .coveragerc

@@ -4,7 +4,7 @@ omit =
         */tests/*
 
 include =
-        */python3_captchaai/*
+        */python3_capsolver/*
 
 
 [report]
@@ -13,4 +13,4 @@ omit =
         */tests/*
 
 include =
-        */python3_captchaai/*
+        */python3_capsolver/*

.gitconfig

@@ -0,0 +1,3 @@
+[user]
+    name = Andrei Drang
+    email = python-captcha@pm.me

.github/workflows/test_build.yml → .github/workflows/build.yml

@@ -1,16 +1,16 @@
-name: Test Build
+name: Build
 
 on:
   push:
     branches: [ "main", "release"]
     paths:
-      - '.github/workflows/test_build.yml'
+      - '.github/workflows/build.yml'
       - 'src/**'
       - 'Makefile'
   pull_request:
     branches: [ "main", "release"]
     paths:
-      - '.github/workflows/test_build.yml'
+      - '.github/workflows/build.yml'
       - 'src/**'
       - 'Makefile'
 
@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v3

.github/workflows/install.yml

@@ -20,7 +20,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v3
@@ -33,4 +33,4 @@ jobs:
       run: make install
 
     - name: PYPI install checking
-      run: pip install python3-captchaai
+      run: pip install python3-capsolver

.github/workflows/lint.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        python-version: ["3.7", "3.8", "3.9", "3.10"]
+        python-version: ["3.7", "3.8", "3.9", "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v3
@@ -37,6 +37,6 @@ jobs:
       run: |
         pip install --upgrade pip
         pip install -r requirements.style.txt
-        
+
     - name: Lint
       run: make lint

.github/workflows/sphinx.yml

@@ -1,4 +1,4 @@
-name: Sphinx build
+name: Sphinx docs
 
 on:
   push:
@@ -20,9 +20,6 @@ jobs:
       - name: Build docs requirements
         run: pip install -r docs/requirements.txt
 
-      - name: Build library requirements
-        run: pip install -r src/requirements.txt
-
       - name: Build docs
         run: make doc
 

.gitignore

@@ -1,24 +1,14 @@
-# Created by .ignore support plugin (hsz.mobi)
-python_rucaptcha.egg-info/
 \.idea/
-Web-Interface/
-/files/ico.png
-src/python_rucaptcha/__pycache__/
-build/
 
 \.vscode/
 
-src/examples/callback_examples/__pycache__/
-
-CaptchaTester/callback_examples/__pycache__/
-
 __pycache__/
 
 dist/
 
 env/
 /.coverage
-/src/python3_captchaai.egg-info/
+/src/python3_capsolver.egg-info/
 /src/.coverage
 /src/coverage/lcov.info
 /src/htmlcov/

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Andrei
+Copyright (c) 2023 Andrei
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

Makefile

@@ -1,38 +1,38 @@
 install:
 	cd src/ && pip install -e .
 
+remove:
+	pip uninstall python3_capsolver -y
+
 refactor:
 	black docs/
 	isort docs/
 
-	cd src/ && \
 	autoflake --in-place \
 				--recursive \
 				--remove-unused-variables \
 				--remove-duplicate-keys \
 				--remove-all-unused-imports \
 				--ignore-init-module-imports \
-				python3_captchaai/ tests/ && \
-	black python3_captchaai/ tests/ && \
-	isort python3_captchaai/ tests/
+				src/ tests/ && \
+	black src/ tests/ && \
+	isort src/ tests/
 
 lint:
-	cd src/ && \
-	autoflake --in-place --recursive python3_captchaai/ --check && \
-	black python3_captchaai/ --check && \
-	isort python3_captchaai/ --check-only
+	autoflake --in-place --recursive src/ --check && \
+	black src/ --check && \
+	isort src/ --check-only
 
 upload:
 	pip install twine
 	cd src/ && python setup.py upload
 
-tests:
-	cd src/ && \
-	coverage run --rcfile=.coveragerc -m pytest -s tests --disable-warnings && \
+tests: install
+	coverage run --rcfile=.coveragerc -m pytest --verbose --showlocals --pastebin=all tests --disable-warnings && \
 	coverage report --precision=3 --sort=cover --skip-empty --show-missing && \
 	coverage html --precision=3 --skip-empty -d coverage/html/ && \
 	coverage xml -o coverage/coverage.xml
 
-doc:
+doc: install
 	cd docs/ && \
 	make html -e

README.md

@@ -1,25 +1,28 @@
-# python3-captchaai
-![](files/CaptchaAISm.png)
+# python3-capsolver
+![Python3-Capsolver](https://github.com/AndreiDrang/python3-capsolver/blob/main/files/CapsolverSm.png)
 
-[![PyPI version](https://badge.fury.io/py/python3-captchaai.svg)](https://badge.fury.io/py/python3-captchaai)
-[![Python versions](https://img.shields.io/pypi/pyversions/python3-captchaai.svg?logo=python&logoColor=FBE072)](https://badge.fury.io/py/python3-captchaai)
-[![Downloads](https://pepy.tech/badge/python3-captchaai/month)](https://pepy.tech/project/python3-captchaai)
+[![Capsolver](https://user-images.githubusercontent.com/16991365/234852229-6e4b3f3c-f498-4fd5-9a6b-f7f269dd4bfc.gif)](https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1)
 
-[![Maintainability](https://api.codeclimate.com/v1/badges/3431fd3fe71baf7eb9da/maintainability)](https://codeclimate.com/github/AndreiDrang/python3-captchaai/maintainability)
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/323d4eda0fe1477bbea8fe8902b9e97e)](https://www.codacy.com/gh/AndreiDrang/python3-captchaai/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AndreiDrang/python3-captchaai&utm_campaign=Badge_Grade)
-[![codecov](https://codecov.io/gh/AndreiDrang/python3-captchaai/branch/main/graph/badge.svg?token=2L4VVIF4G8)](https://codecov.io/gh/AndreiDrang/python3-captchaai)
+[![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)
+[![Downloads](https://pepy.tech/badge/python3-capsolver/month)](https://pepy.tech/project/python3-capsolver)
 
-[![Build check](https://github.com/AndreiDrang/python3-captchaai/actions/workflows/test_build.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-captchaai/actions/workflows/test_build.yml)
-[![Installation check](https://github.com/AndreiDrang/python3-captchaai/actions/workflows/install.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-captchaai/actions/workflows/install.yml)
-[![Test](https://github.com/AndreiDrang/python3-captchaai/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-captchaai/actions/workflows/test.yml)
-[![Lint](https://github.com/AndreiDrang/python3-captchaai/actions/workflows/lint.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-captchaai/actions/workflows/lint.yml)
+[![Maintainability](https://api.codeclimate.com/v1/badges/3c30167b5fb37a0775ea/maintainability)](https://codeclimate.com/github/AndreiDrang/python3-capsolver/maintainability)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/323d4eda0fe1477bbea8fe8902b9e97e)](https://www.codacy.com/gh/AndreiDrang/python3-capsolver/dashboard?utm_source=github.com&utm_medium=referral&utm_content=AndreiDrang/python3-capsolver&utm_campaign=Badge_Grade)
+[![codecov](https://codecov.io/gh/AndreiDrang/python3-capsolver/branch/main/graph/badge.svg?token=2L4VVIF4G8)](https://codecov.io/gh/AndreiDrang/python3-capsolver)
 
+[![Sphinx build](https://github.com/AndreiDrang/python3-capsolver/actions/workflows/sphinx.yml/badge.svg?branch=release)](https://github.com/AndreiDrang/python3-capsolver/actions/workflows/sphinx.yml)
+[![Build](https://github.com/AndreiDrang/python3-capsolver/actions/workflows/build.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-capsolver/actions/workflows/build.yml)
+[![Installation](https://github.com/AndreiDrang/python3-capsolver/actions/workflows/install.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-capsolver/actions/workflows/install.yml)
+[![Tests](https://github.com/AndreiDrang/python3-capsolver/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-capsolver/actions/workflows/test.yml)
+[![Lint](https://github.com/AndreiDrang/python3-capsolver/actions/workflows/lint.yml/badge.svg?branch=main)](https://github.com/AndreiDrang/python3-capsolver/actions/workflows/lint.yml)
 
-Python 3 library for [Capsolver](https://capsolver.com/) service API.
+
+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://capsolver.com/) service API.
+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.
 
 ***
 
@@ -31,24 +34,29 @@ Or email python-captcha@pm.me
 
 ## How to install?
 
-We recommend using the latest version of Python. `python3-captchaai` supports Python 3.7+.
+We recommend using the latest version of Python. `python3-capsolver` supports Python 3.7+.
 
 ### pip
 
 ```bash
-pip install python3-captchaai
+pip install python3-capsolver
 ```
 
 ## How to use?
 
-Is described in the [documentation-website](https://andreidrang.github.io/python3-captchaai/).
+Is described in the [documentation-website](https://andreidrang.github.io/python3-capsolver/).
 
 
 ## How to test?
 
 1. You need set ``API_KEY`` in your environment(get this value from you account).
 2. Run command ``make tests``, from root directory.
 
+
+### Changelog
+
+Check [releases page](https://github.com/AndreiDrang/python3-capsolver/releases).
+
 ### How to get API Key to work with the library
 1. On the page - https://dashboard.capsolver.com/overview/user-center
 2. Find it: ![img.png](files/img.png)

docs/conf.py

@@ -1,25 +1,24 @@
 # -- Path setup --------------------------------------------------------------
-
-import os
-import sys
+from datetime import date
 
 from pallets_sphinx_themes import ProjectLink
 
-os.chdir("../")
-sys.path.insert(0, os.path.abspath("src/"))
-
-for x in os.walk("src/python3_captchaai/"):
-    sys.path.insert(0, x[0])
-
-from python3_captchaai import (core, datadome_slider, fun_captcha, gee_test,
-                               hcaptcha, image_to_text, kasada, mt_captcha,
-                               recaptcha)
-from python3_captchaai.__version__ import __version__
+from python3_capsolver import (
+    core,
+    gee_test,
+    hcaptcha,
+    recaptcha,
+    mt_captcha,
+    fun_captcha,
+    image_to_text,
+    datadome_slider,
+)
+from python3_capsolver.__version__ import __version__
 
 # -- Project information -----------------------------------------------------
 
-project = "python3-captchaai"
-copyright = f"2023, AndreiDrang, Release - {__version__}"
+project = "python3-capsolver"
+copyright = f"{date.today().year}, AndreiDrang; Release - {__version__}; Last update - {date.today()}"
 author = "AndreiDrang"
 
 # -- General configuration ---------------------------------------------------
@@ -39,15 +38,15 @@
 html_theme = "jinja"
 html_theme_options = {"index_sidebar_logo": False}
 html_static_path = ["_static"]
-html_favicon = "_static/CaptchaAIESm.png"
-html_logo = "_static/CaptchaAISm.png"
-html_title = f"python3-captchaai ({__version__})"
+html_favicon = "_static/CapsolverESm.png"
+html_logo = "_static/CapsolverSM.png"
+html_title = f"python3-capsolver ({__version__})"
 html_show_sourcelink = False
 
 html_context = {
     "project_links": [
-        ProjectLink("PyPI Releases", "https://pypi.org/project/python3-captchaai/"),
-        ProjectLink("Source Code", "https://github.com/AndreiDrang/python3-captchaai"),
+        ProjectLink("PyPI Releases", "https://pypi.org/project/python3-capsolver/"),
+        ProjectLink("Source Code", "https://github.com/AndreiDrang/python3-capsolver"),
         ProjectLink(
             "Capsolver",
             "https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1",
@@ -67,7 +66,7 @@
 # Napoleon settings
 napoleon_google_docstring = True
 napoleon_numpy_docstring = False
-napoleon_include_init_with_doc = False
+napoleon_include_init_with_doc = True
 napoleon_include_private_with_doc = False
 napoleon_include_special_with_doc = False
 napoleon_use_admonition_for_examples = True

docs/index.rst

@@ -1,8 +1,8 @@
 .. rst-class:: hide-header
 
-python3-captchaai
+python3-capsolver
 =================
-.. image:: _static/CaptchaAI300x.png
+.. image:: _static/Capsolver300x.png
     :align: center
 
 Python3 library for `Capsolver API <https://dashboard.capsolver.com/passport/register?inviteCode=kQTn-tG07Jb1>`_.
@@ -29,7 +29,6 @@ The library is intended for software developers and is used to work with the `Ca
    modules/fun-captcha/example.rst
    modules/datadome/example.rst
    modules/mt-captcha/example.rst
-   modules/kasada/example.rst
 
 .. toctree::
    :maxdepth: 2

docs/modules/cloudflare/example.rst

@@ -0,0 +1,12 @@
+Cloudflare
+==========
+
+To import this module:
+
+.. code-block:: python
+
+    from python3_capsolver.cloudflare import Cloudflare
+
+
+.. autoclass:: python3_capsolver.cloudflare.Cloudflare
+    :members:

docs/modules/datadome/example.rst

@@ -5,8 +5,8 @@ To import this module:
 
 .. code-block:: python
 
-    from python3_captchaai.datadome_slider import DatadomeSlider
+    from python3_capsolver.datadome_slider import DatadomeSlider
 
 
-.. autoclass:: datadome_slider.DatadomeSlider
+.. autoclass:: python3_capsolver.datadome_slider.DatadomeSlider
     :members: