fix: use request headers in CachedResponse.request_info

Author: alessio-locatelli

HISTORY.md

@@ -2,7 +2,8 @@
 
 ## Unreleased
 
-- Fixed a race condition in SQLite backend that could lead to `sqlite3.OperationalError: database is locked` errors
+- Fixed a race condition in SQLite backend that could lead to `sqlite3.OperationalError: database is locked` errors.
+- Fixed an issue where `CachedResponse.request_info` contained response headers instead of request headers.
 
 ## 0.13.0 (2025-04-08)
 

aiohttp_client_cache/response.py

@@ -35,6 +35,7 @@
     'last_used',
     'real_url',
     'request_info',
+    'request_raw_headers',
 }
 
 # Default attributes to add to ClientResponse objects
@@ -78,6 +79,7 @@ class CachedResponse(HeadersMixin):
     encoding: str = attr.ib(default='utf-8')
     expires: datetime | None = attr.ib(default=None)
     raw_headers: RawHeaders = attr.ib(factory=tuple)
+    request_raw_headers: RawHeaders = attr.ib(factory=tuple)
     real_url: StrOrURL = attr.ib(default=None)
     history: tuple = attr.ib(factory=tuple)
     last_used: datetime = attr.ib(factory=utcnow)
@@ -105,6 +107,10 @@ async def from_client_response(
         response.expires = expires
         response.links = client_response.links
         response.real_url = client_response.request_info.real_url
+        response.request_raw_headers = tuple(
+            (k.encode('utf-8'), v.encode('utf-8'))
+            for k, v in client_response.request_info.headers.items()
+        )
 
         # The encoding may be unset even if the response has been read, and
         # get_encoding() does not handle certain edge cases like an empty response body
@@ -185,12 +191,25 @@ def ok(self) -> bool:
         """Returns ``True`` if ``status`` is less than ``400``, ``False`` if not"""
         return self.status < 400
 
+    @property
+    def request_headers(self) -> CIMultiDictProxy[str]:
+        """Get request headers as an immutable, case-insensitive multidict from raw headers"""
+
+        def decode_header(header):
+            """Decode an individual (key, value) pair"""
+            return (
+                header[0].decode('utf-8', 'surrogateescape'),
+                header[1].decode('utf-8', 'surrogateescape'),
+            )
+
+        return CIMultiDictProxy(CIMultiDict([decode_header(h) for h in self.request_raw_headers]))
+
     @property
     def request_info(self) -> RequestInfo:
         return RequestInfo(
             url=URL(self.url),
             method=self.method,
-            headers=self.headers,
+            headers=self.request_headers,
             real_url=URL(str(self.real_url)),
         )
 

test/unit/test_response.py

@@ -12,14 +12,14 @@
 from aiohttp_client_cache.response import CachedResponse, RequestInfo, UnsupportedExpiresError
 
 
-async def get_test_response(client_factory, url='/', **kwargs):
+async def get_test_response(client_factory, url='/', headers=None, **kwargs):
     app = web.Application()
     app.router.add_route('GET', '/valid_url', mock_handler)
     app.router.add_route('GET', '/json', json_mock_handler)
     app.router.add_route('GET', '/empty_content', empty_mock_handler)
     app.router.add_route('GET', '/null_content', null_mock_handler)
     client = await client_factory(app)
-    client_response = await client.get(url)
+    client_response = await client.get(url, headers=headers)
 
     return await CachedResponse.from_client_response(client_response, **kwargs)
 
@@ -97,14 +97,16 @@ async def test_encoding(aiohttp_client):
 
 
 async def test_request_info(aiohttp_client):
-    response = await get_test_response(aiohttp_client, '/valid_url')
+    response = await get_test_response(
+        aiohttp_client, '/valid_url', headers={'Custom-Header': 'value'}
+    )
     request_info = response.request_info
 
     assert isinstance(request_info, RequestInfo)
     assert request_info.method == 'GET'
     assert request_info.url == request_info.real_url
     assert str(request_info.url).endswith('/valid_url')
-    assert 'Content-Type' in request_info.headers and 'Content-Length' in request_info.headers
+    assert request_info.headers['Custom-Header'] == 'value'
 
 
 async def test_headers(aiohttp_client):