vtexpy 0.0.0b29__tar.gz → 0.0.0b30__tar.gz

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

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

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

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

@@ -126,26 +126,10 @@ class BaseAPI:
                         rate_limit
                         and rate_limit_key
                         and rate_limiter
-                        and not rate_limiter.test(
-                            rate_limit,
-                            request_config.account_name,
-                            rate_limit_key,
-                        )
+                        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"{rate_limit_key}",
-                            extra={
-                                "account_name": request_config.account_name,
-                                "rate_limit_key": rate_limit_key,
-                                "remaining": rate_limiter.get_window_stats(
-                                    rate_limit,
-                                    request_config.account_name,
-                                    rate_limit_key,
-                                ).remaining,
-                            },
-                        )
+                        self.logger.info(f"{rate_limiter} limited {rate_limit_key}")
 
                     try:
                         response = client.request(
@@ -161,22 +145,13 @@ class BaseAPI:
                         )
                     finally:
                         if rate_limit and rate_limit_key and rate_limiter:
-                            rate_limiter.hit(
+                            rate_limiter.hit(rate_limit, rate_limit_key)
+                            remaining = rate_limiter.get_window_stats(
                                 rate_limit,
-                                request_config.account_name,
                                 rate_limit_key,
-                            )
+                            ).remaining
                             self.logger.info(
-                                "Rate limit updated!",
-                                extra={
-                                    "account_name": request_config.account_name,
-                                    "rate_limit_key": rate_limit_key,
-                                    "remaining": rate_limiter.get_window_stats(
-                                        rate_limit,
-                                        request_config.account_name,
-                                        rate_limit_key,
-                                    ).remaining,
-                                },
+                                f"Remaining requests for {rate_limit_key}: {remaining}",
                             )
 
                 response.request.headers = Headers(

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

@@ -89,7 +89,7 @@ class OrdersAPI(BaseAPI):
             params=params,
             config=self.client.config.with_overrides(**kwargs),
             rate_limit=parse("4500 per minute"),
-            rate_limit_key="orders",
+            rate_limit_key=f"{self.client.config.account_name}:orders",
             response_class=VTEXPaginatedItemsResponse[Any, Any],
         )
 
@@ -106,7 +106,7 @@ class OrdersAPI(BaseAPI):
             environment=self.ENVIRONMENT,
             config=self.client.config.with_overrides(**kwargs),
             rate_limit=parse("4500 per minute"),
-            rate_limit_key="orders",
+            rate_limit_key=f"{self.client.config.account_name}:orders",
             response_class=VTEXDataResponse[Any],
         )
 
@@ -127,7 +127,7 @@ class OrdersAPI(BaseAPI):
             },
             config=self.client.config.with_overrides(**kwargs),
             rate_limit=parse("4500 per minute"),
-            rate_limit_key="orders",
+            rate_limit_key=f"{self.client.config.account_name}:orders",
             response_class=VTEXItemsResponse[Any, Any],
         )
 
@@ -153,6 +153,6 @@ class OrdersAPI(BaseAPI):
             json={"handles": handles},
             config=self.client.config.with_overrides(**kwargs),
             rate_limit=parse("4500 per minute"),
-            rate_limit_key="orders",
+            rate_limit_key=f"{self.client.config.account_name}:orders",
             response_class=VTEXDataResponse[Any],
         )

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

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