refactor hierarchy of HttpPolicy & AsyncHttpPolicy

sdk/core/azure-core/azure/core/pipeline/policies/_redirect.py

@@ -41,24 +41,7 @@
 
 _LOGGER = logging.getLogger(__name__)
 
-
-class RedirectPolicy(HTTPPolicy):
-    """A redirect policy.
-
-    A redirect policy in the pipeline can be configured directly or per operation.
-
-    :keyword bool permit_redirects: Whether the client allows redirects. Defaults to True.
-    :keyword int redirect_max: The maximum allowed redirects. Defaults to 30.
-
-    .. admonition:: Example:
-
-        .. literalinclude:: ../samples/test_example_sync.py
-            :start-after: [START redirect_policy]
-            :end-before: [END redirect_policy]
-            :language: python
-            :dedent: 4
-            :caption: Configuring a redirect policy.
-    """
+class RedirectPolicyBase(object):
 
     REDIRECT_STATUSES = frozenset([300, 301, 302, 303, 307, 308])
 
@@ -72,7 +55,7 @@ def __init__(self, **kwargs):
         self._remove_headers_on_redirect = remove_headers.union(self.REDIRECT_HEADERS_BLACKLIST)
         redirect_status = set(kwargs.get('redirect_on_status_codes', []))
         self._redirect_on_status_codes = redirect_status.union(self.REDIRECT_STATUSES)
-        super(RedirectPolicy, self).__init__()
+        super(RedirectPolicyBase, self).__init__()
 
     @classmethod
     def no_redirects(cls):
@@ -141,6 +124,24 @@ def increment(self, settings, response, redirect_location):
             response.http_request.headers.pop(non_redirect_header, None)
         return settings['redirects'] >= 0
 
+class RedirectPolicy(RedirectPolicyBase, HTTPPolicy):
+    """A redirect policy.
+
+    A redirect policy in the pipeline can be configured directly or per operation.
+
+    :keyword bool permit_redirects: Whether the client allows redirects. Defaults to True.
+    :keyword int redirect_max: The maximum allowed redirects. Defaults to 30.
+
+    .. admonition:: Example:
+
+        .. literalinclude:: ../samples/test_example_sync.py
+            :start-after: [START redirect_policy]
+            :end-before: [END redirect_policy]
+            :language: python
+            :dedent: 4
+            :caption: Configuring a redirect policy.
+    """
+
     def send(self, request):
         """Sends the PipelineRequest object to the next policy.
         Uses redirect settings to send request to redirect endpoint if necessary.

sdk/core/azure-core/azure/core/pipeline/policies/_redirect_async.py

@@ -27,10 +27,10 @@
 
 from azure.core.exceptions import TooManyRedirectsError
 from . import AsyncHTTPPolicy
-from ._redirect import RedirectPolicy
+from ._redirect import RedirectPolicyBase
 
 
-class AsyncRedirectPolicy(RedirectPolicy, AsyncHTTPPolicy):
+class AsyncRedirectPolicy(RedirectPolicyBase, AsyncHTTPPolicy):
     """An async redirect policy.
 
     An async redirect policy in the pipeline can be configured directly or per operation.

sdk/core/azure-core/azure/core/pipeline/policies/_retry.py

@@ -53,49 +53,8 @@ class RetryMode(str, Enum):
     Exponential = 'exponential'
     Fixed = 'fixed'
 
