moar cleanup

Author: swaroopAkkineniWorkos

workos/utils/_base_http_client.py

@@ -217,6 +217,18 @@ def _is_retryable_error(self, response: httpx.Response) -> bool:
 
     def _get_retry_delay(self, attempt: int, response: httpx.Response, retry_config: RetryConfig) -> float:
         """Calculate delay with exponential backoff and jitter."""
+        return self._calculate_backoff_delay(attempt, retry_config)
+
+    def _calculate_backoff_delay(self, attempt: int, retry_config: RetryConfig) -> float:
+        """Calculate delay with exponential backoff and jitter.
+        
+        Args:
+            attempt: The current retry attempt number (0-indexed)
+            retry_config: The retry configuration
+            
+        Returns:
+            The delay in seconds to wait before the next retry
+        """
         # Exponential backoff: base_delay * 2^attempt
         delay = retry_config.base_delay * (2 ** attempt)
 

workos/utils/http_client.py

@@ -1,5 +1,4 @@
 import asyncio
-import random
 import time
 from types import TracebackType
 from typing import Optional, Type, Union
@@ -142,18 +141,14 @@ def request(
             except Exception as exc:
                 last_exception = exc
                 if attempt < retry_config.max_retries and self._should_retry_exception(exc):
-                    delay = retry_config.base_delay * (2 ** attempt)
-                    delay = min(delay, retry_config.max_delay)
-                    jitter_amount = delay * retry_config.jitter * random.random()
-                    time.sleep(delay + jitter_amount)
+                    delay = self._calculate_backoff_delay(attempt, retry_config)
+                    time.sleep(delay)
                     continue
                 raise
 
-        # Should not reach here, but raise last exception if we do
         if last_exception is not None:
             raise last_exception
 
-        # Fallback: this should never happen
         raise RuntimeError("Unexpected state in retry logic")
 
 
@@ -279,10 +274,8 @@ async def request(
             except Exception as exc:
                 last_exception = exc
                 if attempt < retry_config.max_retries and self._should_retry_exception(exc):
-                    delay = retry_config.base_delay * (2 ** attempt)
-                    delay = min(delay, retry_config.max_delay)
-                    jitter_amount = delay * retry_config.jitter * random.random()
-                    await asyncio.sleep(delay + jitter_amount)
+                    delay = self._calculate_backoff_delay(attempt, retry_config)
+                    await asyncio.sleep(delay)
                     continue
                 raise