[storage.blob] Remove requests as dependency for storage.blob

sdk/storage/azure-storage-blob/CHANGELOG.md

@@ -5,6 +5,8 @@
 ### Features Added
 
 ### Bugs Fixed
+- Removed `requests` import from `azure.storage.blob._download`.  #25017
+- Fixed retry mechanism in `azure.storage.blob._download`.  #25017
 
 ## 12.13.0b1 (2022-06-15)
 

sdk/storage/azure-storage-blob/azure/storage/blob/_download.py

@@ -11,8 +11,7 @@
 from io import BytesIO
 from typing import Iterator, Union
 
-import requests
-from azure.core.exceptions import HttpResponseError, ServiceResponseError
+from azure.core.exceptions import HttpResponseError, IncompleteReadError, ServiceResponseError
 from azure.core.tracing.common import with_current_context
 
 from ._shared.request_handlers import validate_and_format_range_headers
@@ -205,17 +204,17 @@ def _download_chunk(self, chunk_start, chunk_end):
                         download_stream_current=self.progress_total,
                         **self.request_options
                     )
-                except HttpResponseError as error:
-                    process_storage_error(error)
-
-                try:
-                    chunk_data = process_content(response, offset[0], offset[1], self.encryption_options)
                     retry_active = False
-                except (requests.exceptions.ChunkedEncodingError, requests.exceptions.ConnectionError) as error:
+                except (IncompleteReadError, ServiceResponseError) as error:
                     retry_total -= 1
                     if retry_total <= 0:
                         raise ServiceResponseError(error, error=error)
                     time.sleep(1)
+                except HttpResponseError as error:
+                    process_storage_error(error)
+
+                chunk_data = process_content(response, offset[0], offset[1], self.encryption_options)
+
 
             # This makes sure that if_match is set so that we can validate
             # that subsequent downloads are to an unmodified blob
@@ -434,6 +433,14 @@ def _initial_request(self):
                     self.size = self._file_size - self._start_range
                 else:
                     self.size = self._file_size
+                retry_active = False
+
+            except (IncompleteReadError, ServiceResponseError) as error:
+                retry_total -= 1
+                if retry_total <= 0:
+                    raise ServiceResponseError(error, error=error)
+                time.sleep(1)
+                continue
 
             except HttpResponseError as error:
                 if self._start_range is None and error.response.status_code == 416:
@@ -447,6 +454,13 @@ def _initial_request(self):
                             download_stream_current=0,
                             **self._request_options
                         )
+                        retry_active = False
+                    except (IncompleteReadError, ServiceResponseError) as error:
+                        retry_total -= 1
+                        if retry_total <= 0:
+                            raise ServiceResponseError(error, error=error)
+                        time.sleep(1)
+                        continue
                     except HttpResponseError as error:
                         process_storage_error(error)
 
@@ -456,22 +470,15 @@ def _initial_request(self):
                 else:
                     process_storage_error(error)
 
-            try:
-                if self.size == 0:
-                    self._current_content = b""
-                else:
-                    self._current_content = process_content(
-                        response,
-                        self._initial_offset[0],
-                        self._initial_offset[1],
-                        self._encryption_options
-                    )
-                retry_active = False
-            except (requests.exceptions.ChunkedEncodingError, requests.exceptions.ConnectionError) as error:
-                retry_total -= 1
-                if retry_total <= 0:
-                    raise ServiceResponseError(error, error=error)
-                time.sleep(1)
+            if self.size == 0:
+                self._current_content = b""
+            else:
+                self._current_content = process_content(
+                    response,
+                    self._initial_offset[0],
+                    self._initial_offset[1],
+                    self._encryption_options
+                )
 
         # get page ranges to optimize downloading sparse page blob
         if response.properties.blob_type == 'PageBlob':