From 5ae097485557a7b7ea5187699b40edd50c0da172 Mon Sep 17 00:00:00 2001
From: BuriedInCode <6057651+Buried-In-Code@users.noreply.github.com>
Date: Wed, 9 Jul 2025 20:31:08 +1200
Subject: [PATCH] Switch to pyrate-limiter to properly enforce ratelimit

---
 pyproject.toml      |  2 +-
 simyan/comicvine.py | 34 ++++++++++++++++++++++++++++------
 2 files changed, 29 insertions(+), 7 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 5bb13bb..bc2075a 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -44,7 +44,7 @@ classifiers = [
 dependencies = [
   "eval-type-backport >= 0.2.0; python_version < '3.10'",
   "pydantic >= 2.11.0",
-  "ratelimit >= 2.2.1",
+  "pyrate-limiter >= 3.7.1",
   "requests >= 2.32.3"
 ]
 description = "A Python wrapper for the Comicvine API."
diff --git a/simyan/comicvine.py b/simyan/comicvine.py
index 09b4822..a156953 100644
--- a/simyan/comicvine.py
+++ b/simyan/comicvine.py
@@ -10,11 +10,11 @@
 import platform
 import re
 from enum import Enum
-from typing import Any, Optional, TypeVar, Union
-from urllib.parse import urlencode
+from typing import Any, ClassVar, Final, Optional, TypeVar, Union
+from urllib.parse import urlencode, urlparse
 
 from pydantic import TypeAdapter, ValidationError
-from ratelimit import limits, sleep_and_retry
+from pyrate_limiter import Duration, Limiter, Rate, SQLiteBucket
 from requests import get
 from requests.exceptions import (
     ConnectionError,  # noqa: A004
@@ -39,10 +39,25 @@
 from simyan.schemas.volume import BasicVolume, Volume
 from simyan.sqlite_cache import SQLiteCache
 
-MINUTE = 60
+# Constants
+SECOND_RATE: Final[int] = 1
+HOUR_RATE: Final[int] = 200
 T = TypeVar("T")
 
 
+def rate_mapping(*args: Any, **kwargs: Any) -> tuple[str, int]:
+    if kwargs and "url" in kwargs:
+        url = kwargs["url"]
+    else:
+        return "comicvine", 1
+    parts = urlparse(url).path.strip("/").split("/")
+    if not parts or len(parts) < 2:
+        return "comicvine", 1
+    if len(parts) == 3:
+        return f"get_{parts[1]}", 1
+    return parts[1], 1
+
+
 class ComicvineResource(Enum):
     """Enum class for Comicvine Resources."""
 
@@ -98,6 +113,14 @@ class Comicvine:
 
     API_URL = "https://comicvine.gamespot.com/api"
 
+    _second_rate = Rate(SECOND_RATE, Duration.SECOND)
+    _hour_rate = Rate(HOUR_RATE, Duration.HOUR)
+    _rates: ClassVar[list[Rate]] = [_second_rate, _hour_rate]
+    _bucket = SQLiteBucket.init_from_file(_rates)  # Save between sessions
+    # Can a `BucketFullException` be raised when used as a decorator?
+    _limiter = Limiter(_bucket, raise_when_fail=False, max_delay=Duration.DAY)
+    decorator = _limiter.as_decorator()
+
     def __init__(self, api_key: str, timeout: int = 30, cache: Optional[SQLiteCache] = None):
         self.headers = {
             "Accept": "application/json",
@@ -107,8 +130,7 @@ def __init__(self, api_key: str, timeout: int = 30, cache: Optional[SQLiteCache]
         self.timeout = timeout
         self.cache = cache
 
-    @sleep_and_retry
-    @limits(calls=20, period=MINUTE)
+    @decorator(rate_mapping)
     def _perform_get_request(
         self, url: str, params: Optional[dict[str, str]] = None
     ) -> dict[str, Any]: