runtime settings loaded from DB/ refactoring admin-panel/ minor fixes and improvements

This commit is contained in:
Vladless
2025-11-15 23:14:34 +03:00
parent 76390df4bc
commit 041e1c898d
97 changed files with 8554 additions and 6514 deletions
Binary file not shown.
+18
View File
@@ -0,0 +1,18 @@
from database import async_session_maker
from .settings.buttons_config import BUTTONS_CONFIG, load_buttons_config, update_buttons_config
from .settings.notifications_config import NOTIFICATIONS_CONFIG, load_notifications_config, update_notifications_config
from .settings.modes_config import MODES_CONFIG, load_modes_config, update_modes_config
from .settings.payments_config import PAYMENTS_CONFIG, load_payments_config, update_payments_config
from .settings.money_config import MONEY_CONFIG, load_money_config, update_money_config
from .settings.management_config import MANAGEGENT_CONFIG, load_management_config, update_management_config
async def bootstrap() -> None:
async with async_session_maker() as session:
await load_buttons_config(session)
await load_notifications_config(session)
await load_modes_config(session)
await load_payments_config(session)
await load_money_config(session)
await load_management_config(session)
await session.commit()
Binary file not shown.
+56
View File
@@ -0,0 +1,56 @@
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from database.models import Setting
from ..defaults import DEFAULT_BUTTONS_CONFIG
BUTTONS_CONFIG: dict[str, bool] = DEFAULT_BUTTONS_CONFIG.copy()
async def load_buttons_config(session: AsyncSession) -> None:
stmt = select(Setting).where(Setting.key == "BUTTONS_CONFIG")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
buttons_config = DEFAULT_BUTTONS_CONFIG.copy()
setting = Setting(
key="BUTTONS_CONFIG",
value=buttons_config,
description="Конфигурация кнопок бота",
)
session.add(setting)
else:
stored = setting.value or {}
buttons_config = DEFAULT_BUTTONS_CONFIG.copy()
buttons_config.update(stored)
setting.value = buttons_config
BUTTONS_CONFIG.clear()
BUTTONS_CONFIG.update(buttons_config)
await session.flush()
async def update_buttons_config(session: AsyncSession, new_values: dict[str, bool]) -> None:
stmt = select(Setting).where(Setting.key == "BUTTONS_CONFIG")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
setting = Setting(
key="BUTTONS_CONFIG",
value=new_values,
description="Конфигурация кнопок бота",
)
session.add(setting)
else:
setting.value = new_values
await session.flush()
buttons_config = DEFAULT_BUTTONS_CONFIG.copy()
buttons_config.update(new_values)
BUTTONS_CONFIG.clear()
BUTTONS_CONFIG.update(buttons_config)
+59
View File
@@ -0,0 +1,59 @@
from typing import Any
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from database.models import Setting
from ..defaults import DEFAULT_MANAGEMENT_CONFIG
MANAGEGENT_CONFIG: dict[str, Any] = DEFAULT_MANAGEMENT_CONFIG.copy()
async def load_management_config(session: AsyncSession) -> None:
stmt = select(Setting).where(Setting.key == "management")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
management_config = DEFAULT_MANAGEMENT_CONFIG.copy()
setting = Setting(
key="management",
value=management_config,
description="Конфигурация управления ботом",
)
session.add(setting)
else:
stored = setting.value or {}
management_config = DEFAULT_MANAGEMENT_CONFIG.copy()
management_config.update(stored)
setting.value = management_config
MANAGEGENT_CONFIG.clear()
MANAGEGENT_CONFIG.update(management_config)
await session.flush()
async def update_management_config(session: AsyncSession, new_values: dict[str, Any]) -> None:
stmt = select(Setting).where(Setting.key == "management")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
setting = Setting(
key="management",
value=new_values,
description="Конфигурация управления ботом",
)
session.add(setting)
else:
setting.value = new_values
await session.flush()
await session.commit()
management_config = DEFAULT_MANAGEMENT_CONFIG.copy()
management_config.update(new_values)
MANAGEGENT_CONFIG.clear()
MANAGEGENT_CONFIG.update(management_config)
+56
View File
@@ -0,0 +1,56 @@
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from database.models import Setting
from ..defaults import DEFAULT_MODES_CONFIG
MODES_CONFIG: dict[str, bool] = DEFAULT_MODES_CONFIG.copy()
async def load_modes_config(session: AsyncSession) -> None:
stmt = select(Setting).where(Setting.key == "MODES_CONFIG")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
modes_config = DEFAULT_MODES_CONFIG.copy()
setting = Setting(
key="MODES_CONFIG",
value=modes_config,
description="Конфигурация режимов работы бота",
)
session.add(setting)
else:
stored = setting.value or {}
modes_config = DEFAULT_MODES_CONFIG.copy()
modes_config.update(stored)
setting.value = modes_config
MODES_CONFIG.clear()
MODES_CONFIG.update(modes_config)
await session.flush()
async def update_modes_config(session: AsyncSession, new_values: dict[str, bool]) -> None:
stmt = select(Setting).where(Setting.key == "MODES_CONFIG")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
setting = Setting(
key="MODES_CONFIG",
value=new_values,
description="Конфигурация режимов работы бота",
)
session.add(setting)
else:
setting.value = new_values
await session.flush()
modes_config = DEFAULT_MODES_CONFIG.copy()
modes_config.update(new_values)
MODES_CONFIG.clear()
MODES_CONFIG.update(modes_config)
+58
View File
@@ -0,0 +1,58 @@
from typing import Any
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from database.models import Setting
from ..defaults import DEFAULT_MONEY_CONFIG
MONEY_CONFIG: dict[str, Any] = DEFAULT_MONEY_CONFIG.copy()
async def load_money_config(session: AsyncSession) -> None:
stmt = select(Setting).where(Setting.key == "MONEY_CONFIG")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
money_config = DEFAULT_MONEY_CONFIG.copy()
setting = Setting(
key="MONEY_CONFIG",
value=money_config,
description="Конфигурация валютных настроек",
)
session.add(setting)
else:
stored = setting.value or {}
money_config = DEFAULT_MONEY_CONFIG.copy()
money_config.update(stored)
setting.value = money_config
MONEY_CONFIG.clear()
MONEY_CONFIG.update(money_config)
await session.flush()
async def update_money_config(session: AsyncSession, new_values: dict[str, Any]) -> None:
stmt = select(Setting).where(Setting.key == "MONEY_CONFIG")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
setting = Setting(
key="MONEY_CONFIG",
value=new_values,
description="Конфигурация валютных настроек",
)
session.add(setting)
else:
setting.value = new_values
await session.flush()
money_config = DEFAULT_MONEY_CONFIG.copy()
money_config.update(new_values)
MONEY_CONFIG.clear()
MONEY_CONFIG.update(money_config)
+58
View File
@@ -0,0 +1,58 @@
from typing import Any
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from database.models import Setting
from ..defaults import DEFAULT_NOTIFICATIONS_CONFIG
NOTIFICATIONS_CONFIG: dict[str, Any] = DEFAULT_NOTIFICATIONS_CONFIG.copy()
async def load_notifications_config(session: AsyncSession) -> None:
stmt = select(Setting).where(Setting.key == "NOTIFICATIONS_CONFIG")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
notifications_config = DEFAULT_NOTIFICATIONS_CONFIG.copy()
setting = Setting(
key="NOTIFICATIONS_CONFIG",
value=notifications_config,
description="Конфигурация уведомлений",
)
session.add(setting)
else:
stored = setting.value or {}
notifications_config = DEFAULT_NOTIFICATIONS_CONFIG.copy()
notifications_config.update(stored)
setting.value = notifications_config
NOTIFICATIONS_CONFIG.clear()
NOTIFICATIONS_CONFIG.update(notifications_config)
await session.flush()
async def update_notifications_config(session: AsyncSession, new_values: dict[str, Any]) -> None:
stmt = select(Setting).where(Setting.key == "NOTIFICATIONS_CONFIG")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
setting = Setting(
key="NOTIFICATIONS_CONFIG",
value=new_values,
description="Конфигурация уведомлений",
)
session.add(setting)
else:
setting.value = new_values
await session.flush()
notifications_config = DEFAULT_NOTIFICATIONS_CONFIG.copy()
notifications_config.update(new_values)
NOTIFICATIONS_CONFIG.clear()
NOTIFICATIONS_CONFIG.update(notifications_config)
+56
View File
@@ -0,0 +1,56 @@
from sqlalchemy import select
from sqlalchemy.ext.asyncio import AsyncSession
from database.models import Setting
from ..defaults import DEFAULT_PAYMENTS_CONFIG
PAYMENTS_CONFIG: dict[str, bool] = DEFAULT_PAYMENTS_CONFIG.copy()
async def load_payments_config(session: AsyncSession) -> None:
stmt = select(Setting).where(Setting.key == "PAYMENTS_CONFIG")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
payments_config = DEFAULT_PAYMENTS_CONFIG.copy()
setting = Setting(
key="PAYMENTS_CONFIG",
value=payments_config,
description="Конфигурация платёжных провайдеров",
)
session.add(setting)
else:
stored = setting.value or {}
payments_config = DEFAULT_PAYMENTS_CONFIG.copy()
payments_config.update(stored)
setting.value = payments_config
PAYMENTS_CONFIG.clear()
PAYMENTS_CONFIG.update(payments_config)
await session.flush()
async def update_payments_config(session: AsyncSession, new_values: dict[str, bool]) -> None:
stmt = select(Setting).where(Setting.key == "PAYMENTS_CONFIG")
result = await session.execute(stmt)
setting = result.scalar_one_or_none()
if setting is None:
setting = Setting(
key="PAYMENTS_CONFIG",
value=new_values,
description="Конфигурация платёжных провайдеров",
)
session.add(setting)
else:
setting.value = new_values
await session.flush()
payments_config = DEFAULT_PAYMENTS_CONFIG.copy()
payments_config.update(new_values)
PAYMENTS_CONFIG.clear()
PAYMENTS_CONFIG.update(payments_config)