python-anticaptcha 1.0.0__tar.gz → 2.0.0__tar.gz

python_anticaptcha-2.0.0/.github/workflows/e2e.yml

@@ -0,0 +1,33 @@
+name: E2E test ↔️
+
+on:
+  push:
+  repository_dispatch:
+  schedule:
+  - cron: 0 12 * * *
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    timeout-minutes: 30
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python 3.12
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.12"
+
+    - name: Install setup dependencies
+      run: pip install setuptools_scm wheel
+
+    - name: Build distribution
+      run: make install
+
+    - uses: nanasess/setup-chromedriver@v2
+
+    - name: Run integration tests
+      run: make test_e2e
+      env:
+        ANTICAPTCHA_API_KEY: ${{ secrets.anticaptcha_key }}
+        PROXY_URL: "${{ secrets.proxy_url }}"

python_anticaptcha-2.0.0/.github/workflows/publish.yml

@@ -0,0 +1,70 @@
+name: Publish Python package
+
+on:
+  push:
+    tags:
+      - '*'
+
+jobs:
+  build:
+    name: Build distribution
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: "3.12"
+
+    - name: Install build dependencies
+      run: pip install setuptools setuptools_scm wheel build
+
+    - name: Build distribution
+      run: python -m build
+
+    - name: Store distribution packages
+      uses: actions/upload-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+
+  publish-to-pypi:
+    name: Publish to PyPI
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: pypi
+      url: https://pypi.org/p/python-anticaptcha
+    permissions:
+      id-token: write
+    steps:
+    - name: Download distribution packages
+      uses: actions/download-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+
+    - name: Publish to PyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+
+  publish-to-testpypi:
+    name: Publish to TestPyPI
+    needs: build
+    runs-on: ubuntu-latest
+    environment:
+      name: testpypi
+      url: https://test.pypi.org/p/python-anticaptcha
+    permissions:
+      id-token: write
+    steps:
+    - name: Download distribution packages
+      uses: actions/download-artifact@v4
+      with:
+        name: python-package-distributions
+        path: dist/
+
+    - name: Publish to TestPyPI
+      uses: pypa/gh-action-pypi-publish@release/v1
+      with:
+        repository-url: https://test.pypi.org/legacy/

{python-anticaptcha-1.0.0 → python_anticaptcha-2.0.0}/.github/workflows/pythonpackage.yml

@@ -3,6 +3,18 @@ name: Python package
 on: [push]
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Set up Python
+      uses: actions/setup-python@v5
+      with:
+        python-version: '3.12'
+
+    - uses: j178/prek-action@v1
+
   test:
     runs-on: ubuntu-latest
 
@@ -11,19 +23,18 @@ jobs:
       fail-fast: false
       matrix:
         python-version:
-        - '2.7'
-        - '3.5'
-        - '3.6'
-        - '3.7'
-        - '3.8'
         - '3.9'
         - '3.10'
+        - '3.11'
+        - '3.12'
+        - '3.13'
+        - '3.14'
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v3
+      uses: actions/setup-python@v5
       with:
         python-version: ${{ matrix.python-version }}
 
@@ -36,8 +47,5 @@ jobs:
     - name: Build docs
       run: make docs
 
-    - name: Build docs
-      run: make docs
-
     - name: Test with pytest
-      run: make test
+      run: make test

python_anticaptcha-2.0.0/.pre-commit-config.yaml

@@ -0,0 +1,16 @@
+repos:
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    rev: v0.9.10
+    hooks:
+      - id: ruff
+        args: [--fix]
+      - id: ruff-format
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v1.15.0
+    hooks:
+      - id: mypy
+        additional_dependencies: [types-requests>=2.31]
+        files: ^python_anticaptcha/
+        pass_filenames: false
+        args: [python_anticaptcha]

python_anticaptcha-2.0.0/.readthedocs.yaml

@@ -0,0 +1,19 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+version: 2
+
+build:
+  os: ubuntu-24.04
+  tools:
+    python: "3.12"
+
+sphinx:
+  configuration: docs/conf.py
+
+python:
+  install:
+    - method: pip
+      path: .
+      extra_requirements:
+        - docs

