checkpoint: 架构治理四件套——统一 async / 测试真 PG / Redis 降级可选 / DPB 扶正
- A1 业务层统一 async:gencode 表内省改 run_sync 异步(不再阻塞事件循环)、 check_db 改 async_engine、dict_util 启动预热异步载入;psycopg 降为 APScheduler SQLAlchemyJobStore 专用同步孤岛(注释标注) - A2 测试真 PG 化:conftest 弃 SQLite + mock Redis,改连真实 PG16(dpb_test)+ Redis(number_gen advisory lock 路径真被测);新增 docker/test-compose.yaml 测试依赖栈(postgres:16:5433 + redis:7:6380);run_ci 前置探测 + 容器兜底, pytest -m pg 10 套正式 tc 全过(真实 PG16 + Redis) - B1 Redis 启动不强依赖:redis_connect 失败降级启动,缓存类回源 DB、存储类 (会话/AI 配置/调度)经 require_redis 守卫返回 503;真机 3 阶段降级测试 PASS=11 FAIL=0(独立 Redis 6390 + 后端 8091,不动共享 dev 服务) - C 扶正 DPB:后端横幅/日志(dpb.log)/README/pyproject/ai_factory agent 名、 前端 package.json/署名注释/链接文案/deploy.sh/docker 注释全部去 fastapiadmin; grep backend/app + frontend/web/src 零残留 - 验证:全量回归 pass=72 fail=0
This commit is contained in:
@@ -13,6 +13,9 @@ from app.core.logger import logger
|
||||
def create_engine_and_session(db_url: str = settings.DB_URI) -> tuple[Engine, sessionmaker]:
|
||||
"""创建同步数据库引擎和会话工厂。
|
||||
|
||||
仅 APScheduler SQLAlchemyJobStore(同步库接口,apscheduler==3.11.0)消费;
|
||||
业务层一律使用异步 create_async_engine_and_session,不得再引入同步引擎。
|
||||
|
||||
参数:
|
||||
- db_url (str): 数据库连接URL,默认从配置中获取。
|
||||
|
||||
@@ -84,6 +87,7 @@ def create_async_engine_and_session(db_url: str = settings.ASYNC_DB_URI) -> tupl
|
||||
return async_engine, AsyncSessionLocal
|
||||
|
||||
|
||||
# 同步引擎/会话仅 APScheduler SQLAlchemyJobStore 消费(同步库接口);业务层统一用 async_engine
|
||||
engine, db_session = create_engine_and_session()
|
||||
async_engine, async_db_session = create_async_engine_and_session()
|
||||
|
||||
@@ -91,7 +95,7 @@ async def check_db() -> None:
|
||||
"""检查数据库连接是否正常。"""
|
||||
|
||||
try:
|
||||
with engine.connect():
|
||||
async with async_engine.connect():
|
||||
pass
|
||||
logger.info("✅ 数据库连接正常")
|
||||
except Exception as e:
|
||||
@@ -138,6 +142,7 @@ async def redis_connect(app: FastAPI, status: bool) -> Redis | None:
|
||||
- Redis | None: Redis连接实例,如果连接失败则返回None。
|
||||
"""
|
||||
if status:
|
||||
app.state.redis = None # 先置不可用;连接失败时应用以降级模式启动,不再中断
|
||||
try:
|
||||
rd = await Redis.from_url(
|
||||
url=settings.REDIS_URI,
|
||||
@@ -148,18 +153,20 @@ async def redis_connect(app: FastAPI, status: bool) -> Redis | None:
|
||||
max_connections=settings.POOL_SIZE,
|
||||
socket_timeout=settings.POOL_TIMEOUT,
|
||||
)
|
||||
app.state.redis = rd
|
||||
if await rd.ping(): # pyright: ignore[reportGeneralTypeIssues]
|
||||
app.state.redis = rd
|
||||
return rd
|
||||
except exceptions.AuthenticationError as e:
|
||||
logger.error(f"❌ 数据库 Redis 认证失败: {e}")
|
||||
return None
|
||||
except exceptions.TimeoutError as e:
|
||||
logger.error(f"❌ 数据库 Redis 连接超时: {e}")
|
||||
return None
|
||||
except exceptions.RedisError as e:
|
||||
logger.error(f"❌ 数据库 Redis 连接错误: {e}")
|
||||
raise
|
||||
logger.error("❌ 数据库 Redis ping 失败")
|
||||
await rd.aclose()
|
||||
except (exceptions.RedisError, OSError) as e:
|
||||
logger.error(f"❌ 数据库 Redis 连接失败: {e}")
|
||||
return None
|
||||
else:
|
||||
await app.state.redis.close()
|
||||
rd = app.state.redis
|
||||
if rd is not None:
|
||||
try:
|
||||
await rd.close()
|
||||
except Exception: # noqa: BLE001
|
||||
pass
|
||||
app.state.redis = None
|
||||
logger.info("✅️ Redis连接已关闭")
|
||||
|
||||
Reference in New Issue
Block a user