后端设计治理:批次 0-4 全部完成(安全/部署/一致性/结构/架构)
按 ROADMAP §3.1 治理批次推进的后端设计审查整改:
- 批次 0(安全):/api/status/{task_id} 补 JWT 鉴权与任务归属校验;
pythonocc_available 真实探测;bcrypt 超 72 字节显式拒绝;
SECRET_KEY/RUSTFS_* 惰性校验,代码侧弱默认移除
- 批次 1(部署正确性):主处理链路改走 RustFS(分派入参 stp_file_id 化,
worker 按 object_key 下载);AUTO_MIGRATE 开关 + 迁移目录 alembic/→migrations/
修复包遮蔽(自动迁移此前从未真正生效);OCC 镜像改 conda 原生执行 +
基础镜像 tag 锁定;compose 关键项改 ${VAR:?} 强制显式配置
- 批次 2(任务一致性):删除 Redis 进程内存回退,PG 为任务状态单一事实源;
批量元数据入库(processing_tasks.batch_id,迁移 a3f8c2d91e47);
型腔失败任务标 failed 不再静默 completed;事务边界收口
(数据本体写 flush-only、失败先回滚再置 failed、进度更新保留即时 commit)
- 批次 3(API 与代码结构):592 行 advanced_router 拆为 design/cost/machining/
export 四子路由,请求体全量 Pydantic 化;ROUTE_MODULES + route_registry
(/api/health 呈现 degraded,DEBUG fail fast);纯计算端点统一 to_thread;
StorageIntegrationService 按职责三拆;MAX_FILE_SIZE 接线生效、
celery 复用 Settings.redis_url;管理员重置密码改 JSON body(端到端断裂修复);
openapi.json 重导出(76 paths)+ 前端 gen:api
- 批次 4(架构演进):共享 ORM 按模块拆分(shared/models/base.py + identity.py、
moldinsight/models/、inventory/models/,删除三条无使用方的跨模块
relationship,跨模块桥接收敛为裸 FK 硬规则,无兼容 facade);
OCC executor 重建补 cancel_futures=True(消除旧队列被慢恢复线程
并行消化的数据竞争);OCC 吞吐方案设计先行
(docs/topics/performance/OCC_THROUGHPUT.md);顺手清偿 D15
(vite.config.ts 未用参数致 npm run build 失败)
测试基线:125 passed, 2 skipped(pytest + sqlite+aiosqlite;归属边界、
路由契约、配置治理、鉴权回归等随批新增)
文档同步:STATUS / TECH_DEBT / ROADMAP / ARCHITECTURE / API_CONTRACT /
OPERATIONS / AGENTS
Co-Authored-By: Claude Code <noreply@anthropic.com>
This commit is contained in:
@@ -0,0 +1,76 @@
|
||||
"""D3 模型拆分归属保护(批次 4,2026-09-17)。
|
||||
|
||||
锁定三个拆分成果:
|
||||
1. 三包模型全量注册后 mapper 可配置、31 表齐全;
|
||||
2. 单模块部署(inventory-only / moldinsight-only + auth)独立配置 mapper 成功——
|
||||
跨模块 ORM relationship 已清零,任何一侧不注册对方模型也能工作;
|
||||
3. 旧 shared.models.database 模块已删除且无兼容 facade(诚实原则:不留假象)。
|
||||
"""
|
||||
import importlib
|
||||
import subprocess
|
||||
import sys
|
||||
from pathlib import Path
|
||||
|
||||
SRC = str(Path(__file__).resolve().parent.parent / "src")
|
||||
|
||||
EXPECTED_TABLES = {
|
||||
# identity(shared.models.identity)
|
||||
"users", "roles", "permissions", "user_roles", "role_permissions",
|
||||
"user_activities", "system_logs",
|
||||
# moldinsight.models
|
||||
"stp_files", "geometry_data", "mesh_data", "html_files", "processing_tasks",
|
||||
"mold_cavity_data", "feature_detections", "design_recommendations", "analysis_metrics",
|
||||
# inventory.models
|
||||
"products", "product_materials", "material_price_history", "material_suppliers",
|
||||
"suppliers", "customers", "warehouses", "inventory", "stock_movements",
|
||||
"purchase_orders", "purchase_order_items", "sales_orders", "sales_order_items",
|
||||
"finance_transactions", "finance_allocations",
|
||||
}
|
||||
|
||||
|
||||
def test_full_registration_covers_all_31_tables():
|
||||
import shared.models.identity # noqa: F401
|
||||
import moldinsight.models # noqa: F401
|
||||
import inventory.models # noqa: F401
|
||||
from sqlalchemy.orm import configure_mappers
|
||||
|
||||
from shared.models.base import Base
|
||||
|
||||
configure_mappers()
|
||||
assert set(Base.metadata.tables) == EXPECTED_TABLES
|
||||
|
||||
|
||||
def test_single_module_deployments_configure_mappers_independently():
|
||||
"""单模块注册子进程验证:inventory-only 与 moldinsight-only(含 auth identity)
|
||||
均可在不 import 对方业务模型的情况下 configure_mappers 成功。
|
||||
用子进程隔离,避免污染本进程的 mapper 注册表。"""
|
||||
code = (
|
||||
"import sys; sys.path.insert(0, r'%s')\n"
|
||||
"from sqlalchemy.orm import configure_mappers\n"
|
||||
"%s\n"
|
||||
"configure_mappers()\n"
|
||||
"print('ok')\n"
|
||||
)
|
||||
cases = [
|
||||
# inventory-only:inventory 模型 + auth 必带的 identity
|
||||
"import inventory.models, shared.models.identity",
|
||||
# moldinsight-only:moldinsight 模型 + auth 必带的 identity
|
||||
"import moldinsight.models, shared.models.identity",
|
||||
]
|
||||
for imports in cases:
|
||||
proc = subprocess.run(
|
||||
[sys.executable, "-c", code % (SRC, imports)],
|
||||
capture_output=True, text=True, timeout=120,
|
||||
)
|
||||
assert proc.returncode == 0, f"{imports} 配置失败:\n{proc.stderr}"
|
||||
assert proc.stdout.strip().endswith("ok")
|
||||
|
||||
|
||||
def test_legacy_database_module_is_gone():
|
||||
"""旧 shared.models.database 已物理删除,无兼容 facade。"""
|
||||
try:
|
||||
importlib.import_module("shared.models.database")
|
||||
except ModuleNotFoundError:
|
||||
pass
|
||||
else:
|
||||
raise AssertionError("shared.models.database 仍可导入——拆分后不允许残留兼容 facade")
|
||||
Reference in New Issue
Block a user