refactor: project architecture refactor, container splitting
This commit is contained in:
3252a8
@@ -0,0 +1,163 @@
|
||||
import logging
|
||||
|
||||
from sqlalchemy.engine import make_url
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
|
||||
from sqlalchemy.orm import sessionmaker
|
||||
|
||||
from config.settings import Settings
|
||||
from db.models import Base
|
||||
|
||||
from .migrator import run_database_migrations
|
||||
|
||||
async_engine = None
|
||||
|
||||
|
||||
def redacted_database_url(database_url: str) -> str:
|
||||
try:
|
||||
return make_url(database_url).render_as_string(hide_password=True)
|
||||
except Exception:
|
||||
return "<invalid database url>"
|
||||
|
||||
|
||||
def init_db_connection(settings: Settings) -> sessionmaker:
|
||||
global async_engine
|
||||
|
||||
if async_engine is None:
|
||||
logging.info(
|
||||
"Attempting to create SQLAlchemy engine with URL: %s",
|
||||
redacted_database_url(settings.DATABASE_URL),
|
||||
)
|
||||
async_engine = create_async_engine(
|
||||
settings.DATABASE_URL,
|
||||
echo=False,
|
||||
pool_pre_ping=True,
|
||||
pool_size=settings.DB_POOL_SIZE,
|
||||
max_overflow=settings.DB_MAX_OVERFLOW,
|
||||
pool_timeout=settings.DB_POOL_TIMEOUT_SECONDS,
|
||||
pool_recycle=settings.DB_POOL_RECYCLE_SECONDS,
|
||||
)
|
||||
|
||||
local_async_session_factory = async_sessionmaker(
|
||||
bind=async_engine,
|
||||
class_=AsyncSession,
|
||||
expire_on_commit=False,
|
||||
autocommit=False,
|
||||
autoflush=False,
|
||||
)
|
||||
logging.info("SQLAlchemy Async Engine and SessionFactory configured for PostgreSQL.")
|
||||
return local_async_session_factory
|
||||
|
||||
|
||||
async def get_async_session(session_factory: sessionmaker) -> AsyncSession:
|
||||
|
||||
if session_factory is None:
|
||||
raise RuntimeError("AsyncSessionFactory is not provided or initialized.")
|
||||
|
||||
async_session = session_factory()
|
||||
try:
|
||||
yield async_session
|
||||
finally:
|
||||
await async_session.close()
|
||||
|
||||
|
||||
async def init_db(settings: Settings, session_factory: sessionmaker):
|
||||
|
||||
global async_engine
|
||||
if async_engine is None:
|
||||
logging.warning("init_db: async_engine was None, re-initializing via init_db_connection.")
|
||||
|
||||
raise RuntimeError(
|
||||
"async_engine is not initialized. Call init_db_connection and get session_factory first." # noqa: E501
|
||||
)
|
||||
|
||||
async with async_engine.begin() as conn:
|
||||
await conn.run_sync(Base.metadata.create_all)
|
||||
await conn.run_sync(run_database_migrations)
|
||||
logging.info("PostgreSQL database initialized/checked successfully using SQLAlchemy.")
|
||||
|
||||
try:
|
||||
from bot.services.settings_override_service import load_overrides_from_db
|
||||
|
||||
await load_overrides_from_db(settings, session_factory)
|
||||
except Exception as e_overrides:
|
||||
logging.warning(f"Failed to load setting overrides on startup: {e_overrides}")
|
||||
|
||||
async with session_factory() as session:
|
||||
from sqlalchemy import text
|
||||
|
||||
from .dal.panel_sync_dal import get_panel_sync_status, update_panel_sync_status
|
||||
|
||||
try:
|
||||
current_status = await get_panel_sync_status(session)
|
||||
if current_status is None:
|
||||
logging.info("Initializing panel_sync_status record.")
|
||||
await update_panel_sync_status(
|
||||
session,
|
||||
status="never_run",
|
||||
details="System initialized",
|
||||
users_processed=0,
|
||||
subs_synced=0,
|
||||
)
|
||||
await session.commit()
|
||||
except Exception as e_sync_init:
|
||||
await session.rollback()
|
||||
logging.error(f"Failed to initialize PanelSyncStatus: {e_sync_init}", exc_info=True)
|
||||
|
||||
if settings.tariffs_config:
|
||||
try:
|
||||
default_tariff = settings.tariffs_config.default
|
||||
default_price = (
|
||||
default_tariff.period_price(1, "rub") or default_tariff.min_period_price_rub()
|
||||
)
|
||||
await session.execute(
|
||||
text(
|
||||
"""
|
||||
UPDATE subscriptions AS s
|
||||
SET
|
||||
tariff_key = COALESCE(s.tariff_key, :tariff_key),
|
||||
tier_baseline_bytes = COALESCE(s.tier_baseline_bytes, s.traffic_limit_bytes, :baseline),
|
||||
topup_balance_bytes = COALESCE(s.topup_balance_bytes, 0),
|
||||
premium_baseline_bytes = COALESCE(s.premium_baseline_bytes, :premium_baseline),
|
||||
premium_topup_balance_bytes = COALESCE(s.premium_topup_balance_bytes, 0),
|
||||
premium_topup_used_bytes = COALESCE(s.premium_topup_used_bytes, 0),
|
||||
premium_used_bytes = COALESCE(s.premium_used_bytes, 0),
|
||||
premium_is_limited = COALESCE(s.premium_is_limited, FALSE),
|
||||
period_start_at = NULL,
|
||||
effective_monthly_price_rub = COALESCE(
|
||||
s.effective_monthly_price_rub,
|
||||
(
|
||||
SELECT p.amount / GREATEST(COALESCE(p.subscription_duration_months, 1), 1)
|
||||
FROM payments p
|
||||
WHERE p.user_id = s.user_id
|
||||
AND p.status = 'succeeded'
|
||||
AND COALESCE(p.subscription_duration_months, 0) > 0
|
||||
ORDER BY p.created_at DESC
|
||||
LIMIT 1
|
||||
),
|
||||
:default_price
|
||||
)
|
||||
WHERE s.is_active = TRUE
|
||||
AND s.tariff_key IS NULL
|
||||
""" # noqa: E501
|
||||
),
|
||||
{
|
||||
"tariff_key": default_tariff.key,
|
||||
"baseline": default_tariff.monthly_bytes,
|
||||
"premium_baseline": default_tariff.premium_monthly_bytes,
|
||||
"default_price": default_price,
|
||||
},
|
||||
)
|
||||
await session.execute(
|
||||
text(
|
||||
"""
|
||||
UPDATE subscriptions
|
||||
SET period_start_at = NULL
|
||||
WHERE is_active = TRUE
|
||||
AND tariff_key IS NOT NULL
|
||||
"""
|
||||
)
|
||||
)
|
||||
await session.commit()
|
||||
except Exception:
|
||||
await session.rollback()
|
||||
logging.exception("Failed to backfill existing subscriptions for tariffs config.")
|
||||
Reference in New Issue
Block a user