vtexpy 0.0.0b32__tar.gz → 0.0.0b34__tar.gz

{vtexpy-0.0.0b32 → vtexpy-0.0.0b34}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: vtexpy
-Version: 0.0.0b32
+Version: 0.0.0b34
 Summary: Unofficial VTEX API's Python SDK
 Home-page: https://github.com/lvieirajr/vtex-python
 License: Apache

{vtexpy-0.0.0b32 → vtexpy-0.0.0b34}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "poetry.core.masonry.api"
 [tool.poetry]
 name = "vtexpy"
 description = "Unofficial VTEX API's Python SDK"
-version = "0.0.0b32"
+version = "0.0.0b34"
 readme = "README.md"
 license = "Apache"
 authors = [

{vtexpy-0.0.0b32 → vtexpy-0.0.0b34}/vtex/_api/base.py

@@ -18,7 +18,7 @@ from httpx._types import (
     RequestData,
     RequestFiles,
 )
-from limits import RateLimitItem, storage, strategies
+from limits import RateLimitItem, errors, storage, strategies
 from tenacity import (
     retry,
     retry_if_exception_type,
@@ -48,7 +48,7 @@ class BaseAPI:
             parent=self.client.logger,
         )
 
-    def _request(
+    def _request(  # noqa: C901
         self,
         method: HTTPMethodType,
         endpoint: str,
@@ -92,7 +92,10 @@ class BaseAPI:
                 rate_limit and rate_limit_key and request_config.rate_limit_storage_url
             )
             else strategies.MovingWindowRateLimiter(
-                storage.storage_from_string(request_config.rate_limit_storage_url),
+                storage.storage_from_string(
+                    request_config.rate_limit_storage_url,
+                    wrap_exceptions=True,
+                ),
             )
         )
 
@@ -122,14 +125,15 @@ class BaseAPI:
         def send_vtex_request() -> Response:
             with Client(timeout=request_config.timeout) as client:
                 with disable_loggers(["httpcore", "httpx"]):
-                    while (
-                        rate_limit
-                        and rate_limit_key
-                        and rate_limiter
-                        and not rate_limiter.test(rate_limit, rate_limit_key)
-                    ):
-                        sleep(1)
-                        self.logger.info(f"{rate_limiter} limited {rate_limit_key}")
+                    if rate_limit and rate_limit_key and rate_limiter:
+                        while True:
+                            try:
+                                if rate_limiter.test(rate_limit, rate_limit_key):
+                                    break
+                            except errors.StorageError:
+                                pass
+
+                            sleep(1)
 
                     try:
                         response = client.request(
@@ -145,14 +149,10 @@ class BaseAPI:
                         )
                     finally:
                         if rate_limit and rate_limit_key and rate_limiter:
-                            rate_limiter.hit(rate_limit, rate_limit_key)
-                            remaining = rate_limiter.get_window_stats(
-                                rate_limit,
-                                rate_limit_key,
-                            ).remaining
-                            self.logger.info(
-                                f"Remaining requests for {rate_limit_key}: {remaining}",
-                            )
+                            try:
+                                rate_limiter.hit(rate_limit, rate_limit_key)
+                            except errors.StorageError:
+                                pass
 
                 response.request.headers = Headers(
                     redact_headers(dict(response.request.headers)),

{vtexpy-0.0.0b32 → vtexpy-0.0.0b34}/vtex/_api/orders.py

@@ -88,7 +88,7 @@ class OrdersAPI(BaseAPI):
             environment=self.ENVIRONMENT,
             params=params,
             config=self.client.config.with_overrides(**kwargs),
-            rate_limit=parse("2900 per minute"),
+            rate_limit=parse("1800 per minute"),
             rate_limit_key=f"{self.client.config.account_name}:orders",
             response_class=VTEXPaginatedItemsResponse[Any, Any],
         )
@@ -105,7 +105,7 @@ class OrdersAPI(BaseAPI):
             endpoint=f"/api/oms/pvt/orders/{order_id}",
             environment=self.ENVIRONMENT,
             config=self.client.config.with_overrides(**kwargs),
-            rate_limit=parse("5900 per minute"),
+            rate_limit=parse("5800 per minute"),
             rate_limit_key=f"{self.client.config.account_name}:orders",
             response_class=VTEXDataResponse[Any],
         )

{vtexpy-0.0.0b32 → vtexpy-0.0.0b34}/vtex/_api/payments_gateway.py

@@ -37,7 +37,7 @@ class PaymentsGatewayAPI(BaseAPI):
             endpoint=f"/api/pvt/transactions/{transaction_id}/interactions",
             environment=self.ENVIRONMENT,
             config=self.client.config.with_overrides(**kwargs),
-            rate_limit=parse("3900 per minute"),
+            rate_limit=parse("3800 per minute"),
             rate_limit_key=(
                 f"{self.client.config.account_name}:transaction_interactions"
             ),