add back response.read() check for all operations (#2658)

.chronus/changes/stream_reading-2024-5-25-18-18-57.md

@@ -0,0 +1,8 @@
+---
+changeKind: fix
+packages:
+  - "@autorest/python"
+  - "@azure-tools/typespec-python"
+---
+
+ensure all streamed responses are read before throwing an error

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

@@ -961,11 +961,12 @@ 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)}:"]
-        response_read = f"    {async_await}response.read()  # Load the body in memory and close the socket"
-        if builder.stream_value is True:  # _stream is True so no need to judge it
-            retval.append(response_read)
-        elif isinstance(builder.stream_value, str):  # _stream is not sure, so we need to judge it
-            retval.extend(["    if _stream:", f"    {response_read}"])
+        retval.extend(
+            [
+                "    if _stream:",
+                f"        {async_await} response.read()  # Load the body in memory and close the socket",
+            ]
+        )
         type_ignore = "  # type: ignore" if _need_type_ignore(builder) else ""
         retval.append(
             f"    map_error(status_code=response.status_code, response=response, error_map=error_map){type_ignore}"

packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/aio/operations/_operations.py

@@ -87,6 +87,8 @@ async def head200(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 404]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 
@@ -128,6 +130,8 @@ async def head204(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 
@@ -169,6 +173,8 @@ async def head404(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 

packages/autorest.python/samples/specification/azure_key_credential/generated/azure/key/credential/sample/operations/_operations.py

@@ -107,6 +107,8 @@ def head200(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-return
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 404]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 
@@ -148,6 +150,8 @@ def head204(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-return
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 
@@ -189,6 +193,8 @@ def head404(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-return
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 

packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/aio/operations/_operations.py

@@ -87,6 +87,8 @@ async def head200(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 404]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 
@@ -128,6 +130,8 @@ async def head204(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 
@@ -169,6 +173,8 @@ async def head404(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 

packages/autorest.python/samples/specification/basic/generated/azure/basic/sample/operations/_operations.py

@@ -107,6 +107,8 @@ def head200(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-return
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 404]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 
@@ -148,6 +150,8 @@ def head204(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-return
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 
@@ -189,6 +193,8 @@ def head404(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-return
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 

packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/_operations/_operations.py

@@ -119,7 +119,8 @@ def _basic_polling_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 204]:
-            response.read()  # Load the body in memory and close the socket
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 
@@ -337,6 +338,8 @@ def get_next(next_link=None):
             response = pipeline_response.http_response
 
             if response.status_code not in [200]:
+                if _stream:
+                    response.read()  # Load the body in memory and close the socket
                 map_error(status_code=response.status_code, response=response, error_map=error_map)
                 raise HttpResponseError(response=response)
 

packages/autorest.python/samples/specification/directives/generated/azure/directives/sample/aio/_operations/_operations.py

@@ -90,7 +90,8 @@ async def _basic_polling_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 204]:
-            await response.read()  # Load the body in memory and close the socket
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response)
 
@@ -312,6 +313,8 @@ async def get_next(next_link=None):
             response = pipeline_response.http_response
 
             if response.status_code not in [200]:
+                if _stream:
+                    await response.read()  # Load the body in memory and close the socket
                 map_error(status_code=response.status_code, response=response, error_map=error_map)
                 raise HttpResponseError(response=response)
 

packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/aio/operations/_http_success_operations.py

@@ -84,6 +84,8 @@ async def head200(self, **kwargs: Any) -> bool:
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 404]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -126,6 +128,8 @@ async def head204(self, **kwargs: Any) -> bool:
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -168,6 +172,8 @@ async def head404(self, **kwargs: Any) -> bool:
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 

packages/autorest.python/samples/specification/management/generated/azure/mgmt/sample/operations/_http_success_operations.py

@@ -108,6 +108,8 @@ def head200(self, **kwargs: Any) -> bool:
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 404]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -150,6 +152,8 @@ def head204(self, **kwargs: Any) -> bool:
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -192,6 +196,8 @@ def head404(self, **kwargs: Any) -> bool:
         response = pipeline_response.http_response
 
         if response.status_code not in [204, 404]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 

packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_multiapi_service_client_operations.py

@@ -100,6 +100,8 @@ async def test_one(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -152,7 +154,8 @@ async def _test_lro_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 204]:
-            await response.read()  # Load the body in memory and close the socket
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -301,7 +304,8 @@ async def _test_lro_and_paging_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
-            await response.read()  # Load the body in memory and close the socket
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -396,6 +400,8 @@ async def get_next(next_link=None):
             response = pipeline_response.http_response
 
             if response.status_code not in [200]:
+                if _stream:
+                    await response.read()  # Load the body in memory and close the socket
                 map_error(status_code=response.status_code, response=response, error_map=error_map)
                 raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -485,6 +491,8 @@ async def test_different_calls(  # pylint: disable=inconsistent-return-statement
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)

packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/aio/operations/_operation_group_one_operations.py

@@ -92,6 +92,8 @@ async def test_two(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)

packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_multiapi_service_client_operations.py

@@ -178,6 +178,8 @@ def test_one(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -230,7 +232,8 @@ def _test_lro_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200, 204]:
-            response.read()  # Load the body in memory and close the socket
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -376,7 +379,8 @@ def _test_lro_and_paging_initial(
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
-            response.read()  # Load the body in memory and close the socket
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -471,6 +475,8 @@ def get_next(next_link=None):
             response = pipeline_response.http_response
 
             if response.status_code not in [200]:
+                if _stream:
+                    response.read()  # Load the body in memory and close the socket
                 map_error(status_code=response.status_code, response=response, error_map=error_map)
                 raise HttpResponseError(response=response, error_format=ARMErrorFormat)
 
@@ -560,6 +566,8 @@ def test_different_calls(  # pylint: disable=inconsistent-return-statements
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)

packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v1/operations/_operation_group_one_operations.py

@@ -114,6 +114,8 @@ def test_two(self, **kwargs: Any) -> None:  # pylint: disable=inconsistent-retur
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
+            if _stream:
+                response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)

packages/autorest.python/samples/specification/multiapi/generated/azure/multiapi/sample/v2/aio/operations/_multiapi_service_client_operations.py

@@ -87,6 +87,8 @@ async def test_one(self, id: int, message: Optional[str] = None, **kwargs: Any)
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)
@@ -145,6 +147,8 @@ async def test_different_calls(  # pylint: disable=inconsistent-return-statement
         response = pipeline_response.http_response
 
         if response.status_code not in [200]:
+            if _stream:
+                await response.read()  # Load the body in memory and close the socket
             map_error(status_code=response.status_code, response=response, error_map=error_map)
             error = self._deserialize.failsafe_deserialize(_models.Error, pipeline_response)
             raise HttpResponseError(response=response, model=error, error_format=ARMErrorFormat)