# 0.1.3

* simplify storing cached Response data

Author: igorcoding

CHANGELOG.md

@@ -1,3 +1,6 @@
+# 0.1.3
+* simplify storing cached Response data
+
 # 0.1.2
 * added `auto_read_body` to request and backends in order to automatically read response body so that all retry logic could happen in case of errors
 

extapi/http/backends/aiohttp.py

@@ -13,7 +13,7 @@
 
 
 class AiohttpResponseWrap(BackendResponseProtocol[aiohttp.ClientResponse]):
-    __slots__ = ("_original",)
+    __slots__ = ("_original", "_body")
 
     def __init__(self, response: aiohttp.ClientResponse, *, body: bytes | None = None):
         self._original = response
@@ -39,14 +39,8 @@ async def json(
         encoding: str | None,
         loads: Callable[[str], Any] = DEFAULT_JSON_DECODER,
     ) -> Any:
-        if self._body is not None:
-            if encoding is None:
-                s = self._body.decode()
-            else:
-                s = self._body.decode(encoding=encoding)
-            return loads(s)
-
-        # if body is not supplied - delegate to original
+        # always delegate to original aiohttp.ClientResponse
+        # because the data has already been read
         return await self._original.json(encoding=encoding, loads=loads)
 
 

extapi/http/backends/httpx.py

@@ -12,7 +12,7 @@
 
 
 class HttpxResponseWrap(BackendResponseProtocol[httpx.Response]):
-    __slots__ = ("_original",)
+    __slots__ = ("_original", "_body")
 
     def __init__(self, response: httpx.Response, *, body: bytes | None = None):
         self._original = response

extapi/http/types.py

@@ -66,18 +66,12 @@ class Response(Generic[T]):
     headers: CIMultiDict = field(default_factory=lambda: CIMultiDict())
     backend_response: BackendResponseProtocol[T]
 
-    _data: bytes | None = None
-
     @property
     def original(self) -> T:
         return self.backend_response.original()
 
     async def read(self) -> bytes:
-        if self._data is not None:
-            return self._data
-
-        self._data = await self.backend_response.read()
-        return self._data
+        return await self.backend_response.read()
 
     async def json(
         self,

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "extapi"
-version = "0.1.2"
+version = "0.1.3"
 description = "External API library"
 authors = [
     { name = "KTS", email = "hello@kts.tech" }

tests/conftest.py

@@ -39,7 +39,6 @@ def response_simple(request_simple: RequestData) -> Response[Any]:
         url=request_simple.url,
         status=200,
         backend_response=DummyBackendResponse(),
-        _data=b"",
     )
 
 

tests/exthttp/test_types.py

@@ -50,9 +50,7 @@ async def test_has_data_double(self):
 
         assert response.status == 200
         assert response.headers == CIMultiDict()
-        assert response._data is None
         assert await response.read() == b"some-data"
-        assert response._data is not None
         assert await response.read() == b"some-data"
 
     async def test_ctx_mgr_not_closable(self):