bitvavo-api-upgraded 4.2.0__py3-none-any.whl → 4.2.1__py3-none-any.whl

{bitvavo_api_upgraded-4.2.0.dist-info → bitvavo_api_upgraded-4.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: bitvavo-api-upgraded
-Version: 4.2.0
+Version: 4.2.1
 Summary: A unit-tested fork of the Bitvavo API
 Author: Bitvavo BV (original code), NostraDavid
 Author-email: NostraDavid <55331731+NostraDavid@users.noreply.github.com>

{bitvavo_api_upgraded-4.2.0.dist-info → bitvavo_api_upgraded-4.2.1.dist-info}/RECORD

@@ -9,7 +9,7 @@ bitvavo_client/__init__.py,sha256=YXTBdP6fBREV34VeTqS_gkjfzIoHv5uSYhbqSUEeAVU,20
 bitvavo_client/adapters/__init__.py,sha256=9YVjMhNiAN6K1x7N0UvAXMQwuhOFy4W6Edrba1hW8KI,64
 bitvavo_client/adapters/returns_adapter.py,sha256=3HSAPw6HB9GCS8AbKmeidURpZXnvMZqkvalOu6JhBv0,14195
 bitvavo_client/auth/__init__.py,sha256=bjWu5WCKNNnNoLcVU290tKBml9M5afmcxaU_KrkisSQ,39
-bitvavo_client/auth/rate_limit.py,sha256=NzWpWCc263diuJ3hVPH-fpJjKXy8a1WvdxHqOgvpplQ,4088
+bitvavo_client/auth/rate_limit.py,sha256=EfZtt4nxzu8D3Ea2ElYadrAvEYEt_Wlm60P8u-zVMvs,4391
 bitvavo_client/auth/signing.py,sha256=DJrI1R1SLKjl276opj9hN4RrKIgsMhxsSEDA8b7T04I,1037
 bitvavo_client/core/__init__.py,sha256=WqjaU9Ut5JdZwn4tsR1vDdrSfMjEJred3im6fvWpalc,39
 bitvavo_client/core/errors.py,sha256=jWHHQKqkkhpHS9TeKlccl7wuyuRrq0H_PGZ0bl6sbW4,460
@@ -26,7 +26,7 @@ bitvavo_client/endpoints/base.py,sha256=EyhxXJ2YVuXJeaIwgvF7VAzY-qVZ9maA282Xj0lS
 bitvavo_client/endpoints/common.py,sha256=fc4gNNZ2zGMJJwkbHexNz6qMDLjl6dalQFGDXWmBo2E,2413
 bitvavo_client/endpoints/private.py,sha256=yChMe-HL2wFm6GBYoghURjdLzSxCPTYlEIOjysCrn3E,34589
 bitvavo_client/endpoints/public.py,sha256=EY7y3vuuo3li1BiPCM2KfSNnoa91X426DPtp8BvHiS8,21944
-bitvavo_client/facade.py,sha256=uEfjZu5Ag2KcSVVgv_KTt7lYkRl0_TzNYXTK5SCA3e8,3583
+bitvavo_client/facade.py,sha256=y08585HMAhYGRI51dUbBezsTFOoZFKgpMZ4GA39r1ew,4368
 bitvavo_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 bitvavo_client/schemas/__init__.py,sha256=udqMyAFElrcBbNJIhoarQuTI-CF425JvPFqgLVjILU8,1126
 bitvavo_client/schemas/private_schemas.py,sha256=cG-cV5HKO8ZvWp3hjUPBFMT6Th0UBumMViI8gAZTyik,6143
@@ -34,6 +34,6 @@ bitvavo_client/schemas/public_schemas.py,sha256=zfV6C_PQvNLLYEWS72ZD77Nm3XtRrEgh
 bitvavo_client/transport/__init__.py,sha256=H7txnyuz6v84_GzdBiqpsehVQitEymgUTA5AJPeUEvg,44
 bitvavo_client/transport/http.py,sha256=H5N-ZQbKwtKsGNadi6YB1gTCViZSns2TMLCGY0LiKgQ,6144
 bitvavo_client/ws/__init__.py,sha256=Q4SVEq3EihXLVUKpguMdxrhfNAoU8cncpMFbU6kIX_0,44
-bitvavo_api_upgraded-4.2.0.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
-bitvavo_api_upgraded-4.2.0.dist-info/METADATA,sha256=l5ySQtIhs57E-OwDwce5hzd4i_JBkZQ-givaObkcfkE,35937
-bitvavo_api_upgraded-4.2.0.dist-info/RECORD,,
+bitvavo_api_upgraded-4.2.1.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
+bitvavo_api_upgraded-4.2.1.dist-info/METADATA,sha256=qil3_u24JDZf1uKRE22_kX87viD56lXcSZw4R6o8EdU,35937
+bitvavo_api_upgraded-4.2.1.dist-info/RECORD,,

bitvavo_client/auth/rate_limit.py

@@ -34,6 +34,7 @@ class RateLimitManager:
             buffer: Buffer to keep before hitting limit
             strategy: Optional strategy callback when rate limit exceeded
         """
+        self.default_remaining: int = default_remaining
         self.state: dict[int, dict[str, int]] = {-1: {"remaining": default_remaining, "resetAt": 0}}
         self.buffer: int = buffer
 
@@ -100,6 +101,12 @@ class RateLimitManager:
         """Invoke the configured strategy when rate limit is exceeded."""
         self._strategy(self, idx, weight)
 
+    def reset_key(self, idx: int) -> None:
+        """Reset the remaining budget and reset time for a key index."""
+        self.ensure_key(idx)
+        self.state[idx]["remaining"] = self.default_remaining
+        self.state[idx]["resetAt"] = 0
+
     def get_remaining(self, idx: int) -> int:
         """Get remaining rate limit for key index.
 

bitvavo_client/facade.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import time
 from typing import TYPE_CHECKING, TypeVar
 
 from bitvavo_client.auth.rate_limit import RateLimitManager
@@ -51,7 +52,7 @@ class BitvavoClient:
 
         # Configure API keys if available
         self._api_keys: list[tuple[str, str]] = []
-        self._current_key: int = 0
+        self._current_key: int = -1
         self._configure_api_keys()
 
     def _configure_api_keys(self) -> None:
@@ -68,18 +69,42 @@ class BitvavoClient:
         for idx, (_key, _secret) in enumerate(self._api_keys):
             self.rate_limiter.ensure_key(idx)
 
-        first_key = self._api_keys[0]
-        self.http.configure_key(first_key[0], first_key[1], 0)
-        if len(self._api_keys) > 1:
+        if self._api_keys:
             self.http.set_key_rotation_callback(self.rotate_key)
 
     def rotate_key(self) -> bool:
         """Rotate to the next configured API key if available."""
-        if len(self._api_keys) <= 1:
+        if not self._api_keys:
             return False
-        self._current_key = (self._current_key + 1) % len(self._api_keys)
-        key, secret = self._api_keys[self._current_key]
-        self.http.configure_key(key, secret, self._current_key)
+
+        now = int(time.time() * 1000)
+
+        if self._current_key == -1:
+            idx = 0
+            if now < self.rate_limiter.get_reset_at(idx):
+                self.rate_limiter.sleep_until_reset(idx)
+            self.rate_limiter.reset_key(idx)
+            self._current_key = idx
+            key, secret = self._api_keys[idx]
+            self.http.configure_key(key, secret, idx)
+            return True
+
+        if self._current_key < len(self._api_keys) - 1:
+            idx = self._current_key + 1
+            if now < self.rate_limiter.get_reset_at(idx):
+                self.rate_limiter.sleep_until_reset(idx)
+            self.rate_limiter.reset_key(idx)
+            self._current_key = idx
+            key, secret = self._api_keys[idx]
+            self.http.configure_key(key, secret, idx)
+            return True
+
+        reset_at = self.rate_limiter.get_reset_at(-1)
+        if now < reset_at:
+            self.rate_limiter.sleep_until_reset(-1)
+        self.rate_limiter.reset_key(-1)
+        self._current_key = -1
+        self.http.configure_key("", "", -1)
         return True
 
     def select_key(self, index: int) -> None: