From c4c94b6b8cce18f686b9425439db17a92b2b9248 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 23 Jan 2026 18:13:59 +0000 Subject: [PATCH 1/2] Initial plan From cd95fe218053f701d2e9888c9d18e03e94662ebe Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Fri, 23 Jan 2026 18:48:53 +0000 Subject: [PATCH 2/2] Update all imports to use new _generated/azure/storage/blobs folder structure Co-authored-by: l0lawrence <100643745+l0lawrence@users.noreply.github.com> --- .../azure/storage/blob/__init__.py | 2 +- .../azure/storage/blob/_blob_client.py | 4 ++-- .../azure/storage/blob/_blob_client.pyi | 2 +- .../azure/storage/blob/_blob_client_helpers.py | 4 ++-- .../azure/storage/blob/_blob_service_client.py | 4 ++-- .../azure/storage/blob/_container_client.py | 4 ++-- .../azure/storage/blob/_container_client.pyi | 2 +- .../storage/blob/_container_client_helpers.py | 4 ++-- .../azure/storage/blob/_deserialize.py | 2 +- .../azure/storage/blob/_download.py | 4 ++-- .../azure/storage/blob/_list_blobs_helper.py | 4 ++-- .../azure/storage/blob/_models.py | 16 ++++++++-------- .../azure/storage/blob/_serialize.py | 2 +- .../azure/storage/blob/_upload_helpers.py | 4 ++-- .../azure/storage/blob/aio/_blob_client_async.py | 4 ++-- .../storage/blob/aio/_blob_client_async.pyi | 2 +- .../blob/aio/_blob_service_client_async.py | 4 ++-- .../storage/blob/aio/_container_client_async.py | 4 ++-- .../storage/blob/aio/_container_client_async.pyi | 2 +- .../azure/storage/blob/aio/_download_async.py | 2 +- .../azure/storage/blob/aio/_list_blobs_helper.py | 2 +- .../azure/storage/blob/aio/_models.py | 2 +- .../azure/storage/blob/aio/_upload_helpers.py | 4 ++-- 23 files changed, 42 insertions(+), 42 deletions(-) diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/__init__.py b/sdk/storage/azure-storage-blob/azure/storage/blob/__init__.py index f952370aecb3..7be757dac0ab 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/__init__.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/__init__.py @@ -26,7 +26,7 @@ UserDelegationKey, Services ) -from ._generated.models import RehydratePriority +from ._generated.azure.storage.blobs.models import RehydratePriority from ._models import ( BlobType, BlockState, diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client.py index 1e3f7ea3d6ca..660f81932ebb 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client.py @@ -58,8 +58,8 @@ ) from ._download import StorageStreamDownloader from ._encryption import StorageEncryptionMixin, _ERROR_UNSUPPORTED_METHOD_FOR_ENCRYPTION -from ._generated import AzureBlobStorage -from ._generated.models import CpkInfo +from ._generated.azure.storage.blobs import BlobClient as AzureBlobStorage +from ._generated.azure.storage.blobs.models import CpkInfo from ._lease import BlobLeaseClient from ._models import BlobBlock, BlobProperties, BlobQueryError, BlobType, PageRange, PageRangePaged from ._quick_query_helper import BlobQueryReader diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client.pyi b/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client.pyi index 4b50f447948e..6e3f8bb2abbe 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client.pyi +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client.pyi @@ -30,7 +30,7 @@ from azure.core.tracing.decorator import distributed_trace from ._container_client import ContainerClient from ._download import StorageStreamDownloader from ._encryption import StorageEncryptionMixin -from ._generated.models import RehydratePriority +from ._generated.azure.storage.blobs.models import RehydratePriority from ._lease import BlobLeaseClient from ._models import ( ArrowDialect, diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client_helpers.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client_helpers.py index 16e418835cd4..6e43a1097df5 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client_helpers.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_client_helpers.py @@ -15,7 +15,7 @@ from ._deserialize import deserialize_blob_stream from ._encryption import modify_user_agent_for_encryption, _ERROR_UNSUPPORTED_METHOD_FOR_ENCRYPTION -from ._generated.models import ( +from ._generated.azure.storage.blobs.models import ( AppendPositionAccessConditions, BlobHTTPHeaders, BlockList, @@ -60,7 +60,7 @@ if TYPE_CHECKING: from urllib.parse import ParseResult - from ._generated import AzureBlobStorage + from ._generated.azure.storage.blobs import BlobClient as AzureBlobStorage from ._models import ContentSettings from ._shared.models import StorageConfiguration diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_service_client.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_service_client.py index 81b5775ea24d..e31bb2d6daae 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_service_client.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_blob_service_client.py @@ -22,8 +22,8 @@ from ._container_client import ContainerClient from ._deserialize import service_properties_deserialize, service_stats_deserialize from ._encryption import StorageEncryptionMixin -from ._generated import AzureBlobStorage -from ._generated.models import KeyInfo, StorageServiceProperties +from ._generated.azure.storage.blobs import BlobClient as AzureBlobStorage +from ._generated.azure.storage.blobs.models import KeyInfo, StorageServiceProperties from ._list_blobs_helper import FilteredBlobPaged from ._models import BlobProperties, ContainerProperties, ContainerPropertiesPaged, CorsRule from ._serialize import get_api_version diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client.py index e35e9ce9b0f4..da3bbb732e7b 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client.py @@ -29,8 +29,8 @@ from ._deserialize import deserialize_container_properties from ._download import StorageStreamDownloader from ._encryption import StorageEncryptionMixin -from ._generated import AzureBlobStorage -from ._generated.models import SignedIdentifier +from ._generated.azure.storage.blobs import BlobClient as AzureBlobStorage +from ._generated.azure.storage.blobs.models import SignedIdentifier from ._lease import BlobLeaseClient from ._list_blobs_helper import ( BlobNamesPaged, diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client.pyi b/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client.pyi index 8825670779d7..ce84728b66ad 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client.pyi +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client.pyi @@ -31,7 +31,7 @@ from ._blob_client import BlobClient from ._blob_service_client import BlobServiceClient from ._download import StorageStreamDownloader from ._encryption import StorageEncryptionMixin -from ._generated.models import RehydratePriority +from ._generated.azure.storage.blobs.models import RehydratePriority from ._lease import BlobLeaseClient from ._list_blobs_helper import BlobPrefix from ._models import ( diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client_helpers.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client_helpers.py index 82edd48dffb8..3c2c3c4cb7eb 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client_helpers.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_container_client_helpers.py @@ -10,14 +10,14 @@ from azure.core import MatchConditions from azure.core.pipeline.transport import HttpRequest from ._blob_client_helpers import _generic_delete_blob_options -from ._generated import AzureBlobStorage +from ._generated.azure.storage.blobs import BlobClient as AzureBlobStorage from ._models import BlobProperties from ._shared.base_client import parse_query if TYPE_CHECKING: from azure.storage.blob import RehydratePriority from urllib.parse import ParseResult - from ._generated.models import LeaseAccessConditions, ModifiedAccessConditions + from ._generated.azure.storage.blobs.models import LeaseAccessConditions, ModifiedAccessConditions from ._models import PremiumPageBlobTier, StandardBlobTier diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_deserialize.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_deserialize.py index 19ec4c07e338..dd7663ce9641 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_deserialize.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_deserialize.py @@ -29,7 +29,7 @@ if TYPE_CHECKING: from azure.core.pipeline import PipelineResponse - from ._generated.models import ( + from ._generated.azure.storage.blobs.models import ( BlobItemInternal, BlobTags, PageList, diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_download.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_download.py index 6b4482f3c621..bcdfc13e1b81 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_download.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_download.py @@ -32,8 +32,8 @@ if TYPE_CHECKING: from codecs import IncrementalDecoder from ._encryption import _EncryptionData - from ._generated import AzureBlobStorage - from ._generated.operations import BlobOperations + from ._generated.azure.storage.blobs import BlobClient as AzureBlobStorage + from ._generated.azure.storage.blobs.operations import BlobOperations from ._models import BlobProperties from ._shared.models import StorageConfiguration diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_list_blobs_helper.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_list_blobs_helper.py index 4d55a6c647eb..1e0100f58df0 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_list_blobs_helper.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_list_blobs_helper.py @@ -17,8 +17,8 @@ load_xml_string, parse_tags ) -from ._generated.models import BlobItemInternal, BlobPrefix as GenBlobPrefix, FilterBlobItem -from ._generated._utils.serialization import Deserializer +from ._generated.azure.storage.blobs.models import BlobItemInternal, BlobPrefix as GenBlobPrefix, FilterBlobItem +from ._generated.azure.storage.blobs._utils.serialization import Deserializer from ._models import BlobProperties, FilteredBlob from ._shared.models import DictMixin from ._shared.response_handlers import ( diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_models.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_models.py index b849e8948808..5fa733af20f3 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_models.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_models.py @@ -16,17 +16,17 @@ from ._shared import decode_base64_to_bytes from ._shared.response_handlers import return_context_and_deserialized, process_storage_error from ._shared.models import DictMixin, get_enum_value -from ._generated.models import AccessPolicy as GenAccessPolicy -from ._generated.models import ArrowField -from ._generated.models import CorsRule as GeneratedCorsRule -from ._generated.models import Logging as GeneratedLogging -from ._generated.models import Metrics as GeneratedMetrics -from ._generated.models import RetentionPolicy as GeneratedRetentionPolicy -from ._generated.models import StaticWebsite as GeneratedStaticWebsite +from ._generated.azure.storage.blobs.models import AccessPolicy as GenAccessPolicy +from ._generated.azure.storage.blobs.models import ArrowField +from ._generated.azure.storage.blobs.models import CorsRule as GeneratedCorsRule +from ._generated.azure.storage.blobs.models import Logging as GeneratedLogging +from ._generated.azure.storage.blobs.models import Metrics as GeneratedMetrics +from ._generated.azure.storage.blobs.models import RetentionPolicy as GeneratedRetentionPolicy +from ._generated.azure.storage.blobs.models import StaticWebsite as GeneratedStaticWebsite if TYPE_CHECKING: from datetime import datetime - from ._generated.models import PageList + from ._generated.azure.storage.blobs.models import PageList # Parse a generated PageList into a single list of PageRange sorted by start. def parse_page_list(page_list: "PageList") -> List["PageRange"]: diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_serialize.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_serialize.py index bc290bfe2d08..91dfb6854548 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_serialize.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_serialize.py @@ -12,7 +12,7 @@ from azure.core import MatchConditions -from ._generated.models import ( +from ._generated.azure.storage.blobs.models import ( ArrowConfiguration, BlobModifiedAccessConditions, BlobTag, diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/_upload_helpers.py b/sdk/storage/azure-storage-blob/azure/storage/blob/_upload_helpers.py index 2ce55f7ab237..be33bc2edd36 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/_upload_helpers.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/_upload_helpers.py @@ -18,7 +18,7 @@ get_adjusted_upload_size, get_blob_encryptor_and_padder ) -from ._generated.models import ( +from ._generated.azure.storage.blobs.models import ( AppendPositionAccessConditions, BlockLookupList, ModifiedAccessConditions @@ -34,7 +34,7 @@ ) if TYPE_CHECKING: - from ._generated.operations import AppendBlobOperations, BlockBlobOperations, PageBlobOperations + from ._generated.azure.storage.blobs.operations import AppendBlobOperations, BlockBlobOperations, PageBlobOperations from ._shared.models import StorageConfiguration BlobLeaseClient = TypeVar("BlobLeaseClient") diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_client_async.py b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_client_async.py index 3166093a736d..ea107af25f8a 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_client_async.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_client_async.py @@ -69,8 +69,8 @@ parse_tags ) from .._encryption import StorageEncryptionMixin, _ERROR_UNSUPPORTED_METHOD_FOR_ENCRYPTION -from .._generated.aio import AzureBlobStorage -from .._generated.models import CpkInfo +from .._generated.azure.storage.blobs.aio import BlobClient as AzureBlobStorage +from .._generated.azure.storage.blobs.models import CpkInfo from .._models import BlobType, BlobBlock, BlobProperties, BlobQueryError, PageRange from .._serialize import get_access_conditions, get_api_version, get_modify_conditions, get_version_id from .._shared.base_client import StorageAccountHostsMixin diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_client_async.pyi b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_client_async.pyi index 94dd817efdf0..cf1a6cef4738 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_client_async.pyi +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_client_async.pyi @@ -35,7 +35,7 @@ from ._container_client_async import ContainerClient from ._download_async import StorageStreamDownloader from ._lease_async import BlobLeaseClient from .._encryption import StorageEncryptionMixin -from .._generated.models import RehydratePriority +from .._generated.azure.storage.blobs.models import RehydratePriority from .._models import ( BlobType, BlobBlock, diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_service_client_async.py b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_service_client_async.py index 6d28b4c6d732..2dd35cb6d6b6 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_service_client_async.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_blob_service_client_async.py @@ -25,8 +25,8 @@ from .._blob_service_client_helpers import _parse_url from .._deserialize import service_properties_deserialize, service_stats_deserialize from .._encryption import StorageEncryptionMixin -from .._generated.aio import AzureBlobStorage -from .._generated.models import StorageServiceProperties, KeyInfo +from .._generated.azure.storage.blobs.aio import BlobClient as AzureBlobStorage +from .._generated.azure.storage.blobs.models import StorageServiceProperties, KeyInfo from .._models import BlobProperties, ContainerProperties, CorsRule from .._serialize import get_api_version from .._shared.base_client import parse_query, StorageAccountHostsMixin diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_container_client_async.py b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_container_client_async.py index 72376a2dfcfe..d4e6cd088bff 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_container_client_async.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_container_client_async.py @@ -35,8 +35,8 @@ ) from .._deserialize import deserialize_container_properties from .._encryption import StorageEncryptionMixin -from .._generated.aio import AzureBlobStorage -from .._generated.models import SignedIdentifier +from .._generated.azure.storage.blobs.aio import BlobClient as AzureBlobStorage +from .._generated.azure.storage.blobs.models import SignedIdentifier from .._list_blobs_helper import IgnoreListBlobsDeserializer from .._models import ContainerProperties, BlobType, BlobProperties, FilteredBlob from .._serialize import get_modify_conditions, get_container_cpk_scope_info, get_api_version, get_access_conditions diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_container_client_async.pyi b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_container_client_async.pyi index f4be54eaea38..b67cf71ea254 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_container_client_async.pyi +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_container_client_async.pyi @@ -38,7 +38,7 @@ from ._download_async import StorageStreamDownloader from ._lease_async import BlobLeaseClient from ._list_blobs_helper import BlobPrefix from .._encryption import StorageEncryptionMixin -from .._generated.models import RehydratePriority +from .._generated.azure.storage.blobs.models import RehydratePriority from .._models import ( AccessPolicy, BlobType, diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_download_async.py b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_download_async.py index b4355e8ee841..518298618e46 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_download_async.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_download_async.py @@ -35,7 +35,7 @@ if TYPE_CHECKING: from codecs import IncrementalDecoder from .._encryption import _EncryptionData - from .._generated.aio import AzureBlobStorage + from .._generated.azure.storage.blobs.aio import BlobClient as AzureBlobStorage from .._models import BlobProperties from .._shared.models import StorageConfiguration diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_list_blobs_helper.py b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_list_blobs_helper.py index 1731a3186c40..abe6b8e72d04 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_list_blobs_helper.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_list_blobs_helper.py @@ -16,7 +16,7 @@ load_xml_int, load_xml_string ) -from .._generated.models import BlobItemInternal, BlobPrefix as GenBlobPrefix +from .._generated.azure.storage.blobs.models import BlobItemInternal, BlobPrefix as GenBlobPrefix from .._models import BlobProperties from .._shared.models import DictMixin from .._shared.response_handlers import ( diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_models.py b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_models.py index 27d1d8fa3c0b..85f81e185b9b 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_models.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_models.py @@ -11,7 +11,7 @@ from azure.core.exceptions import HttpResponseError from .._deserialize import parse_tags -from .._generated.models import FilterBlobItem +from .._generated.azure.storage.blobs.models import FilterBlobItem from .._models import ContainerProperties, FilteredBlob, parse_page_list from .._shared.response_handlers import process_storage_error, return_context_and_deserialized diff --git a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_upload_helpers.py b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_upload_helpers.py index 794beee36e3b..61cad91f37fe 100644 --- a/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_upload_helpers.py +++ b/sdk/storage/azure-storage-blob/azure/storage/blob/aio/_upload_helpers.py @@ -19,7 +19,7 @@ _ENCRYPTION_PROTOCOL_V1, _ENCRYPTION_PROTOCOL_V2 ) -from .._generated.models import ( +from .._generated.azure.storage.blobs.models import ( AppendPositionAccessConditions, BlockLookupList, ModifiedAccessConditions @@ -35,7 +35,7 @@ from .._upload_helpers import _any_conditions, _convert_mod_error if TYPE_CHECKING: - from .._generated.aio.operations import AppendBlobOperations, BlockBlobOperations, PageBlobOperations + from .._generated.azure.storage.blobs.aio.operations import AppendBlobOperations, BlockBlobOperations, PageBlobOperations from .._shared.models import StorageConfiguration BlobLeaseClient = TypeVar("BlobLeaseClient")