azure-storage-blob 12.23.0__py3-none-any.whl → 12.23.0b1__py3-none-any.whl

azure/storage/blob/_container_client.py

@@ -1412,8 +1412,6 @@ class ContainerClient(StorageAccountHostsMixin, StorageEncryptionMixin):    # py
         """
         if len(blobs) == 0:
             return iter([])
-        if self._is_localhost:
-            kwargs['url_prepend'] = self.account_name
 
         reqs, options = _generate_delete_blobs_options(
             self._query_str,
@@ -1496,8 +1494,6 @@ class ContainerClient(StorageAccountHostsMixin, StorageEncryptionMixin):    # py
         :return: An iterator of responses, one for each blob in order
         :rtype: Iterator[~azure.core.pipeline.transport.HttpResponse]
         """
-        if self._is_localhost:
-            kwargs['url_prepend'] = self.account_name
         reqs, options = _generate_set_tiers_options(
             self._query_str,
             self.container_name,
@@ -1557,8 +1553,6 @@ class ContainerClient(StorageAccountHostsMixin, StorageEncryptionMixin):    # py
         :return: An iterator of responses, one for each blob in order
         :rtype: Iterator[~azure.core.pipeline.transport.HttpResponse]
         """
-        if self._is_localhost:
-            kwargs['url_prepend'] = self.account_name
         reqs, options = _generate_set_tiers_options(
             self._query_str,
             self.container_name,

azure/storage/blob/_container_client_helpers.py

@@ -120,7 +120,6 @@ def _generate_delete_blobs_options(
     if_modified_since = kwargs.pop('if_modified_since', None)
     if_unmodified_since = kwargs.pop('if_unmodified_since', None)
     if_tags_match_condition = kwargs.pop('if_tags_match_condition', None)
-    url_prepend = kwargs.pop('url_prepend', None)
     kwargs.update({'raise_on_any_failure': raise_on_any_failure,
                     'sas': query_str.replace('?', '&'),
                     'timeout': '&timeout=' + str(timeout) if timeout else "",
@@ -158,11 +157,9 @@ def _generate_delete_blobs_options(
 
         req = HttpRequest(
             "DELETE",
-            (f"{'/' + quote(url_prepend) if url_prepend else ''}/"
-             f"{quote(container_name)}/{quote(str(blob_name), safe='/~')}{query_str}"),
+            f"/{quote(container_name)}/{quote(str(blob_name), safe='/~')}{query_str}",
             headers=header_parameters
         )
-
         req.format_parameters(query_parameters)
         reqs.append(req)
 
@@ -226,7 +223,6 @@ def _generate_set_tiers_options(
     raise_on_any_failure = kwargs.pop('raise_on_any_failure', True)
     rehydrate_priority = kwargs.pop('rehydrate_priority', None)
     if_tags = kwargs.pop('if_tags_match_condition', None)
-    url_prepend = kwargs.pop('url_prepend', None)
     kwargs.update({'raise_on_any_failure': raise_on_any_failure,
                     'sas': query_str.replace('?', '&'),
                     'timeout': '&timeout=' + str(timeout) if timeout else "",
@@ -256,8 +252,7 @@ def _generate_set_tiers_options(
 
         req = HttpRequest(
             "PUT",
-            (f"{'/' + quote(url_prepend) if url_prepend else ''}/"
-             f"{quote(container_name)}/{quote(str(blob_name), safe='/~')}{query_str}"),
+            f"/{quote(container_name)}/{quote(str(blob_name), safe='/~')}{query_str}",
             headers=header_parameters
         )
         req.format_parameters(query_parameters)

azure/storage/blob/_generated/_azure_blob_storage.py

@@ -8,7 +8,6 @@
 
 from copy import deepcopy
 from typing import Any
-from typing_extensions import Self
 
 from azure.core import PipelineClient
 from azure.core.pipeline import policies
@@ -111,7 +110,7 @@ class AzureBlobStorage:  # pylint: disable=client-accepts-api-version-keyword
     def close(self) -> None:
         self._client.close()
 
-    def __enter__(self) -> Self:
+    def __enter__(self) -> "AzureBlobStorage":
         self._client.__enter__()
         return self
 

azure/storage/blob/_generated/_serialization.py

@@ -144,8 +144,6 @@ class RawDeserializer:
                 # context otherwise.
                 _LOGGER.critical("Wasn't XML not JSON, failing")
                 raise DeserializationError("XML is invalid") from err
-        elif content_type.startswith("text/"):
-            return data_as_str
         raise DeserializationError("Cannot deserialize content-type: {}".format(content_type))
 
     @classmethod

azure/storage/blob/_generated/_vendor.py

@@ -0,0 +1,16 @@
+# --------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# Code generated by Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from azure.core.pipeline.transport import HttpRequest
+
+
+def _convert_request(request, files=None):
+    data = request.content if not files else None
+    request = HttpRequest(method=request.method, url=request.url, headers=request.headers, data=data)
+    if files:
+        request.set_formdata_body(files)
+    return request

azure/storage/blob/_generated/aio/_azure_blob_storage.py

@@ -8,7 +8,6 @@
 
 from copy import deepcopy
 from typing import Any, Awaitable
-from typing_extensions import Self
 
 from azure.core import AsyncPipelineClient
 from azure.core.pipeline import policies
@@ -113,7 +112,7 @@ class AzureBlobStorage:  # pylint: disable=client-accepts-api-version-keyword
     async def close(self) -> None:
         await self._client.close()
 
-    async def __aenter__(self) -> Self:
+    async def __aenter__(self) -> "AzureBlobStorage":
         await self._client.__aenter__()
         return self
 

azure/storage/blob/_generated/aio/operations/_append_blob_operations.py

@@ -19,11 +19,13 @@ from azure.core.exceptions import (
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.pipeline.transport import AsyncHttpResponse
+from azure.core.rest import HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 
 from ... import models as _models
+from ..._vendor import _convert_request
 from ...operations._append_blob_operations import (
     build_append_block_from_url_request,
     build_append_block_request,
@@ -205,6 +207,7 @@ class AppendBlobOperations:
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -369,6 +372,7 @@ class AppendBlobOperations:
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -570,6 +574,7 @@ class AppendBlobOperations:
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -691,6 +696,7 @@ class AppendBlobOperations:
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False

azure/storage/blob/_generated/aio/operations/_blob_operations.py

@@ -16,16 +16,16 @@ from azure.core.exceptions import (
     ResourceExistsError,
     ResourceNotFoundError,
     ResourceNotModifiedError,
-    StreamClosedError,
-    StreamConsumedError,
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.pipeline.transport import AsyncHttpResponse
+from azure.core.rest import HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 
 from ... import models as _models
+from ..._vendor import _convert_request
 from ...operations._blob_operations import (
     build_abort_copy_from_url_request,
     build_acquire_lease_request,
@@ -194,9 +194,9 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _decompress = kwargs.pop("decompress", True)
         _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
@@ -205,10 +205,6 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 206]:
-            try:
-                await response.read()  # Load the body in memory and close the socket
-            except (StreamConsumedError, StreamClosedError):
-                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.StorageError, pipeline_response)
             raise HttpResponseError(response=response, model=error)
@@ -293,6 +289,8 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             )
             response_headers["x-ms-legal-hold"] = self._deserialize("bool", response.headers.get("x-ms-legal-hold"))
 
+            deserialized = response.stream_download(self._client._pipeline)
+
         if response.status_code == 206:
             response_headers["Last-Modified"] = self._deserialize("rfc-1123", response.headers.get("Last-Modified"))
             response_headers["x-ms-creation-time"] = self._deserialize(
@@ -375,7 +373,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             )
             response_headers["x-ms-legal-hold"] = self._deserialize("bool", response.headers.get("x-ms-legal-hold"))
 
-        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+            deserialized = response.stream_download(self._client._pipeline)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -480,6 +478,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -692,6 +691,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -759,6 +759,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -838,6 +839,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -959,6 +961,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1052,6 +1055,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1125,6 +1129,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1195,6 +1200,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1324,6 +1330,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1441,6 +1448,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1541,6 +1549,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1640,6 +1649,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1746,6 +1756,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1852,6 +1863,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1982,6 +1994,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2156,6 +2169,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2343,6 +2357,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2443,6 +2458,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2557,6 +2573,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2572,11 +2589,19 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             raise HttpResponseError(response=response, model=error)
 
         response_headers = {}
-        response_headers["x-ms-client-request-id"] = self._deserialize(
-            "str", response.headers.get("x-ms-client-request-id")
-        )
-        response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
-        response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+        if response.status_code == 200:
+            response_headers["x-ms-client-request-id"] = self._deserialize(
+                "str", response.headers.get("x-ms-client-request-id")
+            )
+            response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
+            response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
+
+        if response.status_code == 202:
+            response_headers["x-ms-client-request-id"] = self._deserialize(
+                "str", response.headers.get("x-ms-client-request-id")
+            )
+            response_headers["x-ms-request-id"] = self._deserialize("str", response.headers.get("x-ms-request-id"))
+            response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
 
         if cls:
             return cls(pipeline_response, None, response_headers)  # type: ignore
@@ -2625,6 +2650,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2757,9 +2783,9 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
-        _decompress = kwargs.pop("decompress", True)
         _stream = True
         pipeline_response: PipelineResponse = await self._client._pipeline.run(  # pylint: disable=protected-access
             _request, stream=_stream, **kwargs
@@ -2768,10 +2794,6 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 206]:
-            try:
-                await response.read()  # Load the body in memory and close the socket
-            except (StreamConsumedError, StreamClosedError):
-                pass
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.StorageError, pipeline_response)
             raise HttpResponseError(response=response, model=error)
@@ -2835,6 +2857,8 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
                 "bytearray", response.headers.get("x-ms-blob-content-md5")
             )
 
+            deserialized = response.stream_download(self._client._pipeline)
+
         if response.status_code == 206:
             response_headers["Last-Modified"] = self._deserialize("rfc-1123", response.headers.get("Last-Modified"))
             response_headers["x-ms-meta"] = self._deserialize("{str}", response.headers.get("x-ms-meta"))
@@ -2896,7 +2920,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
                 "bytearray", response.headers.get("x-ms-blob-content-md5")
             )
 
-        deserialized = response.stream_download(self._client._pipeline, decompress=_decompress)
+            deserialized = response.stream_download(self._client._pipeline)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -2977,6 +3001,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -2999,7 +3024,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
         response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
         response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
 
-        deserialized = self._deserialize("BlobTags", pipeline_response.http_response)
+        deserialized = self._deserialize("BlobTags", pipeline_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore
@@ -3092,6 +3117,7 @@ class BlobOperations:  # pylint: disable=too-many-public-methods
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False

azure/storage/blob/_generated/aio/operations/_block_blob_operations.py

@@ -19,11 +19,13 @@ from azure.core.exceptions import (
     map_error,
 )
 from azure.core.pipeline import PipelineResponse
-from azure.core.rest import AsyncHttpResponse, HttpRequest
+from azure.core.pipeline.transport import AsyncHttpResponse
+from azure.core.rest import HttpRequest
 from azure.core.tracing.decorator_async import distributed_trace_async
 from azure.core.utils import case_insensitive_dict
 
 from ... import models as _models
+from ..._vendor import _convert_request
 from ...operations._block_blob_operations import (
     build_commit_block_list_request,
     build_get_block_list_request,
@@ -234,6 +236,7 @@ class BlockBlobOperations:
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -468,6 +471,7 @@ class BlockBlobOperations:
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -606,6 +610,7 @@ class BlockBlobOperations:
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -768,6 +773,7 @@ class BlockBlobOperations:
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -978,6 +984,7 @@ class BlockBlobOperations:
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1094,6 +1101,7 @@ class BlockBlobOperations:
             headers=_headers,
             params=_params,
         )
+        _request = _convert_request(_request)
         _request.url = self._client.format_url(_request.url)
 
         _stream = False
@@ -1122,7 +1130,7 @@ class BlockBlobOperations:
         response_headers["x-ms-version"] = self._deserialize("str", response.headers.get("x-ms-version"))
         response_headers["Date"] = self._deserialize("rfc-1123", response.headers.get("Date"))
 
-        deserialized = self._deserialize("BlockList", pipeline_response.http_response)
+        deserialized = self._deserialize("BlockList", pipeline_response)
 
         if cls:
             return cls(pipeline_response, deserialized, response_headers)  # type: ignore