2captcha-python 1.3.0__tar.gz → 1.5.0__tar.gz

{2captcha_python-1.3.0 → 2captcha_python-1.5.0}/2captcha_python.egg-info/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: 2captcha-python
-Version: 1.3.0
+Version: 1.5.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,hCaptcha,FunCaptcha,Geetest,image captcha,Coordinates,Click Captcha,Geetest V4,Lemin captcha,Amazon WAF,Cloudflare Turnstile,Capy Puzzle,MTCaptcha,Friendly Captcha,Tencent,Cutcaptcha,DataDome
+Keywords: 2captcha,captcha,api,captcha solver,reCAPTCHA,hCaptcha,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
@@ -62,8 +62,9 @@ Examples of API requests for different captcha types are available on the [Pytho
     - [Cutcaptcha](#cutcaptcha)
     - [Tencent](#tencent)
     - [Datadome](#datadome)
+    - [CyberSiARA](#cybersiara)
   - [Other methods](#other-methods)
-    - [send / get_result](#send--get_result)
+    - [send / get\_result](#send--get_result)
     - [balance](#balance)
     - [report](#report)
   - [Error handling](#error-handling)
@@ -72,10 +73,10 @@ Examples of API requests for different captcha types are available on the [Pytho
   - [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)
+  - [Get in touch](#get-in-touch)
+  - [Join the team 👪](#join-the-team-)
+  - [License](#license)
+    - [Graphics and Trademarks](#graphics-and-trademarks)
 
 ## Installation
 
@@ -120,6 +121,8 @@ solver = TwoCaptcha(**config)
 | defaultTimeout   | 120            | Polling timeout in seconds for all captcha types except reCAPTCHA. Defines how long the module tries to get the answer from the `res.php` API endpoint |
 | recaptchaTimeout | 600            | Polling timeout for reCAPTCHA in seconds. Defines how long the module tries to get the answer from the `res.php` API endpoint                          |
 | pollingInterval  | 10             | Interval in seconds between requests to the `res.php` API endpoint. Setting values less than 5 seconds is not recommended                              |
+| extendedResponse | None           | Set to `True` to get the response with additional fields or in more practical format (enables `JSON` response from `res.php` API endpoint). Suitable for [hCaptcha](#hcaptcha), [ClickCaptcha](#clickcaptcha), [Canvas](#canvas) |
+
 
 > [!IMPORTANT]
 > Once `callback` is defined for the `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.
@@ -448,6 +451,18 @@ result = solver.datadome(captcha_url="https://geo.captcha-delivery.com/captcha/?
                          param1=..., ...)
 ```
 
+### CyberSiARA
+
+<sup>[API method description.](https://2captcha.com/2captcha-api#cybersiara)</sup>
+
+Use this method to solve CyberSiARA. Returns a token.
+```python
+result = solver.cybersiara(master_url_id='tpjOCKjjpdzv3d8Ub2E9COEWKt1vl1Mv',
+                           pageurl='https://demo.mycybersiara.com/',
+                           userAgent='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36',
+                           param1=..., ...)
+```
+
 ## Other methods
 
 ### send / get_result
@@ -521,7 +536,8 @@ except TimeoutException as e:
 ## Proxies
 
 You can pass your proxy as an additional argument for the following methods: recaptcha, funcaptcha, geetest, geetest v4, hcaptcha, 
-keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome. 
+keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome, cybersiara. 
+
 
 The proxy will be forwarded to the API to solve the captcha.
 

{2captcha_python-1.3.0 → 2captcha_python-1.5.0}/2captcha_python.egg-info/SOURCES.txt

@@ -12,6 +12,7 @@ tests/test_canvas.py
 tests/test_capy.py
 tests/test_coordinates.py
 tests/test_cutcaptcha.py
+tests/test_cybersiara.py
 tests/test_datadome.py
 tests/test_friendly_captcha.py
 tests/test_funcaptcha.py

{2captcha_python-1.3.0 → 2captcha_python-1.5.0}/PKG-INFO

@@ -1,11 +1,11 @@
 Metadata-Version: 2.1
 Name: 2captcha-python
-Version: 1.3.0
+Version: 1.5.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,hCaptcha,FunCaptcha,Geetest,image captcha,Coordinates,Click Captcha,Geetest V4,Lemin captcha,Amazon WAF,Cloudflare Turnstile,Capy Puzzle,MTCaptcha,Friendly Captcha,Tencent,Cutcaptcha,DataDome
+Keywords: 2captcha,captcha,api,captcha solver,reCAPTCHA,hCaptcha,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
@@ -62,8 +62,9 @@ Examples of API requests for different captcha types are available on the [Pytho
     - [Cutcaptcha](#cutcaptcha)
     - [Tencent](#tencent)
     - [Datadome](#datadome)
+    - [CyberSiARA](#cybersiara)
   - [Other methods](#other-methods)
-    - [send / get_result](#send--get_result)
+    - [send / get\_result](#send--get_result)
     - [balance](#balance)
     - [report](#report)
   - [Error handling](#error-handling)
@@ -72,10 +73,10 @@ Examples of API requests for different captcha types are available on the [Pytho
   - [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)
+  - [Get in touch](#get-in-touch)
+  - [Join the team 👪](#join-the-team-)
+  - [License](#license)
+    - [Graphics and Trademarks](#graphics-and-trademarks)
 
 ## Installation
 
@@ -120,6 +121,8 @@ solver = TwoCaptcha(**config)
 | defaultTimeout   | 120            | Polling timeout in seconds for all captcha types except reCAPTCHA. Defines how long the module tries to get the answer from the `res.php` API endpoint |
 | recaptchaTimeout | 600            | Polling timeout for reCAPTCHA in seconds. Defines how long the module tries to get the answer from the `res.php` API endpoint                          |
 | pollingInterval  | 10             | Interval in seconds between requests to the `res.php` API endpoint. Setting values less than 5 seconds is not recommended                              |
+| extendedResponse | None           | Set to `True` to get the response with additional fields or in more practical format (enables `JSON` response from `res.php` API endpoint). Suitable for [hCaptcha](#hcaptcha), [ClickCaptcha](#clickcaptcha), [Canvas](#canvas) |
+
 
 > [!IMPORTANT]
 > Once `callback` is defined for the `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.
@@ -448,6 +451,18 @@ result = solver.datadome(captcha_url="https://geo.captcha-delivery.com/captcha/?
                          param1=..., ...)
 ```
 
+### CyberSiARA
+
+<sup>[API method description.](https://2captcha.com/2captcha-api#cybersiara)</sup>
+
+Use this method to solve CyberSiARA. Returns a token.
+```python
+result = solver.cybersiara(master_url_id='tpjOCKjjpdzv3d8Ub2E9COEWKt1vl1Mv',
+                           pageurl='https://demo.mycybersiara.com/',
+                           userAgent='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36',
+                           param1=..., ...)
+```
+
 ## Other methods
 
 ### send / get_result
@@ -521,7 +536,8 @@ except TimeoutException as e:
 ## Proxies
 
 You can pass your proxy as an additional argument for the following methods: recaptcha, funcaptcha, geetest, geetest v4, hcaptcha, 
-keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome. 
+keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome, cybersiara. 
+
 
 The proxy will be forwarded to the API to solve the captcha.
 

{2captcha_python-1.3.0 → 2captcha_python-1.5.0}/README.md

@@ -42,8 +42,9 @@ Examples of API requests for different captcha types are available on the [Pytho
     - [Cutcaptcha](#cutcaptcha)
     - [Tencent](#tencent)
     - [Datadome](#datadome)
+    - [CyberSiARA](#cybersiara)
   - [Other methods](#other-methods)
-    - [send / get_result](#send--get_result)
+    - [send / get\_result](#send--get_result)
     - [balance](#balance)
     - [report](#report)
   - [Error handling](#error-handling)
@@ -52,10 +53,10 @@ Examples of API requests for different captcha types are available on the [Pytho
   - [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)
+  - [Get in touch](#get-in-touch)
+  - [Join the team 👪](#join-the-team-)
+  - [License](#license)
+    - [Graphics and Trademarks](#graphics-and-trademarks)
 
 ## Installation
 
@@ -100,6 +101,8 @@ solver = TwoCaptcha(**config)
 | defaultTimeout   | 120            | Polling timeout in seconds for all captcha types except reCAPTCHA. Defines how long the module tries to get the answer from the `res.php` API endpoint |
 | recaptchaTimeout | 600            | Polling timeout for reCAPTCHA in seconds. Defines how long the module tries to get the answer from the `res.php` API endpoint                          |
 | pollingInterval  | 10             | Interval in seconds between requests to the `res.php` API endpoint. Setting values less than 5 seconds is not recommended                              |
+| extendedResponse | None           | Set to `True` to get the response with additional fields or in more practical format (enables `JSON` response from `res.php` API endpoint). Suitable for [hCaptcha](#hcaptcha), [ClickCaptcha](#clickcaptcha), [Canvas](#canvas) |
+
 
 > [!IMPORTANT]
 > Once `callback` is defined for the `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.
@@ -428,6 +431,18 @@ result = solver.datadome(captcha_url="https://geo.captcha-delivery.com/captcha/?
                          param1=..., ...)
 ```
 
+### CyberSiARA
+
+<sup>[API method description.](https://2captcha.com/2captcha-api#cybersiara)</sup>
+
+Use this method to solve CyberSiARA. Returns a token.
+```python
+result = solver.cybersiara(master_url_id='tpjOCKjjpdzv3d8Ub2E9COEWKt1vl1Mv',
+                           pageurl='https://demo.mycybersiara.com/',
+                           userAgent='Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36',
+                           param1=..., ...)
+```
+
 ## Other methods
 
 ### send / get_result
@@ -501,7 +516,8 @@ except TimeoutException as e:
 ## Proxies
 
 You can pass your proxy as an additional argument for the following methods: recaptcha, funcaptcha, geetest, geetest v4, hcaptcha, 
-keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome. 
+keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome, cybersiara. 
+
 
 The proxy will be forwarded to the API to solve the captcha.
 

{2captcha_python-1.3.0 → 2captcha_python-1.5.0}/setup.py

@@ -36,6 +36,6 @@ setup(name='2captcha-python',
           '2captcha', 'captcha', 'api', 'captcha solver', 'reCAPTCHA', 'hCaptcha',
           'FunCaptcha', 'Geetest', 'image captcha', 'Coordinates', 'Click Captcha',
           'Geetest V4', 'Lemin captcha', 'Amazon WAF', 'Cloudflare Turnstile',
-          'Capy Puzzle', 'MTCaptcha', 'Friendly Captcha', 'Tencent', 'Cutcaptcha', 'DataDome'],
+          'Capy Puzzle', 'MTCaptcha', 'Friendly Captcha', 'Tencent', 'Cutcaptcha', 'DataDome', 'cybersiara'],
       python_requires='>=3.6',
       test_suite='tests')

2captcha_python-1.5.0/tests/test_cybersiara.py

@@ -0,0 +1,32 @@
+#!/usr/bin/env python3
+
+import unittest
+
+try:
+    from .abstract import AbstractTest
+except ImportError:
+    from abstract import AbstractTest
+
+
+class CybersiaraTest(AbstractTest):
+
+    def test_all_params(self):
+        params = {
+            'master_url_id': 'tpjOCKjjpdzv3d8Ub2E9COEWKt1vl1Mv',
+            'pageurl': 'https://demo.mycybersiara.com/',
+            'userAgent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36',
+        }
+
+        sends = {
+            'method': 'cybersiara',
+            'master_url_id': 'tpjOCKjjpdzv3d8Ub2E9COEWKt1vl1Mv',
+            'pageurl': 'https://demo.mycybersiara.com/',
+            'userAgent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36',
+        }
+
+        return self.send_return(sends, self.solver.cybersiara, **params)
+
+
+if __name__ == '__main__':
+    unittest.main()
+

{2captcha_python-1.3.0 → 2captcha_python-1.5.0}/twocaptcha/__init__.py

@@ -12,4 +12,4 @@ support@2captcha.com
 """
 
 __author__ = '2captcha'
-__version__ = '1.3.0'
+__version__ = '1.5.0'

{2captcha_python-1.3.0 → 2captcha_python-1.5.0}/twocaptcha/solver.py

@@ -41,7 +41,8 @@ class TwoCaptcha():
                  defaultTimeout=120,
                  recaptchaTimeout=600,
                  pollingInterval=10,
-                 server = '2captcha.com'):
+                 server = '2captcha.com',
+                 extendedResponse=None):
 
         self.API_KEY = apiKey
         self.soft_id = softId
@@ -52,6 +53,7 @@ class TwoCaptcha():
         self.api_client = ApiClient(post_url = str(server))
         self.max_files = 9
         self.exceptions = SolverExceptions
+        self.extendedResponse = extendedResponse
 
     def normal(self, file, **kwargs):
         '''Wrapper for solving a normal captcha (image).
@@ -831,7 +833,27 @@ class TwoCaptcha():
                             userAgent=userAgent,
                             proxy=proxy,
                             **kwargs)
+        return result
+      
+    def cybersiara(self, master_url_id, pageurl, userAgent, **kwargs):
+        '''Wrapper for solving CyberSiARA captcha.
 
+        Parameters
+        __________
+        master_url_id : str
+            The value of the MasterUrlId parameter from the request to API/CyberSiara/GetCyberSiara.
+        pageurl : str
+            Full URL of the page with captcha.
+        userAgent : str
+            User-Agent of your browser.
+        proxy : dict, optional
+            {'type': 'HTTPS', 'uri': 'login:password@IP_address:PORT'}.
+        '''
+        result = self.solve(method='cybersiara',
+                            master_url_id=master_url_id,
+                            pageurl=pageurl,
+                            userAgent=userAgent,
+                            **kwargs)
         return result
 
     def solve(self, timeout=0, polling_interval=0, **kwargs):
@@ -855,14 +877,23 @@ class TwoCaptcha():
         result = {'captchaId': id_}
 
         if self.callback is None:
-
             timeout = float(timeout or self.default_timeout)
             sleep = int(polling_interval or self.polling_interval)
 
             code = self.wait_result(id_, timeout, sleep)
-            result.update({'code': code})
 
-        return result
+            if self.extendedResponse == True:
+
+                new_code = {
+                    key if key != 'request' else 'code': value
+                    for key, value in code.items()
+                    if key != 'status'
+                }
+                result.update(new_code)
+            else:
+                result.update({'code': code})
+
+            return result
 
     def wait_result(self, id_, timeout, polling_interval):
 
@@ -924,6 +955,7 @@ class TwoCaptcha():
         return response[3:]
 
     def get_result(self, id_):
+        import json
         """This method can be used for manual captcha answer polling.
 
         Parameters
@@ -935,15 +967,31 @@ class TwoCaptcha():
         answer : text
         """
 
-        response = self.api_client.res(key=self.API_KEY, action='get', id=id_)
+        if self.extendedResponse == True:
 
-        if response == 'CAPCHA_NOT_READY':
-            raise NetworkException
+            response = self.api_client.res(key=self.API_KEY, action='get', id=id_, json=1)
 
-        if not response.startswith('OK|'):
-            raise ApiException(f'cannot recognize response {response}')
+            response_data = json.loads(response)
 
-        return response[3:]
+            if response_data.get("status") == 0:
+                raise NetworkException
+
+            if not response_data.get("status") == 1:
+                raise ApiException(f'Unexpected status in response: {response_data}')
+
+            return response_data
+
+        else:
+
+            response = self.api_client.res(key=self.API_KEY, action='get', id=id_)
+
+            if response == 'CAPCHA_NOT_READY':
+                raise NetworkException
+
+            if not response.startswith('OK|'):
+                raise ApiException(f'cannot recognize response {response}')
+
+            return response[3:]
 
     def balance(self):
         '''Get my balance