vtexpy 0.0.0b28__tar.gz → 0.0.0b30__tar.gz

{vtexpy-0.0.0b28 → vtexpy-0.0.0b30}/PKG-INFO

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

{vtexpy-0.0.0b28 → vtexpy-0.0.0b30}/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.0b28"
+version = "0.0.0b30"
 readme = "README.md"
 license = "Apache"
 authors = [

{vtexpy-0.0.0b28 → vtexpy-0.0.0b30}/vtex/_api/base.py

@@ -62,6 +62,7 @@ class BaseAPI:
         files: Union[RequestFiles, None] = None,
         config: Union[VTEXConfig, None] = None,
         rate_limit: Union[RateLimitItem, None] = None,
+        rate_limit_key: Union[str, None] = None,
         response_class: Union[Type[VTEXResponseType], None] = None,
         **kwargs: Any,
     ) -> VTEXResponseType:
@@ -87,7 +88,9 @@ class BaseAPI:
 
         rate_limiter = (
             None
-            if not (rate_limit and request_config.rate_limit_storage_url)
+            if not (
+                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),
             )
@@ -120,25 +123,13 @@ class BaseAPI:
             with Client(timeout=request_config.timeout) as client:
                 with disable_loggers(["httpcore", "httpx"]):
                     while (
-                        rate_limiter
-                        and rate_limit
-                        and not rate_limiter.test(
-                            rate_limit,
-                            request_config.account_name,
-                            endpoint,
-                        )
+                        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 {request_config.account_name} on "
-                            f"{endpoint}",
-                            extra={
-                                "endpoint": endpoint,
-                                "account_name": request_config.account_name,
-                                "rate_limiter": rate_limiter,
-                                "rate_limit": rate_limit,
-                            },
-                        )
+                        self.logger.info(f"{rate_limiter} limited {rate_limit_key}")
 
                     try:
                         response = client.request(
@@ -153,11 +144,14 @@ class BaseAPI:
                             files=files,
                         )
                     finally:
-                        if rate_limiter and rate_limit:
-                            rate_limiter.hit(
+                        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,
-                                request_config.account_name,
-                                endpoint,
+                                rate_limit_key,
+                            ).remaining
+                            self.logger.info(
+                                f"Remaining requests for {rate_limit_key}: {remaining}",
                             )
 
                 response.request.headers = Headers(

{vtexpy-0.0.0b28 → vtexpy-0.0.0b30}/vtex/_api/orders.py

@@ -89,6 +89,7 @@ class OrdersAPI(BaseAPI):
             params=params,
             config=self.client.config.with_overrides(**kwargs),
             rate_limit=parse("4500 per minute"),
+            rate_limit_key=f"{self.client.config.account_name}:orders",
             response_class=VTEXPaginatedItemsResponse[Any, Any],
         )
 
@@ -104,6 +105,8 @@ class OrdersAPI(BaseAPI):
             endpoint=f"/api/oms/pvt/orders/{order_id}",
             environment=self.ENVIRONMENT,
             config=self.client.config.with_overrides(**kwargs),
+            rate_limit=parse("4500 per minute"),
+            rate_limit_key=f"{self.client.config.account_name}:orders",
             response_class=VTEXDataResponse[Any],
         )
 
@@ -123,6 +126,8 @@ class OrdersAPI(BaseAPI):
                 ),
             },
             config=self.client.config.with_overrides(**kwargs),
+            rate_limit=parse("4500 per minute"),
+            rate_limit_key=f"{self.client.config.account_name}:orders",
             response_class=VTEXItemsResponse[Any, Any],
         )
 
@@ -147,5 +152,7 @@ class OrdersAPI(BaseAPI):
             environment=self.ENVIRONMENT,
             json={"handles": handles},
             config=self.client.config.with_overrides(**kwargs),
+            rate_limit=parse("4500 per minute"),
+            rate_limit_key=f"{self.client.config.account_name}:orders",
             response_class=VTEXDataResponse[Any],
         )

{vtexpy-0.0.0b28 → vtexpy-0.0.0b30}/vtex/_api/payments_gateway.py

@@ -38,6 +38,9 @@ class PaymentsGatewayAPI(BaseAPI):
             environment=self.ENVIRONMENT,
             config=self.client.config.with_overrides(**kwargs),
             rate_limit=parse("3500 per minute"),
+            rate_limit_key=(
+                f"{self.client.config.account_name}:transaction_interactions"
+            ),
             response_class=VTEXItemsResponse[Any, Any],
         )