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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (36) hide show
  1. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/2captcha_python.egg-info/PKG-INFO +17 -3
  2. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/2captcha_python.egg-info/SOURCES.txt +1 -0
  3. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/PKG-INFO +17 -3
  4. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/README.md +15 -1
  5. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/setup.py +1 -1
  6. 2captcha_python-1.4.0/tests/test_cybersiara.py +32 -0
  7. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/twocaptcha/__init__.py +1 -1
  8. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/twocaptcha/solver.py +20 -0
  9. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/2captcha_python.egg-info/dependency_links.txt +0 -0
  10. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/2captcha_python.egg-info/requires.txt +0 -0
  11. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/2captcha_python.egg-info/top_level.txt +0 -0
  12. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/LICENSE +0 -0
  13. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/setup.cfg +0 -0
  14. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_amazon_waf.py +0 -0
  15. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_atb_captcha.py +0 -0
  16. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_canvas.py +0 -0
  17. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_capy.py +0 -0
  18. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_coordinates.py +0 -0
  19. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_cutcaptcha.py +0 -0
  20. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_datadome.py +0 -0
  21. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_friendly_captcha.py +0 -0
  22. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_funcaptcha.py +0 -0
  23. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_geetest.py +0 -0
  24. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_geetest_v4.py +0 -0
  25. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_grid.py +0 -0
  26. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_hcaptcha.py +0 -0
  27. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_keycaptcha.py +0 -0
  28. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_lemin.py +0 -0
  29. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_mtcaptcha.py +0 -0
  30. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_normal.py +0 -0
  31. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_recaptcha.py +0 -0
  32. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_rotate.py +0 -0
  33. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_tencent.py +0 -0
  34. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_text.py +0 -0
  35. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/tests/test_turnstile.py +0 -0
  36. {2captcha_python-1.3.0 → 2captcha_python-1.4.0}/twocaptcha/api.py +0 -0
@@ -1,11 +1,11 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: 2captcha-python
3
- Version: 1.3.0
3
+ Version: 1.4.0
4
4
  Summary: Python module for easy integration with 2Captcha API
5
5
  Home-page: https://github.com/2captcha/2captcha-python/
6
6
  Author: 2Captcha
7
7
  Author-email: info@2captcha.com
8
- 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
8
+ 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
9
9
  Classifier: Programming Language :: Python :: 3
10
10
  Classifier: License :: OSI Approved :: MIT License
11
11
  Classifier: Operating System :: OS Independent
