diff --git a/hishel/_async/_pool.py b/hishel/_async/_pool.py index 43194a76..71199f50 100644 --- a/hishel/_async/_pool.py +++ b/hishel/_async/_pool.py @@ -56,7 +56,7 @@ async def handle_async_request(self, request: Request) -> Response: request.headers.extend([(b"cache-control", b"no-cache"), (b"cache-control", b"max-age=0")]) key = generate_key(request) - stored_data = await self._storage.retreive(key) + stored_data = await self._storage.retrieve(key) request_cache_control = parse_cache_control(extract_header_values_decoded(request.headers, b"Cache-Control")) @@ -66,22 +66,22 @@ async def handle_async_request(self, request: Request) -> Response: if stored_data: # Try using the stored response if it was discovered. - stored_resposne, stored_request, metadata = stored_data + stored_response, stored_request, metadata = stored_data res = self._controller.construct_response_from_cache( request=request, - response=stored_resposne, + response=stored_response, original_request=stored_request, ) if isinstance(res, Response): # Simply use the response if the controller determines it is ready for use. metadata["number_of_uses"] += 1 - stored_resposne.read() + stored_response.read() await self._storage.store( key=key, request=request, - response=stored_resposne, + response=stored_response, metadata=metadata, ) res.extensions["from_cache"] = True # type: ignore[index] @@ -97,14 +97,14 @@ async def handle_async_request(self, request: Request) -> Response: try: response = await self._pool.handle_async_request(res) except ConnectError: - if self._controller._allow_stale and allowed_stale(response=stored_resposne): - stored_resposne.extensions["from_cache"] = True # type: ignore[index] - stored_resposne.extensions["cache_metadata"] = metadata # type: ignore[index] - return stored_resposne + if self._controller._allow_stale and allowed_stale(response=stored_response): + stored_response.extensions["from_cache"] = True # type: ignore[index] + stored_response.extensions["cache_metadata"] = metadata # type: ignore[index] + return stored_response raise # pragma: no cover # Merge headers with the stale response. full_response = self._controller.handle_validation_response( - old_response=stored_resposne, new_response=response + old_response=stored_response, new_response=response ) await full_response.aread() diff --git a/hishel/_async/_storages.py b/hishel/_async/_storages.py index ccde5904..63a0c4d4 100644 --- a/hishel/_async/_storages.py +++ b/hishel/_async/_storages.py @@ -39,7 +39,7 @@ def __init__( async def store(self, key: str, response: Response, request: Request, metadata: Metadata) -> None: raise NotImplementedError() - async def retreive(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: + async def retrieve(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: raise NotImplementedError() async def aclose(self) -> None: @@ -96,7 +96,7 @@ async def store(self, key: str, response: Response, request: Request, metadata: ) await self._remove_expired_caches() - async def retreive(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: + async def retrieve(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: """ Retreives the response from the cache using his key. @@ -199,7 +199,7 @@ async def store(self, key: str, response: Response, request: Request, metadata: await self._connection.commit() await self._remove_expired_caches() - async def retreive(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: + async def retrieve(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: """ Retreives the response from the cache using his key. @@ -292,7 +292,7 @@ async def store(self, key: str, response: Response, request: Request, metadata: key, self._serializer.dumps(response=response, request=request, metadata=metadata), px=px ) - async def retreive(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: + async def retrieve(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: """ Retreives the response from the cache using his key. diff --git a/hishel/_async/_transports.py b/hishel/_async/_transports.py index d19baaaa..85924b7b 100644 --- a/hishel/_async/_transports.py +++ b/hishel/_async/_transports.py @@ -95,7 +95,7 @@ async def handle_async_request(self, request: Request) -> Response: extensions=request.extensions, ) key = generate_key(httpcore_request) - stored_data = await self._storage.retreive(key) + stored_data = await self._storage.retrieve(key) request_cache_control = parse_cache_control( extract_header_values_decoded(request.headers.raw, b"Cache-Control") @@ -107,22 +107,22 @@ async def handle_async_request(self, request: Request) -> Response: if stored_data: # Try using the stored response if it was discovered. - stored_resposne, stored_request, metadata = stored_data + stored_response, stored_request, metadata = stored_data res = self._controller.construct_response_from_cache( request=httpcore_request, - response=stored_resposne, + response=stored_response, original_request=stored_request, ) if isinstance(res, httpcore.Response): # Simply use the response if the controller determines it is ready for use. metadata["number_of_uses"] += 1 - stored_resposne.read() + stored_response.read() await self._storage.store( key=key, request=stored_request, - response=stored_resposne, + response=stored_response, metadata=metadata, ) res.extensions["from_cache"] = True # type: ignore[index] @@ -130,7 +130,7 @@ async def handle_async_request(self, request: Request) -> Response: return Response( status_code=res.status, headers=res.headers, - stream=AsyncCacheStream(fake_stream(stored_resposne.content)), + stream=AsyncCacheStream(fake_stream(stored_response.content)), extensions=res.extensions, ) @@ -149,15 +149,15 @@ async def handle_async_request(self, request: Request) -> Response: try: response = await self._transport.handle_async_request(revalidation_request) except ConnectError: - if self._controller._allow_stale and allowed_stale(response=stored_resposne): - await stored_resposne.aread() - stored_resposne.extensions["from_cache"] = True # type: ignore[index] - stored_resposne.extensions["cache_metadata"] = metadata # type: ignore[index] + if self._controller._allow_stale and allowed_stale(response=stored_response): + await stored_response.aread() + stored_response.extensions["from_cache"] = True # type: ignore[index] + stored_response.extensions["cache_metadata"] = metadata # type: ignore[index] return Response( - status_code=stored_resposne.status, - headers=stored_resposne.headers, - stream=AsyncCacheStream(fake_stream(stored_resposne.content)), - extensions=stored_resposne.extensions, + status_code=stored_response.status, + headers=stored_response.headers, + stream=AsyncCacheStream(fake_stream(stored_response.content)), + extensions=stored_response.extensions, ) raise # pragma: no cover assert isinstance(response.stream, tp.AsyncIterable) @@ -170,7 +170,7 @@ async def handle_async_request(self, request: Request) -> Response: # Merge headers with the stale response. full_response = self._controller.handle_validation_response( - old_response=stored_resposne, new_response=httpcore_response + old_response=stored_response, new_response=httpcore_response ) await full_response.aread() diff --git a/hishel/_sync/_pool.py b/hishel/_sync/_pool.py index 85917fb4..a116c1f1 100644 --- a/hishel/_sync/_pool.py +++ b/hishel/_sync/_pool.py @@ -56,7 +56,7 @@ def handle_request(self, request: Request) -> Response: request.headers.extend([(b"cache-control", b"no-cache"), (b"cache-control", b"max-age=0")]) key = generate_key(request) - stored_data = self._storage.retreive(key) + stored_data = self._storage.retrieve(key) request_cache_control = parse_cache_control(extract_header_values_decoded(request.headers, b"Cache-Control")) @@ -66,22 +66,22 @@ def handle_request(self, request: Request) -> Response: if stored_data: # Try using the stored response if it was discovered. - stored_resposne, stored_request, metadata = stored_data + stored_response, stored_request, metadata = stored_data res = self._controller.construct_response_from_cache( request=request, - response=stored_resposne, + response=stored_response, original_request=stored_request, ) if isinstance(res, Response): # Simply use the response if the controller determines it is ready for use. metadata["number_of_uses"] += 1 - stored_resposne.read() + stored_response.read() self._storage.store( key=key, request=request, - response=stored_resposne, + response=stored_response, metadata=metadata, ) res.extensions["from_cache"] = True # type: ignore[index] @@ -97,14 +97,14 @@ def handle_request(self, request: Request) -> Response: try: response = self._pool.handle_request(res) except ConnectError: - if self._controller._allow_stale and allowed_stale(response=stored_resposne): - stored_resposne.extensions["from_cache"] = True # type: ignore[index] - stored_resposne.extensions["cache_metadata"] = metadata # type: ignore[index] - return stored_resposne + if self._controller._allow_stale and allowed_stale(response=stored_response): + stored_response.extensions["from_cache"] = True # type: ignore[index] + stored_response.extensions["cache_metadata"] = metadata # type: ignore[index] + return stored_response raise # pragma: no cover # Merge headers with the stale response. full_response = self._controller.handle_validation_response( - old_response=stored_resposne, new_response=response + old_response=stored_response, new_response=response ) full_response.read() diff --git a/hishel/_sync/_storages.py b/hishel/_sync/_storages.py index 9ac25a44..bd8001d1 100644 --- a/hishel/_sync/_storages.py +++ b/hishel/_sync/_storages.py @@ -39,7 +39,7 @@ def __init__( def store(self, key: str, response: Response, request: Request, metadata: Metadata) -> None: raise NotImplementedError() - def retreive(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: + def retrieve(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: raise NotImplementedError() def close(self) -> None: @@ -96,7 +96,7 @@ def store(self, key: str, response: Response, request: Request, metadata: Metada ) self._remove_expired_caches() - def retreive(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: + def retrieve(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: """ Retreives the response from the cache using his key. @@ -199,7 +199,7 @@ def store(self, key: str, response: Response, request: Request, metadata: Metada self._connection.commit() self._remove_expired_caches() - def retreive(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: + def retrieve(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: """ Retreives the response from the cache using his key. @@ -292,7 +292,7 @@ def store(self, key: str, response: Response, request: Request, metadata: Metada key, self._serializer.dumps(response=response, request=request, metadata=metadata), px=px ) - def retreive(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: + def retrieve(self, key: str) -> tp.Optional[tp.Tuple[Response, Request, Metadata]]: """ Retreives the response from the cache using his key. diff --git a/hishel/_sync/_transports.py b/hishel/_sync/_transports.py index b7d357c0..49b9b24f 100644 --- a/hishel/_sync/_transports.py +++ b/hishel/_sync/_transports.py @@ -95,7 +95,7 @@ def handle_request(self, request: Request) -> Response: extensions=request.extensions, ) key = generate_key(httpcore_request) - stored_data = self._storage.retreive(key) + stored_data = self._storage.retrieve(key) request_cache_control = parse_cache_control( extract_header_values_decoded(request.headers.raw, b"Cache-Control") @@ -107,22 +107,22 @@ def handle_request(self, request: Request) -> Response: if stored_data: # Try using the stored response if it was discovered. - stored_resposne, stored_request, metadata = stored_data + stored_response, stored_request, metadata = stored_data res = self._controller.construct_response_from_cache( request=httpcore_request, - response=stored_resposne, + response=stored_response, original_request=stored_request, ) if isinstance(res, httpcore.Response): # Simply use the response if the controller determines it is ready for use. metadata["number_of_uses"] += 1 - stored_resposne.read() + stored_response.read() self._storage.store( key=key, request=stored_request, - response=stored_resposne, + response=stored_response, metadata=metadata, ) res.extensions["from_cache"] = True # type: ignore[index] @@ -130,7 +130,7 @@ def handle_request(self, request: Request) -> Response: return Response( status_code=res.status, headers=res.headers, - stream=CacheStream(fake_stream(stored_resposne.content)), + stream=CacheStream(fake_stream(stored_response.content)), extensions=res.extensions, ) @@ -149,15 +149,15 @@ def handle_request(self, request: Request) -> Response: try: response = self._transport.handle_request(revalidation_request) except ConnectError: - if self._controller._allow_stale and allowed_stale(response=stored_resposne): - stored_resposne.read() - stored_resposne.extensions["from_cache"] = True # type: ignore[index] - stored_resposne.extensions["cache_metadata"] = metadata # type: ignore[index] + if self._controller._allow_stale and allowed_stale(response=stored_response): + stored_response.read() + stored_response.extensions["from_cache"] = True # type: ignore[index] + stored_response.extensions["cache_metadata"] = metadata # type: ignore[index] return Response( - status_code=stored_resposne.status, - headers=stored_resposne.headers, - stream=CacheStream(fake_stream(stored_resposne.content)), - extensions=stored_resposne.extensions, + status_code=stored_response.status, + headers=stored_response.headers, + stream=CacheStream(fake_stream(stored_response.content)), + extensions=stored_response.extensions, ) raise # pragma: no cover assert isinstance(response.stream, tp.Iterable) @@ -170,7 +170,7 @@ def handle_request(self, request: Request) -> Response: # Merge headers with the stale response. full_response = self._controller.handle_validation_response( - old_response=stored_resposne, new_response=httpcore_response + old_response=stored_response, new_response=httpcore_response ) full_response.read() diff --git a/tests/_async/test_storages.py b/tests/_async/test_storages.py index a3e2d0a0..f90209ed 100644 --- a/tests/_async/test_storages.py +++ b/tests/_async/test_storages.py @@ -34,7 +34,7 @@ async def test_filestorage(use_temp_dir): await storage.store(key, response=response, request=request, metadata=dummy_metadata) - stored_data = await storage.retreive(key) + stored_data = await storage.retrieve(key) assert stored_data is not None stored_response, stored_request, metadata = stored_data stored_response.read() @@ -59,7 +59,7 @@ async def test_redisstorage(): await storage.store(key, response=response, request=request, metadata=dummy_metadata) - stored_data = await storage.retreive(key) + stored_data = await storage.retrieve(key) assert stored_data is not None stored_response, stored_request, metadata = stored_data stored_response.read() @@ -82,7 +82,7 @@ async def test_sqlitestorage(): await storage.store(key, response=response, request=request, metadata=dummy_metadata) - stored_data = await storage.retreive(key) + stored_data = await storage.retrieve(key) assert stored_data is not None stored_response, stored_request, metadata = stored_data stored_response.read() @@ -105,12 +105,12 @@ async def test_filestorage_expired(): await response.aread() await storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata) - assert await storage.retreive(first_key) is not None + assert await storage.retrieve(first_key) is not None await asleep(0.3) await storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata) - assert await storage.retreive(first_key) is None + assert await storage.retrieve(first_key) is None @pytest.mark.asyncio @@ -128,12 +128,12 @@ async def test_redisstorage_expired(): await response.aread() await storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata) - assert await storage.retreive(first_key) is not None + assert await storage.retrieve(first_key) is not None await asleep(0.3) await storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata) - assert await storage.retreive(first_key) is None + assert await storage.retrieve(first_key) is None @pytest.mark.asyncio @@ -149,9 +149,9 @@ async def test_sqlite_expired(): await response.aread() await storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata) - assert await storage.retreive(first_key) is not None + assert await storage.retrieve(first_key) is not None await asleep(0.3) await storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata) - assert await storage.retreive(first_key) is None + assert await storage.retrieve(first_key) is None diff --git a/tests/_sync/test_storages.py b/tests/_sync/test_storages.py index eb4a8ea5..dbf88b45 100644 --- a/tests/_sync/test_storages.py +++ b/tests/_sync/test_storages.py @@ -34,7 +34,7 @@ def test_filestorage(use_temp_dir): storage.store(key, response=response, request=request, metadata=dummy_metadata) - stored_data = storage.retreive(key) + stored_data = storage.retrieve(key) assert stored_data is not None stored_response, stored_request, metadata = stored_data stored_response.read() @@ -59,7 +59,7 @@ def test_redisstorage(): storage.store(key, response=response, request=request, metadata=dummy_metadata) - stored_data = storage.retreive(key) + stored_data = storage.retrieve(key) assert stored_data is not None stored_response, stored_request, metadata = stored_data stored_response.read() @@ -82,7 +82,7 @@ def test_sqlitestorage(): storage.store(key, response=response, request=request, metadata=dummy_metadata) - stored_data = storage.retreive(key) + stored_data = storage.retrieve(key) assert stored_data is not None stored_response, stored_request, metadata = stored_data stored_response.read() @@ -105,12 +105,12 @@ def test_filestorage_expired(): response.read() storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata) - assert storage.retreive(first_key) is not None + assert storage.retrieve(first_key) is not None sleep(0.3) storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata) - assert storage.retreive(first_key) is None + assert storage.retrieve(first_key) is None @@ -128,12 +128,12 @@ def test_redisstorage_expired(): response.read() storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata) - assert storage.retreive(first_key) is not None + assert storage.retrieve(first_key) is not None sleep(0.3) storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata) - assert storage.retreive(first_key) is None + assert storage.retrieve(first_key) is None @@ -149,9 +149,9 @@ def test_sqlite_expired(): response.read() storage.store(first_key, response=response, request=first_request, metadata=dummy_metadata) - assert storage.retreive(first_key) is not None + assert storage.retrieve(first_key) is not None sleep(0.3) storage.store(second_key, response=response, request=second_request, metadata=dummy_metadata) - assert storage.retreive(first_key) is None + assert storage.retrieve(first_key) is None diff --git a/tests/test_controller.py b/tests/test_controller.py index b1a67900..5f062cc9 100644 --- a/tests/test_controller.py +++ b/tests/test_controller.py @@ -16,13 +16,13 @@ def test_is_cachable_for_cachables(): request = Request(b"GET", b"https://example.com", headers=[]) - resposne = Response(200, headers=[(b"Expires", b"some-date")]) + response = Response(200, headers=[(b"Expires", b"some-date")]) - assert controller.is_cachable(request=request, response=resposne) + assert controller.is_cachable(request=request, response=response) - resposne = Response(200, headers=[(b"Cache-Control", b"max-age=10000")]) + response = Response(200, headers=[(b"Cache-Control", b"max-age=10000")]) - assert controller.is_cachable(request=request, response=resposne) + assert controller.is_cachable(request=request, response=response) def test_is_cachable_for_non_cachables(): @@ -30,9 +30,9 @@ def test_is_cachable_for_non_cachables(): request = Request(b"GET", b"https://example.com", headers=[]) - resposne = Response(200, headers=[]) + response = Response(200, headers=[]) - assert not controller.is_cachable(request=request, response=resposne) + assert not controller.is_cachable(request=request, response=response) def test_is_cachable_for_heuristically_cachable(): @@ -40,9 +40,9 @@ def test_is_cachable_for_heuristically_cachable(): request = Request(b"GET", b"https://example.com", headers=[]) - resposne = Response(200, headers=[]) + response = Response(200, headers=[]) - assert controller.is_cachable(request=request, response=resposne) + assert controller.is_cachable(request=request, response=response) def test_is_cachable_for_unsupported_method(): @@ -50,9 +50,9 @@ def test_is_cachable_for_unsupported_method(): request = Request(b"GET", b"https://example.com", headers=[]) - resposne = Response(200, headers=[(b"Expires", b"some-date")]) + response = Response(200, headers=[(b"Expires", b"some-date")]) - assert not controller.is_cachable(request=request, response=resposne) + assert not controller.is_cachable(request=request, response=response) def test_controller_with_unsupported_method(): @@ -68,9 +68,9 @@ def test_is_cachable_for_unsupported_status(): request = Request(b"GET", b"https://example.com", headers=[]) - resposne = Response(200, headers=[(b"Expires", b"some-date")]) + response = Response(200, headers=[(b"Expires", b"some-date")]) - assert not controller.is_cachable(request=request, response=resposne) + assert not controller.is_cachable(request=request, response=response) def test_is_cachable_for_not_final(): @@ -78,9 +78,9 @@ def test_is_cachable_for_not_final(): request = Request(b"GET", b"https://example.com", headers=[]) - resposne = Response(100, headers=[(b"Expires", b"some-date")]) + response = Response(100, headers=[(b"Expires", b"some-date")]) - assert not controller.is_cachable(request=request, response=resposne) + assert not controller.is_cachable(request=request, response=response) def test_is_cachable_for_no_store(): @@ -88,9 +88,9 @@ def test_is_cachable_for_no_store(): request = Request(b"GET", b"https://example.com", headers=[]) - resposne = Response(200, headers=[(b"Cache-Control", b"no-store")]) + response = Response(200, headers=[(b"Cache-Control", b"no-store")]) - assert not controller.is_cachable(request=request, response=resposne) + assert not controller.is_cachable(request=request, response=response) def test_get_freshness_lifetime():