From 5deffdfcf13e6abe1532347c21ee357a9624bd95 Mon Sep 17 00:00:00 2001 From: "MH.Dmitrii" Date: Tue, 30 Sep 2025 15:27:13 +0300 Subject: [PATCH] alembic 1.0 --- requirements | 3 +- server/backend/endpoints.py | 3 +- server/database/alembic/__init__.py | 0 server/database/alembic/alembic.ini | 148 ++++++++++++++++++ server/database/alembic/alembic/README | 1 + server/database/alembic/alembic/__init__.py | 0 server/database/alembic/alembic/env.py | 78 +++++++++ .../database/alembic/alembic/script.py.mako | 28 ++++ .../alembic/versions/4182906fdea3_check.py | 45 ++++++ .../a29593b8fb22_add_description2_to_users.py | 32 ++++ server/database/db.py | 1 + 11 files changed, 337 insertions(+), 2 deletions(-) create mode 100644 server/database/alembic/__init__.py create mode 100644 server/database/alembic/alembic.ini create mode 100644 server/database/alembic/alembic/README create mode 100644 server/database/alembic/alembic/__init__.py create mode 100644 server/database/alembic/alembic/env.py create mode 100644 server/database/alembic/alembic/script.py.mako create mode 100644 server/database/alembic/alembic/versions/4182906fdea3_check.py create mode 100644 server/database/alembic/alembic/versions/a29593b8fb22_add_description2_to_users.py diff --git a/requirements b/requirements index ac96079..0fdab63 100644 --- a/requirements +++ b/requirements @@ -5,4 +5,5 @@ aiosqlite == 0.21.0 greenlet == 3.2.4 passlib == 1.7.4 bcrypt == 4.0.1 -python-jose[cryptography] == 3.5.0 \ No newline at end of file +python-jose[cryptography] == 3.5.0 +alembic == 1.16.5 \ No newline at end of file diff --git a/server/backend/endpoints.py b/server/backend/endpoints.py index a65f969..b52dafa 100644 --- a/server/backend/endpoints.py +++ b/server/backend/endpoints.py @@ -51,7 +51,8 @@ async def create_user(row:pydentic.CreateUser): await db.create_user(new_row) except: raise HTTPException(status_code=409, detail="User with this email already exists") - return new_row + user = await db.get_user_by_email(row.email) + return user @api.delete("/user_delete/{email}", response_model=pydentic.UserOut) async def delete_user(email:str,current_user: str = Depends(JWT.current_user)): user = await db.get_user_by_email(email) diff --git a/server/database/alembic/__init__.py b/server/database/alembic/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/server/database/alembic/alembic.ini b/server/database/alembic/alembic.ini new file mode 100644 index 0000000..1300e18 --- /dev/null +++ b/server/database/alembic/alembic.ini @@ -0,0 +1,148 @@ +# 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 + +# 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 python>=3.9 or backports.zoneinfo library and tzdata library. +# Any required deps can 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 = sqlite:///server/database/DB/example.db + + +[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/server/database/alembic/alembic/README b/server/database/alembic/alembic/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/server/database/alembic/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/server/database/alembic/alembic/__init__.py b/server/database/alembic/alembic/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/server/database/alembic/alembic/env.py b/server/database/alembic/alembic/env.py new file mode 100644 index 0000000..3038ded --- /dev/null +++ b/server/database/alembic/alembic/env.py @@ -0,0 +1,78 @@ +from logging.config import fileConfig + +from sqlalchemy import engine_from_config +from sqlalchemy import pool + +from alembic import context +from server.database.db import Base +# this is the Alembic Config object, which provides +# access to the values within the .ini file in use. +config = context.config + +# 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 run_migrations_online() -> None: + """Run migrations in 'online' mode. + + In this scenario we need to create an Engine + and associate a connection with the context. + + """ + connectable = engine_from_config( + config.get_section(config.config_ini_section, {}), + prefix="sqlalchemy.", + poolclass=pool.NullPool, + ) + + with connectable.connect() as connection: + context.configure( + connection=connection, target_metadata=target_metadata + ) + + with context.begin_transaction(): + context.run_migrations() + + +if context.is_offline_mode(): + run_migrations_offline() +else: + run_migrations_online() diff --git a/server/database/alembic/alembic/script.py.mako b/server/database/alembic/alembic/script.py.mako new file mode 100644 index 0000000..1101630 --- /dev/null +++ b/server/database/alembic/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/server/database/alembic/alembic/versions/4182906fdea3_check.py b/server/database/alembic/alembic/versions/4182906fdea3_check.py new file mode 100644 index 0000000..bbc2c8c --- /dev/null +++ b/server/database/alembic/alembic/versions/4182906fdea3_check.py @@ -0,0 +1,45 @@ +"""check + +Revision ID: 4182906fdea3 +Revises: +Create Date: 2025-09-30 14:57:28.113339 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '4182906fdea3' +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('users', + sa.Column('id', sa.Integer(), nullable=False), + sa.Column('email', sa.String(length=254), nullable=False), + sa.Column('description', sa.String(), nullable=False), + sa.Column('activated', sa.Boolean(), nullable=True), + sa.Column('password', sa.String(), nullable=False), + sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('(CURRENT_TIMESTAMP)'), nullable=True), + sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True), + sa.Column('last_login', sa.DateTime(timezone=True), nullable=True), + sa.PrimaryKeyConstraint('id'), + sa.UniqueConstraint('email') + ) + op.create_index(op.f('ix_users_id'), 'users', ['id'], unique=False) + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.drop_index(op.f('ix_users_id'), table_name='users') + op.drop_table('users') + # ### end Alembic commands ### diff --git a/server/database/alembic/alembic/versions/a29593b8fb22_add_description2_to_users.py b/server/database/alembic/alembic/versions/a29593b8fb22_add_description2_to_users.py new file mode 100644 index 0000000..5a7663b --- /dev/null +++ b/server/database/alembic/alembic/versions/a29593b8fb22_add_description2_to_users.py @@ -0,0 +1,32 @@ +"""add description2 to users + +Revision ID: a29593b8fb22 +Revises: 4182906fdea3 +Create Date: 2025-09-30 15:18:33.377319 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = 'a29593b8fb22' +down_revision: Union[str, Sequence[str], None] = '4182906fdea3' +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.add_column('users', sa.Column('description2', sa.String(), nullable=True)) + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + op.drop_column('users', 'description2') + # ### end Alembic commands ### diff --git a/server/database/db.py b/server/database/db.py index e8982c9..5f62450 100644 --- a/server/database/db.py +++ b/server/database/db.py @@ -39,6 +39,7 @@ class User(Base): created_at = Column(DateTime(timezone=True), server_default=func.now()) updated_at = Column(DateTime(timezone=True), onupdate=func.now()) last_login = Column(DateTime(timezone=True)) + description2 = Column(String, nullable=True) async def init_db(): async with async_engine.begin() as conn: