updated requirements and fixed relevant code & tests

.gitignore

@@ -131,3 +131,6 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# PyCharm/Idea
+.idea/

HISTORY.md

@@ -1,6 +1,6 @@
 + **Version 0.0.10**:
   1. Reached 10000 training samples.
-  2. Reached 90%+ accuracy.
+  2. Reached 90%+ solve rate.
 + **Version 0.0.11**:
   1. Fixed error with captcha images that were taken from BytesIO.
 + **Version 0.0.12**:
@@ -9,18 +9,18 @@
 + **Version 0.0.13**:
   1. Added and tested 'from_webdriver' classmethod.
 + **Version 0.1.0**:
-  1. 100,000 captchas crash test, accuracy is 98.5%.
+  1. 100,000 captchas crash test, solve rate is 98.5%.
 + **Version 0.1.1 - 0.1.5**:
   1. Code adjustments and improvements.
   2. Added tests.
 + **Version 0.2.0**:
   1. Second crash test through 120k+ captchas.
-  2. Accuracy increased to 99.1%
+  2. Solve rate increased to 99.1%
   3. Code coverage is 100%
 + **Version 0.3.0**:
   1. Program can now solve images where letters are intercepted.
   2. Third crash test through 140k+ captchas.
-  3. Accuracy increased to 99.998%
+  3. Solve rate increased to 99.998%
 + **Version 0.3.8**:
   1. Added new instance - AmazonCaptchaCollector.
 + **Version 0.4.0**:
@@ -50,9 +50,11 @@
   4. Drop Python 3.6 support
   5. Remove `from_webdriver` method
 + **Version 0.5.4**:
-  1. 200,000 captchas crash test, accuracy is 100%.
+  1. 200,000 captchas crash test, solve rate is 100%.
   2. Minor notes added.
 + **Version 0.5.6**:
   1. Remove `selenium` from required dependencies.
 + **Version 0.5.10**:
   1. Add timeout to `AmazonCaptcha.fromlink` method.
++ **Version 0.5.11**:
+  1. Accuracy is 99.5%

README.md

@@ -10,14 +10,14 @@
  \▓▓   \▓▓\▓▓  \▓▓  \▓▓\▓▓▓▓▓▓▓▓\▓▓   \▓▓ \▓▓▓▓▓▓  \▓▓▓▓▓▓▓ ▓▓▓▓▓▓▓    \▓▓▓▓  \▓▓▓▓▓▓▓\▓▓   \▓▓ \▓▓▓▓▓▓▓
                                                           | ▓▓                                          
   >>>solution                                             | ▓▓                            Response 0.24s
