From 7c130fb59f3eec918287ddba56eb1d1e8f9f7324 Mon Sep 17 00:00:00 2001 From: pi3c Date: Fri, 19 Jan 2024 03:15:48 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20=D0=B4?= =?UTF-8?q?=D0=BB=D1=8F=20=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD=D0=B8?= =?UTF-8?q?=D0=B7=D0=B0=D1=86=D0=B8=D0=B8.=20=D0=A7=D0=B0=D1=81=D1=82?= =?UTF-8?q?=D0=B8=D1=87=D0=BD=D0=BE=20=D1=81=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?= =?UTF-8?q?=D1=8B=20=D1=80=D0=BE=D1=83=D1=82=D1=8B=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D1=8E.=20=D0=9C=D0=BE=D0=B4=D0=B5=D0=BB?= =?UTF-8?q?=D0=B8=20=D0=B8=20=D1=81=D1=85=D0=B5=D0=BC=D1=8B=20=D0=BF=D0=B0?= =?UTF-8?q?=D0=B9=D0=B4=D0=B0=D0=BD=D1=82=D0=B8=D0=BA=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fastfood/app.py | 3 ++ fastfood/config.py | 24 +++++++++++ fastfood/crud.py | 31 ++++++++++++++ fastfood/dbase.py | 22 ++++++++++ fastfood/models.py | 42 +++++++++++++++++++ fastfood/routes.py | 30 ++++++++++++++ fastfood/schemas.py | 39 ++++++++++++++++++ manage.py | 6 +++ poetry.lock | 99 ++++++++++++++++++++++++++++++++++++++++++++- pyproject.toml | 2 + 10 files changed, 297 insertions(+), 1 deletion(-) create mode 100644 fastfood/config.py create mode 100644 fastfood/crud.py create mode 100644 fastfood/dbase.py create mode 100644 fastfood/models.py create mode 100644 fastfood/routes.py create mode 100644 fastfood/schemas.py diff --git a/fastfood/app.py b/fastfood/app.py index b2d20f9..9991a58 100644 --- a/fastfood/app.py +++ b/fastfood/app.py @@ -1,5 +1,7 @@ from fastapi import FastAPI +from fastfood.routes import router + async def generate_test_data(): """ @@ -13,5 +15,6 @@ def create_app(): Создание экземпляра приложения FastAPI и врзврат его """ app = FastAPI() + app.include_router(router) return app diff --git a/fastfood/config.py b/fastfood/config.py new file mode 100644 index 0000000..47f7063 --- /dev/null +++ b/fastfood/config.py @@ -0,0 +1,24 @@ +from pydantic_settings import BaseSettings, SettingsConfigDict + + +class Settings(BaseSettings): + DB_HOST: str = "localhost" + DB_PORT: int = 5432 + DB_USER: str = "postrges" + DB_PASS: str = "postgres" + DB_NAME: str = "demo_db" + + @property + def DATABASE_URL_asyncpg(self): + """ + Возвращает строку подключения к БД необходимую для SQLAlchemy + """ + return ( + f"postgresql+asyncpg://{self.DB_USER}:{self.DB_PASS}" + f"@{self.DB_HOST}:{self.DB_PORT}/{self.DB_NAME}" + ) + + model_config = SettingsConfigDict(env_file=".env") + + +settings = Settings() diff --git a/fastfood/crud.py b/fastfood/crud.py new file mode 100644 index 0000000..3b0d435 --- /dev/null +++ b/fastfood/crud.py @@ -0,0 +1,31 @@ +from sqlalchemy import select + +from fastfood.dbase import async_session_maker, async_engine +from fastfood import models, schemas + + +async def create_db_and_tables(): + async with async_engine.begin() as conn: + await conn.run_sync(models.Base.metadata.drop_all) + await conn.run_sync(models.Base.metadata.create_all) + + +class Crud: + @staticmethod + async def get_menus(): + async with async_session_maker() as session: + query = select(models.Menu) + result = await session.execute(query) + return result.scalars().all() + + + @staticmethod + async def add_menu(menu: schemas.Menu): + async with async_session_maker() as session: + new_menu_item = models.Menu( + title=menu.title, + description=menu.description, + ) + session.add(new_menu_item) + await session.commit() + return new_menu_item diff --git a/fastfood/dbase.py b/fastfood/dbase.py new file mode 100644 index 0000000..143268e --- /dev/null +++ b/fastfood/dbase.py @@ -0,0 +1,22 @@ +from typing import AsyncGenerator + +from sqlalchemy.ext.asyncio import ( + AsyncSession, + async_sessionmaker, + create_async_engine, +) + +from fastfood.config import settings + + +async_engine = create_async_engine(settings.DATABASE_URL_asyncpg) +async_session_maker = async_sessionmaker( + async_engine, + class_=AsyncSession, + expire_on_commit=False, +) + + +async def get_async_session() -> AsyncGenerator[AsyncSession, None]: + async with async_session_maker() as session: + yield session diff --git a/fastfood/models.py b/fastfood/models.py new file mode 100644 index 0000000..3947523 --- /dev/null +++ b/fastfood/models.py @@ -0,0 +1,42 @@ +from decimal import Decimal +from typing import List, Annotated, Optional + +from sqlalchemy import ForeignKey +from sqlalchemy.orm import Mapped, mapped_column, relationship, DeclarativeBase + + +intpk = Annotated[int, mapped_column(primary_key=True)] +str_25 = Annotated[str, 25] + + +class Base(DeclarativeBase): + pass + + +class Menu(Base): + __tablename__ = "menu" + + id: Mapped[intpk] + title: Mapped[str_25] + description: Mapped[Optional[str]] + submenus: Mapped[List["SubMenu"]] = relationship() + + +class SubMenu(Base): + __tablename__ = "submenu" + + id: Mapped[intpk] + title: Mapped[str_25] + description: Mapped[Optional[str]] + parent_menu: Mapped[int] = mapped_column(ForeignKey("menu.id")) + dishes: Mapped[List["Dish"]] = relationship() + + +class Dish(Base): + __tablename__ = "dish" + + id: Mapped[intpk] + title: Mapped[str_25] + description: Mapped[Optional[str]] + price: Mapped[Decimal] + parent_submenu: Mapped[int] = mapped_column(ForeignKey("submenu.id")) diff --git a/fastfood/routes.py b/fastfood/routes.py new file mode 100644 index 0000000..3bf05bf --- /dev/null +++ b/fastfood/routes.py @@ -0,0 +1,30 @@ +from sqlalchemy.ext.asyncio import AsyncSession + +from fastapi import APIRouter, Depends +from sqlalchemy import insert, select + +from fastfood import models, schemas +from fastfood.dbase import get_async_session + + +router = APIRouter() + + +@router.get("/api/v1/menus") +async def read_menu(session: AsyncSession = Depends(get_async_session)): + stmt = select(models.Menu) + result = await session.execute(stmt) + data = result.mappings().all() + return data + + +@router.post("/api/v1/menus", status_code=201) +async def add_menu(menu: schemas.MenuBase, session: AsyncSession = Depends(get_async_session)): + """ + docstring + """ + stmt = insert(models.Menu).values(**menu.dict()) + await session.execute(stmt) + await session.commit() + return {"status": "success"} + diff --git a/fastfood/schemas.py b/fastfood/schemas.py new file mode 100644 index 0000000..7b1aed5 --- /dev/null +++ b/fastfood/schemas.py @@ -0,0 +1,39 @@ +from decimal import Decimal + +from pydantic import BaseModel + + +class MenuBase(BaseModel): + title: str + description: str | None = None + + +class SubMenuBase(MenuBase): + pass + + +class DishBase(MenuBase): + price: Decimal + + +class Dish(): + id: int + + class Config: + orm_mode = True + + +class SubMenu(SubMenuBase): + id: int + # dishes: list[Dish] + + class Config: + orm_mode = True + + +class Menu(MenuBase): + id: int + # submenus: list[SubMenu] + + class Config: + orm_mode = True diff --git a/manage.py b/manage.py index b428985..a33377b 100644 --- a/manage.py +++ b/manage.py @@ -1,7 +1,10 @@ +import asyncio import sys import uvicorn +from fastfood.crud import create_db_and_tables + def run_app(): """ @@ -20,4 +23,7 @@ if __name__ == "__main__": pass if "--run-server" in sys.argv: + async def create(): + await create_db_and_tables() + asyncio.run(create()) run_app() diff --git a/poetry.lock b/poetry.lock index 20d17e0..ec1f5ac 100644 --- a/poetry.lock +++ b/poetry.lock @@ -33,6 +33,74 @@ doc = ["Sphinx (>=7)", "packaging", "sphinx-autodoc-typehints (>=1.2.0)", "sphin test = ["anyio[trio]", "coverage[toml] (>=7)", "exceptiongroup (>=1.2.0)", "hypothesis (>=4.0)", "psutil (>=5.9)", "pytest (>=7.0)", "pytest-mock (>=3.6.1)", "trustme", "uvloop (>=0.17)"] trio = ["trio (>=0.23)"] +[[package]] +name = "async-timeout" +version = "4.0.3" +description = "Timeout context manager for asyncio programs" +optional = false +python-versions = ">=3.7" +files = [ + {file = "async-timeout-4.0.3.tar.gz", hash = "sha256:4640d96be84d82d02ed59ea2b7105a0f7b33abe8703703cd0ab0bf87c427522f"}, + {file = "async_timeout-4.0.3-py3-none-any.whl", hash = "sha256:7405140ff1230c310e51dc27b3145b9092d659ce68ff733fb0cefe3ee42be028"}, +] + +[[package]] +name = "asyncpg" +version = "0.29.0" +description = "An asyncio PostgreSQL driver" +optional = false +python-versions = ">=3.8.0" +files = [ + {file = "asyncpg-0.29.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:72fd0ef9f00aeed37179c62282a3d14262dbbafb74ec0ba16e1b1864d8a12169"}, + {file = "asyncpg-0.29.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:52e8f8f9ff6e21f9b39ca9f8e3e33a5fcdceaf5667a8c5c32bee158e313be385"}, + {file = "asyncpg-0.29.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:a9e6823a7012be8b68301342ba33b4740e5a166f6bbda0aee32bc01638491a22"}, + {file = "asyncpg-0.29.0-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:746e80d83ad5d5464cfbf94315eb6744222ab00aa4e522b704322fb182b83610"}, + {file = "asyncpg-0.29.0-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:ff8e8109cd6a46ff852a5e6bab8b0a047d7ea42fcb7ca5ae6eaae97d8eacf397"}, + {file = "asyncpg-0.29.0-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:97eb024685b1d7e72b1972863de527c11ff87960837919dac6e34754768098eb"}, + {file = "asyncpg-0.29.0-cp310-cp310-win32.whl", hash = "sha256:5bbb7f2cafd8d1fa3e65431833de2642f4b2124be61a449fa064e1a08d27e449"}, + {file = "asyncpg-0.29.0-cp310-cp310-win_amd64.whl", hash = "sha256:76c3ac6530904838a4b650b2880f8e7af938ee049e769ec2fba7cd66469d7772"}, + {file = "asyncpg-0.29.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4900ee08e85af01adb207519bb4e14b1cae8fd21e0ccf80fac6aa60b6da37b4"}, + {file = "asyncpg-0.29.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a65c1dcd820d5aea7c7d82a3fdcb70e096f8f70d1a8bf93eb458e49bfad036ac"}, + {file = "asyncpg-0.29.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:5b52e46f165585fd6af4863f268566668407c76b2c72d366bb8b522fa66f1870"}, + {file = "asyncpg-0.29.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:dc600ee8ef3dd38b8d67421359779f8ccec30b463e7aec7ed481c8346decf99f"}, + {file = "asyncpg-0.29.0-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:039a261af4f38f949095e1e780bae84a25ffe3e370175193174eb08d3cecab23"}, + {file = "asyncpg-0.29.0-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:6feaf2d8f9138d190e5ec4390c1715c3e87b37715cd69b2c3dfca616134efd2b"}, + {file = "asyncpg-0.29.0-cp311-cp311-win32.whl", hash = "sha256:1e186427c88225ef730555f5fdda6c1812daa884064bfe6bc462fd3a71c4b675"}, + {file = "asyncpg-0.29.0-cp311-cp311-win_amd64.whl", hash = "sha256:cfe73ffae35f518cfd6e4e5f5abb2618ceb5ef02a2365ce64f132601000587d3"}, + {file = "asyncpg-0.29.0-cp312-cp312-macosx_10_9_x86_64.whl", hash = "sha256:6011b0dc29886ab424dc042bf9eeb507670a3b40aece3439944006aafe023178"}, + {file = "asyncpg-0.29.0-cp312-cp312-macosx_11_0_arm64.whl", hash = "sha256:b544ffc66b039d5ec5a7454667f855f7fec08e0dfaf5a5490dfafbb7abbd2cfb"}, + {file = "asyncpg-0.29.0-cp312-cp312-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d84156d5fb530b06c493f9e7635aa18f518fa1d1395ef240d211cb563c4e2364"}, + {file = "asyncpg-0.29.0-cp312-cp312-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:54858bc25b49d1114178d65a88e48ad50cb2b6f3e475caa0f0c092d5f527c106"}, + {file = "asyncpg-0.29.0-cp312-cp312-musllinux_1_1_aarch64.whl", hash = "sha256:bde17a1861cf10d5afce80a36fca736a86769ab3579532c03e45f83ba8a09c59"}, + {file = "asyncpg-0.29.0-cp312-cp312-musllinux_1_1_x86_64.whl", hash = "sha256:37a2ec1b9ff88d8773d3eb6d3784dc7e3fee7756a5317b67f923172a4748a175"}, + {file = "asyncpg-0.29.0-cp312-cp312-win32.whl", hash = "sha256:bb1292d9fad43112a85e98ecdc2e051602bce97c199920586be83254d9dafc02"}, + {file = "asyncpg-0.29.0-cp312-cp312-win_amd64.whl", hash = "sha256:2245be8ec5047a605e0b454c894e54bf2ec787ac04b1cb7e0d3c67aa1e32f0fe"}, + {file = "asyncpg-0.29.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0009a300cae37b8c525e5b449233d59cd9868fd35431abc470a3e364d2b85cb9"}, + {file = "asyncpg-0.29.0-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:5cad1324dbb33f3ca0cd2074d5114354ed3be2b94d48ddfd88af75ebda7c43cc"}, + {file = "asyncpg-0.29.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:012d01df61e009015944ac7543d6ee30c2dc1eb2f6b10b62a3f598beb6531548"}, + {file = "asyncpg-0.29.0-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:000c996c53c04770798053e1730d34e30cb645ad95a63265aec82da9093d88e7"}, + {file = "asyncpg-0.29.0-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:e0bfe9c4d3429706cf70d3249089de14d6a01192d617e9093a8e941fea8ee775"}, + {file = "asyncpg-0.29.0-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:642a36eb41b6313ffa328e8a5c5c2b5bea6ee138546c9c3cf1bffaad8ee36dd9"}, + {file = "asyncpg-0.29.0-cp38-cp38-win32.whl", hash = "sha256:a921372bbd0aa3a5822dd0409da61b4cd50df89ae85150149f8c119f23e8c408"}, + {file = "asyncpg-0.29.0-cp38-cp38-win_amd64.whl", hash = "sha256:103aad2b92d1506700cbf51cd8bb5441e7e72e87a7b3a2ca4e32c840f051a6a3"}, + {file = "asyncpg-0.29.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:5340dd515d7e52f4c11ada32171d87c05570479dc01dc66d03ee3e150fb695da"}, + {file = "asyncpg-0.29.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e17b52c6cf83e170d3d865571ba574577ab8e533e7361a2b8ce6157d02c665d3"}, + {file = "asyncpg-0.29.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f100d23f273555f4b19b74a96840aa27b85e99ba4b1f18d4ebff0734e78dc090"}, + {file = "asyncpg-0.29.0-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:48e7c58b516057126b363cec8ca02b804644fd012ef8e6c7e23386b7d5e6ce83"}, + {file = "asyncpg-0.29.0-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:f9ea3f24eb4c49a615573724d88a48bd1b7821c890c2effe04f05382ed9e8810"}, + {file = "asyncpg-0.29.0-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:8d36c7f14a22ec9e928f15f92a48207546ffe68bc412f3be718eedccdf10dc5c"}, + {file = "asyncpg-0.29.0-cp39-cp39-win32.whl", hash = "sha256:797ab8123ebaed304a1fad4d7576d5376c3a006a4100380fb9d517f0b59c1ab2"}, + {file = "asyncpg-0.29.0-cp39-cp39-win_amd64.whl", hash = "sha256:cce08a178858b426ae1aa8409b5cc171def45d4293626e7aa6510696d46decd8"}, + {file = "asyncpg-0.29.0.tar.gz", hash = "sha256:d1c49e1f44fffafd9a55e1a9b101590859d881d639ea2922516f5d9c512d354e"}, +] + +[package.dependencies] +async-timeout = {version = ">=4.0.3", markers = "python_version < \"3.12.0\""} + +[package.extras] +docs = ["Sphinx (>=5.3.0,<5.4.0)", "sphinx-rtd-theme (>=1.2.2)", "sphinxcontrib-asyncio (>=0.3.0,<0.4.0)"] +test = ["flake8 (>=6.1,<7.0)", "uvloop (>=0.15.3)"] + [[package]] name = "click" version = "8.1.7" @@ -357,6 +425,21 @@ files = [ [package.dependencies] typing-extensions = ">=4.6.0,<4.7.0 || >4.7.0" +[[package]] +name = "pydantic-settings" +version = "2.1.0" +description = "Settings management using Pydantic" +optional = false +python-versions = ">=3.8" +files = [ + {file = "pydantic_settings-2.1.0-py3-none-any.whl", hash = "sha256:7621c0cb5d90d1140d2f0ef557bdf03573aac7035948109adf2574770b77605a"}, + {file = "pydantic_settings-2.1.0.tar.gz", hash = "sha256:26b1492e0a24755626ac5e6d715e9077ab7ad4fb5f19a8b7ed7011d52f36141c"}, +] + +[package.dependencies] +pydantic = ">=2.3.0" +python-dotenv = ">=0.21.0" + [[package]] name = "pytest" version = "7.4.4" @@ -379,6 +462,20 @@ tomli = {version = ">=1.0.0", markers = "python_version < \"3.11\""} [package.extras] testing = ["argcomplete", "attrs (>=19.2.0)", "hypothesis (>=3.56)", "mock", "nose", "pygments (>=2.7.2)", "requests", "setuptools", "xmlschema"] +[[package]] +name = "python-dotenv" +version = "1.0.0" +description = "Read key-value pairs from a .env file and set them as environment variables" +optional = false +python-versions = ">=3.8" +files = [ + {file = "python-dotenv-1.0.0.tar.gz", hash = "sha256:a8df96034aae6d2d50a4ebe8216326c61c3eb64836776504fcca410e5937a3ba"}, + {file = "python_dotenv-1.0.0-py3-none-any.whl", hash = "sha256:f5971a9226b701070a4bf2c38c89e5a3f0d64de8debda981d1db98583009122a"}, +] + +[package.extras] +cli = ["click (>=5.0)"] + [[package]] name = "sniffio" version = "1.3.0" @@ -538,4 +635,4 @@ standard = ["colorama (>=0.4)", "httptools (>=0.5.0)", "python-dotenv (>=0.13)", [metadata] lock-version = "2.0" python-versions = "^3.10" -content-hash = "204612e68cf78c0394e4c63eafa2f40114c36bfa8f9877d2c7a6d78b9de17f80" +content-hash = "7d4c2713da8d969278204677c9f1b4790b62a0114fe51a0d973313bf079b871c" diff --git a/pyproject.toml b/pyproject.toml index d86efd4..f60116d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -10,6 +10,8 @@ python = "^3.10" sqlalchemy = "^2.0.25" fastapi = "^0.109.0" uvicorn = "^0.26.0" +asyncpg = "^0.29.0" +pydantic-settings = "^2.1.0" [tool.poetry.group.dev.dependencies]