_shared parity

Author: l0lawrence

sdk/storage/azure-storage-file-datalake/azure/storage/filedatalake/_shared/response_handlers.py

@@ -92,14 +92,8 @@ def process_storage_error(storage_error) -> NoReturn:  # type: ignore [misc] # p
         )
     if not storage_error.response or storage_error.response.status_code in [200, 204]:
         raise storage_error
-    # The generated layer now pre-maps 412 (Precondition Failed) responses to typed
-    # exceptions based on the request's match condition (e.g. ResourceExistsError for
-    # IfMissing, ResourceNotFoundError for IfPresent). Historically 412 was not
-    # pre-mapped and always flowed through the error-code mapping below, surfacing as
-    # ResourceModifiedError. Skip the "already serialized" shortcut for 412 so it is
-    # re-mapped from x-ms-error-code (ConditionNotMet -> ResourceModifiedError) and the
-    # public exception type is preserved for users.
-    if storage_error.response.status_code != 412 and isinstance(
+    # If it is one of those three then it has been serialized prior by the generated layer.
+    if isinstance(
         storage_error,
         (PartialBatchErrorException, ClientAuthenticationError, ResourceNotFoundError, ResourceExistsError),
     ):

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_deserialize.py

@@ -65,16 +65,15 @@ def deserialize_file_stream(
 ) -> Tuple["LocationMode", Any]:
     file_properties = deserialize_file_properties(response, obj, headers)
     http_response = response.http_response
-    # The TypeSpec-generated download returns a raw bytes iterator (from iter_bytes/iter_raw)
-    # that doesn't allow attaching attributes. If properties can't be set on the stream
-    # directly, wrap it so callers can still reach .properties and .response.
-    try:
-        obj.properties = file_properties
-    except AttributeError:
+    # The TypeSpec-generated download returns a raw bytes iterator or a structured-message
+    # decoder rather than a response object that exposes .properties. When the stream can't
+    # carry our metadata, wrap it so callers can still reach .properties and .response.
+    if not hasattr(obj, "properties"):
         stream = _StreamWrapper(obj)
         stream.properties = file_properties
         stream.response = http_response
         return http_response.location_mode, stream
+    obj.properties = file_properties
     return http_response.location_mode, obj
 
 

sdk/storage/azure-storage-file-share/azure/storage/fileshare/_shared/response_handlers.py

@@ -93,8 +93,14 @@ def process_storage_error(storage_error) -> NoReturn:  # type: ignore [misc] # p
         )
     if not storage_error.response or storage_error.response.status_code in [200, 204]:
         raise storage_error
-    # If it is one of those three then it has been serialized prior by the generated layer.
-    if isinstance(
+    # The generated layer now pre-maps 412 (Precondition Failed) responses to typed
+    # exceptions based on the request's match condition (e.g. ResourceExistsError for
+    # IfMissing, ResourceNotFoundError for IfPresent). Historically 412 was not
+    # pre-mapped and always flowed through the error-code mapping below, surfacing as
+    # ResourceModifiedError. Skip the "already serialized" shortcut for 412 so it is
+    # re-mapped from x-ms-error-code (ConditionNotMet -> ResourceModifiedError) and the
+    # public exception type is preserved for users.
+    if storage_error.response.status_code != 412 and isinstance(
         storage_error,
         (PartialBatchErrorException, ClientAuthenticationError, ResourceNotFoundError, ResourceExistsError),
     ):