Compare commits

...

13 Commits

Author SHA1 Message Date
7254175cdb migrations
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 15:10:42 +09:00
a0cbdd5358 migrations and db creation
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 15:03:13 +09:00
05990bf36e migrations fix
Some checks failed
continuous-integration/drone/push Build is failing
2025-09-05 14:56:06 +09:00
f1d782bb74 database fix
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 14:40:25 +09:00
908aff8b3d database creation fixes
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 14:35:27 +09:00
4ea540021a database creation process
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 14:32:20 +09:00
3aabe99a4e migrations fix
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 14:27:07 +09:00
a91283b681 migration fix
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 14:22:41 +09:00
a23ca87c84 model channels
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 14:16:47 +09:00
8dc49261b1 script fix
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 14:04:45 +09:00
100a73355a script fix docker-compose vs docker compose
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 13:59:26 +09:00
ec5c09ee24 script fix
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 13:57:05 +09:00
f35113e5c8 migrations + util scripts
Some checks failed
continuous-integration/drone/push Build is failing
continuous-integration/drone/pr Build is failing
2025-09-05 13:54:59 +09:00
11 changed files with 364 additions and 9 deletions

147
alembic.ini Normal file
View File

@@ -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 <script_location>/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

1
alembic/README Normal file
View File

@@ -0,0 +1 @@
Generic single-database configuration.

53
alembic/env.py Normal file
View File

@@ -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()

28
alembic/script.py.mako Normal file
View File

@@ -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"}

View File

@@ -0,0 +1,57 @@
"""init
Revision ID: eeb6744b9452
Revises:
Create Date: 2025-09-05 14:55:12.005564
"""
from typing import Sequence, Union
from alembic import op
import sqlalchemy as sa
# revision identifiers, used by Alembic.
revision: str = 'eeb6744b9452'
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:
"""Создание всех таблиц согласно моделям."""
op.create_table(
'admins',
sa.Column('id', sa.Integer(), primary_key=True),
sa.Column('tg_id', sa.Integer(), unique=True, nullable=False),
)
op.create_table(
'channels',
sa.Column('id', sa.Integer(), primary_key=True),
sa.Column('name', sa.String, nullable=True),
sa.Column('link', sa.String, nullable=True),
sa.Column('admin_id', sa.Integer(), sa.ForeignKey('admins.id'), nullable=True),
)
op.create_table(
'groups',
sa.Column('id', sa.Integer(), primary_key=True),
sa.Column('name', sa.String, nullable=False),
sa.Column('link', sa.String, nullable=False),
sa.Column('admin_id', sa.Integer(), sa.ForeignKey('admins.id'), nullable=True),
)
op.create_table(
'buttons',
sa.Column('id', sa.Integer(), primary_key=True),
sa.Column('name', sa.String, nullable=False),
sa.Column('url', sa.String, nullable=False),
sa.Column('channel_id', sa.Integer(), sa.ForeignKey('channels.id'), nullable=True),
sa.Column('group_id', sa.Integer(), sa.ForeignKey('groups.id'), nullable=True),
)
def downgrade() -> None:
"""Удаление всех таблиц."""
op.drop_table('buttons')
op.drop_table('groups')
op.drop_table('channels')
op.drop_table('admins')

26
bin/update.sh Normal file
View File

@@ -0,0 +1,26 @@
#!/bin/bash
set -e
echo "[update.sh] Проверка bot.db..."
if [ -d "bot.db" ]; then
echo "Удаляю папку bot.db..."
rm -rf bot.db
fi
if [ ! -f "bot.db" ]; then
echo "Создаю пустой файл bot.db..."
touch bot.db
fi
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] Готово!"

10
db.py
View File

@@ -9,15 +9,13 @@ DATABASE_URL = os.getenv("DATABASE_URL", "sqlite+aiosqlite:///bot.db")
if DATABASE_URL.startswith("sqlite+aiosqlite:///"):
db_path = DATABASE_URL.replace("sqlite+aiosqlite:///", "")
# Убираем лишний слэш в конце, если есть
if db_path.endswith(os.sep):
db_path = db_path.rstrip(os.sep)
abs_db_path = os.path.abspath(db_path)
db_dir = os.path.dirname(abs_db_path)
if db_dir and not os.path.exists(db_dir):
# Создаём директорию только если она не равна текущей ('.') и не пустая
if db_dir and db_dir != os.path.abspath("") and db_dir != '.' and not os.path.exists(db_dir):
os.makedirs(db_dir, exist_ok=True)
# Если по этому пути уже есть папка, удаляем её и создаём файл
if os.path.isdir(abs_db_path):
# Если по этому пути уже есть папка, удаляем её
if os.path.exists(abs_db_path) and os.path.isdir(abs_db_path):
import shutil
shutil.rmtree(abs_db_path)
# Если файла нет, создаём пустой файл

40
handlers/admin_panel.py Normal file
View File

@@ -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"<b>Ваша админ-панель</b>\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=[]
)

View File

@@ -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'):

View File

@@ -10,8 +10,9 @@ class Admin(Base):
class Channel(Base):
__tablename__ = 'channels'
id = Column(Integer, primary_key=True)
name = Column(String, nullable=False)
link = Column(String, nullable=False)
name = Column(String)
link = Column(String)
admin_id = Column(Integer, ForeignKey('admins.id'))
buttons = relationship('Button', back_populates='channel')
class Group(Base):
@@ -19,6 +20,7 @@ class Group(Base):
id = Column(Integer, primary_key=True)
name = Column(String, nullable=False)
link = Column(String, nullable=False)
admin_id = Column(Integer, ForeignKey('admins.id'))
buttons = relationship('Button', back_populates='group')
class Button(Base):

View File

@@ -2,4 +2,5 @@ python-telegram-bot>=20.0
sqlalchemy>=2.0
python-dotenv>=1.0
pytest>=7.0
aiosqlite>=0.19
aiosqlite
alembic