From f35113e5c83563a5c6ea5aacd7386f3bd7d636f7 Mon Sep 17 00:00:00 2001 From: "Choi A.K." Date: Fri, 5 Sep 2025 13:54:59 +0900 Subject: [PATCH] migrations + util scripts --- alembic.ini | 147 ++++++++++++++++++++++++++ alembic/README | 1 + alembic/env.py | 53 ++++++++++ alembic/script.py.mako | 28 +++++ alembic/versions/69ef23ef1ed1_init.py | 32 ++++++ bin/update.sh | 16 +++ handlers/admin_panel.py | 40 +++++++ main.py | 2 + requirements.txt | 3 +- 9 files changed, 321 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/69ef23ef1ed1_init.py create mode 100644 bin/update.sh create mode 100644 handlers/admin_panel.py diff --git a/alembic.ini b/alembic.ini new file mode 100644 index 0000000..09b92bb --- /dev/null +++ b/alembic.ini @@ -0,0 +1,147 @@ +# 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:///bot.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/alembic/README b/alembic/README new file mode 100644 index 0000000..98e4f9c --- /dev/null +++ b/alembic/README @@ -0,0 +1 @@ +Generic single-database configuration. \ No newline at end of file diff --git a/alembic/env.py b/alembic/env.py new file mode 100644 index 0000000..d45cdf8 --- /dev/null +++ b/alembic/env.py @@ -0,0 +1,53 @@ +from logging.config import fileConfig + +from sqlalchemy import create_engine, pool + +from alembic import context +import os + + +# 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) + +from models import Base +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: + url = os.getenv("DATABASE_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: + url = config.get_main_option("sqlalchemy.url") + connectable = create_engine(url, 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/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/69ef23ef1ed1_init.py b/alembic/versions/69ef23ef1ed1_init.py new file mode 100644 index 0000000..c8b6950 --- /dev/null +++ b/alembic/versions/69ef23ef1ed1_init.py @@ -0,0 +1,32 @@ +"""init + +Revision ID: 69ef23ef1ed1 +Revises: +Create Date: 2025-09-05 13:53:02.737876 + +""" +from typing import Sequence, Union + +from alembic import op +import sqlalchemy as sa + + +# revision identifiers, used by Alembic. +revision: str = '69ef23ef1ed1' +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! ### + pass + # ### end Alembic commands ### + + +def downgrade() -> None: + """Downgrade schema.""" + # ### commands auto generated by Alembic - please adjust! ### + pass + # ### end Alembic commands ### diff --git a/bin/update.sh b/bin/update.sh new file mode 100644 index 0000000..3c7eec2 --- /dev/null +++ b/bin/update.sh @@ -0,0 +1,16 @@ +#!/bin/bash +set -e + +echo "[update.sh] Получение свежего кода..." +git pull + +echo "[update.sh] Пересборка контейнера..." +docker-compose build --no-cache + +echo "[update.sh] Применение миграций Alembic..." +docker-compose run --rm bot alembic upgrade head + +echo "[update.sh] Запуск контейнера..." +docker-compose up -d + +echo "[update.sh] Готово!" diff --git a/handlers/admin_panel.py b/handlers/admin_panel.py new file mode 100644 index 0000000..fb95581 --- /dev/null +++ b/handlers/admin_panel.py @@ -0,0 +1,40 @@ +from telegram import Update, InlineKeyboardButton, InlineKeyboardMarkup +from telegram.ext import CommandHandler, CallbackQueryHandler, ConversationHandler, ContextTypes +from db import AsyncSessionLocal +from models import Admin, Channel, Group, Button + +ADMIN_MENU, PREVIEW_POST = range(2) + +async def admin_panel(update: Update, context: ContextTypes.DEFAULT_TYPE): + user_id = update.effective_user.id if update.effective_user else None + async with AsyncSessionLocal() as session: + # Получаем каналы и группы, которыми управляет админ + channels_result = await session.execute(Channel.__table__.select().where(Channel.admin_id == user_id)) + channels = channels_result.scalars().all() + groups_result = await session.execute(Group.__table__.select().where(Group.admin_id == user_id)) + groups = groups_result.scalars().all() + # Статистика + buttons_result = await session.execute(Button.__table__.select()) + buttons = buttons_result.scalars().all() + stats = f"Каналов: {len(channels)}\nГрупп: {len(groups)}\nКнопок: {len(buttons)}" + text = f"Ваша админ-панель\n\n{stats}\n\nВаши каналы:\n" + '\n'.join([f"- {c.name}" for c in channels]) + "\n\nВаши группы:\n" + '\n'.join([f"- {g.name}" for g in groups]) + keyboard = [] + # Кнопка предпросмотра поста (можно доработать) + keyboard.append([InlineKeyboardButton("Предпросмотр поста", callback_data="preview_post")]) + await update.message.reply_text(text, reply_markup=InlineKeyboardMarkup(keyboard), parse_mode='HTML') + return ADMIN_MENU + +async def preview_post_callback(update: Update, context: ContextTypes.DEFAULT_TYPE): + query = update.callback_query + await query.answer() + # Здесь можно реализовать предпросмотр поста с кнопками + await query.edit_message_text("Здесь будет предпросмотр поста с кнопками.") + return ConversationHandler.END + +admin_panel_conv = ConversationHandler( + entry_points=[CommandHandler('admin', admin_panel)], + states={ + ADMIN_MENU: [CallbackQueryHandler(preview_post_callback, pattern="preview_post")], + }, + fallbacks=[] +) diff --git a/main.py b/main.py index 69151db..a6410f3 100644 --- a/main.py +++ b/main.py @@ -10,6 +10,7 @@ from dotenv import load_dotenv from db import AsyncSessionLocal, init_db from models import Admin, Channel, Group, Button from asyncio import run as sync_to_async +from handlers.admin_panel import admin_panel_conv load_dotenv() TELEGRAM_TOKEN = os.getenv('TELEGRAM_TOKEN') @@ -91,6 +92,7 @@ def main(): application.add_handler(channel_buttons_conv) application.add_handler(CommandHandler('edit_button', edit_button)) application.add_handler(CommandHandler('del_button', del_button)) + application.add_handler(admin_panel_conv) import sys import asyncio if sys.platform.startswith('win'): diff --git a/requirements.txt b/requirements.txt index 7a6e55e..5ee2645 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,4 +2,5 @@ python-telegram-bot>=20.0 sqlalchemy>=2.0 python-dotenv>=1.0 pytest>=7.0 -aiosqlite>=0.19 \ No newline at end of file +aiosqlite +alembic \ No newline at end of file