From 8f0920d0d7f0a34bfb8987736cf794be5e3cc33f Mon Sep 17 00:00:00 2001 From: long2ice Date: Mon, 7 Nov 2022 16:39:17 +0800 Subject: [PATCH] ci: fix --- examples/in_memory/main.py | 1 + examples/redis/main.py | 20 ++++++++++---------- fastapi_cache/backends/__init__.py | 2 +- fastapi_cache/backends/dynamodb.py | 2 +- fastapi_cache/backends/memcached.py | 2 +- fastapi_cache/backends/redis.py | 2 +- fastapi_cache/coder.py | 2 +- fastapi_cache/decorator.py | 7 +++---- fastapi_cache/key_builder.py | 2 +- tests/test_decorator.py | 3 +-- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/examples/in_memory/main.py b/examples/in_memory/main.py index 1df6bc2..e7164ba 100644 --- a/examples/in_memory/main.py +++ b/examples/in_memory/main.py @@ -42,6 +42,7 @@ async def get_date(): async def get_datetime(request: Request, response: Response): return {"now": pendulum.now()} + @app.get("/sync-me") @cache(namespace="test") def sync_me(): diff --git a/examples/redis/main.py b/examples/redis/main.py index 773416e..434acd5 100644 --- a/examples/redis/main.py +++ b/examples/redis/main.py @@ -4,12 +4,13 @@ import pendulum import redis.asyncio as redis import uvicorn from fastapi import FastAPI -from redis.asyncio.connection import ConnectionPool -from starlette.requests import Request -from starlette.responses import Response from fastapi.responses import HTMLResponse from fastapi.staticfiles import StaticFiles from fastapi.templating import Jinja2Templates +from redis.asyncio.connection import ConnectionPool +from starlette.requests import Request +from starlette.responses import Response + from fastapi_cache import FastAPICache from fastapi_cache.backends.redis import RedisBackend from fastapi_cache.coder import PickleCoder @@ -18,10 +19,11 @@ from fastapi_cache.decorator import cache app = FastAPI() app.mount( - path='/static', - app=StaticFiles(directory='./'), name='static', + path="/static", + app=StaticFiles(directory="./"), + name="static", ) -templates = Jinja2Templates(directory='./') +templates = Jinja2Templates(directory="./") ret = 0 @@ -65,12 +67,10 @@ async def get_datetime(request: Request, response: Response): return pendulum.now() -@app.get('/html', response_class=HTMLResponse) +@app.get("/html", response_class=HTMLResponse) @cache(expire=60, namespace="html", coder=PickleCoder) async def cache_html(request: Request): - return templates.TemplateResponse('index.html', { - 'request': request, "ret": await get_ret() - }) + return templates.TemplateResponse("index.html", {"request": request, "ret": await get_ret()}) @app.on_event("startup") diff --git a/fastapi_cache/backends/__init__.py b/fastapi_cache/backends/__init__.py index 7b3d070..2aa3433 100644 --- a/fastapi_cache/backends/__init__.py +++ b/fastapi_cache/backends/__init__.py @@ -1,5 +1,5 @@ import abc -from typing import Tuple, Optional +from typing import Optional, Tuple class Backend: diff --git a/fastapi_cache/backends/dynamodb.py b/fastapi_cache/backends/dynamodb.py index fc3650b..46df6d2 100644 --- a/fastapi_cache/backends/dynamodb.py +++ b/fastapi_cache/backends/dynamodb.py @@ -1,5 +1,5 @@ import datetime -from typing import Tuple, Optional +from typing import Optional, Tuple from aiobotocore.client import AioBaseClient from aiobotocore.session import get_session diff --git a/fastapi_cache/backends/memcached.py b/fastapi_cache/backends/memcached.py index 3c96ef4..31f1a35 100644 --- a/fastapi_cache/backends/memcached.py +++ b/fastapi_cache/backends/memcached.py @@ -1,4 +1,4 @@ -from typing import Tuple, Optional +from typing import Optional, Tuple from aiomcache import Client diff --git a/fastapi_cache/backends/redis.py b/fastapi_cache/backends/redis.py index 20b3538..6d70627 100644 --- a/fastapi_cache/backends/redis.py +++ b/fastapi_cache/backends/redis.py @@ -1,4 +1,4 @@ -from typing import Tuple, Optional +from typing import Optional, Tuple from redis.asyncio.client import Redis diff --git a/fastapi_cache/coder.py b/fastapi_cache/coder.py index b6cd683..e8f55a1 100644 --- a/fastapi_cache/coder.py +++ b/fastapi_cache/coder.py @@ -2,7 +2,7 @@ import datetime import json import pickle # nosec:B403 from decimal import Decimal -from typing import Any, Dict, Union +from typing import Any import pendulum from fastapi.encoders import jsonable_encoder diff --git a/fastapi_cache/decorator.py b/fastapi_cache/decorator.py index 0aea981..6869885 100644 --- a/fastapi_cache/decorator.py +++ b/fastapi_cache/decorator.py @@ -1,7 +1,7 @@ import inspect import sys from functools import wraps -from typing import Any, Awaitable, Callable, Optional, TypeVar, Type +from typing import Any, Awaitable, Callable, Optional, Type, TypeVar if sys.version_info >= (3, 10): from typing import ParamSpec @@ -15,7 +15,6 @@ from starlette.responses import Response from fastapi_cache import FastAPICache from fastapi_cache.coder import Coder - P = ParamSpec("P") R = TypeVar("R") @@ -113,7 +112,7 @@ def cache( request=request, response=response, args=args, - kwargs=copy_kwargs + kwargs=copy_kwargs, ) else: cache_key = key_builder( @@ -122,7 +121,7 @@ def cache( request=request, response=response, args=args, - kwargs=copy_kwargs + kwargs=copy_kwargs, ) ttl, ret = await backend.get_with_ttl(cache_key) diff --git a/fastapi_cache/key_builder.py b/fastapi_cache/key_builder.py index e751e0b..852e632 100644 --- a/fastapi_cache/key_builder.py +++ b/fastapi_cache/key_builder.py @@ -1,5 +1,5 @@ import hashlib -from typing import Optional, Callable +from typing import Callable, Optional from starlette.requests import Request from starlette.responses import Response diff --git a/tests/test_decorator.py b/tests/test_decorator.py index 6d54aef..b118cde 100644 --- a/tests/test_decorator.py +++ b/tests/test_decorator.py @@ -3,11 +3,10 @@ from typing import Generator import pendulum import pytest - -from fastapi_cache import FastAPICache from starlette.testclient import TestClient from examples.in_memory.main import app +from fastapi_cache import FastAPICache from fastapi_cache.backends.inmemory import InMemoryBackend