@@ -62,6 +62,7 @@ Examples of API requests for different captcha types are available on the [Pytho
62
62
  - [Cutcaptcha](#cutcaptcha)
63
63
  - [Tencent](#tencent)
64
64
  - [Datadome](#datadome)
65
+ - [CyberSiARA](#cybersiara)
65
66
  - [Other methods](#other-methods)
66
67
  - [send / get_result](#send--get_result)
67
68
  - [balance](#balance)
@@ -448,6 +449,18 @@ result = solver.datadome(captcha_url="https://geo.captcha-delivery.com/captcha/?
448
449
  param1=..., ...)
449
450
  ```
450
451
 
452
+ ### CyberSiARA
453
+
454
+ <sup>[API method description.](https://2captcha.com/2captcha-api#cybersiara)</sup>
455
+
456
+ Use this method to solve CyberSiARA. Returns a token.
457
+ ```python
458
+ result = solver.cybersiara(master_url_id='tpjOCKjjpdzv3d8Ub2E9COEWKt1vl1Mv',
459
+ pageurl='https://demo.mycybersiara.com/',
460
+ 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',
461
+ param1=..., ...)
462
+ ```
463
+
451
464
  ## Other methods
452
465
 
453
466
  ### send / get_result
@@ -521,7 +534,8 @@ except TimeoutException as e:
521
534
  ## Proxies
522
535
 
523
536
  You can pass your proxy as an additional argument for the following methods: recaptcha, funcaptcha, geetest, geetest v4, hcaptcha,
524
- keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome.
537
+ keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome, cybersiara.
538
+
525
539
 
526
540
  The proxy will be forwarded to the API to solve the captcha.
527
541
 
@@ -12,6 +12,7 @@ tests/test_canvas.py
12
12
  tests/test_capy.py
13
13
  tests/test_coordinates.py
14
14
  tests/test_cutcaptcha.py
15
+ tests/test_cybersiara.py
15
16
  tests/test_datadome.py
16
17
  tests/test_friendly_captcha.py
17
18
  tests/test_funcaptcha.py
@@ -1,11 +1,11 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: 2captcha-python
3
- Version: 1.3.0
3
+ Version: 1.4.0
4
4
  Summary: Python module for easy integration with 2Captcha API
5
5
  Home-page: https://github.com/2captcha/2captcha-python/
6
6
  Author: 2Captcha
7
7
  Author-email: info@2captcha.com
8
- 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
8
+ 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
9
9
  Classifier: Programming Language :: Python :: 3
10
10
  Classifier: License :: OSI Approved :: MIT License
11
11
  Classifier: Operating System :: OS Independent
@@ -62,6 +62,7 @@ Examples of API requests for different captcha types are available on the [Pytho
62
62
  - [Cutcaptcha](#cutcaptcha)
63
63
  - [Tencent](#tencent)
64
64
  - [Datadome](#datadome)
65
+ - [CyberSiARA](#cybersiara)
65
66
  - [Other methods](#other-methods)
66
67
  - [send / get_result](#send--get_result)
67
68
  - [balance](#balance)
@@ -448,6 +449,18 @@ result = solver.datadome(captcha_url="https://geo.captcha-delivery.com/captcha/?
448
449
  param1=..., ...)
449
450
  ```
450
451
 
452
+ ### CyberSiARA
453
+
454
+ <sup>[API method description.](https://2captcha.com/2captcha-api#cybersiara)</sup>
455
+
456
+ Use this method to solve CyberSiARA. Returns a token.
457
+ ```python
458
+ result = solver.cybersiara(master_url_id='tpjOCKjjpdzv3d8Ub2E9COEWKt1vl1Mv',
459
+ pageurl='https://demo.mycybersiara.com/',
460
+ 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',
461
+ param1=..., ...)
462
+ ```
463
+
451
464
  ## Other methods
452
465
 
453
466
  ### send / get_result
@@ -521,7 +534,8 @@ except TimeoutException as e:
521
534
  ## Proxies
522
535
 
523
536
  You can pass your proxy as an additional argument for the following methods: recaptcha, funcaptcha, geetest, geetest v4, hcaptcha,
524
- keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome.
537
+ keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome, cybersiara.
538
+
525
539
 
526
540
  The proxy will be forwarded to the API to solve the captcha.
527
541
 
@@ -42,6 +42,7 @@ Examples of API requests for different captcha types are available on the [Pytho
42
42
  - [Cutcaptcha](#cutcaptcha)
43
43
  - [Tencent](#tencent)
44
44
  - [Datadome](#datadome)
45
+ - [CyberSiARA](#cybersiara)
45
46
  - [Other methods](#other-methods)
46
47
  - [send / get_result](#send--get_result)
47
48
  - [balance](#balance)
@@ -428,6 +429,18 @@ result = solver.datadome(captcha_url="https://geo.captcha-delivery.com/captcha/?
428
429
  param1=..., ...)
429
430
  ```
430
431
 
432
+ ### CyberSiARA
433
+
434
+ <sup>[API method description.](https://2captcha.com/2captcha-api#cybersiara)</sup>
435
+
436
+ Use this method to solve CyberSiARA. Returns a token.
437
+ ```python
438
+ result = solver.cybersiara(master_url_id='tpjOCKjjpdzv3d8Ub2E9COEWKt1vl1Mv',
439
+ pageurl='https://demo.mycybersiara.com/',
440
+ 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',
441
+ param1=..., ...)
442
+ ```
443
+
431
444
  ## Other methods
432
445
 
433
446
  ### send / get_result
@@ -501,7 +514,8 @@ except TimeoutException as e:
501
514
  ## Proxies
502
515
 
503
516
  You can pass your proxy as an additional argument for the following methods: recaptcha, funcaptcha, geetest, geetest v4, hcaptcha,
504
- keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome.
517
+ keycaptcha, capy puzzle, lemin, atbcaptcha, turnstile, amazon waf, mtcaptcha, friendly captcha, cutcaptcha, Tencent, DataDome, cybersiara.
518
+
505
519
 
506
520
  The proxy will be forwarded to the API to solve the captcha.
507
521
 
@@ -36,6 +36,6 @@ setup(name='2captcha-python',
36
36
  '2captcha', 'captcha', 'api', 'captcha solver', 'reCAPTCHA', 'hCaptcha',
37
37
  'FunCaptcha', 'Geetest', 'image captcha', 'Coordinates', 'Click Captcha',
38
38
  'Geetest V4', 'Lemin captcha', 'Amazon WAF', 'Cloudflare Turnstile',
39
- 'Capy Puzzle', 'MTCaptcha', 'Friendly Captcha', 'Tencent', 'Cutcaptcha', 'DataDome'],
39
+ 'Capy Puzzle', 'MTCaptcha', 'Friendly Captcha', 'Tencent', 'Cutcaptcha', 'DataDome', 'cybersiara'],
40
40
  python_requires='>=3.6',
41
41
  test_suite='tests')
@@ -0,0 +1,32 @@
1
+ #!/usr/bin/env python3
2
+
3
+ import unittest
4
+
5
+ try:
6
+ from .abstract import AbstractTest
7
+ except ImportError:
8
+ from abstract import AbstractTest
9
+
10
+
11
+ class CybersiaraTest(AbstractTest):
12
+
13
+ def test_all_params(self):
14
+ params = {
15
+ 'master_url_id': 'tpjOCKjjpdzv3d8Ub2E9COEWKt1vl1Mv',
16
+ 'pageurl': 'https://demo.mycybersiara.com/',
17
+ 'userAgent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36',
18
+ }
19
+
20
+ sends = {
21
+ 'method': 'cybersiara',
22
+ 'master_url_id': 'tpjOCKjjpdzv3d8Ub2E9COEWKt1vl1Mv',
23
+ 'pageurl': 'https://demo.mycybersiara.com/',
24
+ 'userAgent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/83.0.4103.61 Safari/537.36',
25
+ }
26
+
27
+ return self.send_return(sends, self.solver.cybersiara, **params)
28
+
29
+
30
+ if __name__ == '__main__':
31
+ unittest.main()
32
+
@@ -12,4 +12,4 @@ support@2captcha.com
12
12
  """
13
13
 
14
14
  __author__ = '2captcha'
15
- __version__ = '1.3.0'
15
+ __version__ = '1.4.0'
@@ -831,7 +831,27 @@ class TwoCaptcha():
831
831
  userAgent=userAgent,
832
832
  proxy=proxy,
833
833
  **kwargs)
834
+ return result
835
+
836
+ def cybersiara(self, master_url_id, pageurl, userAgent, **kwargs):
837
+ '''Wrapper for solving CyberSiARA captcha.
834
838
 
839
+ Parameters
840
+ __________
841
+ master_url_id : str
842
+ The value of the MasterUrlId parameter from the request to API/CyberSiara/GetCyberSiara.
843
+ pageurl : str
844
+ Full URL of the page with captcha.
845
+ userAgent : str
846
+ User-Agent of your browser.
847
+ proxy : dict, optional
848
+ {'type': 'HTTPS', 'uri': 'login:password@IP_address:PORT'}.
849
+ '''
850
+ result = self.solve(method='cybersiara',
851
+ master_url_id=master_url_id,
852
+ pageurl=pageurl,
853
+ userAgent=userAgent,
854
+ **kwargs)
835
855
  return result
836
856
 
837
857
  def solve(self, timeout=0, polling_interval=0, **kwargs):
File without changes