Public/fastapi-cache
1
0
Fork 0
mirror of https://github.com/long2ice/fastapi-cache.git synced 2026-03-24 20:47:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'long2ice:main' into fix/piclke-coder

Browse Source
This commit is contained in:
Ivan Moiseev
2023-01-11 16:26:05 +03:00
committed by GitHub
parent e23289fcbf 59a47b7fae
commit 9a39db7a73
7 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
fastapi_cache/coder.py
View File

@@ -7,6 +7,7 @@ from typing import Any
import pendulum
from fastapi.encoders import jsonable_encoder
from starlette.responses import JSONResponse
from starlette.templating import _TemplateResponse as TemplateResponse
CONVERTERS = {
@@ -52,6 +53,8 @@ class Coder:
class JsonCoder(Coder):
@classmethod
def encode(cls, value: Any) -> str:
if isinstance(value, JSONResponse):
return value.body
return json.dumps(value, cls=JsonEncoder)
@classmethod

22
fastapi_cache/decorator.py
View File

@@ -77,9 +77,9 @@ def cache(
# if the wrapped function does NOT have request or response in its function signature,
# make sure we don't pass them in as keyword arguments
if not request_param:
kwargs.pop("request")
kwargs.pop("request", None)
if not response_param:
kwargs.pop("response")
kwargs.pop("response", None)
if inspect.iscoroutinefunction(func):
# async, return as is.
@@ -123,13 +123,20 @@ def cache(
args=args,
kwargs=copy_kwargs,
)
ttl, ret = await backend.get_with_ttl(cache_key)
try:
ttl, ret = await backend.get_with_ttl(cache_key)
except ConnectionError:
ttl, ret = 0, None
if not request:
if ret is not None:
return coder.decode(ret)
ret = await ensure_async_func(*args, **kwargs)
await backend.set(cache_key, coder.encode(ret), expire or FastAPICache.get_expire())
try:
await backend.set(
cache_key, coder.encode(ret), expire or FastAPICache.get_expire()
)
except ConnectionError:
pass
return ret
if request.method != "GET":
@@ -148,7 +155,10 @@ def cache(
ret = await ensure_async_func(*args, **kwargs)
await backend.set(cache_key, coder.encode(ret), expire or FastAPICache.get_expire())
try:
await backend.set(cache_key, coder.encode(ret), expire or FastAPICache.get_expire())
except ConnectionError:
pass
return ret
return inner