[Storage Blob] Migrating to TypeSpec

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

@@ -2,6 +2,9 @@
 
 ## 12.31.0b1 (Unreleased)
 
+## Other Changes
+Access Policy was leaking generated model type
+
 ### Features Added
 
 ## 12.30.0 (2026-06-08)

sdk/storage/azure-storage-blob/MANIFEST.in

@@ -1,7 +1,7 @@
 include *.md
-include azure/__init__.py
-include azure/storage/__init__.py
 include LICENSE
+include azure/storage/blob/py.typed
 recursive-include tests *.py
 recursive-include samples *.py *.md
-include azure/storage/blob/py.typed
+include azure/__init__.py
+include azure/storage/__init__.py

sdk/storage/azure-storage-blob/_metadata.json

@@ -0,0 +1,6 @@
+{
+  "apiVersion": "2026-06-06",
+  "apiVersions": {
+    "Storage.Blob": "2026-06-06"
+  }
+}

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

@@ -1,3 +1,4 @@
+# pylint: disable=too-many-lines
 # -------------------------------------------------------------------------
 # Copyright (c) Microsoft Corporation. All rights reserved.
 # Licensed under the MIT License. See License.txt in the project root for
@@ -33,6 +34,7 @@
     _get_page_ranges_options,
     _parse_url,
     _quick_query_options,
+    _strip_snapshot_from_url,
     _resize_blob_options,
     _seal_append_blob_options,
     _set_blob_metadata_options,
@@ -56,15 +58,23 @@
 from ._download import StorageStreamDownloader
 from ._encryption import StorageEncryptionMixin, _ERROR_UNSUPPORTED_METHOD_FOR_ENCRYPTION
 from ._generated import AzureBlobStorage
-from ._generated.models import CpkInfo
 from ._lease import BlobLeaseClient
 from ._models import BlobBlock, BlobProperties, BlobQueryError, BlobType, PageRange, PageRangePaged
 from ._quick_query_helper import BlobQueryReader
 from ._shared.base_client import parse_connection_str, StorageAccountHostsMixin, TransportWrapper
 from ._shared.response_handlers import process_storage_error, return_response_headers
 from ._shared.validation import is_crc64_validation, parse_validation_option
-from ._serialize import get_access_conditions, get_api_version, get_modify_conditions, get_version_id
-from ._upload_helpers import upload_append_blob, upload_block_blob, upload_page_blob
+from ._serialize import (
+    get_access_conditions,
+    get_api_version,
+    get_modify_conditions,
+    get_version_id
+)
+from ._upload_helpers import (
+    upload_append_blob,
+    upload_block_blob,
+    upload_page_blob
+)
 
 if TYPE_CHECKING:
     from azure.core.credentials import AzureNamedKeyCredential, AzureSasCredential, TokenCredential
