better error reporting

Author: ElectricalBoy

src/lpdb_python/__init__.py

@@ -24,7 +24,14 @@
     Transfer,
     TeamTemplate,
 )
-from .session import LpdbError, LpdbWarning, LpdbSession
+from .session import (
+    LpdbError,
+    LpdbInvalidKeyError,
+    LpdbInvalidRequestError,
+    LpdbRateLimitError,
+    LpdbWarning,
+    LpdbSession,
+)
 
 __all__ = [
     "OpponentType",
@@ -33,6 +40,9 @@
     "Datapoint",
     "ExternalMediaLink",
     "LpdbError",
+    "LpdbInvalidKeyError",
+    "LpdbInvalidRequestError",
+    "LpdbRateLimitError",
     "LpdbWarning",
     "LpdbSession",
     "Match",

src/lpdb_python/session.py

@@ -21,7 +21,15 @@
 
 import requests
 
-__all__ = ["LpdbDataType", "LpdbError", "LpdbWarning", "LpdbSession"]
+__all__ = [
+    "LpdbDataType",
+    "LpdbError",
+    "LpdbInvalidKeyError",
+    "LpdbInvalidRequestError",
+    "LpdbRateLimitError",
+    "LpdbWarning",
+    "LpdbSession",
+]
 
 _PACKAGE_NAME: Final[str] = "lpdb_python"
 
@@ -82,6 +90,22 @@ class LpdbError(IOError):
     pass
 
 
+class LpdbInvalidKeyError(LpdbError):
+    """
+    Raised when the LPDB request failed due to an invalid key.
+    """
+
+    pass
+
+
+class LpdbInvalidRequestError(LpdbError):
+    """
+    Raised when the LPDB request failed due to an invalid request.
+    """
+
+    pass
+
+
 class LpdbRateLimitError(LpdbError):
     """
     Raised when the LPDB request failed due to a rate limit.
@@ -301,19 +325,19 @@ def _parse_results(
         lpdb_warnings = response.get("warning")
         lpdb_errors = response.get("error")
 
-        if lpdb_errors and len(lpdb_errors) != 0:
-            rate_limit = re.match(
-                r"API key \"[0-9A-Za-z]+\" limits for wiki \"(?P<wiki>[a-z]+)\" and table \"(?P<table>[a-z]+)\" exceeded\.",
-                lpdb_errors[0],
-            )
-            if rate_limit:
+        match status_code:
+            case HTTPStatus.FORBIDDEN:
+                raise LpdbInvalidKeyError(lpdb_errors[0])
+            case HTTPStatus.NOT_FOUND:
+                raise LpdbInvalidRequestError(lpdb_errors[0])
+            case HTTPStatus.TOO_MANY_REQUESTS:
+                rate_limit = re.match(
+                    r"API key \"[0-9A-Za-z]+\" limits for wiki \"(?P<wiki>[a-z]+)\" and table \"(?P<table>[a-z]+)\" exceeded\.",
+                    lpdb_errors[0],
+                )
                 raise LpdbRateLimitError(
                     wiki=rate_limit.group("wiki"), table=rate_limit.group("table")
                 )
-            raise LpdbError(re.sub(r"^Error: ?", "", lpdb_errors[0]))
-        elif status_code != HTTPStatus.OK:
-            status = HTTPStatus(status_code)
-            raise LpdbError(f"HTTP {status_code}: {status.name}")
         if lpdb_warnings and len(lpdb_warnings) != 0:
             for lpdb_warning in lpdb_warnings:
                 warnings.warn(lpdb_warning, LpdbWarning)