-  "AmznCaptcha"                                            \▓▓                            Accuracy 99.9%
+  "AmznCaptcha"                                            \▓▓                            Accuracy 99.5%
 ```
 The motivation behind the creation of this library is taking its start from the genuinely simple idea: "**I don't want to use pytesseract or some other non-amazon-specific OCR services, nor do I want to install some executables to just solve a captcha. I desire to get a solution with 2 lines of code without any heavy add-ons, using a pure Python.**"
 
 ---
 Pure Python, lightweight, [Pillow](https://github.com/python-pillow/Pillow)-based solver for [Amazon's text captcha](https://www.amazon.com/errors/validateCaptcha).
 
-[![Accuracy](https://img.shields.io/badge/success%20rate-99.9%25-success)](https://github.com/a-maliarov/amazoncaptcha/blob/master/ext/accuracy.log)
+[![Solve rate](https://img.shields.io/badge/success%20rate-99.9%25-success)](https://github.com/a-maliarov/amazoncaptcha/blob/master/ext/solve_rate.log)
 ![Timing](https://img.shields.io/badge/response%20time-0.2s-success)
 [![Size](https://img.shields.io/badge/wheel%20size-0.9%20MB-informational)](https://pypi.org/project/amazoncaptcha/)
 [![Version](https://img.shields.io/pypi/v/amazoncaptcha?color=informational)](https://pypi.org/project/amazoncaptcha/)

amazoncaptcha/__version__.py

@@ -1,7 +1,7 @@
 __title__ = 'amazoncaptcha'
 __description__ = "Pure Python, lightweight, Pillow-based solver for the Amazon text captcha."
 __url__ = 'https://github.com/a-maliarov/amazoncaptcha'
-__version__ = '0.5.11'
+__version__ = '0.5.11b'
 __author__ = 'Anatolii Maliarov'
 __author_email__ = '[email protected]'
 __license__ = 'MIT'

amazoncaptcha/devtools.py

@@ -16,29 +16,29 @@
 import requests
 import os
 
-#--------------------------------------------------------------------------------------------------------------
+# --------------------------------------------------------------------------------------------------------------
 
 class AmazonCaptchaCollector(object):
 
-    def __init__(self, output_folder_path, keep_logs=True, accuracy_test=False):
+    def __init__(self, output_folder_path, keep_logs=True, solve_rate_test=False):
         """
         Initializes the AmazonCaptchaCollector instance.
 
         Args:
             output_folder (str): Folder where images or logs should be stored.
             keep_logs (bool, optional): If set to True, unsolved captcha links
                 will be stored separately.
-            accuracy_test (bool, optional): If set to True, AmazonCaptchaCollector
+            solve_rate_test (bool, optional): If set to True, AmazonCaptchaCollector
                 will not download images but just solve them and log the results.
 
         """
 
         self.output_folder = output_folder_path
         self.keep_logs = keep_logs
-        self.accuracy_test = accuracy_test
+        self.solve_rate_test = solve_rate_test
 
         if not os.path.exists(self.output_folder):
-            os.mkdir(self.output_folder)
+            os.makedirs(self.output_folder)
 
         elif not os.path.isdir(self.output_folder):
             raise NotFolderError(self.output_folder)
@@ -79,7 +79,7 @@ def get_captcha_image(self):
         Requests the page with Amazon's captcha, gets random captcha.
         Creates AmazonCaptcha instance, stores an original image before solving.
 
-        If it is not an accuracy test, the image will be stored in a specified
+        If it is not a solve rate test, the image will be stored in a specified
         folder with the solution within its name. Otherwise, only the logs
         will be stored, mentioning the captcha link being processed and the result.
 
@@ -96,7 +96,7 @@ def get_captcha_image(self):
         solution = captcha.solve(keep_logs=self.keep_logs, logs_path=self.not_solved_logs)
         log_message = f'{captcha.image_link}::{solution}'
 
-        if solution != 'Not solved' and not self.accuracy_test:
+        if solution != 'Not solved' and not self.solve_rate_test:
             print(log_message)
             captcha_name = 'dl_' + self._extract_captcha_id(captcha.image_link) + '_' + solution + '.png'
             original_image.save(os.path.join(self.output_folder, captcha_name))
@@ -121,20 +121,25 @@ def start(self, target, processes):
             processes (int): Number of simultaneous processes.
 
         """
+        assert (processes > 0)
+        assert (target % processes == 0)
 
         goal = list(range(target))
         milestones = [goal[x: x + target // processes] for x in range(0, len(goal), target // processes)]
 
-        jobs = list()
-        for j in range(processes):
-            p = multiprocessing.Process(target=self._distribute_collecting, args=(milestones[j], ))
-            jobs.append(p)
-            p.start()
+        if processes > 1:
+            jobs = list()
+            for j in range(processes):
+                p = multiprocessing.Process(target=self._distribute_collecting, args=(milestones[j], ))
+                jobs.append(p)
+                p.start()
 
-        for proc in jobs:
-            proc.join()
+            for proc in jobs:
+                proc.join()
+        else:
+            self._distribute_collecting(milestones[0])
 
-        if self.accuracy_test:
+        if self.solve_rate_test:
             with open(self.collector_logs, 'r', encoding='utf-8') as f:
                 output = f.readlines()
 
@@ -147,4 +152,4 @@ def start(self, target, processes):
                 print(result)
                 f.write(result)
 
-#--------------------------------------------------------------------------------------------------------------
+# --------------------------------------------------------------------------------------------------------------

amazoncaptcha/solver.py

@@ -18,7 +18,7 @@
 from .utils import cut_the_white, merge_horizontally, find_letter_boxes
 from .exceptions import ContentTypeError
 
-from PIL import Image, ImageChops
+from PIL import Image
 from io import BytesIO
 import warnings
 import requests
@@ -139,7 +139,7 @@ def _translate(self):
         Returns:
             str: a solution if there is one OR
                 'Not solved' if devmode set to False OR
-                a solution where unrecognised letters will be replaces with dashes
+                a solution where unrecognised letters will be replaced with dashes
 
         """
 
@@ -182,8 +182,11 @@ def solve(self, keep_logs=False, logs_path='not-solved-captcha.log'):
 
         solution = self._translate()
 
-        if solution == 'Not solved' and keep_logs and self.image_link:
+        output_folder = os.path.dirname(logs_path)
+        if len(output_folder) > 0 and not os.path.exists(output_folder):
+            os.makedirs(output_folder)
 
+        if solution == 'Not solved' and keep_logs and self.image_link:
             with open(logs_path, 'a', encoding='utf-8') as f:
                 f.write(self.image_link + '\n')
 
@@ -207,23 +210,9 @@ def fromdriver(cls, driver, devmode=False):
 
         """
 
-        png = driver.get_screenshot_as_png()
         element = driver.find_element(By.TAG_NAME, 'img')
         image_link = element.get_attribute('src')
-
-        location = element.location
-        size = element.size
-        left = location['x']
-        top = location['y']
-        right = location['x'] + size['width']
-        bottom = location['y'] + size['height']
-
-        img = Image.open(BytesIO(png))
-        img = img.crop((left, top, right, bottom))
-
-        bytes_array = BytesIO()
-        img.save(bytes_array, format='PNG')
-        image_bytes_array = BytesIO(bytes_array.getvalue())
+        image_bytes_array = BytesIO(element.screenshot_as_png)
 
         return cls(image_bytes_array, image_link, devmode)
 

docs/index.rst

@@ -4,11 +4,11 @@ AmazonCaptcha
 AmazonCaptcha is an image processing library oriented on `a specific type of images taken from Amazon <https://www.amazon.com/errors/validateCaptcha>`_, which main objective is to solve the captcha in terms of a research sake without using any add-ons.
 
 .. image:: https://img.shields.io/badge/success%20rate-99.9%25-success