@@ -178,7 +188,11 @@ def __init__(
         self._raw_credential = credential if credential else sas_token
         self._query_str, credential = self._format_query_string(sas_token, credential, snapshot=self.snapshot)
         super(BlobClient, self).__init__(parsed_url, service="blob", credential=credential, **kwargs)
-        self._client = AzureBlobStorage(self.url, get_api_version(kwargs), base_url=self.url, pipeline=self._pipeline)
+        # The generated client should not include snapshot in the base URL since
+        # it is passed as a method parameter by operations that need it.
+        self._client = AzureBlobStorage(
+            _strip_snapshot_from_url(self.url), version=get_api_version(kwargs), pipeline=self._pipeline
+        )
         self._configure_encryption(kwargs)
 
     def __enter__(self) -> Self:
@@ -612,7 +626,7 @@ def upload_blob(
             raise ValueError("Encryption required but no key was provided.")
         if kwargs.get("cpk") and self.scheme.lower() != "https":
             raise ValueError("Customer provided encryption key must be used over HTTPS.")
-        validate_content = parse_validation_option(kwargs.pop("validate_content", None))
+        validate_content = parse_validation_option(kwargs.pop('validate_content', None))
         if is_crc64_validation(validate_content) and self.key_encryption_key:
             raise ValueError("Using encryption and content validation together is not currently supported.")
         options = _upload_blob_options(
@@ -753,12 +767,13 @@ def download_blob(
             raise ValueError("Offset value must not be None if length is set.")
         if kwargs.get("cpk") and self.scheme.lower() != "https":
             raise ValueError("Customer provided encryption key must be used over HTTPS.")
-        validate_content = parse_validation_option(kwargs.pop("validate_content", None))
+        validate_content = parse_validation_option(kwargs.pop('validate_content', None))
         if is_crc64_validation(validate_content) and self.key_encryption_key:
             raise ValueError("Using encryption and content validation together is not currently supported.")
         options = _download_blob_options(
             blob_name=self.blob_name,
             container_name=self.container_name,
+            snapshot=self.snapshot,
             version_id=get_version_id(self.version_id, kwargs),
             offset=offset,
             length=length,
@@ -863,7 +878,7 @@ def query_blob(self, query_expression: str, **kwargs: Any) -> BlobQueryReader:
             raise ValueError("Customer provided encryption key must be used over HTTPS.")
         options, delimiter = _quick_query_options(self.snapshot, query_expression, **kwargs)
         try:
-            headers, raw_response_body = self._client.blob.query(**options)
+            headers, raw_response_body = self._client.block_blob.query(**options)
         except HttpResponseError as error:
             process_storage_error(error)
         return BlobQueryReader(
@@ -1106,13 +1121,13 @@ def get_blob_properties(self, **kwargs: Any) -> BlobProperties:
         mod_conditions = get_modify_conditions(kwargs)
         version_id = get_version_id(self.version_id, kwargs)
         cpk = kwargs.pop("cpk", None)
-        cpk_info = None
+        cpk_kwargs = {}
         if cpk:
             if self.scheme.lower() != "https":
                 raise ValueError("Customer provided encryption key must be used over HTTPS.")
-            cpk_info = CpkInfo(
-                encryption_key=cpk.key_value, encryption_key_sha256=cpk.key_hash, encryption_algorithm=cpk.algorithm
-            )
+            cpk_kwargs["encryption_key"] = cpk.key_value
+            cpk_kwargs["encryption_key_sha256"] = cpk.key_hash
+            cpk_kwargs["encryption_algorithm"] = cpk.algorithm
         try:
             cls_method = kwargs.pop("cls", None)
             if cls_method:
@@ -1123,10 +1138,10 @@ def get_blob_properties(self, **kwargs: Any) -> BlobProperties:
                     timeout=kwargs.pop("timeout", None),
                     version_id=version_id,
                     snapshot=self.snapshot,
-                    lease_access_conditions=access_conditions,
-                    modified_access_conditions=mod_conditions,
                     cls=kwargs.pop("cls", None) or deserialize_blob_properties,
-                    cpk_info=cpk_info,
+                    **access_conditions,
+                    **mod_conditions,
+                    **cpk_kwargs,
                     **kwargs,
                 ),
             )
@@ -1284,11 +1299,16 @@ def set_immutability_policy(self, immutability_policy: "ImmutabilityPolicy", **k
         """
 
         version_id = get_version_id(self.version_id, kwargs)
-        kwargs["immutability_policy_expiry"] = immutability_policy.expiry_time
-        kwargs["immutability_policy_mode"] = immutability_policy.policy_mode
         return cast(
             Dict[str, str],
-            self._client.blob.set_immutability_policy(cls=return_response_headers, version_id=version_id, **kwargs),
+            self._client.blob.set_immutability_policy(
+                immutability_policy_expiry=immutability_policy.expiry_time,
+                immutability_policy_mode=immutability_policy.policy_mode,
+                cls=return_response_headers,
+                version_id=version_id,
+                snapshot=self.snapshot,
+                **kwargs,
+            ),
         )
 
     @distributed_trace
@@ -1312,7 +1332,7 @@ def delete_immutability_policy(self, **kwargs: Any) -> None:
         """
 
         version_id = get_version_id(self.version_id, kwargs)
-        self._client.blob.delete_immutability_policy(version_id=version_id, **kwargs)
+        self._client.blob.delete_immutability_policy(version_id=version_id, snapshot=self.snapshot, **kwargs)
 
     @distributed_trace
     def set_legal_hold(self, legal_hold: bool, **kwargs: Any) -> Dict[str, Union[str, datetime, bool]]:
@@ -1339,7 +1359,13 @@ def set_legal_hold(self, legal_hold: bool, **kwargs: Any) -> Dict[str, Union[str
         version_id = get_version_id(self.version_id, kwargs)
         return cast(
             Dict[str, Union[str, datetime, bool]],
-            self._client.blob.set_legal_hold(legal_hold, version_id=version_id, cls=return_response_headers, **kwargs),
+            self._client.blob.set_legal_hold(
+                legal_hold=legal_hold,
+                version_id=version_id,
+                snapshot=self.snapshot,
+                cls=return_response_headers,
+                **kwargs,
+            ),
         )
 
     @distributed_trace
@@ -1971,9 +1997,9 @@ def set_standard_blob_tier(self, standard_blob_tier: Union[str, "StandardBlobTie
                 tier=standard_blob_tier,
                 snapshot=self.snapshot,
                 timeout=kwargs.pop("timeout", None),
-                modified_access_conditions=mod_conditions,
-                lease_access_conditions=access_conditions,
                 version_id=version_id,
+                if_tags=mod_conditions.get("if_tags"),
+                **access_conditions,
                 **kwargs,
             )
         except HttpResponseError as error:
@@ -2154,8 +2180,8 @@ def get_block_list(
                 list_type=block_list_type,
                 snapshot=self.snapshot,
                 timeout=kwargs.pop("timeout", None),
-                lease_access_conditions=access_conditions,
-                modified_access_conditions=mod_conditions,
+                if_tags=mod_conditions.get("if_tags"),
+                **access_conditions,
                 **kwargs,
             )
         except HttpResponseError as error:
@@ -2309,8 +2335,9 @@ def set_premium_page_blob_tier(self, premium_page_blob_tier: "PremiumPageBlobTie
             self._client.blob.set_tier(
                 tier=premium_page_blob_tier,
                 timeout=kwargs.pop("timeout", None),
-                lease_access_conditions=access_conditions,
-                modified_access_conditions=mod_conditions,
+                snapshot=self.snapshot,
+                if_tags=mod_conditions.get("if_tags"),
+                **access_conditions,
                 **kwargs,
             )
         except HttpResponseError as error: