added recaptcha v3 support

Author: imagetyperz-api

README.md

@@ -59,8 +59,23 @@ ita.solve_captcha('http://abc.com/your_captcha.jpg')
 For recaptcha submission there are two things that are required.
 - page_url
 - site_key
+- type - can be one of this 3 values: `1` - normal, `2` - invisible, `3` - v3 (it's optional, defaults to `1`)
+- v3_min_score - minimum score to target for v3 recaptcha `- optional`
+- v3_action - action parameter to use for v3 recaptcha `- optional`
+- proxy - proxy to use when solving recaptcha, eg. `12.34.56.78:1234` or `12.34.56.78:1234:user:password` `- optional`
+- user_agent - useragent to use when solve recaptcha `- optional` 
+
 ``` python
-captcha_id = ita.submit_recaptcha(page_url, sitekey)        # submit captcha first, to get ID
+recaptcha_params = {
+    'page_url' : 'example.com',
+    'sitekey' : '6FDDs34g3321-3234fgfh23rv32fgtrrsv3c',
+    'type' : 3,                     # optional, 1 - normal recaptcha, 2 - invisible recaptcha, 3 - v3 recaptcha, default: 1
+    'v3_min_score' : .3,           # optional
+    'v3_action' : 'homepage',      # optional
+    'proxy': '126.45.34.53:345',    # or 126.45.34.53:123:joe:password
+    'user_agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/60.0'    # optional
+}
+captcha_id = ita.submit_recaptcha(recaptcha_params)
 ```
 This method returns a captchaID. This ID will be used next, to retrieve the g-response, once workers have 
 completed the captcha. This takes somewhere between 10-80 seconds.
@@ -98,19 +113,6 @@ As a 3rd parameter in the constructor, you can specify a timeout for the request
 ita = ImageTyperzAPI(access_token, 123, 60)  # sets timeout to 60 seconds
 ```
 
-**Submit recaptcha with proxy**
-
-When a proxy is submitted with the recaptcha details, the workers will complete the captcha using
-the provided proxy/IP.
-
-``` python
-captcha_id = ita.submit_recaptcha(page_url, sitekey, '12.34.56.78:1234')    # ip:port
-```
-Proxy with authentication is also supported
-``` python
-captcha_id = ita.submit_recaptcha(page_url, sitekey, '12.34.56.78:1234:user:password')
-```
-
 **Get details of proxy for recaptcha**
 
 In case you submitted the recaptcha with proxy, you can check the status of the proxy, if it was used or not,

imagetyperzapi2/imagetyperzapi.py

@@ -12,15 +12,15 @@
 # endpoints
 # -------------------------------------------------------------------------------------------
 CAPTCHA_ENDPOINT = 'http://captchatypers.com/Forms/UploadFileAndGetTextNEW.ashx'
-RECAPTCHA_SUBMIT_ENDPOINT = 'http://captchatypers.com/captchaapi/UploadRecaptchaV1.ashx'
+RECAPTCHA_SUBMIT_ENDPOINT = 'http://captchatypers.com/captchaAPI/uploadrecaptchav1.ashx'
 RECAPTCHA_RETRIEVE_ENDPOINT = 'http://captchatypers.com/captchaapi/GetRecaptchaText.ashx'
 BALANCE_ENDPOINT = 'http://captchatypers.com/Forms/RequestBalance.ashx'
 BAD_IMAGE_ENDPOINT = 'http://captchatypers.com/Forms/SetBadImage.ashx'
 PROXY_CHECK_ENDPOINT = 'http://captchatypers.com/captchaAPI/GetReCaptchaTextJSON.ashx'
 
 CAPTCHA_ENDPOINT_CONTENT_TOKEN = 'http://captchatypers.com/Forms/UploadFileAndGetTextNEWToken.ashx'
 CAPTCHA_ENDPOINT_URL_TOKEN = 'http://captchatypers.com/Forms/FileUploadAndGetTextCaptchaURLToken.ashx'
-RECAPTCHA_SUBMIT_ENDPOINT_TOKEN = 'http://captchatypers.com/captchaapi/UploadRecaptchaToken.ashx'
+RECAPTCHA_SUBMIT_ENDPOINT_TOKEN = 'http://captchatypers.com/captchaAPI/uploadrecaptchatoken.ashx'
 RECAPTCHA_RETRIEVE_ENDPOINT_TOKEN = 'http://captchatypers.com/captchaapi/GetRecaptchaTextToken.ashx'
 BALANCE_ENDPOINT_TOKEN = 'http://captchatypers.com/Forms/RequestBalanceToken.ashx'
 BAD_IMAGE_ENDPOINT_TOKEN = 'http://captchatypers.com/Forms/SetBadImageToken.ashx'
@@ -161,7 +161,14 @@ def solve_captcha(self, image_path, case_sensitive = False):
     # -------------------
     # ----------------------------------
     # ------------------------------
-    def submit_recaptcha(self, page_url, sitekey, proxy = None):
+    def submit_recaptcha(self, d):
+        page_url = d['page_url']
+        sitekey = d['sitekey']
+
+        # check for proxy
+        proxy = None
+        if d.has_key('proxy'): proxy = d['proxy']       # if proxy, add it
+
         # check if page_url and sitekey are != None
         if not page_url: raise Exception('provide a valid page_url')
         if not sitekey: raise Exception('provide a valid sitekey')
@@ -189,6 +196,15 @@ def submit_recaptcha(self, page_url, sitekey, proxy = None):
         if self._affiliate_id:
             data['affiliateid'] = self._affiliate_id
 
+        # user agent
+        if d.has_key('user_agent'): data['useragent'] = d['user_agent']
+
+        # v3
+        data['recaptchatype'] = 0
+        if d.has_key('type'): data['recaptchatype'] = d['type']
+        if d.has_key('v3_action'): data['captchaaction'] = d['v3_action']
+        if d.has_key('v3_min_score'): data['score'] = d['v3_min_score']
+
         # make request with all data
         response = self._session.post(url, data=data,
                                       headers=self._headers, timeout=self._timeout)

main.py

@@ -6,8 +6,8 @@
 
 # solve captcha
 def test_api():
-    access_token = 'access_token_here'
     # get access token from: http://www.imagetyperz.com/Forms/ClientHome.aspx
+    access_token = 'access_token_here'
     ita = ImageTyperzAPI(access_token)      # init imagetyperz api obj
 
     # legacy way, will get deprecated at some point
@@ -17,20 +17,27 @@ def test_api():
     # ---------------------------
     balance = ita.account_balance()                       # get account balance
     print 'Balance: {}'.format(balance)                 # print balance
-
-    # solve image captcha
-    # --------------------
-    # works with URL as well, if authenticated with token
+    #
+    # # solve image captcha
+    # # --------------------
+    # # works with URL as well, if authenticated with token
     print 'Solving captcha ...'
     captcha_text = ita.solve_captcha('captcha.jpg')
     print 'Captcha text: {}'.format(captcha_text)
 
     # solve recaptcha
-    # check: http://www.imagetyperz.com/Forms/recaptchaapi.aspx on how to get page_url and googlekey
+    # check https://github.com/imagetyperz-api/API-docs#submit-recaptcha for more details
     # -----------------------------------------------------------------------------------------------
-    page_url = 'http://your_site_here.com'
-    sitekey = 'your_sitekey_here'
-    captcha_id = ita.submit_recaptcha(page_url, sitekey)        # submit captcha first, to get ID
+    recaptcha_params = {
+        'page_url' : 'page_url_here',
+        'sitekey' : 'sitekey_here',
+        'type' : 1,                     # optional, 1 - normal recaptcha, 2 - invisible recaptcha, 3 - v3 recaptcha, default: 1
+        #'v3_min_score' : .1,           # optional
+        #'v3_action' : 'homepage',      # optional
+        #'proxy': '126.45.34.53:345',    # or 126.45.34.53:123:joe:password
+        #'user_agent': 'Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/60.0'    # optional
+    }
+    captcha_id = ita.submit_recaptcha(recaptcha_params)        # submit captcha first, to get ID
 
     # check if it's still in progress (waiting to be solved), every 10 seconds
     print 'Waiting for recaptcha to be solved ...'
@@ -45,10 +52,7 @@ def test_api():
     # ita = ImageTypersAPI(access_token, 123)  # init imagetyperz api obj with access_token and affiliate id
     # ita = ImageTypersAPI(access_token, 123, 60)  # init imagetyperz api obj with access_token, affid and timeout
     # ita.set_user_password('your_username', 'your_password') # in case you want to use user & pass instead of token (not recommended)
-    
-    # submit recaptcha with proxy (checks API docs for more info)
-    # captcha_id = ita.submit_recaptcha(page_url, sitekey, '127.0.0.1:1234')
-    # captcha_id = ita.submit_recaptcha(page_url, sitekey, '127.0.0.1:1234:user:password')	# proxy auth
+
     # print ita.was_proxy_used(captcha_id)        # tells if proxy submitted (if any) was used or not, and if not used, reason
 
     # print (ita.captcha_id)               # get last captcha solved id