{python-anticaptcha-1.0.0 → python_anticaptcha-2.0.0}/CHANGELOG.rst

@@ -1,6 +1,47 @@
 Changelog
 =========
 
+2.0.0 - 2025-05-09
+------------------
+
+Added
+#####
+
+- Add ``AsyncAnticaptchaClient`` and ``AsyncJob`` for async/await usage with ``httpx`` (``pip install python-anticaptcha[async]``)
+- Rename ``base.py`` → ``sync_client.py`` for symmetry with ``async_client.py``; backward-compatible ``base.py`` shim preserved
+- Rename sync example files with ``sync_`` prefix to match ``async_`` examples
+- Add context manager support to ``AnticaptchaClient`` (``__enter__``, ``__exit__``, ``close``)
+- Add ``ANTICAPTCHA_API_KEY`` environment variable fallback for ``AnticaptchaClient``
+- Add ``Proxy`` frozen dataclass with ``parse_url()`` and ``to_kwargs()`` methods
+- Add snake_case aliases: ``create_task``, ``create_task_smee``, ``get_balance``, ``get_app_stats``
+- Add ``py.typed`` marker and complete type annotations (`#124 <https://github.com/ad-m/python-anticaptcha/pull/124>`_)
+- Add ``__repr__`` to ``Job``, ``AnticaptchaClient``, and ``BaseTask`` (`#123 <https://github.com/ad-m/python-anticaptcha/pull/123>`_)
+- Add optional ``on_check`` callback to ``Job.join()`` (`#125 <https://github.com/ad-m/python-anticaptcha/pull/125>`_)
+- ``ImageToTextTask`` now accepts file paths (``str``/``Path``), raw bytes, or file-like objects
+
+Changed
+#######
+
+- **Breaking:** Minimum Python version increased from 2.7+ to 3.9+
+- Migrate from ``setup.py`` / ``setup.cfg`` to ``pyproject.toml`` (PEP 621) (`#122 <https://github.com/ad-m/python-anticaptcha/pull/122>`_)
+- Switch README from RST to Markdown (`#126 <https://github.com/ad-m/python-anticaptcha/pull/126>`_)
+- Switch test runner from nose2 to pytest
+- Switch PyPI publishing to trusted publishing via GitHub Actions (`#114 <https://github.com/ad-m/python-anticaptcha/pull/114>`_)
+- Fix ``RecaptchaV2EnterpriseTask`` missing proxyless base class inheritance
+- Fix ``ImageToTextTask.serialize()`` sending ``None`` values
+- Fix ``GeeTestTask`` incorrect inheritance
+- Fix ``AntiGateTaskProxyless`` super() call
+- Remove redundant cookies serialization in ``ProxyMixin``
+- Use Python 3 ``super()`` without arguments throughout codebase
+
+Removed
+#######
+
+- **Breaking:** Drop Python 2.7 and Python 3.4-3.8 support
+- Remove ``six`` dependency (replaced with stdlib ``urllib.parse``)
+- Remove ``compat.py`` module
+- Remove legacy ``setup.py`` and ``setup.cfg``
+
 1.0.0 - 2022-03-28
 ------------------
 

{python-anticaptcha-1.0.0 → python_anticaptcha-2.0.0}/CODE_OF_CONDUCT.md

@@ -34,7 +34,7 @@ This Code of Conduct applies both within project spaces and in public spaces whe
 
 ## Enforcement
 
-Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at naczelnik@jawnosc.tk. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project team at naczelnik@jawne.info.pl. The project team will review and investigate all complaints, and will respond in a way that it deems appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. Further details of specific enforcement policies may be posted separately.
 
 Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project's leadership.
 

{python-anticaptcha-1.0.0 → python_anticaptcha-2.0.0}/Makefile

@@ -1,10 +1,10 @@
 CHROMEDRIVER_VERSION=99.0.4844.17
