Merge pull request #17 from sumaro2101/develop

cache, fix DAO

Author: sumaro2101

api_v1/tests/conftest.py

@@ -9,8 +9,9 @@
 from fastapi import FastAPI
 from sqlalchemy.pool import NullPool
 
-from config import test_connection, settings, BaseModel
+from config import test_connection, settings
 from config import db_connection
+from config.models.base import Base
 from api_v1.routers import register_routers
 
 
@@ -37,9 +38,9 @@ async def app() -> AsyncGenerator[LifespanManager, Any]:
     @asynccontextmanager
     async def lifespan(app: FastAPI):
         async with db_setup.engine.begin() as conn:
-            await conn.run_sync(BaseModel.metadata.create_all)
+            await conn.run_sync(Base.metadata.create_all)
             yield
-            await conn.run_sync(BaseModel.metadata.drop_all)
+            await conn.run_sync(Base.metadata.drop_all)
 
     app = FastAPI(docs_url=None,
                   redoc_url=None,
@@ -67,3 +68,15 @@ async def client(app: FastAPI) -> AsyncGenerator[httpx.AsyncClient, Any]:
 async def get_async_session():
     async with db_setup.session() as session:
         yield session
+
+
+@pytest.fixture()
+def user_test_data():
+    data = {
+        "email": "user@example.com",
+        "password": "password",
+        "is_active": True,
+        "is_superuser": False,
+        "is_verified": False,
+    }
+    return data

api_v1/tests/test_users.py

@@ -4,8 +4,9 @@
 
 
 @pytest.mark.asyncio
-async def test_get_user_error(client: AsyncClient):
-    response = await client.get(
-        '/users/get',
+async def test_get_user_error(client: AsyncClient, user_test_data):
+    response = await client.post(
+        '/auth/register',
+        json=user_test_data,
     )
-    assert response.status_code == 400
+    assert response.status_code == 201

api_v1/users/views.py

@@ -1,5 +1,6 @@
 from fastapi import APIRouter, Depends
 from fastapi_users import FastAPIUsers
+from fastapi_cache.decorator import cache
 
 from config.models import User
 from api_v1.auth.backends import auth_backend
@@ -18,11 +19,11 @@
 
 
 @router.get(path='/test',
-            response_model=UserRead,
             dependencies=[Depends(active_user)],
             )
+@cache()
 async def test_end_point(user: User = Depends(active_user)):
-    return user
+    return dict(name=user.email)
 
 
 router.include_router(fastapi_users.get_users_router(UserRead, UserUpdate),

async_alembic/env.py

@@ -3,7 +3,7 @@
 
 from sqlalchemy import pool
 from sqlalchemy.engine import Connection
-from sqlalchemy.ext.asyncio import async_engine_from_config, AsyncEngine
+from sqlalchemy.ext.asyncio import AsyncEngine
 from sqlalchemy import engine_from_config
 
 from alembic import context

config/alembic/__init__.py

@@ -0,0 +1,4 @@
+from .alembic_helper import AlembicHelper
+
+
+__all__ = ('AlembicHelper',)

config/alembic/alembic_helper.py

@@ -0,0 +1,34 @@
+from pathlib import Path
+from alembic.command import upgrade
+from alembic.config import Config
+from typing import ClassVar
+from sqlalchemy.ext.asyncio.engine import AsyncConnection
+
+
+from config import settings
+
+
+class AlembicHelper:
+    """
+    Вспомогательный класс для Alembic
+    """
+    config: ClassVar[Config] = Config
+    migration_path: ClassVar[Path] = settings.alembic.MIGRATION_PATH
+
+    def __init__(self,
+                 sql_url: str | Path,
+                 ):
+        self.sql_url = sql_url
+
+    def get_config(self, connection: AsyncConnection) -> Config:
+        cfg = self.config()
+        cfg.set_main_option('sqlalchemy.url',
+                            self.sql_url)
+        cfg.set_main_option('script_location',
+                            self.migration_path.as_posix())
+        cfg.attributes['connection'] = connection
+        return cfg
+
+    def make_upgrade(self, connection: AsyncConnection):
+        config = self.get_config(connection=connection)
+        upgrade(config, 'head')

config/config.py

@@ -27,7 +27,7 @@ class AlembicSettings(BaseModel):
     Настройки Alembic
     """
     CONFIG_PATH: Path = Path('alembic.ini')
-    MIGRATION_PATH: Path = Path('async_alembic/')
+    MIGRATION_PATH: Path = Path('async_alembic')
 
 
 class TestDBSettings(BaseModel):

config/dao/base_dao.py

@@ -140,20 +140,14 @@ def struct_options_statment(model: BaseModel,
     Returns:
         Select: Экземпляр запроса
     """
-    if one_to_many and many_to_many:
-        stmt = (Select(model)
-                .filter_by(**kwargs)
-                .options(joinedload(*one_to_many))
-                .options(selectinload(*many_to_many)))
-    elif one_to_many:
-        stmt = (Select(model)
-                .filter_by(**kwargs)
-                .options(joinedload(*one_to_many)))
-    elif many_to_many:
-        stmt = (Select(model)
-                .filter_by(**kwargs)
-                .options(selectinload(*many_to_many)))
-    else:
-        stmt = (Select(model)
-                .filter_by(**kwargs))
+    stms_one_to_many = ([selectinload(join) for join in one_to_many]
+                        if one_to_many
+                        else list())
+    stmt_any_to_many = ([joinedload(join)for join in many_to_many]
+                        if many_to_many
+                        else list())
+    stmt = (Select(model)
+            .filter_by(**kwargs)
+            .options(*stms_one_to_many)
+            .options(*stmt_any_to_many))
     return stmt

config/database/db_helper.py

@@ -29,7 +29,7 @@ class DataBaseHelper:
         :function:`DataBaseHelper.session_geter` - Получение генератора текущей сессии.
         :function:`DataBaseHelper.get_scoped_session` - Получение текущей сессии.
         :function:`DataBaseHelper.dispose` - Закрытые соединения.
-    
+
     ## Примеры:
     ```python
     from fastapi import FastAPI

main.py

@@ -1,12 +1,18 @@
 from contextlib import asynccontextmanager
 from fastapi import FastAPI
+from fastapi_cache import FastAPICache
+from fastapi_cache.backends.redis import RedisBackend
+from fastapi_cache.decorator import cache
+
+from redis import asyncio as aioredis
 
 from api_v1 import register_routers
 from app_includes import (
     register_errors,
     register_middlewares,
     register_prometheus,
     )
+from config import settings
 
 
 def start_app() -> FastAPI:
@@ -23,7 +29,15 @@ def start_app() -> FastAPI:
 
 @asynccontextmanager
 async def lifespan(app: FastAPI):
+    redis = aioredis.from_url(settings.redis.redis_url)
+    FastAPICache.init(RedisBackend(redis), prefix='fastapi-cache')
     yield
 
 
 app = start_app()
+
+
+@app.get(path='/test')
+@cache()
+async def test_end_point():
+    return dict(hello='world')