2captcha-python 1.5.1__tar.gz → 2.0.0__tar.gz

{2captcha_python-1.5.1 → 2captcha_python-2.0.0/2captcha_python.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: 2captcha-python
-Version: 1.5.1
+Version: 2.0.0
 Summary: Python module for easy integration with 2Captcha API
 Home-page: https://github.com/2captcha/2captcha-python/
 Author: 2Captcha
@@ -17,6 +17,8 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests
+Requires-Dist: httpx
+Requires-Dist: aiofiles
 Dynamic: author
 Dynamic: author-email
 Dynamic: classifier
@@ -24,6 +26,7 @@ Dynamic: description
 Dynamic: description-content-type
 Dynamic: home-page
 Dynamic: keywords
+Dynamic: license-file
 Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
@@ -82,11 +85,11 @@ Examples of API requests for different captcha types are available on the [Pytho
   - [Async calls](#async-calls)
   - [Examples](#examples)
   - [Examples using Selenium](#examples-using-selenium)
-  - [Useful articles](#useful-articles)
-  - [Get in touch](#get-in-touch)
-  - [Join the team 👪](#join-the-team-)
-  - [License](#license)
-    - [Graphics and Trademarks](#graphics-and-trademarks)
+- [Useful articles](#useful-articles)
+- [Get in touch](#get-in-touch)
+- [Join the team 👪](#join-the-team-)
+- [License](#license)
+  - [Graphics and Trademarks](#graphics-and-trademarks)
 
 ## Installation
 
@@ -106,6 +109,18 @@ from twocaptcha import TwoCaptcha
 
 solver = TwoCaptcha('YOUR_API_KEY')
 ```
+
+<details>
+<summary>Async</summary>
+
+```python 
+from twocaptcha import AsyncTwoCaptcha
+
+solver = AsyncTwoCaptcha('YOUR_API_KEY')
+```
+
+</details>
+
 Also, there are a few options that can be configured:
 
 ```python 
@@ -547,7 +562,55 @@ proxy={
 ```
 
 ## Async calls
-You can also make async calls with [asyncio], for example:
+
+To use the async version, just replace `TwoCaptcha` with `AsyncTwoCaptcha`:
+
+```python
+import asyncio
+from twocaptcha import AsyncTwoCaptcha
+
+async def solve_captcha():
+    solver = AsyncTwoCaptcha('YOUR_API_KEY')
+    
+    try:
+        recaptcha_result = await solver.recaptcha(...)
+        return recaptcha_result
+    except Exception as e:
+        print(e)
+        return None
+
+if __name__ == '__main__':
+    result = asyncio.run(solve_captcha())
+```
+
+The `AsyncTwoCaptcha` class supports all the same methods and parameters as the synchronous `TwoCaptcha` class but operates asynchronously. Configuration is identical.
+
+### Solving Multiple Captchas in Parallel
+
+One of the main advantages of using async support is the ability to solve multiple captchas concurrently:
+
+```python
+async def solve_multiple_captchas():
+    solver = AsyncTwoCaptcha('YOUR_API_KEY')
+    
+    # Start all tasks simultaneously
+    task1 = asyncio.create_task(solver.text('What color is the sky on a clear day?'))
+    task2 = asyncio.create_task(solver.text('What is 2+2?'))
+    task3 = asyncio.create_task(solver.text('Name of the planet we live on?'))
+    
+    # Wait for all tasks to complete
+    results = await asyncio.gather(task1, task2, task3, return_exceptions=True)
+    return results
+
+# This completes much faster than solving captchas sequentially
+results = asyncio.run(solve_multiple_captchas())
+```
+
+Examples of solving all supported captcha types asynchronously are located in the [examples/async directory] directory.
+
+### Legacy Async Method
+
+For backward compatibility, you can also use the traditional executor-based approach with the synchronous client:
 
 ```python
 import asyncio
@@ -565,6 +628,7 @@ async def captchaSolver(image):
 
 captcha_result = asyncio.run(captchaSolver(image))
 ```
+
 ## Examples
 Examples of solving all supported captcha types are located in the [examples] directory.
 
@@ -604,6 +668,8 @@ The graphics and trademarks included in this repository are not covered by the M
 [post options]: https://2captcha.com/2captcha-api#normal_post
 [list of supported languages]: https://2captcha.com/2captcha-api#language
 [examples directory]: /examples
+[examples/sync directory]: /examples/sync
+[examples/async directory]: /examples/async
 [asyncio]: https://docs.python.org/3/library/asyncio.html
 [Buy residential proxies]: https://2captcha.com/proxy/residential-proxies
 [Quick start]: https://2captcha.com/proxy?openAddTrafficModal=true

2captcha_python-2.0.0/2captcha_python.egg-info/SOURCES.txt

@@ -0,0 +1,16 @@
+LICENSE
+README.md
+setup.py
+2captcha_python.egg-info/PKG-INFO
+2captcha_python.egg-info/SOURCES.txt
+2captcha_python.egg-info/dependency_links.txt
+2captcha_python.egg-info/requires.txt
+2captcha_python.egg-info/top_level.txt
+twocaptcha/__init__.py
+twocaptcha/api.py
+twocaptcha/async_api.py
+twocaptcha/async_solver.py
+twocaptcha/solver.py
+twocaptcha/exceptions/__init__.py
+twocaptcha/exceptions/api.py
+twocaptcha/exceptions/solver.py

2captcha_python-2.0.0/2captcha_python.egg-info/requires.txt

@@ -0,0 +1,3 @@
+requests
+httpx
+aiofiles

2captcha_python-1.5.1/README.md → 2captcha_python-2.0.0/PKG-INFO

@@ -1,3 +1,36 @@
+Metadata-Version: 2.4
+Name: 2captcha-python
+Version: 2.0.0
+Summary: Python module for easy integration with 2Captcha API
+Home-page: https://github.com/2captcha/2captcha-python/
+Author: 2Captcha
+Author-email: info@2captcha.com
+Keywords: 2captcha,captcha,api,captcha solver,reCAPTCHA,FunCaptcha,Geetest,image captcha,Coordinates,Click Captcha,Geetest V4,Lemin captcha,Amazon WAF,Cloudflare Turnstile,Capy Puzzle,MTCaptcha,Friendly Captcha,Tencent,Cutcaptcha,DataDome,cybersiara
+Classifier: Programming Language :: Python :: 3
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Software Development :: Libraries :: Python Modules
+Classifier: Topic :: Scientific/Engineering :: Image Recognition
+Classifier: Topic :: Utilities
+Classifier: Intended Audience :: Developers
+Requires-Python: >=3.6
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: requests
+Requires-Dist: httpx
+Requires-Dist: aiofiles
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
+
 <a href="https://github.com/2captcha/2captcha-python"><img src="https://github.com/user-attachments/assets/a737d428-5233-4605-9d09-211fa213d069" width="82" height="30"></a>
 <a href="https://github.com/2captcha/2captcha-javascript"><img src="https://github.com/user-attachments/assets/4d3b4541-34b2-4ed2-a687-d694ce67e5a6" width="36" height="30"></a>
 <a href="https://github.com/2captcha/2captcha-go"><img src="https://github.com/user-attachments/assets/ab22182e-6cb2-41fa-91f4-d5e89c6d7c6f" width="63" height="30"></a>
@@ -52,11 +85,11 @@ Examples of API requests for different captcha types are available on the [Pytho
   - [Async calls](#async-calls)
   - [Examples](#examples)
   - [Examples using Selenium](#examples-using-selenium)
-  - [Useful articles](#useful-articles)
-  - [Get in touch](#get-in-touch)
-  - [Join the team 👪](#join-the-team-)
-  - [License](#license)
-    - [Graphics and Trademarks](#graphics-and-trademarks)
+- [Useful articles](#useful-articles)
+- [Get in touch](#get-in-touch)
+- [Join the team 👪](#join-the-team-)
+- [License](#license)
+  - [Graphics and Trademarks](#graphics-and-trademarks)
 
 ## Installation
 
@@ -76,6 +109,18 @@ from twocaptcha import TwoCaptcha
 
 solver = TwoCaptcha('YOUR_API_KEY')
 ```
+
+<details>
+<summary>Async</summary>
+
+```python 
+from twocaptcha import AsyncTwoCaptcha
+
+solver = AsyncTwoCaptcha('YOUR_API_KEY')
+```
+
+</details>
+
 Also, there are a few options that can be configured:
 
 ```python 
@@ -517,7 +562,55 @@ proxy={
 ```
 
 ## Async calls
-You can also make async calls with [asyncio], for example:
+
+To use the async version, just replace `TwoCaptcha` with `AsyncTwoCaptcha`:
+
+```python
+import asyncio
+from twocaptcha import AsyncTwoCaptcha
+
+async def solve_captcha():
+    solver = AsyncTwoCaptcha('YOUR_API_KEY')
+    
+    try:
+        recaptcha_result = await solver.recaptcha(...)
+        return recaptcha_result
+    except Exception as e:
+        print(e)
+        return None
+
+if __name__ == '__main__':
+    result = asyncio.run(solve_captcha())
+```
+
+The `AsyncTwoCaptcha` class supports all the same methods and parameters as the synchronous `TwoCaptcha` class but operates asynchronously. Configuration is identical.
+
+### Solving Multiple Captchas in Parallel
+
+One of the main advantages of using async support is the ability to solve multiple captchas concurrently:
+
+```python
+async def solve_multiple_captchas():
+    solver = AsyncTwoCaptcha('YOUR_API_KEY')
+    
+    # Start all tasks simultaneously
+    task1 = asyncio.create_task(solver.text('What color is the sky on a clear day?'))
+    task2 = asyncio.create_task(solver.text('What is 2+2?'))
+    task3 = asyncio.create_task(solver.text('Name of the planet we live on?'))
+    
+    # Wait for all tasks to complete
+    results = await asyncio.gather(task1, task2, task3, return_exceptions=True)
+    return results
+
+# This completes much faster than solving captchas sequentially
+results = asyncio.run(solve_multiple_captchas())
+```
+
+Examples of solving all supported captcha types asynchronously are located in the [examples/async directory] directory.
+
+### Legacy Async Method
+
+For backward compatibility, you can also use the traditional executor-based approach with the synchronous client:
 
 ```python
 import asyncio
@@ -535,6 +628,7 @@ async def captchaSolver(image):
 
 captcha_result = asyncio.run(captchaSolver(image))
 ```
+
 ## Examples
 Examples of solving all supported captcha types are located in the [examples] directory.
 
@@ -574,6 +668,8 @@ The graphics and trademarks included in this repository are not covered by the M
 [post options]: https://2captcha.com/2captcha-api#normal_post
 [list of supported languages]: https://2captcha.com/2captcha-api#language
 [examples directory]: /examples
+[examples/sync directory]: /examples/sync
+[examples/async directory]: /examples/async
 [asyncio]: https://docs.python.org/3/library/asyncio.html
 [Buy residential proxies]: https://2captcha.com/proxy/residential-proxies
 [Quick start]: https://2captcha.com/proxy?openAddTrafficModal=true

2captcha_python-1.5.1/2captcha_python.egg-info/PKG-INFO → 2captcha_python-2.0.0/README.md

@@ -1,33 +1,3 @@
-Metadata-Version: 2.2
-Name: 2captcha-python
-Version: 1.5.1
-Summary: Python module for easy integration with 2Captcha API
-Home-page: https://github.com/2captcha/2captcha-python/
-Author: 2Captcha
-Author-email: info@2captcha.com
-Keywords: 2captcha,captcha,api,captcha solver,reCAPTCHA,FunCaptcha,Geetest,image captcha,Coordinates,Click Captcha,Geetest V4,Lemin captcha,Amazon WAF,Cloudflare Turnstile,Capy Puzzle,MTCaptcha,Friendly Captcha,Tencent,Cutcaptcha,DataDome,cybersiara
-Classifier: Programming Language :: Python :: 3
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Topic :: Scientific/Engineering :: Image Recognition
-Classifier: Topic :: Utilities
-Classifier: Intended Audience :: Developers
-Requires-Python: >=3.6
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: requests
-Dynamic: author
-Dynamic: author-email
-Dynamic: classifier
-Dynamic: description
-Dynamic: description-content-type
-Dynamic: home-page
-Dynamic: keywords
-Dynamic: requires-dist
-Dynamic: requires-python
-Dynamic: summary
-
 <a href="https://github.com/2captcha/2captcha-python"><img src="https://github.com/user-attachments/assets/a737d428-5233-4605-9d09-211fa213d069" width="82" height="30"></a>
 <a href="https://github.com/2captcha/2captcha-javascript"><img src="https://github.com/user-attachments/assets/4d3b4541-34b2-4ed2-a687-d694ce67e5a6" width="36" height="30"></a>
 <a href="https://github.com/2captcha/2captcha-go"><img src="https://github.com/user-attachments/assets/ab22182e-6cb2-41fa-91f4-d5e89c6d7c6f" width="63" height="30"></a>
@@ -82,11 +52,11 @@ Examples of API requests for different captcha types are available on the [Pytho
   - [Async calls](#async-calls)
   - [Examples](#examples)
   - [Examples using Selenium](#examples-using-selenium)
-  - [Useful articles](#useful-articles)
-  - [Get in touch](#get-in-touch)
-  - [Join the team 👪](#join-the-team-)
-  - [License](#license)
-    - [Graphics and Trademarks](#graphics-and-trademarks)
+- [Useful articles](#useful-articles)
+- [Get in touch](#get-in-touch)
+- [Join the team 👪](#join-the-team-)
+- [License](#license)
+  - [Graphics and Trademarks](#graphics-and-trademarks)
 
 ## Installation
 
@@ -106,6 +76,18 @@ from twocaptcha import TwoCaptcha
 
 solver = TwoCaptcha('YOUR_API_KEY')
 ```
+
+<details>
+<summary>Async</summary>
+
+```python 
+from twocaptcha import AsyncTwoCaptcha
+
+solver = AsyncTwoCaptcha('YOUR_API_KEY')
+```
+
+</details>
+
 Also, there are a few options that can be configured:
 
 ```python 
@@ -547,7 +529,55 @@ proxy={
 ```
 
 ## Async calls
-You can also make async calls with [asyncio], for example:
+
+To use the async version, just replace `TwoCaptcha` with `AsyncTwoCaptcha`:
+
+```python
+import asyncio
+from twocaptcha import AsyncTwoCaptcha
+
+async def solve_captcha():
+    solver = AsyncTwoCaptcha('YOUR_API_KEY')
+    
+    try:
+        recaptcha_result = await solver.recaptcha(...)
+        return recaptcha_result
+    except Exception as e:
+        print(e)
+        return None
+
+if __name__ == '__main__':
+    result = asyncio.run(solve_captcha())
+```
+
+The `AsyncTwoCaptcha` class supports all the same methods and parameters as the synchronous `TwoCaptcha` class but operates asynchronously. Configuration is identical.
+
+### Solving Multiple Captchas in Parallel
+
+One of the main advantages of using async support is the ability to solve multiple captchas concurrently:
+
+```python
+async def solve_multiple_captchas():
+    solver = AsyncTwoCaptcha('YOUR_API_KEY')
+    
+    # Start all tasks simultaneously
+    task1 = asyncio.create_task(solver.text('What color is the sky on a clear day?'))
+    task2 = asyncio.create_task(solver.text('What is 2+2?'))
+    task3 = asyncio.create_task(solver.text('Name of the planet we live on?'))
+    
+    # Wait for all tasks to complete
+    results = await asyncio.gather(task1, task2, task3, return_exceptions=True)
+    return results
+
+# This completes much faster than solving captchas sequentially
+results = asyncio.run(solve_multiple_captchas())
+```
+
+Examples of solving all supported captcha types asynchronously are located in the [examples/async directory] directory.
+
+### Legacy Async Method
+
+For backward compatibility, you can also use the traditional executor-based approach with the synchronous client:
 
 ```python
 import asyncio
@@ -565,6 +595,7 @@ async def captchaSolver(image):
 
 captcha_result = asyncio.run(captchaSolver(image))
 ```
+
 ## Examples
 Examples of solving all supported captcha types are located in the [examples] directory.
 
@@ -604,6 +635,8 @@ The graphics and trademarks included in this repository are not covered by the M
 [post options]: https://2captcha.com/2captcha-api#normal_post
 [list of supported languages]: https://2captcha.com/2captcha-api#language
 [examples directory]: /examples
+[examples/sync directory]: /examples/sync
+[examples/async directory]: /examples/async
 [asyncio]: https://docs.python.org/3/library/asyncio.html
 [Buy residential proxies]: https://2captcha.com/proxy/residential-proxies
 [Quick start]: https://2captcha.com/proxy?openAddTrafficModal=true

{2captcha_python-1.5.1 → 2captcha_python-2.0.0}/setup.py

@@ -3,12 +3,12 @@
 from setuptools import setup, find_packages
 import re
 
-with open("README.md", "r") as fh:
+with open("README.md", "r", encoding="utf-8") as fh:
     long_description = fh.read()
 
 
 def get_version():
-    with open('twocaptcha/__init__.py', 'r') as f:
+    with open('twocaptcha/__init__.py', 'r', encoding="utf-8") as f:
         return re.search(r'__version__ = ["\'](.*?)["\']', f.read()).group(1)
 
 
@@ -18,7 +18,7 @@ setup(name='2captcha-python',
       long_description=long_description,
       long_description_content_type="text/markdown",
       url='https://github.com/2captcha/2captcha-python/',
-      install_requires=['requests'],
+      install_requires=['requests', 'httpx', 'aiofiles'],
       author='2Captcha',
       author_email='info@2captcha.com',
       packages=find_packages(),

{2captcha_python-1.5.1 → 2captcha_python-2.0.0}/twocaptcha/__init__.py

@@ -1,6 +1,11 @@
 from .api import ApiClient
-from .solver import (TwoCaptcha, SolverExceptions, ValidationException,
-                     NetworkException, ApiException, TimeoutException)
+from .solver import TwoCaptcha
+
+from .async_api import AsyncApiClient
+from .async_solver import AsyncTwoCaptcha
+
+from .solver import SolverExceptions, ValidationException, NetworkException, ApiException, TimeoutException
+
 
 """
 Python 3 package for easy integration with the API of 2captcha captcha solving service to bypass recaptcha, 
@@ -12,4 +17,4 @@ support@2captcha.com
 """
 
 __author__ = '2captcha'
-__version__ = '1.5.1'
+__version__ = '2.0.0'

{2captcha_python-1.5.1 → 2captcha_python-2.0.0}/twocaptcha/api.py

@@ -2,20 +2,16 @@
 
 import requests
 
-
-class NetworkException(Exception):
-    pass
-
-
-class ApiException(Exception):
-    pass
+try:
+    from .exceptions.api import NetworkException, ApiException
+except ImportError:
+    from twocaptcha.exceptions.api import NetworkException, ApiException
 
 
 class ApiClient():
-    def __init__(self, post_url = '2captcha.com'):
+    def __init__(self, post_url='2captcha.com'):
         self.post_url = post_url
-        
-        
+
     def in_(self, files={}, **kwargs):
         '''
         
@@ -43,7 +39,7 @@ class ApiClient():
         '''
 
         try:
-            current_url = 'https://'+self.post_url+'/in.php'
+            current_url = 'https://' + self.post_url + '/in.php'
             if files:
 
                 files = {key: open(path, 'rb') for key, path in files.items()}
@@ -101,7 +97,7 @@ class ApiClient():
         '''
 
         try:
-            current_url_out = 'https://'+self.post_url+'/res.php'
+            current_url_out = 'https://' + self.post_url + '/res.php'
             resp = requests.get(current_url_out, params=kwargs)
 
             if resp.status_code != 200:

2captcha_python-2.0.0/twocaptcha/async_api.py

@@ -0,0 +1,124 @@
+#!/usr/bin/env python3
+
+from contextlib import AsyncExitStack
+
+import aiofiles
+import httpx
+
+try:
+    from .exceptions.api import NetworkException, ApiException
+except ImportError:
+    from twocaptcha.exceptions.api import NetworkException, ApiException
+
+
+class AsyncApiClient():
+    def __init__(self, post_url='2captcha.com'):
+        self.post_url = post_url
+
+    async def in_(self, files={}, **kwargs):
+        '''
+        
+        sends POST-request (files and/or params) to solve captcha
+
+        Parameters
+        ----------
+        files : TYPE, optional
+            DESCRIPTION. The default is {}.
+        **kwargs : TYPE
+            DESCRIPTION.
+
+        Raises
+        ------
+        NetworkException
+            DESCRIPTION.
+        ApiException
+            DESCRIPTION.
+
+        Returns
+        -------
+        resp : TYPE
+            DESCRIPTION.
+
+        '''
+
+        try:
+            current_url = 'https://' + self.post_url + '/in.php'
+
+            async with httpx.AsyncClient(follow_redirects=True) as client:
+                if files:
+                    async with AsyncExitStack() as stack:
+                        file_objects = {}
+                        for key, path in files.items():
+                            file_handle = await stack.enter_async_context(aiofiles.open(path, 'rb'))
+                            content = await file_handle.read()
+                            file_objects[key] = content
+
+                        resp = await client.post(current_url,
+                                                 data=kwargs,
+                                                 files=file_objects)
+
+                elif 'file' in kwargs:
+                    file_path = kwargs.pop('file')
+                    async with aiofiles.open(file_path, 'rb') as file_handle:
+                        content = await file_handle.read()
+                        resp = await client.post(current_url,
+                                                 data=kwargs,
+                                                 files={'file': content})
+                else:
+                    resp = await client.post(current_url,
+                                             data=kwargs)
+
+        except httpx.RequestError as e:
+            raise NetworkException(e)
+
+        if resp.status_code != 200:
+            raise NetworkException(f'bad response: {resp.status_code}')
+
+        resp = resp.content.decode('utf-8')
+
+        if 'ERROR' in resp:
+            raise ApiException(resp)
+
+        return resp
+
+    async def res(self, **kwargs):
+        '''
+        sends additional GET-requests (solved captcha, balance, report etc.)
+
+        Parameters
+        ----------
+        **kwargs : TYPE
+            DESCRIPTION.
+
+        Raises
+        ------
+        NetworkException
+            DESCRIPTION.
+        ApiException
+            DESCRIPTION.
+
+        Returns
+        -------
+        resp : TYPE
+            DESCRIPTION.
+
+        '''
+
+        try:
+            current_url_out = 'https://' + self.post_url + '/res.php'
+
+            async with httpx.AsyncClient(follow_redirects=True) as client:
+                resp = await client.get(current_url_out, params=kwargs)
+
+                if resp.status_code != 200:
+                    raise NetworkException(f'bad response: {resp.status_code}')
+
+                resp = resp.content.decode('utf-8')
+
+                if 'ERROR' in resp:
+                    raise ApiException(resp)
+
+        except httpx.RequestError as e:
+            raise NetworkException(e)
+
+        return resp