Fix imports for new _generated folder structure in azure-storage-blob

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,

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

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,

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
 

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

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,

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 (

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
 
 

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,

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
 

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 (

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"]:

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,

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")
 

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

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,

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

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

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,

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
 

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 (

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
 

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")