review

packages/autorest.python/autorest/codegen/serializers/builder_serializer.py

@@ -899,7 +899,7 @@ def call_request_builder(self, builder: OperationType, is_paging: bool = False)
 
     @property
     def deserialize_for_stream_res(self) -> str:
-        if self.code_model.options["version_tolerant"]:
+        if not self.code_model.is_legacy:
             return "response.iter_bytes()"
         return (
             "(await response.load_body()) or response._content # pylint: disable=protected-access"
@@ -929,7 +929,10 @@ def response_headers_and_deserialization(
                 deserialized = f"{'await ' if self.async_mode else ''}response.read()"
             else:
                 stream_logic = False
-                deserialized = self.deserialize_for_stream_res
+                if self.code_model.options["version_tolerant"]:
+                    deserialized = "response.iter_bytes()"
+                else:
+                    deserialized = f"response.stream_download(self._client.{self.pipeline_name})"
             deserialize_code.append(f"deserialized = {deserialized}")
         elif response.type:
             pylint_disable = ""
@@ -984,9 +987,7 @@ def response_headers_and_deserialization(
     def handle_error_response(self, builder: OperationType) -> List[str]:
         async_await = "await " if self.async_mode else ""
         retval = [f"if response.status_code not in {str(builder.success_status_codes)}:"]
-        need_download = (
-            builder.has_stream_kwargs and self.async_mode and not self.code_model.options["version_tolerant"]
-        )
+        need_download = builder.has_stream_kwargs and self.async_mode
         if not self.code_model.need_request_converter or need_download:
             load_func = "load_body" if need_download else "read"
             retval.extend(

packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyBinary/bodybinary/aio/operations/_download_operations.py

@@ -93,7 +93,7 @@ async def error_stream(self, **kwargs: Any) -> AsyncIterator[bytes]:
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error)
 
-        deserialized = (await response.load_body()) or response._content  # pylint: disable=protected-access
+        deserialized = response.stream_download(self._client._pipeline)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore

packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFile/bodyfile/aio/operations/_files_operations.py

@@ -97,7 +97,7 @@ async def get_file(self, **kwargs: Any) -> AsyncIterator[bytes]:
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error)
 
-        deserialized = (await response.load_body()) or response._content  # pylint: disable=protected-access
+        deserialized = response.stream_download(self._client._pipeline)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -144,7 +144,7 @@ async def get_file_large(self, **kwargs: Any) -> AsyncIterator[bytes]:
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error)
 
-        deserialized = (await response.load_body()) or response._content  # pylint: disable=protected-access
+        deserialized = response.stream_download(self._client._pipeline)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -191,7 +191,7 @@ async def get_empty_file(self, **kwargs: Any) -> AsyncIterator[bytes]:
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error)
 
-        deserialized = (await response.load_body()) or response._content  # pylint: disable=protected-access
+        deserialized = response.stream_download(self._client._pipeline)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore

packages/autorest.python/test/vanilla/legacy/Expected/AcceptanceTests/BodyFormData/bodyformdata/aio/operations/_formdata_operations.py

@@ -112,7 +112,7 @@ async def upload_file(self, file_content: IO[bytes], file_name: str, **kwargs: A
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error)
 
-        deserialized = (await response.load_body()) or response._content  # pylint: disable=protected-access
+        deserialized = response.stream_download(self._client._pipeline)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -166,7 +166,7 @@ async def upload_file_via_body(self, file_content: IO[bytes], **kwargs: Any) ->
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error)
 
-        deserialized = (await response.load_body()) or response._content  # pylint: disable=protected-access
+        deserialized = response.stream_download(self._client._pipeline)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore
@@ -223,7 +223,7 @@ async def upload_files(self, file_content: List[IO[bytes]], **kwargs: Any) -> As
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error)
 
-        deserialized = (await response.load_body()) or response._content  # pylint: disable=protected-access
+        deserialized = response.stream_download(self._client._pipeline)
 
         if cls:
             return cls(pipeline_response, deserialized, {})  # type: ignore