update protocolutils to new http interfaces

Author: jonemo

python-packages/smithy-python/smithy_python/protocolutils.py

@@ -1,7 +1,7 @@
 import json
 from typing import NamedTuple
 
-from .interfaces.http import Response
+from .interfaces.http import HTTPResponse
 from .types import Document
 from .utils import expect_type
 
@@ -31,7 +31,7 @@ class RestJsonErrorInfo(NamedTuple):
 
 
 async def parse_rest_json_error_info(
-    http_response: Response, check_body: bool = True
+    http_response: HTTPResponse, check_body: bool = True
 ) -> RestJsonErrorInfo:
     """Parses generic RestJson error info from an HTTP response.
 
@@ -43,12 +43,12 @@ async def parse_rest_json_error_info(
     message: str | None = None
     json_body: dict[str, Document] | None = None
 
-    for header_key, header_value in http_response.headers:
-        if header_key.lower() == _REST_JSON_CODE_HEADER:
-            code = header_value
+    for field in http_response.fields:
+        if field.name.lower() == _REST_JSON_CODE_HEADER:
+            code = field.values[0]
 
     if check_body:
-        if body := await http_response.body.read():
+        if body := await http_response.consume_body():
             json_body = json.loads(body)
 
         if json_body:

python-packages/smithy-python/tests/unit/test_protocolutils.py

@@ -1,27 +1,27 @@
+# Copyright 2023 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+
 import json
+from collections.abc import AsyncIterator
 
 import pytest
 
-from smithy_python._private.http import Response
-from smithy_python.interfaces.http import HeadersList
+from smithy_python._private.http import HTTPResponse, tuples_list_to_fields
+from smithy_python.async_utils import async_list
 from smithy_python.protocolutils import RestJsonErrorInfo, parse_rest_json_error_info
 from smithy_python.types import Document
 
 
-class _AsyncReader:
-    def __init__(self, body: str):
-        self._body: bytes = body.encode("utf-8")
-
-    async def read(self, size: int = -1) -> bytes:
-        result: bytes = self._body
-        if size <= 0:
-            self._body = b""
-        else:
-            result = self._body[:size]
-            self._body = self._body[size:]
-        return result
-
-
 @pytest.mark.parametrize(
     "headers, body, expected",
     [
@@ -82,17 +82,19 @@ async def read(self, size: int = -1) -> bytes:
     ],
 )
 async def test_parse_rest_json_error_info(
-    headers: HeadersList, body: Document, expected: RestJsonErrorInfo
+    headers: list[tuple[str, str]], body: Document, expected: RestJsonErrorInfo
 ) -> None:
-    response = Response(
-        status_code=400, headers=headers, body=_AsyncReader(json.dumps(body))
+    response = HTTPResponse(
+        status=400,
+        fields=tuples_list_to_fields(headers),
+        body=async_list([json.dumps(body).encode()]),
     )
     actual = await parse_rest_json_error_info(response)
     assert actual == expected
 
 
 class _ExceptionThrowingBody:
-    async def read(self, size: int = -1) -> bytes:
+    def __aiter__(self) -> AsyncIterator[bytes]:
         raise Exception("Body unexpectedly accessed")
 
 
@@ -117,8 +119,10 @@ async def read(self, size: int = -1) -> bytes:
     ],
 )
 async def test_parse_rest_json_error_info_without_body(
-    headers: HeadersList, expected: RestJsonErrorInfo
+    headers: list[tuple[str, str]], expected: RestJsonErrorInfo
 ) -> None:
-    response = Response(status_code=400, headers=headers, body=_ExceptionThrowingBody())
+    response = HTTPResponse(
+        status=400, fields=tuples_list_to_fields(headers), body=_ExceptionThrowingBody()
+    )
     actual = await parse_rest_json_error_info(response, check_body=False)
     assert actual == expected