upd

.coveragerc

@@ -4,7 +4,7 @@ omit =
         */tests/*
 
 include =
-        */src/python3_anticaptcha/*
+        */src/*
 
 
 [report]
@@ -13,4 +13,4 @@ omit =
         */tests/*
 
 include =
-        */src/python3_anticaptcha/*
+        */src/*

.github/workflows/test.yml

@@ -38,7 +38,7 @@ jobs:
       - name: Install dependencies
         run: |
           pip install --upgrade pip
-          pip install -r requirements.test.txt
+          pip install -U -r requirements.test.txt
 
       - name: Test
         run: make tests

Makefile

@@ -5,7 +5,8 @@ remove:
 	pip3 uninstall python3_anticaptcha -y
 
 tests: install
-	coverage run --rcfile=.coveragerc -m pytest --verbose --showlocals --pastebin=all tests --disable-warnings && \
+	coverage run --rcfile=.coveragerc -m pytest --verbose --showlocals --pastebin=all  --disable-warnings \
+	tests/ && \
 	coverage report --precision=3 --sort=cover --skip-empty --show-missing && \
 	coverage html --precision=3 --skip-empty -d coverage/html/ && \
 	coverage xml -o coverage/coverage.xml

docs/conf.py

@@ -12,7 +12,7 @@
 for x in os.walk("src/python3_anticaptcha/"):
     sys.path.insert(0, x[0])
 
-from python3_anticaptcha import core, control, turnstile
+from python3_anticaptcha import core, control, turnstile, image_captcha
 from python3_anticaptcha.__version__ import __version__
 
 # -- Project information -----------------------------------------------------

docs/modules/enum/info.rst

@@ -31,3 +31,7 @@ To import this module:
 .. autoclass:: core.enum.ControlPostfixEnm
     :members:
     :undoc-members:
+
+.. autoclass:: core.enum.SaveFormatsEnm
+    :members:
+    :undoc-members:

docs/modules/image/example.rst

@@ -0,0 +1,12 @@
+ImageToTextCaptcha
+==================
+
+To import this module:
+
+.. code-block:: python
+
+    from python3_anticaptcha.image_captcha import ImageToTextCaptcha
+
+
+.. autoclass:: python3_anticaptcha.image_captcha.ImageToTextCaptcha
+    :members:

requirements.test.txt

@@ -1,3 +1,4 @@
 pytest==8.*
 coverage==7.*
 pytest-asyncio==0.*
+pytest-mock==3.14.0

src/python3_anticaptcha/NoCaptchaTask.py

@@ -47,7 +47,6 @@ def __exit__(self, exc_type, exc_value, traceback):
             return False
         return True
 
-    # Работа с капчей
     def captcha_handler(self, websiteURL: str, websiteKey: str, recaptchaDataSValue: str = "", **kwargs) -> dict:
         """
         Метод получает ссылку на страницу, где расположена капча, и ключ капчи

src/python3_anticaptcha/control.py

@@ -1,7 +1,7 @@
 from typing import Optional
 
 from .core.base import BaseCaptcha
-from .core.enum import CaptchaTypeEnm, ControlPostfixEnm
+from .core.enum import ControlPostfixEnm
 
 
 class Control(BaseCaptcha):
@@ -16,7 +16,6 @@ def __init__(
 
         Args:
             api_key: Capsolver API key
-            captcha_type: Captcha type
             websiteURL: Address of the webpage
             websiteKey: Turnstile sitekey
             proxyType: Type of the proxy
@@ -113,7 +112,7 @@ def __init__(
             https://anti-captcha.com/apidoc/methods/reportIncorrectImageCaptcha
         """
 
-        super().__init__(api_key=api_key, captcha_type=CaptchaTypeEnm.Control, *args, **kwargs)
+        super().__init__(api_key=api_key, *args, **kwargs)
 
     def get_balance(self) -> dict:
         """
@@ -135,7 +134,7 @@ def get_balance(self) -> dict:
         return self._send_post_request(
             session=self._session,
             url_postfix=ControlPostfixEnm.GET_BALANCE,
-            payload={"clientKey": self._params.clientKey},
+            payload={"clientKey": self.create_task_payload.clientKey},
         )
 
     async def aio_get_balance(self) -> dict:
@@ -157,7 +156,7 @@ async def aio_get_balance(self) -> dict:
         """
 
         return await self._aio_send_post_request(
-            url_postfix=ControlPostfixEnm.GET_BALANCE, payload={"clientKey": self._params.clientKey}
+            url_postfix=ControlPostfixEnm.GET_BALANCE, payload={"clientKey": self.create_task_payload.clientKey}
         )
 
     @staticmethod
@@ -290,7 +289,7 @@ def get_spending_stats(self, **kwargs) -> dict:
         return self._send_post_request(
             session=self._session,
             url_postfix=ControlPostfixEnm.GET_SPENDING_STATS,
-            payload={"clientKey": self._params.clientKey, **kwargs},
+            payload={"clientKey": self.create_task_payload.clientKey, **kwargs},
         )
 
     async def aio_get_spending_stats(self, **kwargs) -> dict:
@@ -345,7 +344,8 @@ async def aio_get_spending_stats(self, **kwargs) -> dict:
             https://anti-captcha.com/apidoc/methods/getSpendingStats
         """
         return await self._aio_send_post_request(
-            url_postfix=ControlPostfixEnm.GET_SPENDING_STATS, payload={"clientKey": self._params.clientKey, **kwargs}
+            url_postfix=ControlPostfixEnm.GET_SPENDING_STATS,
+            payload={"clientKey": self.create_task_payload.clientKey, **kwargs},
         )
 
     def get_app_stats(self, softId: int, mode: Optional[str] = None) -> dict:
@@ -388,7 +388,7 @@ def get_app_stats(self, softId: int, mode: Optional[str] = None) -> dict:
         return self._send_post_request(
             session=self._session,
             url_postfix=ControlPostfixEnm.GET_APP_STATS,
-            payload={"clientKey": self._params.clientKey, "softId": softId, "mode": mode},
+            payload={"clientKey": self.create_task_payload.clientKey, "softId": softId, "mode": mode},
         )
 
     async def aio_get_app_stats(self, softId: int, mode: Optional[str] = None) -> dict:
@@ -430,7 +430,7 @@ async def aio_get_app_stats(self, softId: int, mode: Optional[str] = None) -> di
 
         return await self._aio_send_post_request(
             url_postfix=ControlPostfixEnm.GET_APP_STATS,
-            payload={"clientKey": self._params.clientKey, "softId": softId, "mode": mode},
+            payload={"clientKey": self.create_task_payload.clientKey, "softId": softId, "mode": mode},
         )
 
     def report_incorrect_image(self, taskId: int) -> dict:
@@ -455,7 +455,7 @@ def report_incorrect_image(self, taskId: int) -> dict:
         return self._send_post_request(
             session=self._session,
             url_postfix=ControlPostfixEnm.REPORT_INCORRECT_IMAGE_CAPTCHA,
-            payload={"clientKey": self._params.clientKey, "taskId": taskId},
+            payload={"clientKey": self.create_task_payload.clientKey, "taskId": taskId},
         )
 
     async def aio_report_incorrect_image(self, taskId: int) -> dict:
@@ -479,7 +479,7 @@ async def aio_report_incorrect_image(self, taskId: int) -> dict:
 
         return await self._aio_send_post_request(
             url_postfix=ControlPostfixEnm.REPORT_INCORRECT_IMAGE_CAPTCHA,
-            payload={"clientKey": self._params.clientKey, "taskId": taskId},
+            payload={"clientKey": self.create_task_payload.clientKey, "taskId": taskId},
         )
 
     def report_incorrect_recaptcha(self, taskId: int) -> dict:
@@ -504,7 +504,7 @@ def report_incorrect_recaptcha(self, taskId: int) -> dict:
         return self._send_post_request(
             session=self._session,
             url_postfix=ControlPostfixEnm.REPORT_INCORRECT_RECAPTCHA,
-            payload={"clientKey": self._params.clientKey, "taskId": taskId},
+            payload={"clientKey": self.create_task_payload.clientKey, "taskId": taskId},
         )
 
     async def aio_report_incorrect_recaptcha(self, taskId: int) -> dict:
@@ -527,7 +527,7 @@ async def aio_report_incorrect_recaptcha(self, taskId: int) -> dict:
         """
         return await self._aio_send_post_request(
             url_postfix=ControlPostfixEnm.REPORT_INCORRECT_RECAPTCHA,
-            payload={"clientKey": self._params.clientKey, "taskId": taskId},
+            payload={"clientKey": self.create_task_payload.clientKey, "taskId": taskId},
         )
 
     def report_correct_recaptcha(self, taskId: int) -> dict:
@@ -552,7 +552,7 @@ def report_correct_recaptcha(self, taskId: int) -> dict:
         return self._send_post_request(
             session=self._session,
             url_postfix=ControlPostfixEnm.REPORT_CORRECT_RECAPTCHA,
-            payload={"clientKey": self._params.clientKey, "taskId": taskId},
+            payload={"clientKey": self.create_task_payload.clientKey, "taskId": taskId},
         )
 
     async def aio_report_correct_recaptcha(self, taskId: int) -> dict:
@@ -575,7 +575,7 @@ async def aio_report_correct_recaptcha(self, taskId: int) -> dict:
         """
         return await self._aio_send_post_request(
             url_postfix=ControlPostfixEnm.REPORT_CORRECT_RECAPTCHA,
-            payload={"clientKey": self._params.clientKey, "taskId": taskId},
+            payload={"clientKey": self.create_task_payload.clientKey, "taskId": taskId},
         )
 
     def report_incorrect_hcaptcha(self, taskId: int) -> dict:
@@ -600,7 +600,7 @@ def report_incorrect_hcaptcha(self, taskId: int) -> dict:
         return self._send_post_request(
             session=self._session,
             url_postfix=ControlPostfixEnm.REPORT_INCORRECT_HCAPTCHA,
-            payload={"clientKey": self._params.clientKey, "taskId": taskId},
+            payload={"clientKey": self.create_task_payload.clientKey, "taskId": taskId},
         )
 
     async def aio_report_incorrect_hcaptcha(self, taskId: int) -> dict:
@@ -623,5 +623,5 @@ async def aio_report_incorrect_hcaptcha(self, taskId: int) -> dict:
         """
         return await self._aio_send_post_request(
             url_postfix=ControlPostfixEnm.REPORT_INCORRECT_HCAPTCHA,
-            payload={"clientKey": self._params.clientKey, "taskId": taskId},
+            payload={"clientKey": self.create_task_payload.clientKey, "taskId": taskId},
         )