Follow-up package refresh (#99)

* Fix Mixin class

* fix deprecated test

* bump setup-python version

* add support new version of python

* add classifiers for python version

* revert cache for setup-python

* remove fields from docs

* Fix return in CookieMixin

* Make dry task in data

* fix call super.__init__

* update README

* switch selenium tests to use chrome

* refresh funcaptcha example

* fix ImageToTextTask class hierarchy

* migrate to nose2

* set timeout in gha

* fix multiprocessing for nose2

Author: ad-m

.github/workflows/e2e.yml

@@ -9,6 +9,7 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    timeout-minutes: 30
     steps:
     - uses: actions/checkout@v1
 
@@ -20,8 +21,7 @@ jobs:
     - name: Build distribution
       run: make install
 
-    - name: Install Geckodriver
-      run: make gecko
+    - uses: nanasess/setup-chromedriver@v1
 
     - name: Run integration tests
       run: make test

.github/workflows/pythonpackage.yml

@@ -10,13 +10,20 @@ jobs:
       max-parallel: 4
       fail-fast: false
       matrix:
-        python-version: [2.7, 3.5, 3.6, 3.7]
+        python-version:
+        - '2.7'
+        - '3.5'
+        - '3.6'
+        - '3.7'
+        - '3.8'
+        - '3.9'
+        - '3.10'
 
     steps:
     - uses: actions/checkout@v1
 
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v1
+      uses: actions/setup-python@v3
       with:
         python-version: ${{ matrix.python-version }}
 

Makefile

@@ -1,4 +1,7 @@
-.PHONY: lint fmt build docs install test
+CHROMEDRIVER_VERSION=99.0.4844.17
+CHROMEDRIVER_DIR=${PWD}/geckodriver
+
+.PHONY: lint fmt build docs install test gecko
 
 build:
 	python setup.py sdist bdist_wheel
@@ -16,14 +19,13 @@ install_pkg:
 	pip install .
 
 gecko:
-	wget https://github.com/mozilla/geckodriver/releases/download/v0.24.0/geckodriver-v0.24.0-linux64.tar.gz
-	mkdir geckodriver
-	tar -xzf geckodriver-v0.24.0-linux64.tar.gz -C geckodriver
-	rm geckodriver-v0.24.0-linux64.tar.gz
+	mkdir -p ${CHROMEDRIVER_DIR}
+	wget -q -P ${CHROMEDRIVER_DIR} "http://chromedriver.storage.googleapis.com/${CHROMEDRIVER_VERSION}/chromedriver_linux64.zip"
+	unzip ${CHROMEDRIVER_DIR}/chromedriver* -d ${CHROMEDRIVER_DIR}
+	rm ${CHROMEDRIVER_DIR}/chromedriver_linux64.zip
 
 test:
-	# nosetests tests -v --with-coverage --cover-package=python_anticaptcha --processes=8
-	PATH=$$PATH:$$PWD/geckodriver nosetests tests --verbosity=3 --processes=8 --process-timeout=1800
+	PATH=$$PWD/geckodriver:$$PATH nose2 --verbose
 
 clean:
 	rm -r build geckodriver

README.rst

@@ -151,14 +151,6 @@ Example snippet for reporting an incorrect image task:
     print job.get_captcha_text()
     job.report_incorrect()
 
-Custom tasks
-############
-
-There is support for your own (captcha) forms. It allows you to analyze any data in various ways, eg. classify offensive
-image, count elements on the image, etc. The scope of the data, the form to describe them, you specify yourself.
-
-For details, go to 'Custom fields' section in the documentation.
-
 Setup proxy
 ###########
 
@@ -203,8 +195,6 @@ In the event of an application error, the AnticaptchaException exception is thro
         else:
             raise
 
-
-
 .. usage-end
 
 Versioning

docs/api.rst

@@ -20,13 +20,4 @@ Tasks
 
  .. automodule:: python_anticaptcha.tasks
    :members:
-   :undoc-members:
-
-.. _form_fields:
-
-Fields
-------
-
- .. automodule:: python_anticaptcha.fields
-   :members:
-   :undoc-members:
+   :undoc-members:

examples/funcaptcha_request.py

@@ -2,12 +2,13 @@
 import requests
 from os import environ
 import re
-from random import choice
 
 from python_anticaptcha import AnticaptchaClient, FunCaptchaTask
 
 api_key = environ["KEY"]
 site_key_pattern = 'public_key: "(.+?)",'
+site_key_pattern = 'public_key: "(.+?)",'
+surl_pattern = 'surl: "(.+?)",'
 url = "https://client-demo.arkoselabs.com/solo-animals"
 client = AnticaptchaClient(api_key)
 session = requests.Session()
@@ -37,23 +38,31 @@ def get_form_html():
 
 def get_token(form_html):
     proxy = parse_url(proxy_url)
-
     site_key = re.search(site_key_pattern, form_html).group(1)
-    task = FunCaptchaTask(url, site_key, user_agent=UA, **proxy)
+    print("Determined site-key:", site_key)
+    surl = re.search(surl_pattern, form_html).group(1)
+    print("Determined surl:", surl)
+    task = FunCaptchaTask(surl, site_key, user_agent=UA, **proxy)
     job = client.createTask(task)
-    job.join(maximum_time=10 ** 4)
+    job.join(maximum_time=10**4)
     return job.get_token_response()
 
 
 def form_submit(token):
     return requests.post(
-        url="{}/verify".format(url), data={"name": "xx", "fc-token": token}
+        url="{}/verify".format(url),
+        data={"name": "xx", "fc-token": token},
+        proxies={
+            "http": proxy_url,
+            "https": proxy_url,
+        },
     ).text
 
 
 def process():
     html = get_form_html()
     token = get_token(html)
+    print("Received token:", token)
     return form_submit(token)
 
 

examples/recaptcha_selenium.py

@@ -46,10 +46,10 @@ def get_sitekey(driver):
 
 
 if __name__ == "__main__":
-    from selenium.webdriver import Firefox
-    from selenium.webdriver.firefox.options import Options
+    from selenium.webdriver import Chrome
+    from selenium.webdriver.chrome.options import Options
 
     options = Options()
-    # options.add_argument('-headless')
-    driver = Firefox(firefox_options=options)
+    options.add_experimental_option('prefs', {'intl.accept_languages': 'en_US'})
+    driver = Chrome(options=options)
     assert EXPECTED_RESULT in process(driver)