Add examples and fix FunCaptchaTask

Author: ad-m

.github/workflows/e2e.yml

@@ -27,3 +27,4 @@ jobs:
       run: make test
       env:
         KEY: ${{ secrets.anticaptcha_key }}
+        PROXY_URL: "${{ secrets.proxy_url }}

CHANGELOG.rst

@@ -1,6 +1,20 @@
 Changelog
 =========
 
+0.7.1 - 2020-07-17
+------------------
+
+Added
+#####
+
+- Added examples for proxy mode including `hcaptcha_request_proxy`
+
+Changed
+#######
+
+- Fix inheritance of `FunCaptchaTask`
+- Added `FunCaptchaTask` to e2e tests
+
 0.7.0 - 2020-06-08
 ------------------
 

examples/funcaptcha_request.py

@@ -1,5 +1,4 @@
-from urllib.parse import urlparse
-
+from six.moves.urllib import parse
 import requests
 from os import environ
 import re
@@ -8,8 +7,8 @@
 from python_anticaptcha import AnticaptchaClient, FunCaptchaTask
 
 api_key = environ["KEY"]
-site_key_pattern = 'data-pkey="(.+?)"'
-url = "https://www.funcaptcha.com/demo/"
+site_key_pattern = 'public_key: "(.+?)",'
+url = "https://client-demo.arkoselabs.com/solo-animals"
 client = AnticaptchaClient(api_key)
 session = requests.Session()
 
@@ -18,11 +17,11 @@
     "(KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36"
 )
 session.headers = {"User-Agent": UA}
-proxy_urls = environ["PROXY_URL"].split(",")
+proxy_url = environ["PROXY_URL"]
 
 
 def parse_url(url):
