Check allowed methods, remove 413

Author: therve

.generator/src/generator/templates/rest.j2

@@ -21,12 +21,13 @@ from {{ package }}.exceptions import (
 logger = logging.getLogger(__name__)
 
 
-RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 500, 501, 502, 503, 504, 505, 506, 507, 509, 510, 511])
+RETRY_AFTER_STATUS_CODES = frozenset([429, 500, 501, 502, 503, 504, 505, 506, 507, 509, 510, 511])
+RETRY_ALLOWED_METHODS = frozenset(["GET", "PUT", "DELETE", "POST", "PATCH"])
 
 
 class ClientRetry(urllib3.util.Retry):
     RETRY_AFTER_STATUS_CODES = RETRY_AFTER_STATUS_CODES
-    DEFAULT_ALLOWED_METHODS = frozenset(["GET", "PUT", "DELETE", "POST", "PATCH"])
+    DEFAULT_ALLOWED_METHODS = RETRY_ALLOWED_METHODS
 
     def get_retry_after(self, response):
         """
@@ -240,9 +241,10 @@ class AsyncRESTClientObject:
         self._client = aiosonic.HTTPClient(proxy=proxy)
         self._configuration = configuration
 
-    def _retry(self, response, counter):
+    def _retry(self, method, response, counter):
         if (not self._configuration.enable_retry
             or counter >= self._configuration.max_retries
+            or method not in RETRY_ALLOWED_METHODS
             or response.status_code not in RETRY_AFTER_STATUS_CODES):
             return 0
         retry_after = response.headers.get("X-Ratelimit-Reset")
@@ -309,7 +311,7 @@ class AsyncRESTClientObject:
             response = await self._client.request(
                 url, method, headers, query_params, request_body, timeouts=request_timeout
             )
-            retry = self._retry(response, counter)
+            retry = self._retry(method, response, counter)
             if not retry:
                 break
             import asyncio

.pre-commit-config.yaml

@@ -31,7 +31,7 @@ repos:
   - id: generator
     name: generator
     language: python
-    entry: bash -c "cd .generator && poetry install && poetry run python -m generator ./schemas/v1/openapi.yaml ./schemas/v2/openapi.yaml -o ../src/"
+    entry: bash -c "unset VIRTUAL_ENV && cd .generator && poetry install && poetry run python -m generator ./schemas/v1/openapi.yaml ./schemas/v2/openapi.yaml -o ../src/"
     files: "^.generator/(config|schemas/v1|src|poetry.lock|pyproject.toml)"
     stages: [manual]
     pass_filenames: false
@@ -40,7 +40,7 @@ repos:
   - id: examples
     name: examples
     language: python
-    entry: bash -c "cd .generator && poetry install && poetry run pytest"
+    entry: bash -c "unset VIRTUAL_ENV && cd .generator && poetry install && poetry run pytest"
     files: "^.generator/"
     stages: [manual]
     pass_filenames: false

src/datadog_api_client/rest.py

@@ -23,12 +23,13 @@
 logger = logging.getLogger(__name__)
 
 
-RETRY_AFTER_STATUS_CODES = frozenset([413, 429, 500, 501, 502, 503, 504, 505, 506, 507, 509, 510, 511])
+RETRY_AFTER_STATUS_CODES = frozenset([429, 500, 501, 502, 503, 504, 505, 506, 507, 509, 510, 511])
+RETRY_ALLOWED_METHODS = frozenset(["GET", "PUT", "DELETE", "POST", "PATCH"])
 
 
 class ClientRetry(urllib3.util.Retry):
     RETRY_AFTER_STATUS_CODES = RETRY_AFTER_STATUS_CODES
-    DEFAULT_ALLOWED_METHODS = frozenset(["GET", "PUT", "DELETE", "POST", "PATCH"])
+    DEFAULT_ALLOWED_METHODS = RETRY_ALLOWED_METHODS
 
     def get_retry_after(self, response):
         """
@@ -242,10 +243,11 @@ def __init__(self, configuration):
         self._client = aiosonic.HTTPClient(proxy=proxy)
         self._configuration = configuration
 
-    def _retry(self, response, counter):
+    def _retry(self, method, response, counter):
         if (
             not self._configuration.enable_retry
             or counter >= self._configuration.max_retries
+            or method not in RETRY_ALLOWED_METHODS
             or response.status_code not in RETRY_AFTER_STATUS_CODES
         ):
             return 0
@@ -313,7 +315,7 @@ async def request(
             response = await self._client.request(
                 url, method, headers, query_params, request_body, timeouts=request_timeout
             )
-            retry = self._retry(response, counter)
+            retry = self._retry(method, response, counter)
             if not retry:
                 break
             import asyncio