-class RetryPolicy(HTTPPolicy):
-    """A retry policy.
-
-    The retry policy in the pipeline can be configured directly, or tweaked on a per-call basis.
-
-    :keyword int retry_total: Total number of retries to allow. Takes precedence over other counts.
-     Default value is 10.
-
-    :keyword int retry_connect: How many connection-related errors to retry on.
-     These are errors raised before the request is sent to the remote server,
-     which we assume has not triggered the server to process the request. Default value is 3.
-
-    :keyword int retry_read: How many times to retry on read errors.
-     These errors are raised after the request was sent to the server, so the
-     request may have side-effects. Default value is 3.
-
-    :keyword int retry_status: How many times to retry on bad status codes. Default value is 3.
-
-    :keyword float retry_backoff_factor: A backoff factor to apply between attempts after the second try
-     (most errors are resolved immediately by a second try without a delay).
-     In fixed mode, retry policy will alwasy sleep for {backoff factor}.
-     In 'exponential' mode, retry policy will sleep for: `{backoff factor} * (2 ** ({number of total retries} - 1))`
-     seconds. If the backoff_factor is 0.1, then the retry will sleep
-     for [0.0s, 0.2s, 0.4s, ...] between retries. The default value is 0.8.
-
-    :keyword int retry_backoff_max: The maximum back off time. Default value is 120 seconds (2 minutes).
-
-    :keyword RetryMode retry_mode: Fixed or exponential delay between attemps, default is exponential.
-
-    :keyword int timeout: Timeout setting for the operation in seconds, default is 604800s (7 days).
-
-    .. admonition:: Example:
-
-        .. literalinclude:: ../samples/test_example_sync.py
-            :start-after: [START retry_policy]
-            :end-before: [END retry_policy]
-            :language: python
-            :dedent: 4
-            :caption: Configuring a retry policy.
-    """
-
+class RetryPolicyBase(object):
     # pylint: disable=too-many-instance-attributes
-
     #: Maximum backoff time.
     BACKOFF_MAX = 120
     _SAFE_CODES = set(range(506)) - set([408, 429, 500, 502, 503, 504])
@@ -116,7 +75,7 @@ def __init__(self, **kwargs):
         self._retry_on_status_codes = set(status_codes) | retry_codes
         self._method_whitelist = frozenset(['HEAD', 'GET', 'PUT', 'DELETE', 'OPTIONS', 'TRACE'])
         self._respect_retry_after_header = True
-        super(RetryPolicy, self).__init__()
+        super(RetryPolicyBase, self).__init__()
 
     @classmethod
     def no_retries(cls):
@@ -179,49 +138,6 @@ def get_retry_after(self, response):
         """
         return _utils.get_retry_after(response)
 
-    def _sleep_for_retry(self, response, transport):
-        """Sleep based on the Retry-After response header value.
-
-        :param response: The PipelineResponse object.
-        :type response: ~azure.core.pipeline.PipelineResponse
-        :param transport: The HTTP transport type.
-        """
-        retry_after = self.get_retry_after(response)
-        if retry_after:
-            transport.sleep(retry_after)
-            return True
-        return False
-
-    def _sleep_backoff(self, settings, transport):
-        """Sleep using exponential backoff. Immediately returns if backoff is 0.
-
-        :param dict settings: The retry settings.
-        :param transport: The HTTP transport type.
-        """
-        backoff = self.get_backoff_time(settings)
-        if backoff <= 0:
-            return
-        transport.sleep(backoff)
-
-    def sleep(self, settings, transport, response=None):
-        """Sleep between retry attempts.
-
-        This method will respect a server's ``Retry-After`` response header
-        and sleep the duration of the time requested. If that is not present, it
-        will use an exponential backoff. By default, the backoff factor is 0 and
-        this method will return immediately.
-
-        :param dict settings: The retry settings.
-        :param transport: The HTTP transport type.
-        :param response: The PipelineResponse object.
-        :type response: ~azure.core.pipeline.PipelineResponse
-        """
-        if response:
-            slept = self._sleep_for_retry(response, transport)
-            if slept:
-                return
-        self._sleep_backoff(settings, transport)
-
     def _is_connection_error(self, err):
         """Errors when we're fairly sure that the server did not receive the
         request, so it should be safe to retry.
@@ -411,6 +327,89 @@ def _configure_positions(self, request, retry_settings):
         retry_settings['body_position'] = body_position
         retry_settings['file_positions'] = file_positions
 