-  :target: https://github.com/a-maliarov/amazoncaptcha/blob/master/ext/accuracy.log
-  :alt: Accuracy
+  :target: https://github.com/a-maliarov/amazoncaptcha/blob/master/ext/solve_rate.log
+  :alt: Solve rate
 
 .. image:: https://img.shields.io/badge/response%20time-0.2s-success
-  :target: https://github.com/a-maliarov/amazoncaptcha/blob/master/ext/accuracy.log
+  :target: https://github.com/a-maliarov/amazoncaptcha/blob/master/ext/solve_rate.log
   :alt: Timing
 
 .. image:: https://img.shields.io/badge/wheel%20size-0.9%20MB-informational

docs/reference/devtools.rst

@@ -23,8 +23,8 @@ Collect captcha.
     collector = AmazonCaptchaCollector(output_folder_path)
     collector.start(target, simultaneous_processes)
 
-Proceed accuracy tests.
-^^^^^^^^^^^^^^^^^^^^^^^
+Proceed solve rate tests.
+^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. code-block:: python
 
@@ -34,7 +34,7 @@ Proceed accuracy tests.
     simultaneous_processes = 4
     target = 200
 
-    collector = AmazonCaptchaCollector(output_folder_path, accuracy_test=True)
+    collector = AmazonCaptchaCollector(output_folder_path, solve_rate_test=True)
     collector.start(target, simultaneous_processes)
 
 The AmazonCaptchaCollector Class

ext/accuracy.log

