🐛 Fix #236: stop forwarding backoff_jitter to requests

README.md

@@ -161,7 +161,7 @@ The following options can be provided when initializing the `Gateway` to customi
 * `retry_backoff_jitter` (float, default `3.0`)
 * `retry_backoff_max` (float, default `30`)
 
-These correspond to their counterparts in [`urllib3.util.Retry`](https://urllib3.readthedocs.io/en/stable/reference/urllib3.util.html#urllib3.util.Retry).
+These options follow the same behavior as their counterparts in [`urllib3.util.Retry`](https://urllib3.readthedocs.io/en/stable/reference/urllib3.util.html#urllib3.util.Retry), but are implemented by the SDK retry logic.
 
 Example:
 

osc_sdk_python/retry.py

@@ -24,16 +24,16 @@ def __init__(self, session: requests.Session, method: str, url: str, **kwargs):
         # Extract all retry parameters
         self.attempt: int = int(self.request_kwargs.pop("attempt", 0))
         self.max_retries: int = int(
-            self.request_kwargs.get("max_retries", MAX_RETRIES)
+            self.request_kwargs.pop("max_retries", MAX_RETRIES)
         )
         self.backoff_factor: float = float(
-            self.request_kwargs.get("backoff_factor", RETRY_BACKOFF_FACTOR)
+            self.request_kwargs.pop("backoff_factor", RETRY_BACKOFF_FACTOR)
         )
         self.backoff_jitter: float = float(
-            self.request_kwargs.get("backoff_jitter", RETRY_BACKOFF_JITTER)
+            self.request_kwargs.pop("backoff_jitter", RETRY_BACKOFF_JITTER)
         )
         self.backoff_max: float = float(
-            self.request_kwargs.get("backoff_max", RETRY_BACKOFF_MAX)
+            self.request_kwargs.pop("backoff_max", RETRY_BACKOFF_MAX)
         )
 
     def execute_once(self) -> requests.Response:
@@ -47,7 +47,15 @@ def increment(self) -> "Retry":
         Return a copy of the retry with an incremented attempt count
         """
         new_kwargs = self.request_kwargs.copy()
-        new_kwargs["attempt"] = self.attempt + 1
+        new_kwargs.update(
+            {
+                "attempt": self.attempt + 1,
+                "max_retries": self.max_retries,
+                "backoff_factor": self.backoff_factor,
+                "backoff_jitter": self.backoff_jitter,
+                "backoff_max": self.backoff_max,
+            }
+        )
         return Retry(self.session, self.method, self.url, **new_kwargs)
 
     def should_retry(self, e: requests.exceptions.RequestException) -> bool:

pyproject.toml

@@ -21,7 +21,7 @@ classifiers = [
 dependencies = [
     "requests>=2.20.0",
     "ruamel.yaml==0.19.1",
-    "urllib3>=2.6.3",
+    "urllib3>=1.26.0",
 ]
 
 [dependency-groups]