diff --git a/fastapi_book_server/app/views/author.py b/fastapi_book_server/app/views/author.py index 7b06100..821480a 100644 --- a/fastapi_book_server/app/views/author.py +++ b/fastapi_book_server/app/views/author.py @@ -2,7 +2,7 @@ from fastapi import APIRouter, Depends, HTTPException, status from fastapi_pagination import Params, Page from fastapi_pagination.ext.ormar import paginate -from fastapi_book_server.app.utils.pagination import CustomPage +from app.utils.pagination import CustomPage from app.models import Author as AuthorDB, AuthorAnnotation as AuthorAnnotationDB, Book as BookDB from app.serializers.author import Author, CreateAuthor, UpdateAuthor, AuthorBook, TranslatedBook diff --git a/poetry.lock b/poetry.lock index db2e466..e0ecac9 100644 --- a/poetry.lock +++ b/poetry.lock @@ -143,7 +143,7 @@ test = ["pytest (>=6.2.4,<7.0.0)", "pytest-cov (>=2.12.0,<4.0.0)", "mypy (==0.91 [[package]] name = "fastapi-pagination" -version = "0.9.0" +version = "0.9.1" description = "FastAPI pagination" category = "main" optional = false @@ -156,15 +156,16 @@ pydantic = ">=1.7.2" [package.extras] gino = ["gino[starlette] (>=1.0.1)", "SQLAlchemy (>=1.3.20)"] -all = ["gino[starlette] (>=1.0.1)", "SQLAlchemy (>=1.3.20)", "databases[sqlite,postgresql,mysql] (>=0.4.0)", "orm (>=0.1.5)", "tortoise-orm[aiosqlite,aiomysql,asyncpg] (>=0.16.18,<0.18.0)", "asyncpg (>=0.24.0)", "ormar (>=0.10.5)", "Django (<3.3.0)", "piccolo (>=0.29,<0.35)"] +all = ["gino[starlette] (>=1.0.1)", "SQLAlchemy (>=1.3.20)", "databases[mysql,postgresql,sqlite] (>=0.4.0)", "orm (>=0.1.5)", "tortoise-orm[aiosqlite,asyncpg,aiomysql] (>=0.16.18,<0.18.0)", "asyncpg (>=0.24.0)", "ormar (>=0.10.5)", "Django (<3.3.0)", "piccolo (>=0.29,<0.35)", "motor (>=2.5.1,<3.0.0)"] sqlalchemy = ["SQLAlchemy (>=1.3.20)"] asyncpg = ["SQLAlchemy (>=1.3.20)", "asyncpg (>=0.24.0)"] -databases = ["databases[sqlite,postgresql,mysql] (>=0.4.0)"] -orm = ["databases[sqlite,postgresql,mysql] (>=0.4.0)", "orm (>=0.1.5)", "typesystem (>=0.2.0,<0.3.0)"] -django = ["databases[sqlite,postgresql,mysql] (>=0.4.0)", "Django (<3.3.0)"] -tortoise = ["tortoise-orm[aiosqlite,aiomysql,asyncpg] (>=0.16.18,<0.18.0)"] +databases = ["databases[mysql,postgresql,sqlite] (>=0.4.0)"] +orm = ["databases[mysql,postgresql,sqlite] (>=0.4.0)", "orm (>=0.1.5)", "typesystem (>=0.2.0,<0.3.0)"] +django = ["databases[mysql,postgresql,sqlite] (>=0.4.0)", "Django (<3.3.0)"] +tortoise = ["tortoise-orm[aiosqlite,asyncpg,aiomysql] (>=0.16.18,<0.18.0)"] ormar = ["ormar (>=0.10.5)"] piccolo = ["piccolo (>=0.29,<0.35)"] +motor = ["motor (>=2.5.1,<3.0.0)"] [[package]] name = "greenlet" @@ -430,7 +431,7 @@ python-versions = "*" [metadata] lock-version = "1.1" python-versions = "^3.9" -content-hash = "e750b0a06df1d4d45f85eddc65fedf25e468482a39f78e824da7415ae34dbb1d" +content-hash = "c4ef74338cbe7b2849d529fc28d7ca77e8f7fa8cb3dc0b490b3ebf99cb40d9f3" [metadata.files] aiosqlite = [ @@ -489,8 +490,8 @@ fastapi = [ {file = "fastapi-0.70.0.tar.gz", hash = "sha256:66da43cfe5185ea1df99552acffd201f1832c6b364e0f4136c0a99f933466ced"}, ] fastapi-pagination = [ - {file = "fastapi-pagination-0.9.0.tar.gz", hash = "sha256:1ee9784a5fcf82c44a92673567845fbf4e4ad07e9b9d9f395783c0ae15c1dfe9"}, - {file = "fastapi_pagination-0.9.0-py3-none-any.whl", hash = "sha256:ade455825866f71560882e053381caa06a2141d36811d1bb3a37879df808f3b6"}, + {file = "fastapi-pagination-0.9.1.tar.gz", hash = "sha256:401b0fdbc0e12e7b178c7f37709918a93df44827d3de75fb7d85d6c4465e77b0"}, + {file = "fastapi_pagination-0.9.1-py3-none-any.whl", hash = "sha256:ef84b01f364e5eb4dec0c59068c02e83c4a04319659354297680122592c9b884"}, ] greenlet = [ {file = "greenlet-1.1.2-cp27-cp27m-macosx_10_14_x86_64.whl", hash = "sha256:58df5c2a0e293bf665a51f8a100d3e9956febfbf1d9aaf8c0677cf70218910c6"}, diff --git a/pyproject.toml b/pyproject.toml index 253241c..2636aea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -8,7 +8,7 @@ authors = ["Kurbanov Bulat "] python = "^3.9" fastapi = "^0.70.0" pydantic = {extras = ["dotenv"], version = "^1.8.2"} -uvicorn = "^0.15.0" +uvicorn = {extras = ["standart"], version = "^0.15.0"} ormar = "^0.10.22" alembic = "^1.7.4" asyncpg = "^0.24.0"