@@ -1,20 +1,8 @@
-::Definition:: 'Test means - running the script through continious unordered
-                stream of earlier not solved captchas on specific version of
-                the program (Ver), solving specific number of captchas (Cap)
-                and calculating the accuracy percentage (Per) based on bare,
-                unedit results right after the end of process.'
-
-::Test::Ver0.0.5::Cap1000::Per36.7::
-::Test::Ver0.0.6::Cap1000::Per67.9::
-::Test::Ver0.0.7::Cap2000::Per77.4::
-::Test::Ver0.0.8::Cap2000::Per87.9::
-::Test::Ver0.0.9::Cap3000::Per88.3::
-::Test::Ver0.0.10::Cap2000::Per93.8::
-
-::Test::Ver0.0.12::Cap12157::Per94.7::
-::Test::Ver0.1.0::Cap104463::Per98.5::
-::Test::Ver0.2.0::Cap125851::Per99.1::
-::Test::Ver0.2.2::Cap140572::Per99.998::
-
-::Test::Ver0.4.7::Cap144050::Per99.999::
-::Test::Ver0.5.3::Cap185691::Per100.0::
+::Definition:: 'Test means - running the script through a stream of captchas
+                for which the correct solution is known solution, with a specific
+                version of the program (Ver), solving a specific number of
+                captchas (Cap) and calculating the percentage of correctly solved
+                captcha (Per) based on bare, un-edited results immediately after
+                the end of process.'
+
+::Test::Ver0.5.11::Cap4040::Per99.5::

ext/requirements-dev.txt

@@ -1,6 +1,5 @@
-pillow ~= 9.5.0
-requests ~= 2.30.0
-coverage >= 6.3.1
-codecov >= 2.1.12
-webdriver_manager ~= 3.8.6
-selenium ~= 4.9.1
+pillow~=10.3.0
+requests~=2.32.3
+coverage~=7.5.3
+codecov>=2.1.12
+selenium~=4.21.0

ext/solve_rate.log

@@ -0,0 +1,20 @@
+::Definition:: 'Test means - running the script through a continuous unordered
+                stream of previously unsolved captchas with a specific version of
+                the program (Ver), solving a specific number of captchas (Cap)
+                and calculating the percentage of solved captcha (Per) based
+                on bare, un-edited results immediately after the end of process.'
+
+::Test::Ver0.0.5::Cap1000::Per36.7::
+::Test::Ver0.0.6::Cap1000::Per67.9::
+::Test::Ver0.0.7::Cap2000::Per77.4::
+::Test::Ver0.0.8::Cap2000::Per87.9::
+::Test::Ver0.0.9::Cap3000::Per88.3::
+::Test::Ver0.0.10::Cap2000::Per93.8::
+
+::Test::Ver0.0.12::Cap12157::Per94.7::
+::Test::Ver0.1.0::Cap104463::Per98.5::
+::Test::Ver0.2.0::Cap125851::Per99.1::
+::Test::Ver0.2.2::Cap140572::Per99.998::
+
+::Test::Ver0.4.7::Cap144050::Per99.999::
+::Test::Ver0.5.3::Cap185691::Per100.0::

setup.py

@@ -3,14 +3,15 @@
 import setuptools
 import os
 
-#--------------------------------------------------------------------------------------------------------------
+# --------------------------------------------------------------------------------------------------------------
 
 here = os.path.abspath(os.path.dirname(__file__))
 
 with open(os.path.join(here, 'amazoncaptcha', '__version__.py'), 'r', encoding='utf-8') as f:
     file_data = [i.replace('\n', '').replace('\'', '').split(' = ') for i in f.readlines()]
     about = {k: v for k, v in file_data}
 
+
 def readme(logo_end_line=14):
     """Extracts the logo from README file before pushing to PyPi."""
 
@@ -19,6 +20,7 @@ def readme(logo_end_line=14):
 
     return long_description
 
+
 classifiers = [
     "Programming Language :: Python :: 3.6",
     "Programming Language :: Python :: 3.7",
@@ -34,11 +36,11 @@ def readme(logo_end_line=14):
 ]
 
 requires = [
-    "pillow >= 9.0.1,< 9.6.0",
-    "requests >= 2.27.1,< 2.31.0"
+    "pillow >= 9.0.1,< 10.4.0",
+    "requests >= 2.27.1,< 2.33.0"
 ]
 
-#--------------------------------------------------------------------------------------------------------------
+# --------------------------------------------------------------------------------------------------------------
 
 setuptools.setup(
     name=about['__title__'],
@@ -61,4 +63,4 @@ def readme(logo_end_line=14):
     },
 )
 
-#--------------------------------------------------------------------------------------------------------------
+# --------------------------------------------------------------------------------------------------------------