anti
467511e997
- aiomysql → asyncmy on both sides of the URL/import (faster, maintained). - Pool sizing now reads DECNET_DB_POOL_SIZE / MAX_OVERFLOW / RECYCLE / PRE_PING for both SQLite and MySQL engines so stress runs can bump without code edits. - MySQL initialize() now wraps schema DDL in a GET_LOCK advisory lock so concurrent uvicorn workers racing create_all() don't hit 'Table was skipped since its definition is being modified by concurrent DDL'. - sqlite & mysql repo get_log_histogram use the shared _session() helper instead of session_factory() for consistency with the rest of the repo. - SSE stream_events docstring updated to asyncmy.
99 lines
3.4 KiB
Python
99 lines
3.4 KiB
Python
"""
|
|
MySQL async engine factory.
|
|
|
|
Builds a SQLAlchemy AsyncEngine against MySQL using the ``asyncmy`` driver.
|
|
|
|
Connection info is resolved (in order of precedence):
|
|
|
|
1. An explicit ``url`` argument passed to :func:`get_async_engine`
|
|
2. ``DECNET_DB_URL`` — full SQLAlchemy URL
|
|
3. Component env vars:
|
|
``DECNET_DB_HOST`` (default ``localhost``)
|
|
``DECNET_DB_PORT`` (default ``3306``)
|
|
``DECNET_DB_NAME`` (default ``decnet``)
|
|
``DECNET_DB_USER`` (default ``decnet``)
|
|
``DECNET_DB_PASSWORD`` (default empty — raises unless pytest is running)
|
|
"""
|
|
from __future__ import annotations
|
|
|
|
import os
|
|
from typing import Optional
|
|
from urllib.parse import quote_plus
|
|
|
|
from sqlalchemy.ext.asyncio import AsyncEngine, create_async_engine
|
|
|
|
|
|
DEFAULT_POOL_SIZE = int(os.environ.get("DECNET_DB_POOL_SIZE", "20"))
|
|
DEFAULT_MAX_OVERFLOW = int(os.environ.get("DECNET_DB_MAX_OVERFLOW", "40"))
|
|
DEFAULT_POOL_RECYCLE = int(os.environ.get("DECNET_DB_POOL_RECYCLE", "3600"))
|
|
DEFAULT_POOL_PRE_PING = os.environ.get("DECNET_DB_POOL_PRE_PING", "true").lower() == "true"
|
|
|
|
|
|
def build_mysql_url(
|
|
host: Optional[str] = None,
|
|
port: Optional[int] = None,
|
|
database: Optional[str] = None,
|
|
user: Optional[str] = None,
|
|
password: Optional[str] = None,
|
|
) -> str:
|
|
"""Compose an async SQLAlchemy URL for MySQL using the asyncmy driver.
|
|
|
|
Component args override env vars. Password is percent-encoded so special
|
|
characters (``@``, ``:``, ``/``…) don't break URL parsing.
|
|
"""
|
|
host = host or os.environ.get("DECNET_DB_HOST", "localhost")
|
|
port = port or int(os.environ.get("DECNET_DB_PORT", "3306"))
|
|
database = database or os.environ.get("DECNET_DB_NAME", "decnet")
|
|
user = user or os.environ.get("DECNET_DB_USER", "decnet")
|
|
|
|
if password is None:
|
|
password = os.environ.get("DECNET_DB_PASSWORD", "")
|
|
|
|
# Allow empty passwords during tests (pytest sets PYTEST_* env vars).
|
|
# Outside tests, an empty MySQL password is almost never intentional.
|
|
if not password and not any(k.startswith("PYTEST") for k in os.environ):
|
|
raise ValueError(
|
|
"DECNET_DB_PASSWORD is not set. Either export it, set DECNET_DB_URL, "
|
|
"or run under pytest for an empty-password default."
|
|
)
|
|
|
|
pw_enc = quote_plus(password)
|
|
user_enc = quote_plus(user)
|
|
return f"mysql+asyncmy://{user_enc}:{pw_enc}@{host}:{port}/{database}"
|
|
|
|
|
|
def resolve_url(url: Optional[str] = None) -> str:
|
|
"""Pick a connection URL: explicit arg → DECNET_DB_URL env → built from components."""
|
|
if url:
|
|
return url
|
|
env_url = os.environ.get("DECNET_DB_URL")
|
|
if env_url:
|
|
return env_url
|
|
return build_mysql_url()
|
|
|
|
|
|
def get_async_engine(
|
|
url: Optional[str] = None,
|
|
*,
|
|
pool_size: int = DEFAULT_POOL_SIZE,
|
|
max_overflow: int = DEFAULT_MAX_OVERFLOW,
|
|
pool_recycle: int = DEFAULT_POOL_RECYCLE,
|
|
pool_pre_ping: bool = DEFAULT_POOL_PRE_PING,
|
|
echo: bool = False,
|
|
) -> AsyncEngine:
|
|
"""Create an AsyncEngine for MySQL.
|
|
|
|
Defaults tuned for a dashboard workload: a modest pool, hourly recycle
|
|
to sidestep MySQL's idle-connection reaper, and pre-ping to fail fast
|
|
if a pooled connection has been killed server-side.
|
|
"""
|
|
dsn = resolve_url(url)
|
|
return create_async_engine(
|
|
dsn,
|
|
echo=echo,
|
|
pool_size=pool_size,
|
|
max_overflow=max_overflow,
|
|
pool_recycle=pool_recycle,
|
|
pool_pre_ping=pool_pre_ping,
|
|
)
|