-CHROMEDRIVER_DIR=${PWD}/geckodriver
+CHROMEDRIVER_DIR=${PWD}/chromedriver
 
-.PHONY: lint fmt build docs install test gecko
+.PHONY: lint fmt typecheck build docs install test test_e2e chromedriver
 
 build:
-	python setup.py sdist bdist_wheel
+	python -m build
 
 install: install_test install_docs install_pkg
 	
@@ -18,24 +18,31 @@ install_pkg:
 	python -m pip install --upgrade pip wheel
 	pip install .
 
-gecko:
+chromedriver:
 	mkdir -p ${CHROMEDRIVER_DIR}
 	wget -q -P ${CHROMEDRIVER_DIR} "http://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip"
 	unzip ${CHROMEDRIVER_DIR}/chromedriver* -d ${CHROMEDRIVER_DIR}
 	rm ${CHROMEDRIVER_DIR}/chromedriver_linux64.zip
 
 test:
-	PATH=$$PWD/geckodriver:$$PATH nose2 --verbose
+	pytest
+
+test_e2e:
+	PATH=$$PWD/chromedriver:$$PATH pytest -m e2e --override-ini="addopts="
 
 clean:
-	rm -r build geckodriver
+	rm -r build chromedriver
 
 lint:
-	docker run --rm -v /$$(pwd):/apps alpine/flake8 ./
-	docker run --rm -v /$$(pwd):/data cytopia/black --check ./
+	ruff check .
+	ruff format --check .
 
 fmt:
-	docker run --rm -v /$$(pwd):/data cytopia/black ./
+	ruff check --fix .
+	ruff format .
+
+typecheck:
+	mypy python_anticaptcha
 
 docs:
 	sphinx-build -W docs /dev/shm/sphinx

python_anticaptcha-2.0.0/PKG-INFO

