Skip to content

Commit b4af645

Browse files
committed
модель слов, миграции
1 parent 90f91a2 commit b4af645

8 files changed

Lines changed: 350 additions & 1 deletion

File tree

alembic.ini

Lines changed: 149 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,149 @@
1+
# A generic, single database configuration.
2+
3+
[alembic]
4+
# path to migration scripts.
5+
# this is typically a path given in POSIX (e.g. forward slashes)
6+
# format, relative to the token %(here)s which refers to the location of this
7+
# ini file
8+
script_location = %(here)s/alembic
9+
10+
# template used to generate migration file names; The default value is %%(rev)s_%%(slug)s
11+
# Uncomment the line below if you want the files to be prepended with date and time
12+
# see https://alembic.sqlalchemy.org/en/latest/tutorial.html#editing-the-ini-file
13+
# for all available tokens
14+
# file_template = %%(year)d_%%(month).2d_%%(day).2d_%%(hour).2d%%(minute).2d-%%(rev)s_%%(slug)s
15+
# Or organize into date-based subdirectories (requires recursive_version_locations = true)
16+
# file_template = %%(year)d/%%(month).2d/%%(day).2d_%%(hour).2d%%(minute).2d_%%(second).2d_%%(rev)s_%%(slug)s
17+
18+
# sys.path path, will be prepended to sys.path if present.
19+
# defaults to the current working directory. for multiple paths, the path separator
20+
# is defined by "path_separator" below.
21+
prepend_sys_path = .
22+
23+
# timezone to use when rendering the date within the migration file
24+
# as well as the filename.
25+
# If specified, requires the tzdata library which can be installed by adding
26+
# `alembic[tz]` to the pip requirements.
27+
# string value is passed to ZoneInfo()
28+
# leave blank for localtime
29+
# timezone =
30+
31+
# max length of characters to apply to the "slug" field
32+
# truncate_slug_length = 40
33+
34+
# set to 'true' to run the environment during
35+
# the 'revision' command, regardless of autogenerate
36+
# revision_environment = false
37+
38+
# set to 'true' to allow .pyc and .pyo files without
39+
# a source .py file to be detected as revisions in the
40+
# versions/ directory
41+
# sourceless = false
42+
43+
# version location specification; This defaults
44+
# to <script_location>/versions. When using multiple version
45+
# directories, initial revisions must be specified with --version-path.
46+
# The path separator used here should be the separator specified by "path_separator"
47+
# below.
48+
# version_locations = %(here)s/bar:%(here)s/bat:%(here)s/alembic/versions
49+
50+
# path_separator; This indicates what character is used to split lists of file
51+
# paths, including version_locations and prepend_sys_path within configparser
52+
# files such as alembic.ini.
53+
# The default rendered in new alembic.ini files is "os", which uses os.pathsep
54+
# to provide os-dependent path splitting.
55+
#
56+
# Note that in order to support legacy alembic.ini files, this default does NOT
57+
# take place if path_separator is not present in alembic.ini. If this
58+
# option is omitted entirely, fallback logic is as follows:
59+
#
60+
# 1. Parsing of the version_locations option falls back to using the legacy
61+
# "version_path_separator" key, which if absent then falls back to the legacy
62+
# behavior of splitting on spaces and/or commas.
63+
# 2. Parsing of the prepend_sys_path option falls back to the legacy
64+
# behavior of splitting on spaces, commas, or colons.
65+
#
66+
# Valid values for path_separator are:
67+
#
68+
# path_separator = :
69+
# path_separator = ;
70+
# path_separator = space
71+
# path_separator = newline
72+
#
73+
# Use os.pathsep. Default configuration used for new projects.
74+
path_separator = os
75+
76+
77+
# set to 'true' to search source files recursively
78+
# in each "version_locations" directory
79+
# new in Alembic version 1.10
80+
# recursive_version_locations = false
81+
82+
# the output encoding used when revision files
83+
# are written from script.py.mako
84+
# output_encoding = utf-8
85+
86+
# database URL. This is consumed by the user-maintained env.py script only.
87+
# other means of configuring database URLs may be customized within the env.py
88+
# file.
89+
sqlalchemy.url = driver://user:pass@localhost/dbname
90+
91+
92+
[post_write_hooks]
93+
# post_write_hooks defines scripts or Python functions that are run
94+
# on newly generated revision scripts. See the documentation for further
95+
# detail and examples
96+
97+
# format using "black" - use the console_scripts runner, against the "black" entrypoint
98+
# hooks = black
99+
# black.type = console_scripts
100+
# black.entrypoint = black
101+
# black.options = -l 79 REVISION_SCRIPT_FILENAME
102+
103+
# lint with attempts to fix using "ruff" - use the module runner, against the "ruff" module
104+
# hooks = ruff
105+
# ruff.type = module
106+
# ruff.module = ruff
107+
# ruff.options = check --fix REVISION_SCRIPT_FILENAME
108+
109+
# Alternatively, use the exec runner to execute a binary found on your PATH
110+
# hooks = ruff
111+
# ruff.type = exec
112+
# ruff.executable = ruff
113+
# ruff.options = check --fix REVISION_SCRIPT_FILENAME
114+
115+
# Logging configuration. This is also consumed by the user-maintained
116+
# env.py script only.
117+
[loggers]
118+
keys = root,sqlalchemy,alembic
119+
120+
[handlers]
121+
keys = console
122+
123+
[formatters]
124+
keys = generic
125+
126+
[logger_root]
127+
level = WARNING
128+
handlers = console
129+
qualname =
130+
131+
[logger_sqlalchemy]
132+
level = WARNING
133+
handlers =
134+
qualname = sqlalchemy.engine
135+
136+
[logger_alembic]
137+
level = INFO
138+
handlers =
139+
qualname = alembic
140+
141+
[handler_console]
142+
class = StreamHandler
143+
args = (sys.stderr,)
144+
level = NOTSET
145+
formatter = generic
146+
147+
[formatter_generic]
148+
format = %(levelname)-5.5s [%(name)s] %(message)s
149+
datefmt = %H:%M:%S

