added affiliate_id

Author: bestcaptchasolver

README.md

@@ -39,20 +39,28 @@ balance = bcs.account_balance()
 **Submit image captcha**
 
 ``` python
-bcs.submit_image_captcha('captcha.jpg', False)    # submit image captcha (case_sensitive param optional)
+bcs.submit_image_captcha({'image': 'your local image or URL', 'case_sensitive': False, 'affiliate_id': 'ID of affiliate'})    # submit image captcha (case_sensitive param optional)
 ```
 The image submission works with both files and b64 encoded strings.
-Also for case-sensitive captchas, the 2nd parameter set to True, will make sure case is taken into account.
+Also for case-sensitive captchas, set the `case_sensitive` parameter to True, will make sure case is taken into account.
+For setting the affiliate_id, set the `affiliate_id` parameter
 
 **Submit recaptcha details**
 
 For recaptcha submission there are two things that are required.
 - page_url
 - site_key
+- type (optional)
+- v3_action (optional)
+- v3_min_score (optional)
+- user_agent (optional)
+- affiliate_id (optional)
 - proxy (optional)
+
 ``` python
-bcs.submit_recaptcha(PAGE_URL, SITE_KEY)   
+bcs.submit_recaptcha({'page_url': 'page_url_here', 'site_key': 'sitekey_here')   
 ```
+
 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.
 

bestcaptchasolverapi3/bestcaptchasolverapi.py

@@ -37,37 +37,32 @@ def account_balance(self):
         return '${}'.format(resp['balance'])
 
     # solve normal captcha
-    def submit_image_captcha(self, image_path, case_sensitive = False):
-        data = dict(self._data)
+    def submit_image_captcha(self, opts):
+        data = {}
+        data.update(self._data)
+
+        image_path = opts['image']
+        # case sensitive
+        if 'case_sensitive' in opts:
+            if opts['case_sensitive']: data['case_sensitive'] = '1'
+        # affiliate
+        if 'affiliate_id' in opts:
+            if opts['affiliate_id']: data['affiliate_id'] = opts['affiliate_id']
         url = '{}/captcha/image'.format(BASE_URL)
+
         if os.path.exists(image_path):
             with open(image_path, 'rb') as f:
                 data['b64image'] = b64encode(f.read())
         else:
-            data['b64image'] = image_path       # should be b64 already
-
-        if case_sensitive: data['case_sensitive'] = '1'
+            data['b64image'] = image_path  # should be b64 already
 
         resp = self.POST(url, data)
-        return resp['id']       # return ID
+        return resp['id']  # return ID
 
     # submit recaptcha to system
-    # SET PROXY AS WELL
-    # -------------------
-    # ----------------------------------
-    # ------------------------------
-    def submit_recaptcha(self, page_url, site_key, proxy = None):
-        # data parameters
-        data = dict(self._data)
-        data['page_url'] = page_url
-        data['site_key'] = site_key
-
-        # check proxy and set dict (request params) accordingly
-        if proxy:   # if proxy is given, check proxytype
-            # we have both proxy and type at this point
-            data['proxy'] = proxy
-            data['proxytype'] = 'HTTP'
-
+    def submit_recaptcha(self, data):
+        data.update(self._data)
+        if 'proxy' in data: data['proxy_type'] = 'HTTP'  # add proxy, if necessary
         # make request with all data
         url = '{}/captcha/recaptcha'.format(BASE_URL)
         resp = self.POST(url, data)

captcha.jpg

@@ -3,9 +3,9 @@
 from bestcaptchasolverapi3.bestcaptchasolverapi import BestCaptchaSolverAPI
 from time import sleep
 
-ACCESS_TOKEN = 'your_access_token'
-PAGE_URL = 'your_page_url'
-SITE_KEY = 'your_site_key'
+ACCESS_TOKEN = 'access_token_here'
+PAGE_URL = 'page_url_here'
+SITE_KEY = 'site_key_here'
 
 
 # solve captcha
@@ -20,9 +20,12 @@ def test_api():
 
     # solve image captcha
     # --------------------
-    # works with URL as well, if authenticated with token
     print ('Solving image captcha ...')
-    id = bcs.submit_image_captcha('captcha.jpg', False)  # submit image captcha (case_sensitive param optional)
+    data = {}
+    data['image'] = 'captcha.jpg'
+    # data['case_sensitive'] = True #, default: False
+    # data['affiliate_id'] = 'affiliate_id from /account'
+    id = bcs.submit_image_captcha(data)  # submit image captcha (case_sensitive param optional)
     image_text = None
     # None is returned if completion is still in pending
     while image_text == None:
@@ -32,9 +35,23 @@ def test_api():
     print ('Captcha text: {}'.format(image_text))
 
     # solve recaptcha
-    # -----------------------------------------------------------------------------------------------
+    # ---------------
     print ('Solving recaptcha ...')
-    captcha_id = bcs.submit_recaptcha(PAGE_URL, SITE_KEY)  # submit captcha first, to get ID
+    data = {}
+    data['page_url'] = PAGE_URL
+    data['site_key'] = SITE_KEY
+
+    # other parameters
+    # ----------------------------------------------------------------------
+    # data['type'] = 1        # 1 - regular, 2 - invisible, 3 - v3, default 1
+    # data['v3_action'] = 'v3 recaptcha action'
+    # data['v3_min_score'] = '0.3'
+    # data['user_agent'] = 'Your user agent'
+    # data['proxy'] = '123.456.678:3031'
+    # data['proxy'] = 'user:[email protected]:3031'
+    # data['affiliate_id'] = 'affiliate_id from /account'
+    captcha_id = bcs.submit_recaptcha(data)  # 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 ...')
     gresponse = None
@@ -44,14 +61,9 @@ def test_api():
         sleep(10)  # sleep for 10 seconds and recheck
 
     print ('Recaptcha response: {}'.format(gresponse))  # print google response
-    #proxy_status = resp['proxy_status']                       # get status of proxy
-
-    # bcs.submit_image_captcha('captcha.jpg', True)    # case sensitive captcha image solving
-    # bcs.submit_recaptcha(PAGE_URL, SITE_KEY, '123.45.67.89:3012')   # solve through proxy
-    # bcs.submit_recaptcha(PAGE_URL, SITE_KEY, 'user:[email protected]:3012')  # solve through proxy with auth
+    # proxy_status = resp['proxy_status']                       # get status of proxy
     # bcs.set_captcha_bad(2)    # set captcha with ID 2, bad
 
-
 # main method
 def main():
     try: