From b4af64587fd5452d6f5cca4efb1a1674713b1cc2 Mon Sep 17 00:00:00 2001 From: Dmitry Titenkov Date: Fri, 20 Feb 2026 15:08:21 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C=20?= =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=B2,=20=D0=BC=D0=B8=D0=B3=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alembic.ini | 149 ++++++++++++++++++ alembic/README | 1 + alembic/env.py | 97 ++++++++++++ alembic/script.py.mako | 28 ++++ .../versions/ffb4e984a7e9_words_migration.py | 38 +++++ app/core/base.py | 4 + app/models/words.py | 15 ++ requirements.txt | 19 ++- 8 files changed, 350 insertions(+), 1 deletion(-) create mode 100644 alembic.ini create mode 100644 alembic/README create mode 100644 alembic/env.py create mode 100644 alembic/script.py.mako create mode 100644 alembic/versions/ffb4e984a7e9_words_migration.py diff --git a/alembic.ini b/alembic.ini new file mode 100644 index 0000000..df80d65 --- /dev/null +++ b/alembic.ini @@ -0,0 +1,149 @@ +# A generic, single database configuration. + +[alembic] +# path to migration scripts. +# this is typically a path given in POSIX (e.g. forward slashes) +# format, relative to the token %(here)s which refers to the location of this +# ini file +script_location = %(here)s/alembic + +# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s +# Uncomment the line below if you want the files to be prepended with date and time +# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file +# for all available tokens +# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s +# Or organize into date-based subdirectories (requires recursive_version_locations = true) +# file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s + +# sys.path path, will be prepended to sys.path if present. +# defaults to the current working directory. for multiple paths, the path separator +# is defined by "path_separator" below. +prepend_sys_path = . + +# timezone to use when rendering the date within the migration file +# as well as the filename. +# If specified, requires the tzdata library which can be installed by adding +# `alembic[tz]` to the pip requirements. +# string value is passed to ZoneInfo() +# leave blank for localtime +# timezone = + +# max length of characters to apply to the "slug" field +# truncate_slug_length = 40 + +# set to 'true' to run the environment during +# the 'revision' command, regardless of autogenerate +# revision_environment = false + +# set to 'true' to allow .pyc and .pyo files without +# a source .py file to be detected as revisions in the +# versions/ directory +# sourceless = false + +# version location specification; This defaults +# to /versions. When using multiple version +# directories, initial revisions must be specified with --version-path. +# The path separator used here should be the separator specified by "path_separator" +# below. +# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions + +# path_separator; This indicates what character is used to split lists of file +# paths, including version_locations and prepend_sys_path within configparser +# files such as alembic.ini. +# The default rendered in new alembic.ini files is "os", which uses os.pathsep +# to provide os-dependent path splitting. +# +# Note that in order to support legacy alembic.ini files, this default does NOT +# take place if path_separator is not present in alembic.ini. If this +# option is omitted entirely, fallback logic is as follows: +# +# 1. Parsing of the version_locations option falls back to using the legacy +# "version_path_separator" key, which if absent then falls back to the legacy +# behavior of splitting on spaces and/or commas. +# 2. Parsing of the prepend_sys_path option falls back to the legacy +# behavior of splitting on spaces, commas, or colons. +# +# Valid values for path_separator are: +# +# path_separator = : +# path_separator = ; +# path_separator = space +# path_separator = newline +# +# Use os.pathsep. Default configuration used for new projects. +path_separator = os + + +# set to 'true' to search source files recursively +# in each "version_locations" directory +# new in Alembic version 1.10 +# recursive_version_locations = false + +# the output encoding used when revision files +# are written from script.py.mako +# output_encoding = utf-8 + +# database URL. This is consumed by the user-maintained env.py script only. +# other means of configuring database URLs may be customized within the env.py +# file. +sqlalchemy.url = driver://user:pass@localhost/dbname + + +[post_write_hooks] +# post_write_hooks defines scripts or Python functions that are run +# on newly generated revision scripts. See the documentation for further +# detail and examples + +# format using "black" - use the console_scripts runner, against the "black" entrypoint +# hooks = black +# black.type = console_scripts +# black.entrypoint = black +# black.options = -l 79 REVISION_SCRIPT_FILENAME + +# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module +# hooks = ruff +# ruff.type = module +# ruff.module = ruff +# ruff.options = check --fix REVISION_SCRIPT_FILENAME + +# Alternatively, use the exec runner to execute a binary found on your PATH +# hooks = ruff +# ruff.type = exec +# ruff.executable = ruff +# ruff.options = check --fix REVISION_SCRIPT_FILENAME + +# Logging configuration. This is also consumed by the user-maintained +# env.py script only. +[loggers] +keys = root,sqlalchemy,alembic + +[handlers] +keys = console + +[formatters] +keys = generic + +[logger_root] +level = WARNING +handlers = console +qualname = + +[logger_sqlalchemy] +level = WARNING +handlers = +qualname = sqlalchemy.engine + +[logger_alembic] +level = INFO +handlers = +qualname = alembic + +[handler_console] +class = StreamHandler +args = (sys.stderr,) +level = NOTSET +formatter = generic + +[formatter_generic] +format = %(levelname)-5.5s [%(name)s] %(message)s +datefmt = %H:%M:%S diff --git a/alembic/README b/alembic/README new file mode 100644 index 0000000..e0d0858 --- /dev/null +++ b/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration with an async dbapi. \ No newline at end of file diff --git a/alembic/env.py b/alembic/env.py new file mode 100644 index 0000000..70c2485 --- /dev/null +++ b/alembic/env.py @@ -0,0 +1,97 @@ +import asyncio +import os +from logging.config import fileConfig + +from dotenv import load_dotenv +from sqlalchemy import pool +from sqlalchemy.engine import Connection +from sqlalchemy.ext.asyncio import async_engine_from_config + +from alembic import context + +from app.core.base import Base + + +load_dotenv('.env') +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +config.set_main_option('sqlalchemy.url', os.environ["DATABASE_URL"]) + +# Interpret the config file for Python logging. +# This line sets up loggers basically. +if config.config_file_name is not None: + fileConfig(config.config_file_name) + +# add your model's MetaData object here +# for 'autogenerate' support +# from myapp import mymodel +# target_metadata = mymodel.Base.metadata +target_metadata = Base.metadata + +# other values from the config, defined by the needs of env.py, +# can be acquired: +# my_important_option = config.get_main_option("my_important_option") +# ... etc. + + +def run_migrations_offline() -> None: + """Run migrations in 'offline' mode. + + This configures the context with just a URL + and not an Engine, though an Engine is acceptable + here as well. By skipping the Engine creation + we don't even need a DBAPI to be available. + + Calls to context.execute() here emit the given string to the + script output. + + """ + url = config.get_main_option("sqlalchemy.url") + context.configure( + url=url, + target_metadata=target_metadata, + literal_binds=True, + dialect_opts={"paramstyle": "named"}, + ) + + with context.begin_transaction(): + context.run_migrations() + + +def do_run_migrations(connection: Connection) -> None: + context.configure(connection=connection, target_metadata=target_metadata) + + with context.begin_transaction(): + context.run_migrations() + + +async def run_async_migrations() -> None: + """In this scenario we need to create an Engine + and associate a connection with the context. + + """ + + connectable = async_engine_from_config( + config.get_section(config.config_ini_section, {}), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + async with connectable.connect() as connection: + await connection.run_sync(do_run_migrations) + + await connectable.dispose() + + +def run_migrations_online() -> None: + """Run migrations in 'online' mode.""" + + asyncio.run(run_async_migrations()) + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/alembic/script.py.mako b/alembic/script.py.mako new file mode 100644 index 0000000..1101630 --- /dev/null +++ b/alembic/script.py.mako @@ -0,0 +1,28 @@ +"""${message} + +Revision ID: ${up_revision} +Revises: ${down_revision | comma,n} +Create Date: ${create_date} + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa +${imports if imports else ""} + +# revision identifiers, used by Alembic. +revision: str = ${repr(up_revision)} +down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)} +branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)} +depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)} + + +def upgrade() -> None: + """Upgrade schema.""" + ${upgrades if upgrades else "pass"} + + +def downgrade() -> None: + """Downgrade schema.""" + ${downgrades if downgrades else "pass"} diff --git a/alembic/versions/ffb4e984a7e9_words_migration.py b/alembic/versions/ffb4e984a7e9_words_migration.py new file mode 100644 index 0000000..5362259 --- /dev/null +++ b/alembic/versions/ffb4e984a7e9_words_migration.py @@ -0,0 +1,38 @@ +"""Words migration + +Revision ID: ffb4e984a7e9 +Revises: +Create Date: 2026-02-20 15:04:53.957933 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = 'ffb4e984a7e9' +down_revision: Union[str, Sequence[str], None] = None +branch_labels: Union[str, Sequence[str], None] = None +depends_on: Union[str, Sequence[str], None] = None + + +def upgrade() -> None: + """Upgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.create_table('words', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('english', sa.String(length=255), nullable=False), + sa.Column('russian', sa.String(length=255), nullable=False), + sa.Column('create_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False), + sa.PrimaryKeyConstraint('id') + ) + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.drop_table('words') + # ### end Alembic commands ### diff --git a/app/core/base.py b/app/core/base.py index e69de29..175ff3b 100644 --- a/app/core/base.py +++ b/app/core/base.py @@ -0,0 +1,4 @@ +"""Импорты класса Base и всех моделей Alembic.""" + +from app.core.database import Base # noqa +from app.models.words import Word # noqa \ No newline at end of file diff --git a/app/models/words.py b/app/models/words.py index e69de29..a1e969d 100644 --- a/app/models/words.py +++ b/app/models/words.py @@ -0,0 +1,15 @@ +from datetime import datetime + +from sqlalchemy import String, Integer, DateTime, func +from sqlalchemy.orm import Mapped, mapped_column + +from app.core.database import Base + + +class Word(Base): + __tablename__ = "words" + + id: Mapped[int] = mapped_column(Integer, primary_key=True) + english: Mapped[str] = mapped_column(String(255), nullable=False) + russian: Mapped[str] = mapped_column(String(255), nullable=False) + create_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now(), nullable=False) diff --git a/requirements.txt b/requirements.txt index c7e6db8..b0fbfba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,35 +3,52 @@ alembic==1.18.4 annotated-doc==0.0.4 annotated-types==0.7.0 anyio==4.12.1 +attrs==25.4.0 +beautifulsoup4==4.14.3 black==26.1.0 +cattrs==25.3.0 +certifi==2026.1.4 +charset-normalizer==3.4.4 click==8.3.1 +dotenv==0.9.9 fastapi==0.129.0 flake8==7.3.0 greenlet==3.3.1 h11==0.16.0 httptools==0.7.1 idna==3.11 +iniconfig==2.3.0 isort==7.0.0 +lxml==6.0.2 Mako==1.3.10 MarkupSafe==3.0.3 mccabe==0.7.0 mypy_extensions==1.1.0 packaging==26.0 pathspec==1.0.4 -platformdirs==4.9.2 +platformdirs==4.5.1 +pluggy==1.6.0 pycodestyle==2.14.0 pydantic==2.12.5 pydantic-settings==2.13.1 pydantic_core==2.41.5 pyflakes==3.4.0 +Pygments==2.19.2 +pytest==9.0.2 python-dotenv==1.2.1 pytokens==0.4.1 PyYAML==6.0.3 +requests==2.32.5 +requests-cache==1.2.1 +soupsieve==2.8.3 SQLAlchemy==2.0.46 starlette==0.52.1 typing-inspection==0.4.2 typing_extensions==4.15.0 +url-normalize==2.2.1 +urllib3==2.6.3 uvicorn==0.41.0 uvloop==0.22.1 watchfiles==1.1.1 +wcwidth==0.2.14 websockets==16.0 From d155437744af9598bb9ceee3c2be99b7b3d36679 Mon Sep 17 00:00:00 2001 From: Dmitry Titenkov Date: Fri, 20 Feb 2026 15:08:55 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=D0=BC=D0=BE=D0=B4=D0=B5=D0=BB=D1=8C=20?= =?UTF-8?q?=D1=81=D0=BB=D0=BE=D0=B2,=20=D0=BC=D0=B8=D0=B3=D1=80=D0=B0?= =?UTF-8?q?=D1=86=D0=B8=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/core/base.py | 4 ++-- app/models/words.py | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/core/base.py b/app/core/base.py index 175ff3b..0d88ce2 100644 --- a/app/core/base.py +++ b/app/core/base.py @@ -1,4 +1,4 @@ """Импорты класса Base и всех моделей Alembic.""" -from app.core.database import Base # noqa -from app.models.words import Word # noqa \ No newline at end of file +from app.core.database import Base # noqa +from app.models.words import Word # noqa diff --git a/app/models/words.py b/app/models/words.py index a1e969d..3e34663 100644 --- a/app/models/words.py +++ b/app/models/words.py @@ -1,6 +1,6 @@ from datetime import datetime -from sqlalchemy import String, Integer, DateTime, func +from sqlalchemy import DateTime, Integer, String, func from sqlalchemy.orm import Mapped, mapped_column from app.core.database import Base @@ -12,4 +12,6 @@ class Word(Base): id: Mapped[int] = mapped_column(Integer, primary_key=True) english: Mapped[str] = mapped_column(String(255), nullable=False) russian: Mapped[str] = mapped_column(String(255), nullable=False) - create_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now(), nullable=False) + create_at: Mapped[datetime] = mapped_column( + DateTime(timezone=True), server_default=func.now(), nullable=False + )