alembic/README

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Generic single-database configuration with an async dbapi.

alembic/env.py

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
import asyncio
2+
import os
3+
from logging.config import fileConfig
4+
5+
from dotenv import load_dotenv
6+
from sqlalchemy import pool
7+
from sqlalchemy.engine import Connection
8+
from sqlalchemy.ext.asyncio import async_engine_from_config
9+
10+
from alembic import context
11+
12+
from app.core.base import Base
13+
14+
15+
load_dotenv('.env')
16+
# this is the Alembic Config object, which provides
17+
# access to the values within the .ini file in use.
18+
config = context.config
19+
20+
config.set_main_option('sqlalchemy.url', os.environ["DATABASE_URL"])
21+
22+
# Interpret the config file for Python logging.
23+
# This line sets up loggers basically.
24+
if config.config_file_name is not None:
25+
fileConfig(config.config_file_name)
26+
27+
# add your model's MetaData object here
28+
# for 'autogenerate' support
29+
# from myapp import mymodel
30+
# target_metadata = mymodel.Base.metadata
31+
target_metadata = Base.metadata
32+
33+
# other values from the config, defined by the needs of env.py,
34+
# can be acquired:
35+
# my_important_option = config.get_main_option("my_important_option")
36+
# ... etc.
37+
38+
39+
def run_migrations_offline() -> None:
40+
"""Run migrations in 'offline' mode.
41+
42+
This configures the context with just a URL
43+
and not an Engine, though an Engine is acceptable
44+
here as well. By skipping the Engine creation
45+
we don't even need a DBAPI to be available.
46+
47+
Calls to context.execute() here emit the given string to the
48+
script output.
49+
50+
"""
51+
url = config.get_main_option("sqlalchemy.url")
52+
context.configure(
53+
url=url,
54+
target_metadata=target_metadata,
55+
literal_binds=True,
56+
dialect_opts={"paramstyle": "named"},
57+
)
58+
59+
with context.begin_transaction():
60+
context.run_migrations()
61+
62+
63+
def do_run_migrations(connection: Connection) -> None:
64+
context.configure(connection=connection, target_metadata=target_metadata)
65+
66+
with context.begin_transaction():
67+
context.run_migrations()
68+
69+
70+
async def run_async_migrations() -> None:
71+
"""In this scenario we need to create an Engine
72+
and associate a connection with the context.
73+
74+
"""
75+
76+
connectable = async_engine_from_config(
77+
config.get_section(config.config_ini_section, {}),
78+
prefix="sqlalchemy.",
79+
poolclass=pool.NullPool,
80+
)
81+
82+
async with connectable.connect() as connection:
83+
await connection.run_sync(do_run_migrations)
84+
85+
await connectable.dispose()
86+
87+
88+
def run_migrations_online() -> None:
89+
"""Run migrations in 'online' mode."""
90+
91+
asyncio.run(run_async_migrations())
92+
93+
94+
if context.is_offline_mode():
95+
run_migrations_offline()
96+
else:
97+
run_migrations_online()

