Refactor retry logic method naming for clarity

Author: swaroopAkkineniWorkos

workos/audit_logs.py

@@ -90,13 +90,13 @@ def create_event(
 
         headers["idempotency-key"] = idempotency_key
 
-        # Enable retries for audit log event creation with default settings
+        # Enable retries for audit log event creation with default retryConfig
         self._http_client.request(
             EVENTS_PATH,
             method=REQUEST_METHOD_POST,
             json=json,
             headers=headers,
-            retry_config=RetryConfig(),  # Uses default values: 3 retries, exponential backoff
+            retry_config=RetryConfig(),
         )
 
     def create_export(

workos/utils/_base_http_client.py

@@ -218,23 +218,22 @@ def _is_retryable_error(self, response: httpx.Response) -> bool:
         """Determine if an error should be retried."""
         return response.status_code in RETRY_STATUS_CODES
 
-    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:
+    def _is_retryable_exception(self, exc: Exception) -> bool:
+        """Determine if an exception should trigger a retry."""
+        # Retry on network [connection, timeout] exceptions
+        if isinstance(exc, (httpx.ConnectError, httpx.TimeoutException)):
+            return True
+        return False
+
+    def _get_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
+            The delay, in seconds, to wait before the next retry
         """
         # Exponential backoff: base_delay * 2^attempt
         delay: float = retry_config.base_delay * (2**attempt)
@@ -246,13 +245,6 @@ def _calculate_backoff_delay(
         jitter_amount: float = delay * retry_config.jitter * random.random()
         return delay + jitter_amount
 
-    def _should_retry_exception(self, exc: Exception) -> bool:
-        """Determine if an exception should trigger a retry."""
-        # Retry on network errors (connection, timeout)
-        if isinstance(exc, (httpx.ConnectError, httpx.TimeoutException)):
-            return True
-        return False
-
     def build_request_url(
         self,
         url: str,

workos/utils/http_client.py

@@ -133,7 +133,7 @@ def request(
                 if attempt < retry_config.max_retries and self._is_retryable_error(
                     response
                 ):
-                    delay = self._get_retry_delay(attempt, response, retry_config)
+                    delay = self._get_backoff_delay(attempt, retry_config)
                     time.sleep(delay)
                     continue
 
@@ -142,10 +142,8 @@ def request(
 
             except Exception as exc:
                 last_exception = exc
-                if attempt < retry_config.max_retries and self._should_retry_exception(
-                    exc
-                ):
-                    delay = self._calculate_backoff_delay(attempt, retry_config)
+                if attempt < retry_config.max_retries and self._is_retryable_exception(exc):
+                    delay = self._get_backoff_delay(attempt, retry_config)
                     time.sleep(delay)
                     continue
                 raise
@@ -270,7 +268,7 @@ async def request(
                 if attempt < retry_config.max_retries and self._is_retryable_error(
                     response
                 ):
-                    delay = self._get_retry_delay(attempt, response, retry_config)
+                    delay = self._get_backoff_delay(attempt, retry_config)
                     await asyncio.sleep(delay)
                     continue
 
@@ -279,10 +277,8 @@ async def request(
 
             except Exception as exc:
                 last_exception = exc
-                if attempt < retry_config.max_retries and self._should_retry_exception(
-                    exc
-                ):
-                    delay = self._calculate_backoff_delay(attempt, retry_config)
+                if attempt < retry_config.max_retries and self._is_retryable_exception(exc):
+                    delay = self._get_backoff_delay(attempt, retry_config)
                     await asyncio.sleep(delay)
                     continue
                 raise