-    parsed = urlparse(url)
+    parsed = parse.urlparse(url)
     return dict(
         proxy_type=parsed.scheme,
         proxy_address=parsed.hostname,
@@ -37,11 +36,10 @@ def get_form_html():
 
 
 def get_token(form_html):
-    proxy_url = choice(proxy_urls)
     proxy = parse_url(proxy_url)
 
     site_key = re.search(site_key_pattern, form_html).group(1)
-    task = FunCaptchaTask(url, site_key, proxy=proxy, user_agent=UA)
+    task = FunCaptchaTask(url, site_key, user_agent=UA, **proxy)
     job = client.createTask(task)
     job.join(maximum_time=10 ** 4)
     return job.get_token_response()
@@ -53,4 +51,4 @@ def process():
 
 
 if __name__ == "__main__":
-    print(process())
+    print('Solved!' in process())

examples/funcaptcha_selenium.py

@@ -1,4 +1,5 @@
-from urllib.parse import urlparse, quote
+from six.moves.urllib.parse import quote
+from six.moves.urllib import parse
 
 import requests
 from os import environ
@@ -19,7 +20,7 @@
 
 
 def parse_url(url):
-    parsed = urlparse(url)
+    parsed = parse.urlparse(url)
     return dict(
         proxy_type=parsed.scheme,
         proxy_address=parsed.hostname,

examples/funcaptcha_selenium_callback.py

@@ -1,6 +1,6 @@
 import re
 import time
-from urllib.parse import urlparse, quote
+from six.moves.urllib.parse import quote
 import os
 from os import environ
 import gzip

examples/hcaptcha_request_proxy.py

@@ -0,0 +1,64 @@
+from six.moves.urllib import parse
+
+import re
+import requests
+from os import environ
+
+from python_anticaptcha import AnticaptchaClient, HCaptchaTask
+
+api_key = environ["KEY"]
+proxy_url = environ["PROXY_URL"]  # eg. socks5://user:password/123.123.123.123:8888/
+site_key_pattern = 'data-sitekey="(.+?)"'
+url = "http://hcaptcha.jawne.info.pl/"
+client = AnticaptchaClient(api_key)
+session = requests.Session()
+EXPECTED_RESULT = "Your request have submitted successfully."
+
+UA = (
+    "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_10_1) AppleWebKit/537.36 "
+    "(KHTML, like Gecko) Chrome/39.0.2171.95 Safari/537.36"
+)
+
+
+def parse_url(url):
+    parsed = parse.urlparse(url)
+    return dict(
+        proxy_type=parsed.scheme,
+        proxy_address=parsed.hostname,
+        proxy_port=parsed.port,
+        proxy_login=parsed.username,
+        proxy_password=parsed.password,
+    )
+
+
+def get_form_html():
+    return session.get(url).text
+
+
+def get_token(form_html):
+    site_key = re.search(site_key_pattern, form_html).group(1)
+    proxy = parse_url(proxy_url)
+    task = HCaptchaTask(
+        website_url=url,
+        website_key=site_key,
+        user_agent=UA,
+        cookies="test=test",
+        **proxy
+    )
+    job = client.createTask(task)
+    job.join()
+    return job.get_solution_response()
+
+
+def form_submit(token):
+    return requests.post(url, data={"g-recaptcha-response": token}).text
+
+
+def process():
+    html = get_form_html()
+    token = get_token(html)
+    return form_submit(token)
+
+
+if __name__ == "__main__":
+    assert EXPECTED_RESULT in process()

python_anticaptcha/tasks.py

@@ -95,7 +95,7 @@ def serialize(self, **result):
         return result
 
 
-class FunCaptchaTask(ProxyMixin, NoCaptchaTaskProxylessTask):
+class FunCaptchaTask(ProxyMixin, FunCaptchaProxylessTask):
     type = "FunCaptchaTask"
 
 
@@ -197,12 +197,13 @@ class HCaptchaTaskProxyless(BaseTask):
     websiteURL = None
     websiteKey = None
 
-    def __init__(self, website_url, website_key):
+    def __init__(self, website_url, website_key, *args, **kwargs):
         self.websiteURL = website_url
         self.websiteKey = website_key
+        super(HCaptchaTaskProxyless, self).__init__(*args, **kwargs)
 
-    def serialize(self):
-        data = super(HCaptchaTaskProxyless, self).serialize()
+    def serialize(self, **result):
+        data = super(HCaptchaTaskProxyless, self).serialize(**result)
         data["type"] = self.type
         data["websiteURL"] = self.websiteURL
         data["websiteKey"] = self.websiteKey

tests/test_examples.py

@@ -16,6 +16,12 @@ def missing_key(*args, **kwargs):
     )(*args, **kwargs)
 
 
+def missing_proxy(*args, **kwargs):
+    return skipIf(
+        "PROXY_URL" not in os.environ, "Missing PROXY_URL environment variable"
+    )(*args, **kwargs)
+
+
 @missing_key
 class CustomDotTestCase(TestCase):
     # For unknown reasons, workers are not always
@@ -51,15 +57,15 @@ def test_process_bulk(self):
 
 
 @missing_key
-@skipIf("PROXY_URL" not in os.environ, "Missing PROXY_URL environment variable")
+@missing_proxy
 class FuncaptchaTestCase(TestCase):
     # CI Proxy is unstable.
     # Occasionally fails, so I repeat my attempt to have others selected.
     @retry(tries=3)
     def test_funcaptcha(self):
-        from examples import funcaptcha
+        from examples import funcaptcha_request
 
-        self.assertTrue(funcaptcha.process())
+        self.assertIn('Solved!', funcaptcha_request.process())
 
 
 @missing_key
@@ -73,7 +79,8 @@ def test_process(self):
 
 
 @missing_key
-class RecaptchaV3TestCase(TestCase):
+@skipIf(True, "Anti-captcha unable to provide required score, but we tests via proxy")
+class RecaptchaV3ProxylessTestCase(TestCase):
     # Anticaptcha responds is not fully reliable.
     @retry(tries=3)
     def test_process(self):
@@ -114,6 +121,7 @@ def test_process(self):
 
 
 @missing_key
+@skipIf(True, 'We testing via proxy for performance reason.')
 class HCaptchaTaskProxylessTestCase(TestCase):
     @retry(tries=3)
     def test_process(self):
@@ -123,12 +131,13 @@ def test_process(self):
 
 
 @missing_key
-class HCaptchaTaskProxylessTestCase(TestCase):
+class HCaptchaTaskTestCase(TestCase):
     def test_process(self):
-        from examples import hcaptcha_request
+        from examples import hcaptcha_request_proxy
 
         self.assertIn(
-            "Your request have submitted successfully.", hcaptcha_request.process()
+            "Your request have submitted successfully.",
+            hcaptcha_request_proxy.process(),
         )