alembic/script.py.mako

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
"""${message}
2+
3+
Revision ID: ${up_revision}
4+
Revises: ${down_revision | comma,n}
5+
Create Date: ${create_date}
6+
7+
"""
8+
from typing import Sequence, Union
9+
10+
from alembic import op
11+
import sqlalchemy as sa
12+
${imports if imports else ""}
13+
14+
# revision identifiers, used by Alembic.
15+
revision: str = ${repr(up_revision)}
16+
down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
17+
branch_labels: Union[str, Sequence[str], None] = ${repr(branch_labels)}
18+
depends_on: Union[str, Sequence[str], None] = ${repr(depends_on)}
19+
20+
21+
def upgrade() -> None:
22+
"""Upgrade schema."""
23+
${upgrades if upgrades else "pass"}
24+
25+
26+
def downgrade() -> None:
27+
"""Downgrade schema."""
28+
${downgrades if downgrades else "pass"}
Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
"""Words migration
2+
3+
Revision ID: ffb4e984a7e9
4+
Revises:
5+
Create Date: 2026-02-20 15:04:53.957933
6+
7+
"""
8+
from typing import Sequence, Union
9+
10+
from alembic import op
11+
import sqlalchemy as sa
12+
13+
14+
# revision identifiers, used by Alembic.
15+
revision: str = 'ffb4e984a7e9'
16+
down_revision: Union[str, Sequence[str], None] = None
17+
branch_labels: Union[str, Sequence[str], None] = None
18+
depends_on: Union[str, Sequence[str], None] = None
19+
20+
21+
def upgrade() -> None:
22+
"""Upgrade schema."""
23+
# ### commands auto generated by Alembic - please adjust! ###
24+
op.create_table('words',
25+
sa.Column('id', sa.Integer(), nullable=False),
26+
sa.Column('english', sa.String(length=255), nullable=False),
27+
sa.Column('russian', sa.String(length=255), nullable=False),
28+
sa.Column('create_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=False),
29+
sa.PrimaryKeyConstraint('id')
30+
)
31+
# ### end Alembic commands ###
32+
33+
34+
def downgrade() -> None:
35+
"""Downgrade schema."""
36+
# ### commands auto generated by Alembic - please adjust! ###
37+
op.drop_table('words')
38+
# ### end Alembic commands ###

app/core/base.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
"""Импорты класса Base и всех моделей Alembic."""
2+
3+
from app.core.database import Base # noqa
4+
from app.models.words import Word # noqa

app/models/words.py

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
from datetime import datetime
2+
3+
from sqlalchemy import String, Integer, DateTime, func
4+
from sqlalchemy.orm import Mapped, mapped_column
5+
6+
from app.core.database import Base
7+
8+
9+
class Word(Base):
10+
__tablename__ = "words"
11+
12+
id: Mapped[int] = mapped_column(Integer, primary_key=True)
13+
english: Mapped[str] = mapped_column(String(255), nullable=False)
14+
russian: Mapped[str] = mapped_column(String(255), nullable=False)
15+
create_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), server_default=func.now(), nullable=False)

requirements.txt

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,52 @@ alembic==1.18.4
33
annotated-doc==0.0.4
44
annotated-types==0.7.0
55
anyio==4.12.1
6+
attrs==25.4.0
7+
beautifulsoup4==4.14.3
68
black==26.1.0
9+
cattrs==25.3.0
10+
certifi==2026.1.4
11+
charset-normalizer==3.4.4
712
click==8.3.1
13+
dotenv==0.9.9
814
fastapi==0.129.0
915
flake8==7.3.0
1016
greenlet==3.3.1
1117
h11==0.16.0
1218
httptools==0.7.1
1319
idna==3.11
20+
iniconfig==2.3.0
1421
isort==7.0.0
22+
lxml==6.0.2
1523
Mako==1.3.10
1624
MarkupSafe==3.0.3
1725
mccabe==0.7.0
1826
mypy_extensions==1.1.0
1927
packaging==26.0
2028
pathspec==1.0.4
21-
platformdirs==4.9.2
29+
platformdirs==4.5.1
30+
pluggy==1.6.0
2231
pycodestyle==2.14.0
2332
pydantic==2.12.5
2433
pydantic-settings==2.13.1
2534
pydantic_core==2.41.5
2635
pyflakes==3.4.0
36+
Pygments==2.19.2
37+
pytest==9.0.2
2738
python-dotenv==1.2.1
2839
pytokens==0.4.1
2940
PyYAML==6.0.3
41+
requests==2.32.5
42+
requests-cache==1.2.1
43+
soupsieve==2.8.3
3044
SQLAlchemy==2.0.46
3145
starlette==0.52.1
3246
typing-inspection==0.4.2
3347
typing_extensions==4.15.0
48+
url-normalize==2.2.1
49+
urllib3==2.6.3
3450
uvicorn==0.41.0
3551
uvloop==0.22.1
3652
watchfiles==1.1.1
53+
wcwidth==0.2.14
3754
websockets==16.0

0 commit comments

Comments
 (0)