Merge pull request #41 from AndreiDrang/main

0.9.1

Author: Andrei

src/python3_capsolver/__version__.py

@@ -1 +1 @@
-__version__ = "0.9"
+__version__ = "0.9.1"

src/python3_capsolver/core/serializer.py

@@ -80,14 +80,14 @@ class ReCaptchaV3Ser(WebsiteDataOptionsSer):
     )
 
 
-class HCaptchaClassificationOptionsSer(BaseModel):
+class HCaptchaClassificationOptionsSer(TaskSer):
     queries: List[str] = Field(..., description="Base64-encoded images, do not include 'data:image/***;base64,'")
     question: str = Field(
         ..., description="Question ID. Support English and Chinese, other languages please convert yourself"
     )
 
 
-class FunCaptchaClassificationOptionsSer(BaseModel):
+class FunCaptchaClassificationOptionsSer(TaskSer):
     images: List[str] = Field(..., description="Base64-encoded images, do not include 'data:image/***;base64,'")
     question: str = Field(
         ...,

tests/conftest.py

@@ -27,7 +27,7 @@ class BaseTest:
     proxyPort = 9999
 
     @staticmethod
-    def get_random_string(length: int) -> str:
+    def get_random_string(length: int = 36) -> str:
         """
         Method generate random string with set length
 

tests/test_datadome_slider.py

@@ -16,6 +16,16 @@ def test_captcha_handler_exist(self):
     def test_aio_captcha_handler_exist(self):
         assert "aio_captcha_handler" in DatadomeSlider.__dict__.keys()
 
+    def test_wrong_captcha_type(self):
+        with pytest.raises(ValueError):
+            DatadomeSlider(
+                api_key=self.API_KEY,
+                captcha_type=self.get_random_string(36),
+                websiteURL=websiteURL,
+                captchaUrl=captchaUrl,
+                userAgent=self.get_random_string(36),
+            )
+
 
 class TestDatadomeSlider(BaseTest):
     """

tests/test_hcaptcha.py

@@ -5,6 +5,7 @@
 from tests.conftest import BaseTest
 from python3_capsolver.hcaptcha import HCaptcha, HCaptchaClassification
 from python3_capsolver.core.enum import HCaptchaTypeEnm, HCaptchaClassificationTypeEnm
+from python3_capsolver.core.serializer import CaptchaResponseSer
 
 HCAPTCHA_KEY = "3ceb8624-1970-4e6b-91d5-70317b70b651"
 PAGE_URL = "https://accounts.hcaptcha.com/demo"
@@ -243,6 +244,15 @@ async def test_aio_params_context(self):
     Failed tests
     """
 
+    def test_wrong_captcha_type(self):
+        with pytest.raises(ValueError):
+            HCaptchaClassification(
+                api_key=self.API_KEY,
+                captcha_type=self.get_random_string(),
+                queries=[self.image_body],
+                question=self.question,
+            )
+
     def test_no_queries(self):
         with pytest.raises(TypeError):
             HCaptchaClassification(
@@ -259,27 +269,26 @@ def test_no_question(self):
                 queries=[self.image_body],
             )
 
-
-"""
-    async def test_aio_api_key_err(self):
-        result = await HCaptchaClassification(
+    def test_api_key_err(self):
+        result = HCaptchaClassification(
             api_key=self.get_random_string(36),
             captcha_type=self.captcha_type,
             queries=[self.image_body],
             question=self.question,
-        ).aio_captcha_handler()
+        ).captcha_handler()
+        assert isinstance(result, CaptchaResponseSer)
         assert result.errorId == 1
         assert result.errorCode == "ERROR_KEY_DENIED_ACCESS"
         assert not result.solution
 
-    def test_api_key_err(self):
-        result = HCaptchaClassification(
+    async def test_aio_api_key_err(self):
+        result = await HCaptchaClassification(
             api_key=self.get_random_string(36),
             captcha_type=self.captcha_type,
             queries=[self.image_body],
             question=self.question,
-        ).captcha_handler()
+        ).aio_captcha_handler()
+        assert isinstance(result, CaptchaResponseSer)
         assert result.errorId == 1
         assert result.errorCode == "ERROR_KEY_DENIED_ACCESS"
         assert not result.solution
-"""

tests/test_image_to_text.py

@@ -1,5 +1,7 @@
 import base64
 
+import pytest
+
 from tests.conftest import BaseTest
 from python3_capsolver.core.enum import ResponseStatusEnm
 from python3_capsolver.image_to_text import ImageToText
@@ -9,18 +11,24 @@
     img_data = img_file.read()
 
 
-class TestImageToText(BaseTest):
-    image_body = base64.b64encode(img_data).decode("utf-8")
-    """
-    Success tests
-    """
-
+class TestImageToTextBase(BaseTest):
     def test_captcha_handler_exist(self):
         assert "captcha_handler" in ImageToText.__dict__.keys()
 
     def test_aio_captcha_handler_exist(self):
         assert "aio_captcha_handler" in ImageToText.__dict__.keys()
 
+    def test_wrong_captcha_type(self):
+        with pytest.raises(ValueError):
+            ImageToText(api_key=self.API_KEY, captcha_type=self.get_random_string())
+
+
+class TestImageToText(BaseTest):
+    image_body = base64.b64encode(img_data).decode("utf-8")
+    """
+    Success tests
+    """
+
     def test_solve_image(self):
         resp = ImageToText(api_key=self.API_KEY).captcha_handler(body=self.image_body)
         assert isinstance(resp, CaptchaResponseSer)

tests/test_mt_captcha.py

@@ -19,6 +19,16 @@ def test_captcha_handler_exist(self):
     def test_aio_captcha_handler_exist(self):
         assert "aio_captcha_handler" in MtCaptcha.__dict__.keys()
 
+    def test_wrong_captcha_type(self):
+        with pytest.raises(ValueError):
+            MtCaptcha(
+                api_key=self.API_KEY,
+                captcha_type=self.get_random_string(),
+                websiteKey=websiteKey,
+                proxy=proxy,
+                websiteURL=websiteURL,
+            )
+
     @pytest.mark.parametrize("captcha_type", captcha_types)
     def test_no_website_url(self, captcha_type: str):
         with pytest.raises(TypeError):

tests/test_recaptcha.py

@@ -70,25 +70,11 @@ def test_solve(self, captcha_type: str):
         assert resp.errorDescription is None
         assert resp.solution is not None
 
-    """def test_solve_context(self):
-        with ReCaptcha(
-            api_key=self.API_KEY,
-            captcha_type=self.captcha_type,
-            websiteURL=self.pageurl,
-            websiteKey=self.googlekey,
-        ) as instance:
-            resp = instance.captcha_handler()
-        assert isinstance(resp, CaptchaResponseSer)
-        assert resp.status == ResponseStatusEnm.Ready
-        assert resp.errorId == 0
-        assert resp.errorCode is None
-        assert resp.errorDescription is None
-        assert resp.solution is not None
-
-    async def test_aio_solve(self):
+    @pytest.mark.parametrize("captcha_type", captcha_types)
+    async def test_aio_solve(self, captcha_type: str):
         resp = await ReCaptcha(
             api_key=self.API_KEY,
-            captcha_type=self.captcha_type,
+            captcha_type=captcha_type,
             websiteURL=self.pageurl,
             websiteKey=self.googlekey,
         ).aio_captcha_handler()
@@ -99,21 +85,6 @@ async def test_aio_solve(self):
         assert resp.errorDescription is None
         assert resp.solution is not None
 
-    async def test_aio_solve_context(self):
-        with ReCaptcha(
-            api_key=self.API_KEY,
-            captcha_type=self.captcha_type,
-            websiteURL=self.pageurl,
-            websiteKey=self.googlekey,
-        ) as instance:
-            resp = await instance.aio_captcha_handler()
-        assert isinstance(resp, CaptchaResponseSer)
-        assert resp.status == ResponseStatusEnm.Ready
-        assert resp.errorId == 0
-        assert resp.errorCode is None
-        assert resp.errorDescription is None
-        assert resp.solution is not None"""
-
     """
     Failed tests
     """