2captcha-python 1.2.1__tar.gz → 1.2.3__tar.gz

{2captcha-python-1.2.1 → 2captcha-python-1.2.3}/2captcha_python.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: 2captcha-python
-Version: 1.2.1
+Version: 1.2.3
 Summary: Python module for easy integration with 2Captcha API
 Home-page: https://github.com/2captcha/2captcha-python/
 Author: 2Captcha
@@ -11,6 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 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.
@@ -22,6 +23,7 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
   - [Solve captcha](#solve-captcha)
     - [Captcha options](#captcha-options)
     - [Normal Captcha](#normal-captcha)
+    - [Audio Captcha](#audio-captcha)
     - [Text Captcha](#text-captcha)
     - [ReCaptcha v2](#recaptcha-v2)
     - [ReCaptcha v3](#recaptcha-v3)
@@ -38,6 +40,9 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
     - [Canvas](#canvas)
     - [ClickCaptcha](#clickcaptcha)
     - [Rotate](#rotate)
+    - [MTCaptcha](#mtcaptcha)
+    - [Friendly Captcha](#friendly_captcha)
+    - [Cutcaptcha](#cutcaptcha)
   - [Other methods](#other-methods)
     - [send / getResult](#send--getresult)
     - [balance](#balance)
@@ -117,6 +122,16 @@ result = solver.normal('path/to/captcha.jpg', param1=..., ...)
 result = solver.normal('https://site-with-captcha.com/path/to/captcha.jpg', param1=..., ...)
 ```
 
+### 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".
+
+```python 
+result = solver.audio('path/to/captcha.mp3', lang = 'lang', param1=..., ...)
+# OR
+result = solver.audio('https://site-with-captcha.com/path/to/captcha.mp3', lang = 'lang', param1=..., ...)
+```
+
 ### Text Captcha
 This method can be used to bypass a captcha that requires to answer a question provided in clear text.
 ```python 
@@ -196,8 +211,10 @@ Use this method to solve Cloudflare Turnstile. Returns JSON with the token.
 ```python
 result = solver.turnstile(sitekey='0x1AAAAAAAAkg0s2VIOD34y5',
                             url='http://mysite.com/', 
-                            param1=..., ...)
-
+                            data='foo',
+                            pagedata='bar',
+                            action='challenge',
+                            useragent='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36')
 ```
 
 ### Amazon WAF
@@ -254,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

{2captcha-python-1.2.1 → 2captcha-python-1.2.3}/2captcha_python.egg-info/SOURCES.txt

@@ -10,6 +10,8 @@ tests/test_amazon_waf.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 +19,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.1 → 2captcha-python-1.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: 2captcha-python
-Version: 1.2.1
+Version: 1.2.3
 Summary: Python module for easy integration with 2Captcha API
 Home-page: https://github.com/2captcha/2captcha-python/
 Author: 2Captcha
@@ -11,6 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 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.
@@ -22,6 +23,7 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
   - [Solve captcha](#solve-captcha)
     - [Captcha options](#captcha-options)
     - [Normal Captcha](#normal-captcha)
+    - [Audio Captcha](#audio-captcha)
     - [Text Captcha](#text-captcha)
     - [ReCaptcha v2](#recaptcha-v2)
     - [ReCaptcha v3](#recaptcha-v3)
@@ -38,6 +40,9 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
     - [Canvas](#canvas)
     - [ClickCaptcha](#clickcaptcha)
     - [Rotate](#rotate)
+    - [MTCaptcha](#mtcaptcha)
+    - [Friendly Captcha](#friendly_captcha)
+    - [Cutcaptcha](#cutcaptcha)
   - [Other methods](#other-methods)
     - [send / getResult](#send--getresult)
     - [balance](#balance)
@@ -117,6 +122,16 @@ result = solver.normal('path/to/captcha.jpg', param1=..., ...)
 result = solver.normal('https://site-with-captcha.com/path/to/captcha.jpg', param1=..., ...)
 ```
 
+### 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".
+
+```python 
+result = solver.audio('path/to/captcha.mp3', lang = 'lang', param1=..., ...)
+# OR
+result = solver.audio('https://site-with-captcha.com/path/to/captcha.mp3', lang = 'lang', param1=..., ...)
+```
+
 ### Text Captcha
 This method can be used to bypass a captcha that requires to answer a question provided in clear text.
 ```python 
@@ -196,8 +211,10 @@ Use this method to solve Cloudflare Turnstile. Returns JSON with the token.
 ```python
 result = solver.turnstile(sitekey='0x1AAAAAAAAkg0s2VIOD34y5',
                             url='http://mysite.com/', 
-                            param1=..., ...)
-
+                            data='foo',
+                            pagedata='bar',
+                            action='challenge',
+                            useragent='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36')
 ```
 
 ### Amazon WAF
@@ -254,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

{2captcha-python-1.2.1 → 2captcha-python-1.2.3}/README.md

@@ -8,6 +8,7 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
   - [Solve captcha](#solve-captcha)
     - [Captcha options](#captcha-options)
     - [Normal Captcha](#normal-captcha)
+    - [Audio Captcha](#audio-captcha)
     - [Text Captcha](#text-captcha)
     - [ReCaptcha v2](#recaptcha-v2)
     - [ReCaptcha v3](#recaptcha-v3)
@@ -24,6 +25,9 @@ The easiest way to quickly integrate [2Captcha] captcha solving service into you
     - [Canvas](#canvas)
     - [ClickCaptcha](#clickcaptcha)
     - [Rotate](#rotate)
+    - [MTCaptcha](#mtcaptcha)
+    - [Friendly Captcha](#friendly_captcha)
+    - [Cutcaptcha](#cutcaptcha)
   - [Other methods](#other-methods)
     - [send / getResult](#send--getresult)
     - [balance](#balance)
@@ -103,6 +107,16 @@ result = solver.normal('path/to/captcha.jpg', param1=..., ...)
 result = solver.normal('https://site-with-captcha.com/path/to/captcha.jpg', param1=..., ...)
 ```
 
+### 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".
+
+```python 
+result = solver.audio('path/to/captcha.mp3', lang = 'lang', param1=..., ...)
+# OR
+result = solver.audio('https://site-with-captcha.com/path/to/captcha.mp3', lang = 'lang', param1=..., ...)
+```
+
 ### Text Captcha
 This method can be used to bypass a captcha that requires to answer a question provided in clear text.
 ```python 
@@ -182,8 +196,10 @@ Use this method to solve Cloudflare Turnstile. Returns JSON with the token.
 ```python
 result = solver.turnstile(sitekey='0x1AAAAAAAAkg0s2VIOD34y5',
                             url='http://mysite.com/', 
-                            param1=..., ...)
-
+                            data='foo',
+                            pagedata='bar',
+                            action='challenge',
+                            useragent='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/114.0.0.0 Safari/537.36')
 ```
 
 ### Amazon WAF
@@ -240,6 +256,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

2captcha-python-1.2.3/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.3/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.3/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.1 → 2captcha-python-1.2.3}/twocaptcha/__init__.py

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

{2captcha-python-1.2.1 → 2captcha-python-1.2.3}/twocaptcha/solver.py

@@ -81,6 +81,39 @@ class TwoCaptcha():
         result = self.solve(**method, **kwargs)
         return result
 
+    def audio(self, file, lang, **kwargs):
+        '''
+        Wrapper for solving audio captcha
+        
+        Required:
+            file (base64, or url to mp3 file)
+            lang ("en", "ru", "de", "el", "pt")
+
+        Optional params:
+        '''
+        method = "audio"
+
+        if not file:
+            raise ValidationException('File is none')
+        elif not '.' in file and len(file) > 50:
+            body = file
+        elif file.endswith(".mp3") and file.startswith("http"):
+            response = requests.get(file)
+            if response.status_code != 200:
+                raise ValidationException(f'File could not be downloaded from url: {file}')
+            body = b64encode(response.content).decode('utf-8')
+        elif file.endswith(".mp3"):
+            with open(file, "rb") as media:
+                body = b64encode(media.read()).decode('utf-8')                
+        else:
+            raise ValidationException('File extension is not .mp3 or it is not a base64 string.')
+
+        if not lang or lang not in ("en", "ru", "de", "el", "pt"):
+            raise ValidationException(f'Lang not in "en", "ru", "de", "el", "pt". You send {lang}')
+
+        result = self.solve(body=body, method=method, **kwargs)
+        return result
+
     def text(self, text, **kwargs):
         '''
         Wrapper for solving text captcha 
@@ -470,7 +503,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):
         '''
@@ -524,7 +617,7 @@ class TwoCaptcha():
 
         if not '.' in file and len(file) > 50:
             return {'method': 'base64', 'body': file}
-        
+
         if file.startswith('http'):
             img_resp = requests.get(file)
             if img_resp.status_code != 200: