2captcha-python 1.2.2__tar.gz → 1.2.4__tar.gz

{2captcha-python-1.2.2 → 2captcha-python-1.2.4}/2captcha_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: 2captcha-python
-Version: 1.2.2
+Version: 1.2.4
 Summary: Python module for easy integration with 2Captcha API
 Home-page: https://github.com/2captcha/2captcha-python/
 Author: 2Captcha
@@ -14,7 +14,7 @@ License-File: LICENSE
 Requires-Dist: requests
 
 # Python Module for 2Captcha API
-The easiest way to quickly integrate [2Captcha] captcha solving service into your code to automate solving of any types of captcha.
+The easiest way to quickly integrate the 2Captcha captcha-solving service into your code and automate the solving of any type of captcha.
 
 - [Python Module for 2Captcha API](#python-module-for-2captcha-api)
   - [Installation](#installation)
@@ -25,8 +25,8 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
     - [Normal Captcha](#normal-captcha)
     - [Audio Captcha](#audio-captcha)
     - [Text Captcha](#text-captcha)
-    - [ReCaptcha v2](#recaptcha-v2)
-    - [ReCaptcha v3](#recaptcha-v3)
+    - [reCAPTCHA v2](#recaptcha-v2)
+    - [reCAPTCHA v3](#recaptcha-v3)
     - [FunCaptcha](#funcaptcha)
     - [GeeTest](#geetest)
     - [hCaptcha](#hcaptcha)
@@ -35,11 +35,15 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
     - [Cloudflare Turnstile](#cloudflare-turnstile)
     - [Amazon WAF](#amazon-waf)
     - [KeyCaptcha](#keycaptcha)
+    - [atbCAPTCHA](#atbcaptcha)
     - [Capy](#capy)
     - [Grid](#grid)
     - [Canvas](#canvas)
     - [ClickCaptcha](#clickcaptcha)
     - [Rotate](#rotate)
+    - [MTCaptcha](#mtcaptcha)
+    - [Friendly Captcha](#friendly-captcha)
+    - [Cutcaptcha](#cutcaptcha)
   - [Other methods](#other-methods)
     - [send / getResult](#send--getresult)
     - [balance](#balance)
@@ -64,7 +68,7 @@ from twocaptcha import TwoCaptcha
 
 solver = TwoCaptcha('YOUR_API_KEY')
 ```
-Also there are few options that can be configured:
+Also there are a few options that can be configured:
 
 ```python 
 config = {
@@ -86,8 +90,8 @@ solver = TwoCaptcha(**config)
 | server           | `2captcha.com` | API server. You can set it to `rucaptcha.com` if your account is registered there                                                                  |
 | softId           | -              | your software ID obtained after publishing in [2captcha sofware catalog]                                                                           |
 | callback         | -              | URL of your web-sever that receives the captcha recognition result. The URl should be first registered in [pingback settings] of your account      |
-| defaultTimeout   | 120            | Polling timeout in seconds for all captcha types except ReCaptcha. Defines how long the module tries to get the answer from `res.php` API endpoint |
-| recaptchaTimeout | 600            | Polling timeout for ReCaptcha in seconds. Defines how long the module tries to get the answer from `res.php` API endpoint                          |
+| defaultTimeout   | 120            | Polling timeout in seconds for all captcha types except reCAPTCHA. Defines how long the module tries to get the answer from `res.php` API endpoint |
+| recaptchaTimeout | 600            | Polling timeout for reCAPTCHA in seconds. Defines how long the module tries to get the answer from `res.php` API endpoint                          |
 | pollingInterval  | 10             | Interval in seconds between requests to `res.php` API endpoint, setting values less than 5 seconds is not recommended                              |
 
 >  **IMPORTANT:** once `callback` is defined for `TwoCaptcha` instance, all methods return only the captcha ID and DO NOT poll the API to get the result. The result will be sent to the callback URL.
@@ -112,7 +116,7 @@ When you submit any image-based captcha use can provide additional options to he
 Below you can find basic examples for every captcha type. Check out [examples directory] to find more examples with all available options.
 
 ### Normal Captcha
-To bypass a normal captcha (distorted text on image) use the following method. This method also can be used to recognize any text on the image.
+To bypass a normal captcha (distorted text on an image) use the following method. This method also can be used to recognize any text on the image.
 ```python 
 result = solver.normal('path/to/captcha.jpg', param1=..., ...)
 # OR
@@ -121,7 +125,7 @@ result = solver.normal('https://site-with-captcha.com/path/to/captcha.jpg', para
 
 ### Audio Captcha
 To bypass an audio captcha (mp3 formats only) use the following method. 
-You must provife the language as  `lang = 'en'`. Supported languages are "en", "ru", "de", "el", "pt".
+You must provide the language as `lang = 'en'`. Supported languages are "en", "ru", "de", "el", "pt".
 
 ```python 
 result = solver.audio('path/to/captcha.mp3', lang = 'lang', param1=..., ...)
@@ -130,21 +134,21 @@ result = solver.audio('https://site-with-captcha.com/path/to/captcha.mp3', lang
 ```
 
 ### Text Captcha
-This method can be used to bypass a captcha that requires to answer a question provided in clear text.
+This method can be used to bypass a captcha that requires answering a question provided in clear text.
 ```python 
 result = solver.text('If tomorrow is Saturday, what day is today?', param1=..., ...)
 ```
 
-### ReCaptcha v2
-Use this method to solve ReCaptcha V2 and obtain a token to bypass the protection.
+### reCAPTCHA v2
+Use this method to solve reCAPTCHA V2 and obtain a token to bypass the protection.
 ```python 
 result = solver.recaptcha(sitekey='6Le-wvkSVVABCPBMRTvw0Q4Muexq1bi0DJwx_mJ-',
                           url='https://mysite.com/page/with/recaptcha',
                           param1=..., ...)
 ```
 
-### ReCaptcha v3
-This method provides ReCaptcha V3 solver and returns a token.
+### reCAPTCHA v3
+This method provides a reCAPTCHA V3 solver and returns a token.
 ```python
 result = solver.recaptcha(sitekey='6Le-wvkSVVABCPBMRTvw0Q4Muexq1bi0DJwx_mJ-',
                             url='https://mysite.com/page/with/recaptcha',
@@ -174,7 +178,7 @@ result = solver.geetest(gt='f1ab2cdefa3456789012345b6c78d90e',
 
 
 ### hCaptcha
-Use this method to solve hCaptcha challenge. Returns a token to bypass captcha.
+Use this method to solve the hCaptcha challenge. Returns a token to bypass the captcha.
 ```python
 result = solver.hcaptcha(sitekey='10000000-ffff-ffff-ffff-000000000001',
                             url='https://www.site.com/page/', 
@@ -193,7 +197,7 @@ result = solver.geetest_v4(captcha_id='e392e1d7fd421dc63325744d5a2b9c73',
 
 
 ### Lemin Cropped Captcha
-Use this method to solve hCaptcha challenge. Returns JSON with answer containing the following values: answer, challenge_id.
+Use this method to solve hCaptcha challenge. Returns JSON with an answer containing the following values: answer, challenge_id.
 ```python
 result = solver.lemin(captcha_id='CROPPED_1abcd2f_a1234b567c890d12ef3a456bc78d901d',
                             div_id='lemin-cropped-captcha', 
@@ -238,6 +242,18 @@ result = solver.keycaptcha(s_s_c_user_id=10,
 
 ```
 
+
+### atbCAPTCHA
+Use this method to solve atbCaptcha challenge. Returns a token to bypass the captcha.
+```python
+result = solver.atb_captcha(app_id='af25e409b33d722a95e56a230ff8771c',
+                            api_server='https://cap.aisecurius.com',
+                            url='http://mysite.com/', 
+                            param1=..., ...)
+
+```
+
+
 ### Capy
 Token-based method to bypass Capy puzzle captcha.
 ```python
@@ -247,17 +263,19 @@ result = solver.capy(sitekey='PUZZLE_Abc1dEFghIJKLM2no34P56q7rStu8v',
                      param1=..., ...)
 ```
 ### Grid
-Grid method is originally called Old ReCaptcha V2 method. The method can be used to bypass any type of captcha where you can apply a grid on image and need to click specific grid boxes. Returns numbers of boxes.
+Grid method was originally called the Old reCAPTCHA V2 method. The method can be used to bypass any type of captcha where you can apply a grid on an image and click specific grid boxes. Returns numbers of boxes.
 ```python
 result = solver.grid('path/to/captcha.jpg', param1=..., ...)
 ```
+
 ### Canvas
-Canvas method can be used when you need to draw a line around an object on image. Returns a set of points' coordinates to draw a polygon.
+Canvas method can be used when you need to draw a line around an object on an image. Returns a set of points' coordinates to draw a polygon.
 ```python
 result = solver.canvas('path/to/captcha.jpg', param1=..., ...)
 ```
+
 ### ClickCaptcha
-ClickCaptcha method returns coordinates of points on captcha image. Can be used if you need to click on particular points on the image.
+ClickCaptcha method returns coordinates of points on the captcha image. Can be used if you need to click on particular points in the image.
 ```python
 result = solver.coordinates('path/to/captcha.jpg', param1=..., ...)
 ```
@@ -268,6 +286,32 @@ This method can be used to solve a captcha that asks to rotate an object. Mostly
 result = solver.rotate('path/to/captcha.jpg', param1=..., ...)
 ```
 
+### MTCaptcha
+Use this method to solve MTCaptcha and obtain a token to bypass the protection.
+```python
+result = solver.mtcaptcha(sitekey='MTPublic-KzqLY1cKH',
+                          url='https://2captcha.com/demo/mtcaptcha',
+                          param1=..., ...)
+```
+
+### Friendly Captcha
+Friendly Captcha solving method. Returns a token.
+```python
+result = solver.friendly_captcha(sitekey='FCMGEMUD2KTDSQ5H',
+                                 url='https://friendlycaptcha.com/demo',
+                                 param1=..., ...)
+```
+
+### Cutcaptcha
+Use this method to solve Cutcaptcha. Returns the response in JSON.
+```python
+result = solver.cutcaptcha(misery_key='ad52c87af17e2ec09b8d918c9f00416b1cb8c320',
+                           apikey='SAs61IAI',
+                           url='https://mysite.com/page/with/cutcaptcha',
+                           param1=..., ...)
+```
+
+
 ## Other methods
 
 ### send / getResult
@@ -290,7 +334,7 @@ balance = solver.balance()
 ```
 
 ### report
-Use this method to report good or bad captcha answer.
+Use this method to report good or bad captcha answers.
 ```python
 solver.report(id, True) # captcha solved correctly
 solver.report(id, False) # captcha solved incorrectly

{2captcha-python-1.2.2 → 2captcha-python-1.2.4}/2captcha_python.egg-info/SOURCES.txt

@@ -7,9 +7,12 @@ setup.py
 2captcha_python.egg-info/requires.txt
 2captcha_python.egg-info/top_level.txt
 tests/test_amazon_waf.py
+tests/test_atb_captcha.py
 tests/test_canvas.py
 tests/test_capy.py
 tests/test_coordinates.py
+tests/test_cutcaptcha.py
+tests/test_friendly_captcha.py
 tests/test_funcaptcha.py
 tests/test_geetest.py
 tests/test_geetest_v4.py
@@ -17,6 +20,7 @@ tests/test_grid.py
 tests/test_hcaptcha.py
 tests/test_keycaptcha.py
 tests/test_lemin.py
+tests/test_mtcaptcha.py
 tests/test_normal.py
 tests/test_recaptcha.py
 tests/test_rotate.py

{2captcha-python-1.2.2 → 2captcha-python-1.2.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: 2captcha-python
-Version: 1.2.2
+Version: 1.2.4
 Summary: Python module for easy integration with 2Captcha API
 Home-page: https://github.com/2captcha/2captcha-python/
 Author: 2Captcha
@@ -14,7 +14,7 @@ License-File: LICENSE
 Requires-Dist: requests
 
 # Python Module for 2Captcha API
-The easiest way to quickly integrate [2Captcha] captcha solving service into your code to automate solving of any types of captcha.
+The easiest way to quickly integrate the 2Captcha captcha-solving service into your code and automate the solving of any type of captcha.
 
 - [Python Module for 2Captcha API](#python-module-for-2captcha-api)
   - [Installation](#installation)
@@ -25,8 +25,8 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
     - [Normal Captcha](#normal-captcha)
     - [Audio Captcha](#audio-captcha)
     - [Text Captcha](#text-captcha)
-    - [ReCaptcha v2](#recaptcha-v2)
-    - [ReCaptcha v3](#recaptcha-v3)
+    - [reCAPTCHA v2](#recaptcha-v2)
+    - [reCAPTCHA v3](#recaptcha-v3)
     - [FunCaptcha](#funcaptcha)
     - [GeeTest](#geetest)
     - [hCaptcha](#hcaptcha)
@@ -35,11 +35,15 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
     - [Cloudflare Turnstile](#cloudflare-turnstile)
     - [Amazon WAF](#amazon-waf)
     - [KeyCaptcha](#keycaptcha)
+    - [atbCAPTCHA](#atbcaptcha)
     - [Capy](#capy)
     - [Grid](#grid)
     - [Canvas](#canvas)
     - [ClickCaptcha](#clickcaptcha)
     - [Rotate](#rotate)
+    - [MTCaptcha](#mtcaptcha)
+    - [Friendly Captcha](#friendly-captcha)
+    - [Cutcaptcha](#cutcaptcha)
   - [Other methods](#other-methods)
     - [send / getResult](#send--getresult)
     - [balance](#balance)
@@ -64,7 +68,7 @@ from twocaptcha import TwoCaptcha
 
 solver = TwoCaptcha('YOUR_API_KEY')
 ```
-Also there are few options that can be configured:
+Also there are a few options that can be configured:
 
 ```python 
 config = {
@@ -86,8 +90,8 @@ solver = TwoCaptcha(**config)
 | server           | `2captcha.com` | API server. You can set it to `rucaptcha.com` if your account is registered there                                                                  |
 | softId           | -              | your software ID obtained after publishing in [2captcha sofware catalog]                                                                           |
 | callback         | -              | URL of your web-sever that receives the captcha recognition result. The URl should be first registered in [pingback settings] of your account      |
-| defaultTimeout   | 120            | Polling timeout in seconds for all captcha types except ReCaptcha. Defines how long the module tries to get the answer from `res.php` API endpoint |
-| recaptchaTimeout | 600            | Polling timeout for ReCaptcha in seconds. Defines how long the module tries to get the answer from `res.php` API endpoint                          |
+| defaultTimeout   | 120            | Polling timeout in seconds for all captcha types except reCAPTCHA. Defines how long the module tries to get the answer from `res.php` API endpoint |
+| recaptchaTimeout | 600            | Polling timeout for reCAPTCHA in seconds. Defines how long the module tries to get the answer from `res.php` API endpoint                          |
 | pollingInterval  | 10             | Interval in seconds between requests to `res.php` API endpoint, setting values less than 5 seconds is not recommended                              |
 
 >  **IMPORTANT:** once `callback` is defined for `TwoCaptcha` instance, all methods return only the captcha ID and DO NOT poll the API to get the result. The result will be sent to the callback URL.
@@ -112,7 +116,7 @@ When you submit any image-based captcha use can provide additional options to he
 Below you can find basic examples for every captcha type. Check out [examples directory] to find more examples with all available options.
 
 ### Normal Captcha
-To bypass a normal captcha (distorted text on image) use the following method. This method also can be used to recognize any text on the image.
+To bypass a normal captcha (distorted text on an image) use the following method. This method also can be used to recognize any text on the image.
 ```python 
 result = solver.normal('path/to/captcha.jpg', param1=..., ...)
 # OR
@@ -121,7 +125,7 @@ result = solver.normal('https://site-with-captcha.com/path/to/captcha.jpg', para
 
 ### Audio Captcha
 To bypass an audio captcha (mp3 formats only) use the following method. 
-You must provife the language as  `lang = 'en'`. Supported languages are "en", "ru", "de", "el", "pt".
+You must provide the language as `lang = 'en'`. Supported languages are "en", "ru", "de", "el", "pt".
 
 ```python 
 result = solver.audio('path/to/captcha.mp3', lang = 'lang', param1=..., ...)
@@ -130,21 +134,21 @@ result = solver.audio('https://site-with-captcha.com/path/to/captcha.mp3', lang
 ```
 
 ### Text Captcha
-This method can be used to bypass a captcha that requires to answer a question provided in clear text.
+This method can be used to bypass a captcha that requires answering a question provided in clear text.
 ```python 
 result = solver.text('If tomorrow is Saturday, what day is today?', param1=..., ...)
 ```
 
-### ReCaptcha v2
-Use this method to solve ReCaptcha V2 and obtain a token to bypass the protection.
+### reCAPTCHA v2
+Use this method to solve reCAPTCHA V2 and obtain a token to bypass the protection.
 ```python 
 result = solver.recaptcha(sitekey='6Le-wvkSVVABCPBMRTvw0Q4Muexq1bi0DJwx_mJ-',
                           url='https://mysite.com/page/with/recaptcha',
                           param1=..., ...)
 ```
 
-### ReCaptcha v3
-This method provides ReCaptcha V3 solver and returns a token.
+### reCAPTCHA v3
+This method provides a reCAPTCHA V3 solver and returns a token.
 ```python
 result = solver.recaptcha(sitekey='6Le-wvkSVVABCPBMRTvw0Q4Muexq1bi0DJwx_mJ-',
                             url='https://mysite.com/page/with/recaptcha',
@@ -174,7 +178,7 @@ result = solver.geetest(gt='f1ab2cdefa3456789012345b6c78d90e',
 
 
 ### hCaptcha
-Use this method to solve hCaptcha challenge. Returns a token to bypass captcha.
+Use this method to solve the hCaptcha challenge. Returns a token to bypass the captcha.
 ```python
 result = solver.hcaptcha(sitekey='10000000-ffff-ffff-ffff-000000000001',
                             url='https://www.site.com/page/', 
@@ -193,7 +197,7 @@ result = solver.geetest_v4(captcha_id='e392e1d7fd421dc63325744d5a2b9c73',
 
 
 ### Lemin Cropped Captcha
-Use this method to solve hCaptcha challenge. Returns JSON with answer containing the following values: answer, challenge_id.
+Use this method to solve hCaptcha challenge. Returns JSON with an answer containing the following values: answer, challenge_id.
 ```python
 result = solver.lemin(captcha_id='CROPPED_1abcd2f_a1234b567c890d12ef3a456bc78d901d',
                             div_id='lemin-cropped-captcha', 
@@ -238,6 +242,18 @@ result = solver.keycaptcha(s_s_c_user_id=10,
 
 ```
 
+
+### atbCAPTCHA
+Use this method to solve atbCaptcha challenge. Returns a token to bypass the captcha.
+```python
+result = solver.atb_captcha(app_id='af25e409b33d722a95e56a230ff8771c',
+                            api_server='https://cap.aisecurius.com',
+                            url='http://mysite.com/', 
+                            param1=..., ...)
+
+```
+
+
 ### Capy
 Token-based method to bypass Capy puzzle captcha.
 ```python
@@ -247,17 +263,19 @@ result = solver.capy(sitekey='PUZZLE_Abc1dEFghIJKLM2no34P56q7rStu8v',
                      param1=..., ...)
 ```
 ### Grid
-Grid method is originally called Old ReCaptcha V2 method. The method can be used to bypass any type of captcha where you can apply a grid on image and need to click specific grid boxes. Returns numbers of boxes.
+Grid method was originally called the Old reCAPTCHA V2 method. The method can be used to bypass any type of captcha where you can apply a grid on an image and click specific grid boxes. Returns numbers of boxes.
 ```python
 result = solver.grid('path/to/captcha.jpg', param1=..., ...)
 ```
+
 ### Canvas
-Canvas method can be used when you need to draw a line around an object on image. Returns a set of points' coordinates to draw a polygon.
+Canvas method can be used when you need to draw a line around an object on an image. Returns a set of points' coordinates to draw a polygon.
 ```python
 result = solver.canvas('path/to/captcha.jpg', param1=..., ...)
 ```
+
 ### ClickCaptcha
-ClickCaptcha method returns coordinates of points on captcha image. Can be used if you need to click on particular points on the image.
+ClickCaptcha method returns coordinates of points on the captcha image. Can be used if you need to click on particular points in the image.
 ```python
 result = solver.coordinates('path/to/captcha.jpg', param1=..., ...)
 ```
@@ -268,6 +286,32 @@ This method can be used to solve a captcha that asks to rotate an object. Mostly
 result = solver.rotate('path/to/captcha.jpg', param1=..., ...)
 ```
 
+### MTCaptcha
+Use this method to solve MTCaptcha and obtain a token to bypass the protection.
+```python
+result = solver.mtcaptcha(sitekey='MTPublic-KzqLY1cKH',
+                          url='https://2captcha.com/demo/mtcaptcha',
+                          param1=..., ...)
+```
+
+### Friendly Captcha
+Friendly Captcha solving method. Returns a token.
+```python
+result = solver.friendly_captcha(sitekey='FCMGEMUD2KTDSQ5H',
+                                 url='https://friendlycaptcha.com/demo',
+                                 param1=..., ...)
+```
+
+### Cutcaptcha
+Use this method to solve Cutcaptcha. Returns the response in JSON.
+```python
+result = solver.cutcaptcha(misery_key='ad52c87af17e2ec09b8d918c9f00416b1cb8c320',
+                           apikey='SAs61IAI',
+                           url='https://mysite.com/page/with/cutcaptcha',
+                           param1=..., ...)
+```
+
+
 ## Other methods
 
 ### send / getResult
@@ -290,7 +334,7 @@ balance = solver.balance()
 ```
 
 ### report
-Use this method to report good or bad captcha answer.
+Use this method to report good or bad captcha answers.
 ```python
 solver.report(id, True) # captcha solved correctly
 solver.report(id, False) # captcha solved incorrectly

{2captcha-python-1.2.2 → 2captcha-python-1.2.4}/README.md

@@ -1,5 +1,5 @@
 # Python Module for 2Captcha API
-The easiest way to quickly integrate [2Captcha] captcha solving service into your code to automate solving of any types of captcha.
+The easiest way to quickly integrate the 2Captcha captcha-solving service into your code and automate the solving of any type of captcha.
 
 - [Python Module for 2Captcha API](#python-module-for-2captcha-api)
   - [Installation](#installation)
@@ -10,8 +10,8 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
     - [Normal Captcha](#normal-captcha)
     - [Audio Captcha](#audio-captcha)
     - [Text Captcha](#text-captcha)
-    - [ReCaptcha v2](#recaptcha-v2)
-    - [ReCaptcha v3](#recaptcha-v3)
+    - [reCAPTCHA v2](#recaptcha-v2)
+    - [reCAPTCHA v3](#recaptcha-v3)
     - [FunCaptcha](#funcaptcha)
     - [GeeTest](#geetest)
     - [hCaptcha](#hcaptcha)
@@ -20,11 +20,15 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
     - [Cloudflare Turnstile](#cloudflare-turnstile)
     - [Amazon WAF](#amazon-waf)
     - [KeyCaptcha](#keycaptcha)
+    - [atbCAPTCHA](#atbcaptcha)
     - [Capy](#capy)
     - [Grid](#grid)
     - [Canvas](#canvas)
     - [ClickCaptcha](#clickcaptcha)
     - [Rotate](#rotate)
+    - [MTCaptcha](#mtcaptcha)
+    - [Friendly Captcha](#friendly-captcha)
+    - [Cutcaptcha](#cutcaptcha)
   - [Other methods](#other-methods)
     - [send / getResult](#send--getresult)
     - [balance](#balance)
@@ -49,7 +53,7 @@ from twocaptcha import TwoCaptcha
 
 solver = TwoCaptcha('YOUR_API_KEY')
 ```
-Also there are few options that can be configured:
+Also there are a few options that can be configured:
 
 ```python 
 config = {
@@ -71,8 +75,8 @@ solver = TwoCaptcha(**config)
 | server           | `2captcha.com` | API server. You can set it to `rucaptcha.com` if your account is registered there                                                                  |
 | softId           | -              | your software ID obtained after publishing in [2captcha sofware catalog]                                                                           |
 | callback         | -              | URL of your web-sever that receives the captcha recognition result. The URl should be first registered in [pingback settings] of your account      |
-| defaultTimeout   | 120            | Polling timeout in seconds for all captcha types except ReCaptcha. Defines how long the module tries to get the answer from `res.php` API endpoint |
-| recaptchaTimeout | 600            | Polling timeout for ReCaptcha in seconds. Defines how long the module tries to get the answer from `res.php` API endpoint                          |
+| defaultTimeout   | 120            | Polling timeout in seconds for all captcha types except reCAPTCHA. Defines how long the module tries to get the answer from `res.php` API endpoint |
+| recaptchaTimeout | 600            | Polling timeout for reCAPTCHA in seconds. Defines how long the module tries to get the answer from `res.php` API endpoint                          |
 | pollingInterval  | 10             | Interval in seconds between requests to `res.php` API endpoint, setting values less than 5 seconds is not recommended                              |
 
 >  **IMPORTANT:** once `callback` is defined for `TwoCaptcha` instance, all methods return only the captcha ID and DO NOT poll the API to get the result. The result will be sent to the callback URL.
@@ -97,7 +101,7 @@ When you submit any image-based captcha use can provide additional options to he
 Below you can find basic examples for every captcha type. Check out [examples directory] to find more examples with all available options.
 
 ### Normal Captcha
-To bypass a normal captcha (distorted text on image) use the following method. This method also can be used to recognize any text on the image.
+To bypass a normal captcha (distorted text on an image) use the following method. This method also can be used to recognize any text on the image.
 ```python 
 result = solver.normal('path/to/captcha.jpg', param1=..., ...)
 # OR
@@ -106,7 +110,7 @@ result = solver.normal('https://site-with-captcha.com/path/to/captcha.jpg', para
 
 ### Audio Captcha
 To bypass an audio captcha (mp3 formats only) use the following method. 
-You must provife the language as  `lang = 'en'`. Supported languages are "en", "ru", "de", "el", "pt".
+You must provide the language as `lang = 'en'`. Supported languages are "en", "ru", "de", "el", "pt".
 
 ```python 
 result = solver.audio('path/to/captcha.mp3', lang = 'lang', param1=..., ...)
@@ -115,21 +119,21 @@ result = solver.audio('https://site-with-captcha.com/path/to/captcha.mp3', lang
 ```
 
 ### Text Captcha
-This method can be used to bypass a captcha that requires to answer a question provided in clear text.
+This method can be used to bypass a captcha that requires answering a question provided in clear text.
 ```python 
 result = solver.text('If tomorrow is Saturday, what day is today?', param1=..., ...)
 ```
 
-### ReCaptcha v2
-Use this method to solve ReCaptcha V2 and obtain a token to bypass the protection.
+### reCAPTCHA v2
+Use this method to solve reCAPTCHA V2 and obtain a token to bypass the protection.
 ```python 
 result = solver.recaptcha(sitekey='6Le-wvkSVVABCPBMRTvw0Q4Muexq1bi0DJwx_mJ-',
                           url='https://mysite.com/page/with/recaptcha',
                           param1=..., ...)
 ```
 
-### ReCaptcha v3
-This method provides ReCaptcha V3 solver and returns a token.
+### reCAPTCHA v3
+This method provides a reCAPTCHA V3 solver and returns a token.
 ```python
 result = solver.recaptcha(sitekey='6Le-wvkSVVABCPBMRTvw0Q4Muexq1bi0DJwx_mJ-',
                             url='https://mysite.com/page/with/recaptcha',
@@ -159,7 +163,7 @@ result = solver.geetest(gt='f1ab2cdefa3456789012345b6c78d90e',
 
 
 ### hCaptcha
-Use this method to solve hCaptcha challenge. Returns a token to bypass captcha.
+Use this method to solve the hCaptcha challenge. Returns a token to bypass the captcha.
 ```python
 result = solver.hcaptcha(sitekey='10000000-ffff-ffff-ffff-000000000001',
                             url='https://www.site.com/page/', 
@@ -178,7 +182,7 @@ result = solver.geetest_v4(captcha_id='e392e1d7fd421dc63325744d5a2b9c73',
 
 
 ### Lemin Cropped Captcha
-Use this method to solve hCaptcha challenge. Returns JSON with answer containing the following values: answer, challenge_id.
+Use this method to solve hCaptcha challenge. Returns JSON with an answer containing the following values: answer, challenge_id.
 ```python
 result = solver.lemin(captcha_id='CROPPED_1abcd2f_a1234b567c890d12ef3a456bc78d901d',
                             div_id='lemin-cropped-captcha', 
@@ -223,6 +227,18 @@ result = solver.keycaptcha(s_s_c_user_id=10,
 
 ```
 
+
+### atbCAPTCHA
+Use this method to solve atbCaptcha challenge. Returns a token to bypass the captcha.
+```python
+result = solver.atb_captcha(app_id='af25e409b33d722a95e56a230ff8771c',
+                            api_server='https://cap.aisecurius.com',
+                            url='http://mysite.com/', 
+                            param1=..., ...)
+
+```
+
+
 ### Capy
 Token-based method to bypass Capy puzzle captcha.
 ```python
@@ -232,17 +248,19 @@ result = solver.capy(sitekey='PUZZLE_Abc1dEFghIJKLM2no34P56q7rStu8v',
                      param1=..., ...)
 ```
 ### Grid
-Grid method is originally called Old ReCaptcha V2 method. The method can be used to bypass any type of captcha where you can apply a grid on image and need to click specific grid boxes. Returns numbers of boxes.
+Grid method was originally called the Old reCAPTCHA V2 method. The method can be used to bypass any type of captcha where you can apply a grid on an image and click specific grid boxes. Returns numbers of boxes.
 ```python
 result = solver.grid('path/to/captcha.jpg', param1=..., ...)
 ```
+
 ### Canvas
-Canvas method can be used when you need to draw a line around an object on image. Returns a set of points' coordinates to draw a polygon.
+Canvas method can be used when you need to draw a line around an object on an image. Returns a set of points' coordinates to draw a polygon.
 ```python
 result = solver.canvas('path/to/captcha.jpg', param1=..., ...)
 ```
+
 ### ClickCaptcha
-ClickCaptcha method returns coordinates of points on captcha image. Can be used if you need to click on particular points on the image.
+ClickCaptcha method returns coordinates of points on the captcha image. Can be used if you need to click on particular points in the image.
 ```python
 result = solver.coordinates('path/to/captcha.jpg', param1=..., ...)
 ```
@@ -253,6 +271,32 @@ This method can be used to solve a captcha that asks to rotate an object. Mostly
 result = solver.rotate('path/to/captcha.jpg', param1=..., ...)
 ```
 
+### MTCaptcha
+Use this method to solve MTCaptcha and obtain a token to bypass the protection.
+```python
+result = solver.mtcaptcha(sitekey='MTPublic-KzqLY1cKH',
+                          url='https://2captcha.com/demo/mtcaptcha',
+                          param1=..., ...)
+```
+
+### Friendly Captcha
+Friendly Captcha solving method. Returns a token.
+```python
+result = solver.friendly_captcha(sitekey='FCMGEMUD2KTDSQ5H',
+                                 url='https://friendlycaptcha.com/demo',
+                                 param1=..., ...)
+```
+
+### Cutcaptcha
+Use this method to solve Cutcaptcha. Returns the response in JSON.
+```python
+result = solver.cutcaptcha(misery_key='ad52c87af17e2ec09b8d918c9f00416b1cb8c320',
+                           apikey='SAs61IAI',
+                           url='https://mysite.com/page/with/cutcaptcha',
+                           param1=..., ...)
+```
+
+
 ## Other methods
 
 ### send / getResult
@@ -275,7 +319,7 @@ balance = solver.balance()
 ```
 
 ### report
-Use this method to report good or bad captcha answer.
+Use this method to report good or bad captcha answers.
 ```python
 solver.report(id, True) # captcha solved correctly
 solver.report(id, False) # captcha solved incorrectly

2captcha-python-1.2.4/tests/test_atb_captcha.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+
+import unittest
+
+try:
+    from .abstract import AbstractTest
+except ImportError:
+    from abstract import AbstractTest
+
+
+class AtbCaptchaTest(AbstractTest):
+
+    def test_all_params(self):
+        params = {
+            'app_id': 'af25e409b33d722a95e56a230ff8771c',
+            'api_server': 'https://cap.aisecurius.com',
+            'url': 'http://mysite.com/'
+        }
+
+        sends = {
+            'method': 'atb_captcha',
+            'app_id': 'af25e409b33d722a95e56a230ff8771c',
+            'api_server': 'https://cap.aisecurius.com',
+            'pageurl': 'http://mysite.com/'
+        }
+
+        return self.send_return(sends, self.solver.atb_captcha, **params)
+
+
+if __name__ == '__main__':
+    unittest.main()

2captcha-python-1.2.4/tests/test_cutcaptcha.py

@@ -0,0 +1,31 @@
+#!/usr/bin/env python3
+
+import unittest
+
+try:
+    from .abstract import AbstractTest
+except ImportError:
+    from abstract import AbstractTest
+
+
+class CutcaptchaTest(AbstractTest):
+
+    def test_all_params(self):
+        params = {
+            'misery_key': 'ad52c87af17e2ec09b8d918c9f00416b1cb8c320',
+            'apikey':     'SAs61IAI',
+            'url':        'https://www.site.com/page/',
+        }
+
+        sends = {
+            'method':     'cutcaptcha',
+            'api_key':    'SAs61IAI',
+            'misery_key': 'ad52c87af17e2ec09b8d918c9f00416b1cb8c320',
+            'pageurl':    'https://www.site.com/page/',
+        }
+
+        return self.send_return(sends, self.solver.cutcaptcha, **params)
+
+
+if __name__ == '__main__':
+    unittest.main()

2captcha-python-1.2.4/tests/test_friendly_captcha.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+import unittest
+
+try:
+    from .abstract import AbstractTest
+except ImportError:
+    from abstract import AbstractTest
+
+
+class FriendlyCaptchaTest(AbstractTest):
+
+    def test_all_params(self):
+        params = {
+            'sitekey': 'FCMGEMUD2KTDSQ5H',
+            'url':     'https://friendlycaptcha.com/demo',
+        }
+
+        sends = {
+            'method':  'friendly_captcha',
+            'sitekey': 'FCMGEMUD2KTDSQ5H',
+            'pageurl': 'https://friendlycaptcha.com/demo',
+        }
+
+        return self.send_return(sends, self.solver.friendly_captcha, **params)
+
+
+if __name__ == '__main__':
+    unittest.main()

2captcha-python-1.2.4/tests/test_mtcaptcha.py

@@ -0,0 +1,29 @@
+#!/usr/bin/env python3
+
+import unittest
+
+try:
+    from .abstract import AbstractTest
+except ImportError:
+    from abstract import AbstractTest
+
+
+class MTCaptchaTest(AbstractTest):
+
+    def test_all_params(self):
+        params = {
+            'sitekey': 'MTPublic-KzqLY1cKH',
+            'url':     'https://2captcha.com/demo/mtcaptcha',
+        }
+
+        sends = {
+            'method':  'mt_captcha',
+            'sitekey': 'MTPublic-KzqLY1cKH',
+            'pageurl': 'https://2captcha.com/demo/mtcaptcha',
+        }
+
+        return self.send_return(sends, self.solver.mtcaptcha, **params)
+
+
+if __name__ == '__main__':
+    unittest.main()

{2captcha-python-1.2.2 → 2captcha-python-1.2.4}/twocaptcha/__init__.py

@@ -2,4 +2,4 @@ from .api import ApiClient
 from .solver import (TwoCaptcha, SolverExceptions, ValidationException,
                      NetworkException, ApiException, TimeoutException)
 
-__version__ = '1.2.2'
+__version__ = '1.2.4'

{2captcha-python-1.2.2 → 2captcha-python-1.2.4}/twocaptcha/solver.py

@@ -36,7 +36,7 @@ class TimeoutException(SolverExceptions):
 class TwoCaptcha():
     def __init__(self,
                  apiKey,
-                 softId=None,
+                 softId=4580,
                  callback=None,
                  defaultTimeout=120,
                  recaptchaTimeout=600,
@@ -457,6 +457,26 @@ class TwoCaptcha():
                             method='lemin',
                             **kwargs)
         return result
+
+    def atb_captcha(self, app_id, api_server, url, **kwargs):
+        '''
+        Wrapper for solving atbCAPTCHA
+
+        Required:
+            app_id
+            api_server
+            url
+
+        Optional params:
+
+
+        '''
+        result = self.solve(app_id=app_id,
+                            api_server=api_server,
+                            url=url,
+                            method='atb_captcha',
+                            **kwargs)
+        return result
     
 
     def turnstile(self, sitekey, url, **kwargs):
@@ -503,7 +523,67 @@ class TwoCaptcha():
         
         return result
 
+    def mtcaptcha(self, sitekey, url, **kwargs):
+        '''
+        Wrapper for solving MTCaptcha
+
+        Required:
+            sitekey
+            url
+
+        Optional params:
+            softId
+            callback
+            proxy           =  {'type': 'HTTPS', 'uri': 'login:password@IP_address:PORT'})
+        '''
+
+        result = self.solve(sitekey=sitekey,
+                            url=url,
+                            method='mt_captcha',
+                            **kwargs)
+        return result
+
+    def friendly_captcha(self, sitekey, url, **kwargs):
+        '''
+        Wrapper for solving Friendly Captcha
+
+        Required:
+            sitekey
+            url
+
+        Optional params:
+            softId
+            callback
+            proxy           =  {'type': 'HTTPS', 'uri': 'login:password@IP_address:PORT'})
+        '''
+
+        result = self.solve(sitekey=sitekey,
+                            url=url,
+                            method='friendly_captcha',
+                            **kwargs)
+        return result
+
+    def cutcaptcha(self, misery_key, apikey, url, **kwargs):
+        '''
+        Wrapper for solving Friendly Captcha
+
+        Required:
+            misery_key
+            apikey
+            url
 
+        Optional params:
+            softId
+            callback
+            proxy           =  {'type': 'HTTPS', 'uri': 'login:password@IP_address:PORT'})
+        '''
+
+        result = self.solve(misery_key=misery_key,
+                            api_key=apikey,
+                            url=url,
+                            method='cutcaptcha',
+                            **kwargs)
+        return result
 
     def solve(self, timeout=0, polling_interval=0, **kwargs):
         '''