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:
34047007@qq.com
2026-08-07 09:06:19 +08:00
parent e937fc930c
commit 86126ea16f
64 changed files with 546 additions and 359 deletions
+4
View File
@@ -177,6 +177,10 @@ class SchedulerUtil:
@classmethod
def shutdown(cls, wait: bool = False) -> None:
# Redis 不可达时 start()/add_job 可能失败导致调度器未真正运行:
# 对未运行实例调用 shutdown 会抛 SchedulerNotRunningError,须先判状态
if not scheduler.running:
return
scheduler.shutdown(wait=wait)
@classmethod
+19 -12
View File
@@ -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连接已关闭")
+23 -1
View File
@@ -34,11 +34,27 @@ async def redis_getter(request: Request) -> Redis:
- request (Request): 请求对象
返回:
- Redis: Redis连接
- Redis: Redis连接(启动降级模式下为 None
"""
return request.app.state.redis
def require_redis(redis: Redis | None) -> Redis:
"""Redis 不可用时显式 503(存储类接口守卫)。
Redis 是认证会话、AI 模型配置、在线监控与调度任务 jobstore 的唯一存储。
启动降级模式下这些接口无法提供服务,应明确返回 503,而非误导性的
401/500 或静默空数据。
"""
if redis is None:
raise CustomException(
msg="Redis 服务不可用,请稍后重试",
code=RET.SERVICE_UNAVAILABLE.code,
status_code=503,
)
return redis
async def get_current_user(
db: AsyncSession = Depends(db_getter),
redis: Redis = Depends(redis_getter),
@@ -69,6 +85,12 @@ async def _authenticate(
session_id = payload.sub
if not session_id:
raise CustomException(msg="认证已失效", code=RET.UNAUTHORIZED.code, status_code=401)
if redis is None:
raise CustomException(
msg="Redis 服务不可用,无法校验登录会话",
code=RET.SERVICE_UNAVAILABLE.code,
status_code=503,
)
raw = await RedisCURD(redis).get(f"{RedisInitKeyConfig.USER_SESSION.key}:{session_id}")
if not raw:
+1 -1
View File
@@ -52,7 +52,7 @@ def setup_logger() -> None:
LOG_FMT = "<green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green> | <level>{level: <8}</level> | <cyan>{name}</cyan>:<cyan>{function}</cyan>:<cyan>{line}</cyan> - <level>{message}</level>{extra[ctx]}"
logger.add(sys.stdout, format=LOG_FMT, backtrace=True, diagnose=True, catch=True, level=settings.LOGGER_LEVEL)
logger.add(
sink=str(LOG_DIR / "fastapiadmin.log"),
sink=str(LOG_DIR / "dpb.log"),
format=LOG_FMT,
level=settings.LOGGER_LEVEL,
backtrace=True,