@@ -0,0 +1,277 @@
+Metadata-Version: 2.4
+Name: python-anticaptcha
+Version: 2.0.0
+Summary: Client library for solve captchas with Anticaptcha.com support.
+Project-URL: Homepage, https://github.com/ad-m/python-anticaptcha
+License-Expression: MIT
+License-File: LICENSE.md
+Keywords: async,asyncio,captcha,development,httpx,recaptcha
+Classifier: Development Status :: 4 - Beta
+Classifier: Framework :: AsyncIO
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
+Classifier: Programming Language :: Python :: 3.14
+Classifier: Topic :: Internet :: WWW/HTTP
+Requires-Python: >=3.9
+Requires-Dist: requests
+Provides-Extra: async
+Requires-Dist: httpx>=0.24; extra == 'async'
+Provides-Extra: docs
+Requires-Dist: sphinx; extra == 'docs'
+Requires-Dist: sphinx-rtd-theme; extra == 'docs'
+Provides-Extra: tests
+Requires-Dist: httpx>=0.24; extra == 'tests'
+Requires-Dist: pytest; extra == 'tests'
+Requires-Dist: pytest-asyncio; extra == 'tests'
+Requires-Dist: retry; extra == 'tests'
+Requires-Dist: selenium; extra == 'tests'
+Description-Content-Type: text/markdown
+
+# python-anticaptcha
+
+[![Build Status](https://github.com/ad-m/python-anticaptcha/workflows/Python%20package/badge.svg)](https://github.com/ad-m/python-anticaptcha/actions?workflow=Python+package)
+[![PyPI](https://img.shields.io/pypi/v/python-anticaptcha.svg)](https://pypi.org/project/python-anticaptcha/)
+[![Chat](https://badges.gitter.im/python-anticaptcha/Lobby.svg)](https://gitter.im/python-anticaptcha/Lobby?utm_source=share-link&utm_medium=link&utm_campaign=share-link)
+[![Python compatibility](https://img.shields.io/pypi/pyversions/python-anticaptcha.svg)](https://github.com/ad-m/python-anticaptcha/blob/master/pyproject.toml)
+
+Client library for solving captchas with [Anticaptcha.com support](http://getcaptchasolution.com/i1hvnzdymd).
+The library requires Python >= 3.9.
+
+The library is cyclically and automatically tested for proper operation. We are constantly making the best efforts for its effective operation.
+
+In case of any problems with integration - [read the documentation](http://python-anticaptcha.readthedocs.io/en/latest/), [create an issue](https://github.com/ad-m/python-anticaptcha/issues/new), use [Gitter](https://gitter.im/python-anticaptcha/Lobby) or contact privately.
+
+## Getting Started
+
+Install as standard Python package using:
+
+```
+pip install python-anticaptcha
+```
+
+For async support (FastAPI, aiohttp, Starlette, etc.):
+
+```
+pip install python-anticaptcha[async]
+```
+
+## Usage
+
+To use this library you need [Anticaptcha.com](http://getcaptchasolution.com/p9bwplkicx) API key.
+
+You can pass the key explicitly or set the `ANTICAPTCHA_API_KEY` environment variable:
+
+```python
+# Explicit key
+client = AnticaptchaClient("my-api-key")
+
+# Or set ANTICAPTCHA_API_KEY environment variable
+client = AnticaptchaClient()
+```
+
+The client can be used as a context manager to ensure the underlying session is closed:
+
+```python
+with AnticaptchaClient(api_key) as client:
+    job = client.create_task(task)
+    job.join()
+```
+
+## Async Usage
+
+For async frameworks, use `AsyncAnticaptchaClient` — the API mirrors the sync
+client but all methods are awaitable:
+
+```python
+from python_anticaptcha import AsyncAnticaptchaClient, NoCaptchaTaskProxylessTask
+
+api_key = '174faff8fbc769e94a5862391ecfd010'
+site_key = '6Le-wvkSAAAAAPBMRTvw0Q4Muexq9bi0DJwx_mJ-'
+url = 'https://www.google.com/recaptcha/api2/demo'
+
+async with AsyncAnticaptchaClient(api_key) as client:
+    task = NoCaptchaTaskProxylessTask(url, site_key)
+    job = await client.create_task(task)
+    await job.join()
+    print(job.get_solution_response())
+```
+
+The full integration example is available in file `examples/async_recaptcha_request.py`.
+
+## Sync Usage
+
+### Solve recaptcha
+
+Example snippet for Recaptcha:
+
+```python
+from python_anticaptcha import AnticaptchaClient, NoCaptchaTaskProxylessTask
+
+api_key = '174faff8fbc769e94a5862391ecfd010'
+site_key = '6Le-wvkSAAAAAPBMRTvw0Q4Muexq9bi0DJwx_mJ-'  # grab from site
+url = 'https://www.google.com/recaptcha/api2/demo'
+
+client = AnticaptchaClient(api_key)
+task = NoCaptchaTaskProxylessTask(url, site_key)
+job = client.create_task(task)
+job.join()
+print(job.get_solution_response())
+```
+
+The full integration example is available in file `examples/sync_recaptcha_request.py`.
+
+If you process the same page many times, to increase reliability you can specify
+whether the captcha is visible or not. This parameter is not required, as the
+system detects invisible sitekeys automatically. To provide that, pass
+`is_invisible` parameter to `NoCaptchaTaskProxylessTask` or `NoCaptchaTask` eg.:
+
+```python
+from python_anticaptcha import AnticaptchaClient, NoCaptchaTaskProxylessTask
+
+api_key = '174faff8fbc769e94a5862391ecfd010'
+site_key = '6Lc-0DYUAAAAAOPM3RGobCfKjIE5STmzvZfHbbNx'  # grab from site
+url = 'https://losangeles.craigslist.org/lac/kid/d/housekeeper-sitting-pet-care/6720136191.html'
+
+client = AnticaptchaClient(api_key)
+task = NoCaptchaTaskProxylessTask(url, site_key, is_invisible=True)
+job = client.create_task(task)
+job.join()
+print(job.get_solution_response())
+```
+
+### Solve text captcha
+
+Example snippet for text captcha:
+
+```python
+from python_anticaptcha import AnticaptchaClient, ImageToTextTask
+
+api_key = '174faff8fbc769e94a5862391ecfd010'
+client = AnticaptchaClient(api_key)
+
+# From a file path:
+task = ImageToTextTask('examples/captcha_ms.jpeg')
+
+# Or from raw bytes:
+# task = ImageToTextTask(open('examples/captcha_ms.jpeg', 'rb').read())
+
+# Or from a file object:
+# task = ImageToTextTask(open('examples/captcha_ms.jpeg', 'rb'))
+
+job = client.create_task(task)
+job.join()
+print(job.get_captcha_text())
+```
+
+### Solve funcaptcha
+
+Example snippet for funcaptcha:
+
+```python
+from python_anticaptcha import AnticaptchaClient, FunCaptchaTask, Proxy
+UA = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 ' \
+     '(KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36'
+
+api_key = '174faff8fbc769e94a5862391ecfd010'
+site_key = 'DE0B0BB7-1EE4-4D70-1853-31B835D4506B'  # grab from site
+url = 'https://www.google.com/recaptcha/api2/demo'
+proxy = Proxy.parse_url("socks5://login:password@123.123.123.123:1080")
+
+client = AnticaptchaClient(api_key)
+task = FunCaptchaTask(url, site_key, user_agent=UA, **proxy.to_kwargs())
+job = client.create_task(task)
+job.join()
+print(job.get_token_response())
+```
+
+### Monitor solve progress
+
+You can pass an `on_check` callback to `job.join()` to monitor progress:
+
+```python
+def progress(elapsed, status):
+    print(f"Elapsed: {elapsed}s, status: {status}")
+
+job = client.create_task(task)
+job.join(on_check=progress)
+```
+
+### Report incorrect image
+
+Example snippet for reporting an incorrect image task:
+
+```python
+from python_anticaptcha import AnticaptchaClient, ImageToTextTask
+
+api_key = '174faff8fbc769e94a5862391ecfd010'
+captcha_fp = open('examples/captcha_ms.jpeg', 'rb')
+client = AnticaptchaClient(api_key)
+task = ImageToTextTask(captcha_fp)
+job = client.create_task(task)
+job.join()
+print(job.get_captcha_text())
+job.report_incorrect_image()
+```
+
+### Setup proxy
+
+The library is not responsible for managing the proxy server. However, we point to
+the possibility of simply launching such a server by:
+
+```
+pip install mitmproxy
+mitmweb -p 9190 -b 0.0.0.0 --ignore '.' --socks
+```
+
+Then in your application use something like:
+
+```python
+proxy = Proxy.parse_url("socks5://123.123.123.123:9190")
+```
+
+We recommend entering IP-based access control for incoming addresses to proxy. IP address required by
+[Anticaptcha.com](http://getcaptchasolution.com/p9bwplkicx) is:
+
+```
+69.65.41.21
+209.212.146.168
+```
+
+### Error handling
+
+In the event of an application error, the `AnticaptchaException` exception is thrown. To handle the exception, do the following:
+
+```python
+from python_anticaptcha import AnticaptchaException, ImageToTextTask
+
+try:
+    # any actions
+except AnticaptchaException as e:
+    if e.error_code == 'ERROR_ZERO_BALANCE':
+        notify_about_no_funds(e.error_id, e.error_code, e.error_description)
+    else:
+        raise
+```
+
+> **Note:** The legacy misspelled `AnticatpchaException` alias is still available for backward compatibility.
+
+## Versioning
+
+We use [SemVer](http://semver.org/) for versioning. For the versions available, see the
+[tags on this repository](https://github.com/ad-m/python-anticaptcha/tags).
+
+## Authors
+
+- **Adam Dobrawy** - *Initial work* - [ad-m](https://github.com/ad-m)
+
+See also the list of [contributors](https://github.com/ad-m/python-anticaptcha/contributors) who participated in this project.
+
+## License
+
+This project is licensed under the MIT License - see the [LICENSE.md](LICENSE.md)
+file for details