nonecap 0.6.0__tar.gz → 0.6.2__tar.gz

{nonecap-0.6.0 → nonecap-0.6.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: nonecap
-Version: 0.6.0
+Version: 0.6.2
 Summary: Official Python client for the NoneCap hCaptcha solving API.
 Project-URL: Homepage, https://nonecap.com
 Project-URL: Documentation, https://nonecap.com/api-reference

{nonecap-0.6.0 → nonecap-0.6.2}/src/nonecap/_types.py

@@ -55,6 +55,11 @@ SolveErrorReason = Literal[
     "proxy_rejected",
     "proxy_tls",
     "proxy_stalled",
+    "proxy_egress_blocked",
+    "target_egress_blocked",
+    "profile_engine_unavailable",
+    "type_not_served",
+    "browser_lane_capped",
 ]
 """A typed sub-reason within :data:`SolveErrorCode`, set when the solver knows more
 than the code says."""

nonecap-0.6.2/src/nonecap/_version.py

@@ -0,0 +1 @@
+__version__ = "0.6.2"

{nonecap-0.6.0 → nonecap-0.6.2}/tests/test_client.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from typing import get_args
+
 import httpx
 import pytest
 
@@ -17,6 +19,7 @@ from nonecap import (
     RateLimitError,
     ServiceUnavailableError,
     SitekeyRateLimitedError,
+    SolveErrorReason,
     SolveFailedError,
     SolveTimeoutError,
     UnsupportedMediaTypeError,
@@ -254,6 +257,63 @@ class TestErrorMapping:
         assert info.value.reason == "proxy_rejected"
         assert info.value.retryable is False
 
+    @pytest.mark.parametrize(
+        ("code", "reason"),
+        [
+            ("proxy_error", "proxy_egress_blocked"),
+            ("target_unreachable", "target_egress_blocked"),
+        ],
+    )
+    def test_egress_blocked_solves_are_typed_and_not_retryable(
+        self, code: str, reason: str
+    ) -> None:
+        assert reason in get_args(SolveErrorReason)
+        failed = solve_payload(
+            status="failed",
+            error={
+                "code": code,
+                "message": "points at a private or internal network address",
+                "reason": reason,
+                "retryable": False,
+                "docs_url": "https://nonecap.com/api-reference#errors",
+            },
+        )
+        nc = client_for(Script((200, failed)))
+        with pytest.raises(SolveFailedError) as info:
+            nc.solve(type="hcaptcha", sitekey="sk", url="https://example.com")
+        assert info.value.solve_code == code
+        assert info.value.reason == reason
+        assert info.value.retryable is False
+
+    @pytest.mark.parametrize(
+        ("code", "reason", "retryable"),
+        [
+            ("capacity_exhausted", "profile_engine_unavailable", True),
+            ("capacity_exhausted", "browser_lane_capped", True),
+            ("internal_error", "type_not_served", False),
+        ],
+    )
+    def test_uncharged_capacity_and_type_reasons_are_typed(
+        self, code: str, reason: str, retryable: bool
+    ) -> None:
+        assert reason in get_args(SolveErrorReason)
+        failed = solve_payload(
+            status="failed",
+            error={
+                "code": code,
+                "message": "not charged",
+                "reason": reason,
+                "retryable": retryable,
+                "docs_url": "https://nonecap.com/api-reference#errors",
+            },
+        )
+        nc = client_for(Script((200, failed)))
+        with pytest.raises(SolveFailedError) as info:
+            nc.solve(type="hcaptcha", sitekey="sk", url="https://example.com")
+        assert info.value.solve_code == code
+        assert info.value.reason == reason
+        assert info.value.retryable is retryable
+
     def test_older_server_error_object_still_parses(self) -> None:
         failed = solve_payload(status="failed", error={"code": "vision_error", "message": "x"})
         nc = client_for(Script((200, failed)))

{nonecap-0.6.0 → nonecap-0.6.2}/tests/typing_assertions.py

@@ -20,6 +20,7 @@ from nonecap import (
     FeedbackReport,
     NoneCap,
     Solve,
+    SolveErrorReason,
     SolveHandle,
     SolveTimeoutError,
 )
@@ -84,6 +85,17 @@ def negative_cases() -> None:
     nc.solve(type="recaptcha", sitekey="s", url="u")  # type: ignore[call-overload]
 
 
+def egress_blocked_reasons() -> None:
+    # The egress guard's reasons are part of the typed vocabulary.
+    _r1: SolveErrorReason = "proxy_egress_blocked"
+    _r2: SolveErrorReason = "target_egress_blocked"
+    _r3: SolveErrorReason = "profile_engine_unavailable"
+    _r4: SolveErrorReason = "type_not_served"
+    _r5: SolveErrorReason = "browser_lane_capped"
+    # A reason the API never defined must not type-check.
+    _bad: SolveErrorReason = "proxy_egress_blockd"  # type: ignore[assignment]
+
+
 def timeout_error_fields(err: SolveTimeoutError) -> None:
     # SolveTimeoutError exposes the solve it timed out on.
     _sid: Optional[str] = err.solve_id

nonecap-0.6.0/src/nonecap/_version.py

@@ -1 +0,0 @@
-__version__ = "0.6.0"