feat: 装配切换——main/服务构造线/conftest 迁至 Registry（含默认租户过渡兜底）
- main.py: 删全局 engine/async_session;lifespan 装配 TenantRegistry (seed_profiles → 仓库根 tenants/,路径锚定),预热默认租户 jiancai 挂 app.state.default_runtime,逐 active 租户(库文件已存在)跑 sweep_stale_pending,退出 dispose_all。app.state.registry 预置即沿用 (测试注入缝) - routes/runtime.py(过渡,Task 7 删): get_runtime——state.tenant 优先, 缺省落 default_runtime;chat.py/chat_rest.py 全部改走它,消除 main↔routes 循环依赖 - ConversationManager 构造线: 新增 runtime 可选参(持 session_factory/ compiled_wall/config 引用;prompts 仍模块级,Task 6;业务接线 Task 9), fire_pending_pushes 随任务传 session_factory(后台写回派发租户的库) - lead_push_service: 去 app.main import;写库入口显式收 session_factory, 模块级 async_session=None 仅作测试注入兜底 - conftest: client 夹具 = 每测试独立 Registry(tmp data_dir)+ 真实 lifespan 在 TestClient 循环内预热;删 _dispose_main_engine; async_db 保持 NullPool(跨 asyncio.run 循环安全,刻意不换 Registry 引擎) - 测试仅动夹具/桩签名(断言零改动): wiring 桩补 session_factory 形参; history-404 用例改经真实 WS 路由造 widget 会话(引擎常驻连接绑定 TestClient 循环,测试线程不得直开 session_factory) Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
浅念
@@ -3,8 +3,8 @@ import logging
|
||||
|
||||
from fastapi import APIRouter, WebSocket, WebSocketDisconnect
|
||||
|
||||
from app.main import async_session
|
||||
from app.engine.models import ConversationSource, ConversationStatus
|
||||
from app.engine.routes.runtime import get_runtime
|
||||
from app.engine.services.conversation import ConversationManager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
@@ -17,8 +17,11 @@ async def ws_chat(websocket: WebSocket):
|
||||
session_id = None
|
||||
|
||||
try:
|
||||
async with async_session() as db:
|
||||
manager = ConversationManager(db)
|
||||
# Task 5b: 租户运行时经 state/默认租户兜底解析(过渡期无中间件);
|
||||
# manager 由装配线从 runtime 造(db 会话 + runtime 引用)
|
||||
runtime = get_runtime(websocket)
|
||||
async with runtime.session_factory() as db:
|
||||
manager = ConversationManager(db, runtime=runtime)
|
||||
|
||||
# Collect client info
|
||||
client_ip = websocket.client.host if websocket.client else ""
|
||||
|
||||
@@ -17,8 +17,8 @@ from fastapi import APIRouter, HTTPException, Request
|
||||
from pydantic import BaseModel
|
||||
from sqlalchemy import select
|
||||
|
||||
from app.main import async_session
|
||||
from app.engine.models import ConversationSource, ConversationStatus, Message
|
||||
from app.engine.routes.runtime import get_runtime
|
||||
from app.engine.services.conversation import ConversationManager
|
||||
from app.engine.services.rate_limit import check as rate_check
|
||||
|
||||
@@ -45,8 +45,11 @@ async def chat_session(req: SessionRequest, request: Request):
|
||||
if xf:
|
||||
client_info["ip"] = xf
|
||||
|
||||
async with async_session() as db:
|
||||
manager = ConversationManager(db)
|
||||
# Task 5b: 租户运行时经 state/默认租户兜底解析(过渡期无中间件);
|
||||
# manager 由装配线从 runtime 造(db 会话 + runtime 引用)
|
||||
runtime = get_runtime(request)
|
||||
async with runtime.session_factory() as db:
|
||||
manager = ConversationManager(db, runtime=runtime)
|
||||
if req.session_id:
|
||||
conv = await manager.get_by_session(req.session_id)
|
||||
if conv and conv.status == ConversationStatus.active:
|
||||
@@ -68,12 +71,13 @@ async def chat_session(req: SessionRequest, request: Request):
|
||||
|
||||
|
||||
@router.get("/{session_id}/messages")
|
||||
async def chat_history(session_id: str):
|
||||
async def chat_history(session_id: str, request: Request):
|
||||
"""Public history endpoint for session replay. App-source only, to narrow
|
||||
the read surface; an unknown or non-app session yields 404.
|
||||
"""
|
||||
async with async_session() as db:
|
||||
manager = ConversationManager(db)
|
||||
runtime = get_runtime(request)
|
||||
async with runtime.session_factory() as db:
|
||||
manager = ConversationManager(db, runtime=runtime)
|
||||
conv = await manager.get_by_session(session_id)
|
||||
if not conv or conv.source != ConversationSource.app:
|
||||
raise HTTPException(status_code=404, detail="session not found")
|
||||
@@ -115,8 +119,9 @@ async def chat_message(req: MessageRequest, request: Request):
|
||||
if not rate_check(ip, dev):
|
||||
raise HTTPException(status_code=429, detail="rate limit exceeded")
|
||||
|
||||
async with async_session() as db:
|
||||
manager = ConversationManager(db)
|
||||
runtime = get_runtime(request)
|
||||
async with runtime.session_factory() as db:
|
||||
manager = ConversationManager(db, runtime=runtime)
|
||||
conv = await manager.get_by_session(req.session_id)
|
||||
if not conv:
|
||||
raise HTTPException(status_code=404, detail="session not found")
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
"""路由取当前租户运行时——Task 5b→7 的过渡兜底。
|
||||
|
||||
Task 7 的 Host 中间件上线前,没有人为请求挂 ``state.tenant``。本助手的
|
||||
兜底规则 = state 里有租户用 state 的(中间件灰度接入即生效);没有则用
|
||||
``app.state.default_runtime``(lifespan 预热的默认租户 jiancai),API 测试
|
||||
与直连(无 Host 语义)在 5b→7 过渡期不断。
|
||||
|
||||
已知过渡限制(记录在案,Task 7 一并解决):默认租户经 registry_reload
|
||||
热切换后 default_runtime 仍指向旧 runtime——过渡期不修,Task 7 中间件
|
||||
按请求 Host 重新 resolve 后本模块整体删除。
|
||||
"""
|
||||
from fastapi import Request, WebSocket
|
||||
|
||||
from app.platform.registry import TenantRuntime
|
||||
|
||||
|
||||
def get_runtime(request_or_ws: Request | WebSocket) -> TenantRuntime:
|
||||
"""state.tenant 优先,缺省落 app.state.default_runtime(Task 7 删)。"""
|
||||
runtime = getattr(request_or_ws.state, "tenant", None)
|
||||
if runtime is not None:
|
||||
return runtime
|
||||
runtime = getattr(request_or_ws.app.state, "default_runtime", None)
|
||||
if runtime is None or runtime.session_factory is None:
|
||||
raise RuntimeError(
|
||||
"默认租户运行时未就绪——lifespan 未运行或未预热 default_runtime")
|
||||
return runtime
|
||||
@@ -3,6 +3,7 @@ import re
|
||||
import uuid
|
||||
from collections.abc import AsyncGenerator
|
||||
from datetime import datetime, timedelta, timezone
|
||||
from typing import TYPE_CHECKING
|
||||
|
||||
from sqlalchemy import select
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
@@ -26,6 +27,9 @@ from app.engine.services.contact_pipeline import (
|
||||
normalize_contacts, resolve_by_recency, scan_user_messages, split_validate,
|
||||
)
|
||||
|
||||
if TYPE_CHECKING:
|
||||
from app.platform.registry import TenantRuntime
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# 职能边界触发词(Task 13.2, 评审#1/#4 修订): 命中即注入红线提醒。精修说明:
|
||||
@@ -323,9 +327,20 @@ def _boundary_rotate() -> int:
|
||||
|
||||
|
||||
class ConversationManager:
|
||||
def __init__(self, db: AsyncSession, ai_service: AIService | None = None):
|
||||
def __init__(self, db: AsyncSession, ai_service: AIService | None = None,
|
||||
runtime: "TenantRuntime | None" = None):
|
||||
self.db = db
|
||||
self.ai = ai_service or AIService()
|
||||
# Task 5b 装配线注入: 持有租户运行时引用(session_factory/compiled_wall/
|
||||
# config 就位;prompts 仍为模块级,Task 6 才 PromptProvider 化;email/push
|
||||
# 等 settings→config 业务接线是 Task 9)。None = 无租户上下文(直连测试)。
|
||||
self.runtime = runtime
|
||||
|
||||
@property
|
||||
def session_factory(self):
|
||||
"""推送后台任务写结果用的工厂(写回派发租户的库);无 runtime 时
|
||||
None,lead_push_service 回退模块级兜底。"""
|
||||
return self.runtime.session_factory if self.runtime is not None else None
|
||||
|
||||
async def create_conversation(
|
||||
self,
|
||||
@@ -777,8 +792,9 @@ class ConversationManager:
|
||||
await self.db.commit()
|
||||
|
||||
# 询盘推送(设计 8.1): 主事务提交后才派生后台任务——payload 内存
|
||||
# 传递,任务不读库只写结果;fire 为同步函数,纳秒级返回不阻塞
|
||||
lead_push_service.fire_pending_pushes(pending_pushes)
|
||||
# 传递,任务不读库只写结果;fire 为同步函数,纳秒级返回不阻塞。
|
||||
# session_factory 随任务传递: 写回本租户的库(Task 5b)
|
||||
lead_push_service.fire_pending_pushes(pending_pushes, self.session_factory)
|
||||
|
||||
yield {
|
||||
"type": "evaluated",
|
||||
|
||||
@@ -7,7 +7,8 @@
|
||||
- sweep_stale_pending: lifespan 启动清扫(崩溃遗留的 pending → failed)。
|
||||
|
||||
后台任务红线(设计 8.1): 不读库只写结果,payload 内存传递;
|
||||
结果写入用独立 session(from app.main import async_session,照 chat_rest 模式)。
|
||||
结果写入用独立 session——session_factory 由派发方传入(Task 5b 起无全局
|
||||
单例,写回派发它的那个租户的库)。
|
||||
"""
|
||||
import asyncio
|
||||
import logging
|
||||
@@ -18,7 +19,6 @@ from sqlalchemy import func, select, update
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
|
||||
from app.engine.config import settings
|
||||
from app.main import async_session
|
||||
from app.engine.models import (
|
||||
Conversation, CustomerProfile, Evaluation, IntentLevel, LeadPushLog,
|
||||
Message, MessageRole,
|
||||
@@ -28,6 +28,12 @@ from app.engine.services.ip_service import resolve_country
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
# Task 5b 装配切换: app.main 全局单例已删,写库入口改为显式传 session_factory
|
||||
# (租户正确: 后台任务写结果必须落回派发租户的库)。模块级 async_session 仅作
|
||||
# 无工厂上下文时的兜底(测试直接驱动 _run_push/sweep_stale_pending 时注入),
|
||||
# 生产装配不设值——装配线(main.lifespan/ConversationManager)总是显式传。
|
||||
async_session = None
|
||||
|
||||
# 对方契约(docs/AI_INQUIRY_PUSH_API.md): phone/whatsapp/email 至少一个有效
|
||||
_TRIO = ("phone", "whatsapp", "email")
|
||||
_CST = timezone(timedelta(hours=8))
|
||||
@@ -207,9 +213,10 @@ def _retryable(resp: httpx.Response | None) -> bool:
|
||||
return resp is None or resp.status_code >= 500
|
||||
|
||||
|
||||
async def _update_log(push_log_id: str, **fields) -> None:
|
||||
"""后台任务写结果——独立 session + 小事务(设计 6.3)。"""
|
||||
async with async_session() as session:
|
||||
async def _update_log(session_factory, push_log_id: str, **fields) -> None:
|
||||
"""后台任务写结果——独立 session + 小事务(设计 6.3)。
|
||||
session_factory: 派发租户的工厂(Task 5b),写回同一租户库。"""
|
||||
async with session_factory() as session:
|
||||
await session.execute(
|
||||
update(LeadPushLog)
|
||||
.where(LeadPushLog.id == push_log_id)
|
||||
@@ -218,11 +225,14 @@ async def _update_log(push_log_id: str, **fields) -> None:
|
||||
await session.commit()
|
||||
|
||||
|
||||
async def _run_push(push_log_id: str, payload: dict) -> None:
|
||||
async def _run_push(push_log_id: str, payload: dict,
|
||||
session_factory=None) -> None:
|
||||
"""后台任务体: 分类重试 + 200 逐条结果解析(设计 6.3/§10)。
|
||||
|
||||
红线: 全套 try/except,异常只记日志绝不逃逸(fire-and-forget)。
|
||||
session_factory 缺省回退模块级 async_session(测试注入缝)。
|
||||
"""
|
||||
factory = session_factory or async_session
|
||||
try:
|
||||
attempts = 0
|
||||
while True:
|
||||
@@ -230,7 +240,7 @@ async def _run_push(push_log_id: str, payload: dict) -> None:
|
||||
resp, transport_error = await _do_post(payload)
|
||||
if _retryable(resp) and attempts < settings.PUSH_MAX_ATTEMPTS:
|
||||
await _update_log(
|
||||
push_log_id, attempts=attempts,
|
||||
factory, push_log_id, attempts=attempts,
|
||||
error_message=transport_error
|
||||
or (f"http {resp.status_code}" if resp is not None else "unknown"),
|
||||
)
|
||||
@@ -245,7 +255,8 @@ async def _run_push(push_log_id: str, payload: dict) -> None:
|
||||
except ValueError:
|
||||
# 非 JSON 的 200(如网关重定向到 HTML 登录页)——
|
||||
# 无法确认对方已接受,诚实落 failed(幂等键保证补推安全)
|
||||
await _update_log(push_log_id, attempts=attempts, status="failed",
|
||||
await _update_log(factory, push_log_id, attempts=attempts,
|
||||
status="failed",
|
||||
response_status=200,
|
||||
error_message="non-JSON 200 body")
|
||||
return
|
||||
@@ -257,7 +268,7 @@ async def _run_push(push_log_id: str, payload: dict) -> None:
|
||||
]
|
||||
if failed_mine:
|
||||
await _update_log(
|
||||
push_log_id, attempts=attempts, status="failed",
|
||||
factory, push_log_id, attempts=attempts, status="failed",
|
||||
response_status=200,
|
||||
error_message=str(failed_mine[0].get("reason") or "rejected"),
|
||||
)
|
||||
@@ -266,7 +277,7 @@ async def _run_push(push_log_id: str, payload: dict) -> None:
|
||||
outcome = ("duplicated"
|
||||
if (data.get("duplicated") or 0) > 0 else "accepted")
|
||||
await _update_log(
|
||||
push_log_id, attempts=attempts, status="success",
|
||||
factory, push_log_id, attempts=attempts, status="success",
|
||||
response_status=200, outcome=outcome,
|
||||
)
|
||||
return
|
||||
@@ -277,7 +288,7 @@ async def _run_push(push_log_id: str, payload: dict) -> None:
|
||||
"密钥/报文问题需人工介入,不重试",
|
||||
push_log_id, resp.status_code)
|
||||
await _update_log(
|
||||
push_log_id, attempts=attempts, status="failed",
|
||||
factory, push_log_id, attempts=attempts, status="failed",
|
||||
response_status=resp.status_code if resp is not None else None,
|
||||
error_message=transport_error
|
||||
or (f"http {resp.status_code}" if resp is not None else "unknown"),
|
||||
@@ -290,27 +301,34 @@ async def _run_push(push_log_id: str, payload: dict) -> None:
|
||||
_tasks: set[asyncio.Task] = set()
|
||||
|
||||
|
||||
def fire_pending_pushes(pushes: list[LeadPushLog]) -> None:
|
||||
def fire_pending_pushes(pushes: list[LeadPushLog], session_factory=None) -> None:
|
||||
"""主事务 commit 之后调用(设计 8.1): payload 内存传递,任务不读库。
|
||||
|
||||
同步函数、纳秒级返回——这就是"不阻塞"的派发点。
|
||||
同步函数、纳秒级返回——这就是"不阻塞"的派发点。session_factory =
|
||||
派发租户的工厂,随任务传递(后台写结果落回同一租户库);缺省回退
|
||||
模块级 async_session(测试注入缝)。
|
||||
"""
|
||||
factory = session_factory or async_session
|
||||
for log in pushes:
|
||||
if log.status != "pending":
|
||||
continue
|
||||
task = asyncio.create_task(_run_push(log.id, log.request_payload))
|
||||
task = asyncio.create_task(
|
||||
_run_push(log.id, log.request_payload, factory))
|
||||
_tasks.add(task)
|
||||
task.add_done_callback(_tasks.discard)
|
||||
|
||||
|
||||
async def sweep_stale_pending(stale_minutes: int = 30) -> int:
|
||||
async def sweep_stale_pending(stale_minutes: int = 30, session_factory=None) -> int:
|
||||
"""启动清扫(设计 8.2): 崩溃遗留的 pending → failed。
|
||||
|
||||
session_factory: 目标租户的工厂(lifespan 逐租户调用);缺省回退
|
||||
模块级 async_session(测试注入缝)。
|
||||
已知限制(设计 §14): 推送成功但结果写回失败也会被标 failed——
|
||||
幂等键保证将来补推安全(对方返回 duplicated),概率极低,接受。
|
||||
"""
|
||||
factory = session_factory or async_session
|
||||
cutoff = datetime.now(timezone.utc) - timedelta(minutes=stale_minutes)
|
||||
async with async_session() as session:
|
||||
async with factory() as session:
|
||||
result = await session.execute(
|
||||
update(LeadPushLog).where(
|
||||
LeadPushLog.status == "pending",
|
||||
|
||||
+35
-16
@@ -1,30 +1,49 @@
|
||||
from contextlib import asynccontextmanager
|
||||
from pathlib import Path
|
||||
|
||||
from fastapi import FastAPI
|
||||
from fastapi.staticfiles import StaticFiles
|
||||
from sqlalchemy.ext.asyncio import AsyncSession, async_sessionmaker, create_async_engine
|
||||
|
||||
from app.engine.config import settings, ensure_dirs, STATIC_DIR
|
||||
from app.engine.models import ensure_schema
|
||||
from app.engine.config import STATIC_DIR
|
||||
from app.platform.registry import TenantRegistry
|
||||
|
||||
|
||||
# 后台推送任务的独立连接写结果可能撞上 SMTP 窗口内持有的写锁,默认 5s
|
||||
# 忙等上限低于 SMTP 最坏时长,抬到 30s;等待发生在 aiosqlite 工作线程,不阻塞事件循环
|
||||
engine = create_async_engine(settings.DATABASE_URL, echo=settings.APP_DEBUG,
|
||||
connect_args={"timeout": 30})
|
||||
async_session = async_sessionmaker(engine, class_=AsyncSession, expire_on_commit=False)
|
||||
# 路径锚定(不随 CWD 漂移):seed_profiles 与 tenants 都在仓库根
|
||||
BASE_DIR = Path(__file__).resolve().parents[1]
|
||||
SEED_DIR = BASE_DIR / "seed_profiles"
|
||||
TENANTS_DIR = BASE_DIR / "tenants" # .gitignore 已忽略 tenants/*.db
|
||||
# 过渡兜底(Task 5b→7,中间件上线后随 routes/runtime.py 一并删除):
|
||||
# Host 中间件落地前请求 state 里没有租户,一律落默认租户 jiancai
|
||||
DEFAULT_TENANT_HOST = "chat2.agent.hnxinyouhe.com"
|
||||
|
||||
|
||||
@asynccontextmanager
|
||||
async def lifespan(app: FastAPI):
|
||||
ensure_dirs()
|
||||
await ensure_schema(engine)
|
||||
# 询盘推送(设计 8.2): 清扫崩溃遗留的 stale pending → failed
|
||||
# 函数内导入: lead_push_service 顶部 from app.main import async_session,
|
||||
# 顶层互相导入会循环
|
||||
# 测试注入缝:conftest 预置过 app.state.registry(临时 data_dir 的独立
|
||||
# Registry)则沿用,不再加载仓库 seed——测试租户库与生产互不污染
|
||||
registry = getattr(app.state, "registry", None)
|
||||
if registry is None:
|
||||
registry = TenantRegistry.load_from_dir(SEED_DIR, data_dir=TENANTS_DIR)
|
||||
app.state.registry = registry
|
||||
|
||||
# 预热默认租户(过渡兜底读 app.state.default_runtime)。engine 建在本
|
||||
# lifespan 的事件循环里——连接与 loop 绑定,别处另起 asyncio.run 复用
|
||||
# 同一 engine 会跨 loop 死锁(测试直连造数走 conftest.async_db)
|
||||
app.state.default_runtime = await registry.resolve(DEFAULT_TENANT_HOST)
|
||||
|
||||
# 询盘推送(设计 8.2): 清扫崩溃遗留的 stale pending → failed。逐租户、
|
||||
# 用该租户自己的 session_factory;db 文件不存在的租户跳过——全新库
|
||||
# 无遗留行,保持 engine 懒建纪律(预热的默认租户文件已建,照常扫)。
|
||||
from app.engine.services.lead_push_service import sweep_stale_pending
|
||||
await sweep_stale_pending()
|
||||
yield
|
||||
for rt in registry.runtimes():
|
||||
if rt.config.status != "active" or not rt.db_path.exists():
|
||||
continue
|
||||
ready = await registry.ensure_ready(rt)
|
||||
await sweep_stale_pending(session_factory=ready.session_factory)
|
||||
|
||||
try:
|
||||
yield
|
||||
finally:
|
||||
await registry.dispose_all() # Windows 文件锁: 不关则库文件删不掉
|
||||
|
||||
|
||||
app = FastAPI(title="HESUPIPE AI 客服", lifespan=lifespan)
|
||||
|
||||
@@ -216,6 +216,19 @@ class TenantRegistry:
|
||||
"""resolve_site 的便捷形式(双 API 一层实现)。"""
|
||||
return (await self.resolve_site(host))[0]
|
||||
|
||||
# ---- 装配期辅助(Task 5b: main.lifespan 逐租户启动清扫)------------------
|
||||
|
||||
def runtimes(self) -> tuple[TenantRuntime, ...]:
|
||||
"""全部租户运行时的加载期快照(engine 仍懒建)——装配期遍历用
|
||||
(lifespan 启动清扫逐租户跑)。返回快照 tuple:遍历中 registry_reload
|
||||
换条目不影响本轮迭代。"""
|
||||
return tuple(self._by_slug.values())
|
||||
|
||||
async def ensure_ready(self, rt: TenantRuntime) -> TenantRuntime:
|
||||
"""懒建的公开入口(装配期批处理用)——与 resolve 走同一条就绪路径,
|
||||
现势检查/双检/建库失败半开语义完全一致。"""
|
||||
return await self._ensure_ready(rt)
|
||||
|
||||
# ---- 懒建 / 热加载 / 释放 ---------------------------------------------
|
||||
|
||||
async def _ensure_ready(self, rt: TenantRuntime) -> TenantRuntime:
|
||||
|
||||
Reference in New Issue
Block a user