+class RetryPolicy(RetryPolicyBase, HTTPPolicy):
+    """A retry policy.
+
+    The retry policy in the pipeline can be configured directly, or tweaked on a per-call basis.
+
+    :keyword int retry_total: Total number of retries to allow. Takes precedence over other counts.
+     Default value is 10.
+
+    :keyword int retry_connect: How many connection-related errors to retry on.
+     These are errors raised before the request is sent to the remote server,
+     which we assume has not triggered the server to process the request. Default value is 3.
+
+    :keyword int retry_read: How many times to retry on read errors.
+     These errors are raised after the request was sent to the server, so the
+     request may have side-effects. Default value is 3.
+
+    :keyword int retry_status: How many times to retry on bad status codes. Default value is 3.
+
+    :keyword float retry_backoff_factor: A backoff factor to apply between attempts after the second try
+     (most errors are resolved immediately by a second try without a delay).
+     In fixed mode, retry policy will alwasy sleep for {backoff factor}.
+     In 'exponential' mode, retry policy will sleep for: `{backoff factor} * (2 ** ({number of total retries} - 1))`
+     seconds. If the backoff_factor is 0.1, then the retry will sleep
+     for [0.0s, 0.2s, 0.4s, ...] between retries. The default value is 0.8.
+
+    :keyword int retry_backoff_max: The maximum back off time. Default value is 120 seconds (2 minutes).
+
+    :keyword RetryMode retry_mode: Fixed or exponential delay between attemps, default is exponential.
+
+    :keyword int timeout: Timeout setting for the operation in seconds, default is 604800s (7 days).
+
+    .. admonition:: Example:
+
+        .. literalinclude:: ../samples/test_example_sync.py
+            :start-after: [START retry_policy]
+            :end-before: [END retry_policy]
+            :language: python
+            :dedent: 4
+            :caption: Configuring a retry policy.
+    """
+    def _sleep_for_retry(self, response, transport):
+        """Sleep based on the Retry-After response header value.
+
+        :param response: The PipelineResponse object.
+        :type response: ~azure.core.pipeline.PipelineResponse
+        :param transport: The HTTP transport type.
+        """
+        retry_after = self.get_retry_after(response)
+        if retry_after:
+            transport.sleep(retry_after)
+            return True
+        return False
+
+    def _sleep_backoff(self, settings, transport):
+        """Sleep using exponential backoff. Immediately returns if backoff is 0.
+
+        :param dict settings: The retry settings.
+        :param transport: The HTTP transport type.
+        """
+        backoff = self.get_backoff_time(settings)
+        if backoff <= 0:
+            return
+        transport.sleep(backoff)
+
+    def sleep(self, settings, transport, response=None):
+        """Sleep between retry attempts.
+
+        This method will respect a server's ``Retry-After`` response header
+        and sleep the duration of the time requested. If that is not present, it
+        will use an exponential backoff. By default, the backoff factor is 0 and
+        this method will return immediately.
+
+        :param dict settings: The retry settings.
+        :param transport: The HTTP transport type.
+        :param response: The PipelineResponse object.
+        :type response: ~azure.core.pipeline.PipelineResponse
+        """
+        if response:
+            slept = self._sleep_for_retry(response, transport)
+            if slept:
+                return
+        self._sleep_backoff(settings, transport)
+
     def send(self, request):
         """Sends the PipelineRequest object to the next policy. Uses retry settings if necessary.
 

sdk/core/azure-core/azure/core/pipeline/policies/_retry_async.py

@@ -36,15 +36,14 @@
     ClientAuthenticationError,
     ServiceRequestError,
 )
-from ._base import HTTPPolicy
 from ._base_async import AsyncHTTPPolicy
-from ._retry import RetryPolicy
+from ._retry import RetryPolicyBase
 
 _LOGGER = logging.getLogger(__name__)
 
 
 
-class AsyncRetryPolicy(RetryPolicy, AsyncHTTPPolicy):
+class AsyncRetryPolicy(RetryPolicyBase, AsyncHTTPPolicy):
     """Async flavor of the retry policy.
 
     The async retry policy in the pipeline can be configured directly, or tweaked on a per-call basis.